1
0

Compare commits

...

6 Commits

Author SHA1 Message Date
522b609ebc
Update description.txt 2024-04-26 23:31:48 +03:00
8223dec827
add CHN and CHT localizations
translator: cheungfatzong
https://steamcommunity.com/profiles/76561199126205919
2024-04-26 22:20:05 +03:00
e680270722
Merge pull request #7 from GenZmeY/short-name
add short alias for mutator
2024-03-08 16:45:49 +03:00
1f6de98e2f
add short alias for mutator 2023-12-31 23:13:28 +03:00
469c8bbd96
update ci/cd 2023-12-31 20:49:54 +03:00
48e1b9ff1d
update megalinter ci/cd 2023-10-21 14:12:10 +03:00
6 changed files with 125 additions and 79 deletions

View File

@ -6,12 +6,14 @@ permissions: read-all
on: on:
push: push:
pull_request: pull_request:
branches: [master] branches:
- 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: COPYPASTE_JSCPD DISABLE_ERRORS_LINTERS: COPYPASTE_JSCPD
@ -20,54 +22,94 @@ concurrency:
cancel-in-progress: true cancel-in-progress: true
jobs: jobs:
build: megalinter:
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@v3 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
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
if: ${{ success() }} || ${{ failure() }} uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
uses: actions/upload-artifact@v3 if: success() || failure()
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: 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) if: env.APPLY_FIXES_IF_PR == 'true'
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: 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) if: env.APPLY_FIXES_IF_PR == 'true'
run: | run: |
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}" echo "PR Number - ${{ steps.cpr.outputs.pull-request-number }}"
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" echo "PR URL - ${{ steps.cpr.outputs.pull-request-url }}"
- name: Prepare commit - name: Prepare commit
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'
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
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) uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
uses: stefanzweifel/git-auto-commit-action@v4 if: env.APPLY_FIXES_IF_COMMIT == 'true'
with: with:
branch: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref }} branch: >-
${{
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: megalinter-bot commit_user_name: "github-actions"
commit_user_email: nicolas.vuillamy@ox.security commit_user_email: "github-actions[bot]@users.noreply.github.com"

View File

@ -1,60 +1 @@
class CVCMut extends KFMutator; class CVCMut extends Mut; // backward compatibility
var private CVC CVC;
public simulated function bool SafeDestroy()
{
return (bPendingDelete || bDeleteMe || Destroy());
}
public event PreBeginPlay()
{
Super.PreBeginPlay();
if (WorldInfo.NetMode == NM_Client) return;
foreach WorldInfo.DynamicActors(class'CVC', CVC)
{
break;
}
if (CVC == None)
{
CVC = WorldInfo.Spawn(class'CVC');
}
if (CVC == None)
{
`Log_Base("FATAL: Can't Spawn 'CVC'");
SafeDestroy();
}
}
public function AddMutator(Mutator Mut)
{
if (Mut == Self) return;
if (Mut.Class == Class)
CVCMut(Mut).SafeDestroy();
else
Super.AddMutator(Mut);
}
public function NotifyLogin(Controller C)
{
Super.NotifyLogin(C);
CVC.NotifyLogin(C);
}
public function NotifyLogout(Controller C)
{
Super.NotifyLogout(C);
CVC.NotifyLogout(C);
}
defaultproperties
{
GroupNames.Add("VoteCollector")
}

60
CVC/Classes/Mut.uc Normal file
View File

@ -0,0 +1,60 @@
class Mut extends KFMutator;
var private CVC CVC;
public simulated function bool SafeDestroy()
{
return (bPendingDelete || bDeleteMe || Destroy());
}
public event PreBeginPlay()
{
Super.PreBeginPlay();
if (WorldInfo.NetMode == NM_Client) return;
foreach WorldInfo.DynamicActors(class'CVC', CVC)
{
break;
}
if (CVC == None)
{
CVC = WorldInfo.Spawn(class'CVC');
}
if (CVC == None)
{
`Log_Base("FATAL: Can't Spawn 'CVC'");
SafeDestroy();
}
}
public function AddMutator(Mutator M)
{
if (M == Self) return;
if (M.Class == Class)
Mut(M).SafeDestroy();
else
Super.AddMutator(M);
}
public function NotifyLogin(Controller C)
{
Super.NotifyLogin(C);
CVC.NotifyLogin(C);
}
public function NotifyLogout(Controller C)
{
Super.NotifyLogout(C);
CVC.NotifyLogout(C);
}
defaultproperties
{
GroupNames.Add("VoteCollector")
}

BIN
Localization/CHN/CVC.chn Normal file

Binary file not shown.

BIN
Localization/CHT/CVC.cht Normal file

Binary file not shown.

View File

@ -31,7 +31,7 @@ https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-m
[*]Add the following string to the [b][OnlineSubsystemSteamworks.KFWorkshopSteamworks][/b] section (create one if it doesn't exist): [*]Add the following string to the [b][OnlineSubsystemSteamworks.KFWorkshopSteamworks][/b] section (create one if it doesn't exist):
[b]ServerSubscribedWorkshopItems=2847465899[/b] [b]ServerSubscribedWorkshopItems=2847465899[/b]
[*]Start the server and wait until the mutator is downloading; [*]Start the server and wait until the mutator is downloading;
[*]Add mutator to server start parameters: [b]?Mutator=CVC.CVCMut[/b] and restart the server. [*]Add mutator to server start parameters: [b]?Mutator=CVC.Mut[/b] and restart the server.
[/olist] [/olist]
[h1]Setup (KFCVC.ini)[/h1] [h1]Setup (KFCVC.ini)[/h1]
@ -131,5 +131,8 @@ Version=0
Then start the server and check the file again - config content should be generated. Then start the server and check the file again - config content should be generated.
[h1]Translators:[/h1]
[url=https://steamcommunity.com/profiles/76561199126205919]cheungfatzong[/url] - Traditional [CHT] and Simplified [CHN] Chinese.
[h1]Sources[/h1] [h1]Sources[/h1]
[url=https://github.com/GenZmeY/KF2-ControlledVoteCollector]https://github.com/GenZmeY/KF2-ControlledVoteCollector[/url] [b](GNU GPLv3)[/b] [url=https://github.com/GenZmeY/KF2-ControlledVoteCollector]https://github.com/GenZmeY/KF2-ControlledVoteCollector[/url] [b](GNU GPLv3)[/b]