Compare commits
No commits in common. "master" and "v1.18.0" have entirely different histories.
76
.github/workflows/mega-linter.yml
vendored
76
.github/workflows/mega-linter.yml
vendored
@ -6,14 +6,12 @@ permissions: read-all
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches: [master]
|
||||||
- master
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
APPLY_FIXES: none
|
APPLY_FIXES: none
|
||||||
APPLY_FIXES_EVENT: pull_request
|
APPLY_FIXES_EVENT: pull_request
|
||||||
APPLY_FIXES_MODE: commit
|
APPLY_FIXES_MODE: commit
|
||||||
FILTER_REGEX_EXCLUDE: (mega-linter.yml)
|
|
||||||
DISABLE: SPELL
|
DISABLE: SPELL
|
||||||
DISABLE_ERRORS_LINTERS: MARKDOWN_MARKDOWN_LINK_CHECK
|
DISABLE_ERRORS_LINTERS: MARKDOWN_MARKDOWN_LINK_CHECK
|
||||||
EDITORCONFIG_EDITORCONFIG_CHECKER_FILTER_REGEX_EXCLUDE: 'xVoteAnnouncer.upk'
|
EDITORCONFIG_EDITORCONFIG_CHECKER_FILTER_REGEX_EXCLUDE: 'xVoteAnnouncer.upk'
|
||||||
@ -23,94 +21,54 @@ concurrency:
|
|||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
megalinter:
|
build:
|
||||||
name: MegaLinter
|
name: MegaLinter
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
issues: write
|
|
||||||
pull-requests: write
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Code
|
- name: Checkout Code
|
||||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
|
uses: actions/checkout@v3
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: MegaLinter
|
- name: MegaLinter
|
||||||
uses: oxsecurity/megalinter@7e042c726c68415475b05a65a686c612120a1232
|
|
||||||
id: ml
|
id: ml
|
||||||
|
uses: oxsecurity/megalinter@v6
|
||||||
env:
|
env:
|
||||||
VALIDATE_ALL_CODEBASE: true
|
VALIDATE_ALL_CODEBASE: true
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Archive production artifacts
|
- name: Archive production artifacts
|
||||||
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
|
if: ${{ success() }} || ${{ failure() }}
|
||||||
if: success() || failure()
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: MegaLinter reports
|
name: MegaLinter reports
|
||||||
path: |
|
path: |
|
||||||
megalinter-reports
|
megalinter-reports
|
||||||
mega-linter.log
|
mega-linter.log
|
||||||
|
|
||||||
- name: Set APPLY_FIXES_IF var
|
|
||||||
run: |
|
|
||||||
printf 'APPLY_FIXES_IF=%s\n' "${{
|
|
||||||
steps.ml.outputs.has_updated_sources == 1 &&
|
|
||||||
(
|
|
||||||
env.APPLY_FIXES_EVENT == 'all' ||
|
|
||||||
env.APPLY_FIXES_EVENT == github.event_name
|
|
||||||
) &&
|
|
||||||
(
|
|
||||||
github.event_name == 'push' ||
|
|
||||||
github.event.pull_request.head.repo.full_name == github.repository
|
|
||||||
)
|
|
||||||
}}" >> "${GITHUB_ENV}"
|
|
||||||
|
|
||||||
- name: Set APPLY_FIXES_IF_* vars
|
|
||||||
run: |
|
|
||||||
printf 'APPLY_FIXES_IF_PR=%s\n' "${{
|
|
||||||
env.APPLY_FIXES_IF == 'true' &&
|
|
||||||
env.APPLY_FIXES_MODE == 'pull_request'
|
|
||||||
}}" >> "${GITHUB_ENV}"
|
|
||||||
printf 'APPLY_FIXES_IF_COMMIT=%s\n' "${{
|
|
||||||
env.APPLY_FIXES_IF == 'true' &&
|
|
||||||
env.APPLY_FIXES_MODE == 'commit' &&
|
|
||||||
(!contains(fromJSON('["refs/heads/main", "refs/heads/master"]'), github.ref))
|
|
||||||
}}" >> "${GITHUB_ENV}"
|
|
||||||
|
|
||||||
- name: Create Pull Request with applied fixes
|
- name: Create Pull Request with applied fixes
|
||||||
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
|
|
||||||
id: cpr
|
id: cpr
|
||||||
if: env.APPLY_FIXES_IF_PR == 'true'
|
if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'pull_request' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
|
||||||
|
uses: peter-evans/create-pull-request@v5
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
|
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
|
||||||
commit-message: "[MegaLinter] Apply linters automatic fixes"
|
commit-message: "[MegaLinter] Apply linters automatic fixes"
|
||||||
title: "[MegaLinter] Apply linters automatic fixes"
|
title: "[MegaLinter] Apply linters automatic fixes"
|
||||||
labels: bot
|
labels: bot
|
||||||
|
|
||||||
- name: Create PR output
|
- name: Create PR output
|
||||||
if: env.APPLY_FIXES_IF_PR == 'true'
|
if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'pull_request' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
|
||||||
run: |
|
run: |
|
||||||
echo "PR Number - ${{ steps.cpr.outputs.pull-request-number }}"
|
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
|
||||||
echo "PR URL - ${{ steps.cpr.outputs.pull-request-url }}"
|
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
|
||||||
|
|
||||||
- name: Prepare commit
|
- name: Prepare commit
|
||||||
if: env.APPLY_FIXES_IF_COMMIT == 'true'
|
if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
|
||||||
run: sudo chown -Rc $UID .git/
|
run: sudo chown -Rc $UID .git/
|
||||||
|
|
||||||
- name: Commit and push applied linter fixes
|
- name: Commit and push applied linter fixes
|
||||||
uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
|
if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
|
||||||
if: env.APPLY_FIXES_IF_COMMIT == 'true'
|
uses: stefanzweifel/git-auto-commit-action@v4
|
||||||
with:
|
with:
|
||||||
branch: >-
|
branch: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref }}
|
||||||
${{
|
|
||||||
github.event.pull_request.head.ref ||
|
|
||||||
github.head_ref ||
|
|
||||||
github.ref
|
|
||||||
}}
|
|
||||||
commit_message: "[MegaLinter] Apply linters fixes"
|
commit_message: "[MegaLinter] Apply linters fixes"
|
||||||
commit_user_name: "github-actions"
|
commit_user_name: megalinter-bot
|
||||||
commit_user_email: "github-actions[bot]@users.noreply.github.com"
|
commit_user_email: nicolas.vuillamy@ox.security
|
||||||
|
Binary file not shown.
@ -88,7 +88,7 @@ SettingsInit=0[/b]
|
|||||||
[b][ServerExtMut.xVotingHandler]
|
[b][ServerExtMut.xVotingHandler]
|
||||||
ConfigVersion=0[/b]
|
ConfigVersion=0[/b]
|
||||||
|
|
||||||
[*]Put in [b]KFServerExt.ini[/b] this: [url=https://gist.githubusercontent.com/GenZmeY/616b6f845f9829c93976f42f6c48505a/raw/1a8c8409d61a2908d5c854ced0932b8ed43a7f51/KFServerExt-Default.ini]<github gist>[/url] [b](*)[/b]
|
[*]Put in [b]KFServerExt.ini[/b] this: [url=https://gist.githubusercontent.com/GenZmeY/616b6f845f9829c93976f42f6c48505a/raw/1a8c8409d61a2908d5c854ced0932b8ed43a7f51/KFServerExt-Default.ini]<gist.github.com>[/url] [b](*)[/b]
|
||||||
|
|
||||||
[*]Start the game/server along with the ServerExt, then check the configs - content should be generated.
|
[*]Start the game/server along with the ServerExt, then check the configs - content should be generated.
|
||||||
[/olist]
|
[/olist]
|
||||||
|
@ -98,4 +98,4 @@ In the description of the pull request, describe the changes you made.
|
|||||||
***
|
***
|
||||||
|
|
||||||
**Note about the banner:**
|
**Note about the banner:**
|
||||||
The cat in the picture is [meowbin](https://twitter.com/meawbinneko). And [Cotton Valent](https://twitter.com/horrormove) is the artist who designed and painted this magnificent cat.
|
The cat in the picture is [meowbin](https://www.deviantart.com/cottonvalent/gallery/48815375/creepy-cat). And [Cotton Valent](https://www.deviantart.com/cottonvalent) is the artist who designed and painted this magnificent cat.
|
||||||
|
@ -15,7 +15,7 @@ static function bool MeetsRequirements(byte Lvl, Ext_PerkBase Perk)
|
|||||||
{
|
{
|
||||||
local int i;
|
local int i;
|
||||||
|
|
||||||
if (Perk.CurrentLevel<Default.MinLevel || Perk.CurrentPrestige<1)
|
if (Perk.CurrentLevel<Default.MinLevel || Perk.CurrentPrestige<3)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (Lvl==0)
|
if (Lvl==0)
|
||||||
@ -43,4 +43,4 @@ defaultproperties
|
|||||||
SupportedPerk=class'Ext_PerkDemolition'
|
SupportedPerk=class'Ext_PerkDemolition'
|
||||||
DefLevelCosts(0)=100
|
DefLevelCosts(0)=100
|
||||||
DefMinLevel=100
|
DefMinLevel=100
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user