diff --git a/mods/Config Files/BepInEx/config/MOAR.settings.cfg b/mods/Config Files/BepInEx/config/MOAR.settings.cfg index 47f4a23..5c778fd 100644 --- a/mods/Config Files/BepInEx/config/MOAR.settings.cfg +++ b/mods/Config Files/BepInEx/config/MOAR.settings.cfg @@ -130,9 +130,9 @@ scavMaxGroupSize = 4 ## Max pmc group size # Setting type: Int32 -# Default value: 4 +# Default value: 5 # Acceptable value range: From 0 to 10 -pmcMaxGroupSize = 4 +pmcMaxGroupSize = 5 ## Increases chances of pmc groups spawning, doesn't dramatically increase quantity. # Setting type: Boolean @@ -158,7 +158,7 @@ MaxBotCap = 25 ## This controls the health of zombies # Setting type: Double -# Default value: 1 +# Default value: 0.5 # Acceptable value range: From 0 to 3 ZombieHealth = 0.5 @@ -166,17 +166,17 @@ ZombieHealth = 0.5 # Setting type: Double # Default value: 1 # Acceptable value range: From 0 to 10 -ZombieWaveQuantity = 0.5 +ZombieWaveQuantity = 1 ## Determines the weighting of spawns at the beginning (1) spread evenly throughout (0.5) or at the end(0) of the raid # Setting type: Double -# Default value: 0.5 +# Default value: 0.2 # Acceptable value range: From 0 to 1 ZombieWaveDistribution = 0.2 ## Enables zombies to spawn # Setting type: Boolean -# Default value: false +# Default value: true zombiesEnabled On/Off = true ## Determines the weighting of spawns at the beginning (1) spread evenly throughout (0.5) or at the end(0) of the raid @@ -187,19 +187,19 @@ ScavWaveDistribution = 0.5 ## Determines the weighting of spawns at the beginning (1) spread evenly throughout (0.5) or at the end(0) of the raid # Setting type: Double -# Default value: 0.7 +# Default value: 0.8 # Acceptable value range: From 0 to 1 -PmcWaveDistribution = 0.7 +PmcWaveDistribution = 0.8 ## Multiplies wave counts seen in the server's mapConfig.json by this number # Setting type: Double -# Default value: 1 +# Default value: 1.5 # Acceptable value range: From 0 to 10 -ScavWaveQuantity = 1 +ScavWaveQuantity = 1.5 ## Multiplies wave counts seen in the server's mapConfig.json by this number # Setting type: Double -# Default value: 1 +# Default value: 1.5 # Acceptable value range: From 0 to 10 PmcWaveQuantity = 1.5 diff --git a/mods/Config Files/user/mods/order.json b/mods/Config Files/user/mods/order.json index 5c82edf..d392f78 100644 --- a/mods/Config Files/user/mods/order.json +++ b/mods/Config Files/user/mods/order.json @@ -27,13 +27,18 @@ "raid_review__0.3.0", "lacyway-mergeconsumables", "acidphantasm-brightlasers", + "AUG_AttachmentPack", "shibdib-shibsexpandedcrafts", "zSolarint-SAIN-ServerMod", "Skwizzy-LootingBots-ServerMod", - "SWAG", + "DewardianDev-MOAR", "inory-dynamicgoons", "acidphantasm-progressivebotsystem", "ArenaLockboxes-Delod-1.0.0", - "tyfon-weaponcustomizer" + "tyfon-weaponcustomizer", + "Additional Clothing BEAR", + "Additional Clothing USEC", + "BRNVG_N-15Adapter", + "OpticRework-310" ] } diff --git a/mods/SWAG + DONUTS/BepInEx/plugins/Donuts/Donuts.dll b/mods/SWAG + DONUTS/BepInEx/plugins/Donuts/Donuts.dll index 172ca1a..eb59ab3 100644 Binary files a/mods/SWAG + DONUTS/BepInEx/plugins/Donuts/Donuts.dll and b/mods/SWAG + DONUTS/BepInEx/plugins/Donuts/Donuts.dll differ diff --git a/mods/SWAG + DONUTS/BepInEx/plugins/Donuts/zoneSpawnPoints/customs_start.json b/mods/SWAG + DONUTS/BepInEx/plugins/Donuts/zoneSpawnPoints/customs_start.json index dfd7002..f830555 100644 --- a/mods/SWAG + DONUTS/BepInEx/plugins/Donuts/zoneSpawnPoints/customs_start.json +++ b/mods/SWAG + DONUTS/BepInEx/plugins/Donuts/zoneSpawnPoints/customs_start.json @@ -49,7 +49,7 @@ { "x": -95.4472046, "y": -9.004111, - "z": 74.5079 + "z": 47.000000 } ], "Zone_Green_Start": [ diff --git a/mods/SWAG + DONUTS/meta.ini b/mods/SWAG + DONUTS/meta.ini index fa9c18e..ca6201c 100644 --- a/mods/SWAG + DONUTS/meta.ini +++ b/mods/SWAG + DONUTS/meta.ini @@ -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= diff --git a/mods/SWAG + DONUTS/user/mods/SWAG/config/config.json b/mods/SWAG + DONUTS/user/mods/SWAG/config/config.json index a0b078c..2172652 100644 --- a/mods/SWAG + DONUTS/user/mods/SWAG/config/config.json +++ b/mods/SWAG + DONUTS/user/mods/SWAG/config/config.json @@ -30,7 +30,7 @@ "factory": 0, "factory_night": 2, "groundzero": 0, - "groundzero_high": 44, + "groundzero_high": 4, "interchange": 0, "laboratory": 0, "lighthouse": 0, diff --git a/mods/SWAG + DONUTS/user/mods/SWAG/src/SWAG.ts b/mods/SWAG + DONUTS/user/mods/SWAG/src/SWAG.ts index 44d3cdf..d5e28a0 100644 --- a/mods/SWAG + DONUTS/user/mods/SWAG/src/SWAG.ts +++ b/mods/SWAG + DONUTS/user/mods/SWAG/src/SWAG.ts @@ -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").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 = [ diff --git a/profiles/Multiplayer/modlist.txt b/profiles/Multiplayer/modlist.txt index ba791b8..d314eac 100644 --- a/profiles/Multiplayer/modlist.txt +++ b/profiles/Multiplayer/modlist.txt @@ -1,8 +1,7 @@ -# This file was automatically generated by Mod Organizer. -Unsorted_separator -Version 1.30.2_separator --SWAG + DONUTS -Visceral Combat +-MOAR - Ultra Lite Spawn Mod -Backburner_separator +Config Files -Modlist Addons_separator @@ -15,7 +14,7 @@ +Nerf Bot Grenades +Progressive Bot System +Dynamic Goons -+MOAR - Ultra Lite Spawn Mod ++SWAG + DONUTS +Looting Bots +That's Lit - Sync +That's Lit diff --git a/profiles/Server/modlist.txt b/profiles/Server/modlist.txt index 9cfc852..b8eaa75 100644 --- a/profiles/Server/modlist.txt +++ b/profiles/Server/modlist.txt @@ -1,8 +1,7 @@ -# This file was automatically generated by Mod Organizer. +Unsorted_separator -Version 1.30.2_separator --SWAG + DONUTS -Visceral Combat +-MOAR - Ultra Lite Spawn Mod +Backburner_separator +Config Files +Modlist Addons_separator @@ -15,7 +14,7 @@ +Nerf Bot Grenades +Progressive Bot System +Dynamic Goons -+MOAR - Ultra Lite Spawn Mod ++SWAG + DONUTS +Looting Bots +That's Lit - Sync +That's Lit