Updated SWAG/DONUTS

2025-01-14 20:43:36 -05:00
parent b292d36c21
commit 951d0201f9
9 changed files with 51 additions and 42 deletions
@@ -49,7 +49,7 @@
      {
        "x": -95.4472046,
        "y": -9.004111,
-        "z": 74.5079
+        "z": 47.000000
      }
    ],
    "Zone_Green_Start": [
@@ -1,11 +1,11 @@
 [General]
 gameName=spt
 modid=0
-version=d2025.1.12.0
+version=d2025.1.14.0
 newestVersion=
 category="1,"
 nexusFileStatus=1
-installationFile=SWAG-Donuts-v4.0.0RC2-SPT310x.7z
+installationFile=SWAG-Donuts-v4.0.0RC4-SPT310x.7z
 repository=Nexus
 ignoredVersion=
 comments=
@@ -30,7 +30,7 @@
         "factory": 0,
         "factory_night": 2,
         "groundzero": 0,
-         "groundzero_high": 44,
+         "groundzero_high": 4,
         "interchange": 0,
         "laboratory": 0,
         "lighthouse": 0,
@@ -65,6 +65,7 @@ import scav_snipers from "../config/other/scav_snipers.json";
 // Custom
 import punisher from "../config/custom/punisher.json"
 import legion from "../config/custom/legion.json"
+import {DatabaseService} from "@spt/services/DatabaseService";

 const otherSpawnConfigs = [
    bloodhounds,
@@ -230,7 +231,7 @@ class SWAG implements IPreSptLoadMod, IPostDBLoadMod
                        !config?.UseDefaultSpawns?.TriggeredWaves
                    ) 
                    {
-                        SWAG.disableSpawnSystems();
+                        SWAG.disableSpawnSystems(container);
                    }

                    // disable more vanilla spawn stuff
@@ -240,10 +241,6 @@ class SWAG implements IPreSptLoadMod, IPostDBLoadMod
                    locationConfig.addCustomBotWavesToMaps = false;
                    locationConfig.enableBotTypeLimits = false;

-                    logger.info(
-                        "SWAG: Vanilla spawn systems disabled"
-                    );
-
                    return output;
                }
            }],
@@ -511,8 +508,6 @@ class SWAG implements IPreSptLoadMod, IPostDBLoadMod
            {
                SWAG.spawnCustom(custom, globalmap);
            });
-
-            logger.warning(`SWAG: Configured boss spawns for map ${globalmap}`);
        });
    }

@@ -753,20 +748,20 @@ class SWAG implements IPreSptLoadMod, IPostDBLoadMod
        return Math.floor(Math.random() * (max - min + 1)) + min;
    }

-    static disableSpawnSystems(): void 
+    static disableSpawnSystems(container: DependencyContainer): void
    {
-        let map: keyof ILocations;
-        for (map in locations) 
-        {
-            if (map === "base" || map === "hideout") 
-            {
-                continue;
-            }
-            // locations[map].base.OfflineNewSpawn = false;
-            // locations[map].base.OfflineOldSpawn = true;
-            locations[map].base.NewSpawn = false;
-            locations[map].base.OldSpawn = true;
+        const DB = container.resolve<DatabaseService>("DatabaseService").getTables();
+        const locations = Object.keys(DB.locations);
+        for (const loc of locations) {
+            const base = DB.locations[loc].base;
+            if (!base) continue;
+            // Set spawn systems
+            base.NewSpawn = false;
+            base.OfflineNewSpawn = false;
+            base.OldSpawn = true;
+            base.OfflineOldSpawn = true;
        }
+        logger.info("SWAG: Spawn Systems Set")
    }

    static clearDefaultSpawns(): void 
@@ -790,6 +785,17 @@ class SWAG implements IPreSptLoadMod, IPostDBLoadMod
                };
            }

+            // Set bot USECs and BEARs to always be hostile to their chanced enemies
+            locations[map].base.BotLocationModifier.AdditionalHostilitySettings.forEach(setting =>
+            {
+                setting.BearEnemyChance = 100;
+                setting.UsecEnemyChance = 100;
+                setting.ChancedEnemies.forEach(enemy =>
+                {
+                    enemy.EnemyChance = 100;
+                })
+            })
+
            // Reset Database, Cringe  -- i stole this code from LUA
            locations[map].base.waves = [...SWAG.savedLocationData[map].waves];
            locations[map].base.BossLocationSpawn = [