StartWave and CD chokepoints compat

.github/workflows/mega-linter.yml

@@ -6,14 +6,12 @@ permissions: read-all
 on:
   push:
   pull_request:
-    branches:
+    branches: [master]
-      - master
 
 env:
   APPLY_FIXES: none
   APPLY_FIXES_EVENT: pull_request
   APPLY_FIXES_MODE: commit
-  FILTER_REGEX_EXCLUDE: (mega-linter.yml)
   DISABLE: SPELL
 
 concurrency:
@@ -21,94 +19,54 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  megalinter:
+  build:
     name: MegaLinter
     runs-on: ubuntu-latest
-
-    permissions:
-      contents: write
-      issues: write
-      pull-requests: write
-
     steps:
       - name: Checkout Code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+        uses: actions/checkout@v3
         with:
           token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
-          fetch-depth: 0
 
       - name: MegaLinter
-        uses: oxsecurity/megalinter@7e042c726c68415475b05a65a686c612120a1232
         id: ml
+        uses: oxsecurity/megalinter@v6
         env:
           VALIDATE_ALL_CODEBASE: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Archive production artifacts
-        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
+        if: ${{ success() }} || ${{ failure() }}
-        if: success() || failure()
+        uses: actions/upload-artifact@v3
         with:
           name: MegaLinter reports
           path: |
             megalinter-reports
             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
-        uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
         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:
           token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
           commit-message: "[MegaLinter] Apply linters automatic fixes"
           title: "[MegaLinter] Apply linters automatic fixes"
           labels: bot
-
       - 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: |
-          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
-        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/
-
       - 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:
-          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_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

PublicationContent/description.txt

@@ -18,7 +18,7 @@ No. This mod is not whitelisted and will de-rank your server. Any XP gained will
 [*]Subscribe to this mutator;
 [*]Start KF2;
 [*]Open console (~) and input:
-[b]open KF-BioticsLab?Mutator=ZedSpawner.Mut[/b]
+[b]open KF-BioticsLab?Mutator=ZedSpawner.ZedSpawnerMut[/b]
 (replace the map and add the parameters you need)
 [*]<Enter>.
 [/olist]
@@ -33,7 +33,7 @@ No. This mod is not whitelisted and will de-rank your server. Any XP gained will
 [*]Add the following string to the [b][OnlineSubsystemSteamworks.KFWorkshopSteamworks][/b] section (create one if it doesn't exist):
 [b]ServerSubscribedWorkshopItems=2811290931[/b]
 [*]Start the server and wait while the mutator is downloading;
-[*]Add mutator to server start parameters: [b]?Mutator=ZedSpawner.Mut[/b] and restart the server.
+[*]Add mutator to server start parameters: [b]?Mutator=ZedSpawner.ZedSpawnerMut[/b] and restart the server.
 [/olist]
 
 [h1]Important setup information[/h1]
@@ -86,10 +86,7 @@ Use the [b][ZedSpawner.SpawnListBossWaves][/b] and [b][ZedSpawner.SpawnListSpeci
 [h1]Spawn logic[/h1]
 I really tried to describe in text how it works, but every time I got some kind of crap. Therefore, I decided to explain it a little differently and made a small calculator for this. It is interactive, you can change the parameters and see what happens. It has all the necessary explanations, so I think you will quickly figure out how the spawner works.
 
-[b]Link (remove spaces):[/b]
+[url=https://redirect.genzmey.su/kf2-zedspawner-calc][img]https://img.shields.io/static/v1?message=Spawn%20Calculator&logo=Google%20Sheets&labelColor=34A853&color=gray&logoColor=white&label=Google%20Sheets%20[/img][/url]
-[code]
-htt ps://docs .google .com/spreadsheets/d/1q67WJ36jhj6Y0lPNO5tS2bU79Wphu4Xmi62me6DAwtM/edit?usp=drive_link
-[/code]
 [i]Just please try not to interfere with each other if you see that someone is already using a calculator.[/i]
 
 [h1]Notes[/h1]

ZedSpawner/Classes/Mut.uc

@@ -1,61 +0,0 @@
-class Mut extends KFMutator
-	dependson(ZedSpawner);
-
-var private ZedSpawner ZS;
-
-public simulated function bool SafeDestroy()
-{
-	return (bPendingDelete || bDeleteMe || Destroy());
-}
-
-public event PreBeginPlay()
-{
-	Super.PreBeginPlay();
-
-	if (WorldInfo.NetMode == NM_Client) return;
-
-	foreach WorldInfo.DynamicActors(class'ZedSpawner', ZS)
-	{
-		break;
-	}
-
-	if (ZS == None)
-	{
-		ZS = WorldInfo.Spawn(class'ZedSpawner');
-	}
-
-	if (ZS == None)
-	{
-		`Log_Base("FATAL: Can't Spawn 'ZedSpawner'");
-		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)
-{
-	ZS.NotifyLogin(C);
-
-	Super.NotifyLogin(C);
-}
-
-public function NotifyLogout(Controller C)
-{
-	ZS.NotifyLogout(C);
-
-	Super.NotifyLogout(C);
-}
-
-defaultproperties
-{
-
-}

ZedSpawner/Classes/ZedSpawner.uc

@@ -255,7 +255,7 @@ private function PreloadContent()
 	}
 }
 
-private function ExtractCustomZedsFromSpawnList(const out Array<S_SpawnEntry> SpawnList, out Array<class<KFPawn_Monster> > Out)
+private function ExtractCustomZedsFromSpawnList(Array<S_SpawnEntry> SpawnList, out Array<class<KFPawn_Monster> > Out)
 {
 	local S_SpawnEntry SE;
 

ZedSpawner/Classes/ZedSpawnerMut.uc

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