2.6.8 update

Andrewgdewar · Jan 10, 2025 · ee1e7ae · ee1e7ae
1 parent 6a2ef0f
commit ee1e7ae
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/dist/DewardianDev-MOAR-2.6.7.zip b/dist/DewardianDev-MOAR-2.6.7.zip
diff --git a/dist/DewardianDev-MOAR-2.6.8.zip b/dist/DewardianDev-MOAR-2.6.8.zip
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MOAR",
-  "version": "2.6.7",
+  "version": "2.6.8",
   "main": "src/mod.js",
   "license": "MIT",
   "author": "DewardianDev",

diff --git a/src/Spawning/buildBossWaves.ts b/src/Spawning/buildBossWaves.ts
@@ -254,17 +254,29 @@ export function buildBossWaves(
         );
       // console.log(locationList[index].base.BossLocationSpawn.length);
 
+      const bossesToSkip = new Set(["sectantPriest", "pmcBot"]);
       // Apply the percentages on all bosses, cull those that won't spawn, make all bosses 100 chance that remain.
       locationList[index].base.BossLocationSpawn = locationList[
         index
-      ].base.BossLocationSpawn.filter(({ BossChance, BossName }, bossIndex) => {
-        if (BossChance < 100 && BossChance / 100 < Math.random()) {
-          return false;
+      ].base.BossLocationSpawn.filter(
+        ({ BossChance, BossName, TriggerId }, bossIndex) => {
+          if (
+            !TriggerId &&
+            !bossesToSkip.has(BossName) &&
+            BossChance < 100 &&
+            BossChance / 100 < Math.random()
+          ) {
+            return false;
+          }
+          return true;
         }
-        return true;
-      }).map((boss) => ({ ...boss, ...{ BossChance: 100 } }));
+      ).map((boss) =>
+        bossesToSkip.has(boss.BossName) || !!boss.TriggerId
+          ? boss
+          : { ...boss, ...{ BossChance: 100 } }
+      );
 
-      // if (mapName === "customs")
+      // if (mapName === "rezervbase")
       //   console.log(mapName, locationList[index].base.BossLocationSpawn);
     });