Optimize add_mission scripts a bit

nikitawastaken · Jan 23, 2025 · a74e2f9 · a74e2f9
1 parent 0c2db7f
commit a74e2f9
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 31 deletions.
diff --git a/lua/charactertweakdata.lua b/lua/charactertweakdata.lua
@@ -683,12 +683,6 @@ Hooks:PostHook(CharacterTweakData, "init", "eclipse_init", function(self)
 		end,
 	}
 
-	-- fix beat cops being stuck on some spawn points in newer heists
-	self.cop.access = {
-		"cop",
-		"fbi",
-	}
-
 	-- Common SWAT
 	self.heavy_swat.damage.hurt_severity = self.presets.hurt_severities.no_heavy_hurt
 	self.heavy_swat.move_speed = self.presets.move_speed.normal

diff --git a/req/mission_script_add/dah.lua b/req/mission_script_add/dah.lua
@@ -2,13 +2,13 @@
 --Should make the heist feel more from PDTH
 local difficulty = tweak_data:difficulty_to_index(Global.game_settings and Global.game_settings.difficulty or "normal")
 local shield = (difficulty == 6 and "units/pd2_dlc_vip/characters/ene_phalanx_1/ene_phalanx_1") or "units/payday2/characters/ene_shield_1/ene_shield_1"
-local sniper = (difficulty >= 5 and "units/payday2/characters/ene_sniper_2/ene_sniper_2") or "units/payday2/characters/ene_sniper_1/ene_sniper_1"
-local swat_rifle = "units/payday2/characters/ene_fbi_swat_1/ene_fbi_swat_1"
-local swat_smg = "units/payday2/characters/ene_fbi_swat_1/ene_fbi_swat_1"
-local swat_shotgun = "units/payday2/characters/ene_fbi_swat_2/ene_fbi_swat_2"
-local swat_heavy_rifle = "units/payday2/characters/ene_fbi_heavy_1/ene_fbi_heavy_1"
-local swat_heavy_shotgun = "units/payday2/characters/ene_fbi_heavy_r870/ene_fbi_heavy_r870"
-local tank = (difficulty == 6 and "units/pd2_dlc_drm/characters/ene_bulldozer_minigun_classic/ene_bulldozer_minigun_classic") or "units/payday2/characters/ene_bulldozer_1/ene_bulldozer_1"
+local sniper = "units/payday2/characters/ene_sniper_1/ene_sniper_1"
+local swat_rifle = "units/payday2/characters/ene_swat_1/ene_swat_1"
+local swat_smg = "units/payday2/characters/ene_swat_1/ene_swwat_1"
+local swat_shotgun = "units/payday2/characters/ene_swat_2/ene_swat_2"
+local swat_heavy_rifle = "units/payday2/characters/ene_swat_heavy_1/ene_swat_heavy_1"
+local swat_heavy_shotgun = "units/payday2/characters/ene_swat_heavy_r870/ene_swat_heavy_r870"
+local tank = "units/payday2/characters/ene_bulldozer_1/ene_bulldozer_1"
 local taser = "units/payday2/characters/ene_tazer_1/ene_tazer_1"
 local cloaker = "units/payday2/characters/ene_spook_1/ene_spook_1"
 local pro_job = Global.game_settings and Global.game_settings.one_down
@@ -19,12 +19,6 @@ local eclipse = difficulty == 6
 local enabled_chance_extra_elevator_spawns = math.random() < diff_scaling
 local enabled_chance_helipad_shields = math.random() < diff_scaling
 local enabled_chance_helipad_dozer = math.random() < diff_scaling
-
-	if difficulty == 6 then
-		swat_rifle = "units/payday2/characters/ene_city_swat_1/ene_city_swat_1"
-		swat_shotgun = "units/payday2/characters/ene_city_swat_2/ene_city_swat_2"
-		swat_smg = "units/payday2/characters/ene_city_swat_3/ene_city_swat_3"
-	end
 
 local optsCloaker = {
     enemy = cloaker,

diff --git a/req/mission_script_add/dinner.lua b/req/mission_script_add/dinner.lua
@@ -2,8 +2,8 @@
 local difficulty = tweak_data:difficulty_to_index(Global.game_settings and Global.game_settings.difficulty or "normal")
 local murkyman_1 = "units/payday2/characters/ene_murkywater_1/ene_murkywater_1"
 local murkyman_2 = "units/payday2/characters/ene_murkywater_2/ene_murkywater_2"
-local shield = (difficulty >= 5 and "units/payday2/characters/ene_shield_1/ene_shield_1") or "units/payday2/characters/ene_shield_2/ene_shield_2"
-local tank = (difficulty == 6 and "units/pd2_dlc_drm/characters/ene_bulldozer_minigun_classic/ene_bulldozer_minigun_classic") or "units/payday2/characters/ene_bulldozer_1/ene_bulldozer_1"
+local shield = "units/payday2/characters/ene_shield_2/ene_shield_2"
+local tank = "units/payday2/characters/ene_bulldozer_1/ene_bulldozer_1"
 local taser = "units/payday2/characters/ene_tazer_1/ene_tazer_1"
 local cloaker = "units/payday2/characters/ene_spook_1/ene_spook_1"
 local hard_above = difficulty >= 3

diff --git a/req/mission_script_add/flat.lua b/req/mission_script_add/flat.lua
@@ -1,9 +1,9 @@
 --Same shit as resmod but with few tweaks
 --Should make the heist feel more from PDTH
 local difficulty = tweak_data:difficulty_to_index(Global.game_settings and Global.game_settings.difficulty or "normal")
-local swat_shotgunner = (difficulty >= 5 and "units/payday2/characters/ene_fbi_heavy_r870/ene_fbi_heavy_r870") or "units/payday2/characters/ene_swat_heavy_r870/ene_swat_heavy_r870"
+local swat_shotgunner = "units/payday2/characters/ene_swat_heavy_r870/ene_swat_heavy_r870"
 local shield = (difficulty == 6 and "units/pd2_dlc_vip/characters/ene_phalanx_1/ene_phalanx_1") or "units/payday2/characters/ene_shield_1/ene_shield_1"
-local tank = (difficulty == 6 and "units/pd2_dlc_drm/characters/ene_bulldozer_minigun_classic/ene_bulldozer_minigun_classic") or "units/payday2/characters/ene_bulldozer_1/ene_bulldozer_1"
+local tank = "units/payday2/characters/ene_bulldozer_1/ene_bulldozer_1"
 local taser = "units/payday2/characters/ene_tazer_1/ene_tazer_1"
 local cloaker = "units/payday2/characters/ene_spook_1/ene_spook_1"
 local diff_scaling = 0.125 * difficulty

diff --git a/req/mission_script_add/glace.lua b/req/mission_script_add/glace.lua
@@ -1,6 +1,5 @@
 local difficulty = tweak_data:difficulty_to_index(Global.game_settings and Global.game_settings.difficulty or "normal")
-local dozer = (difficulty == 6 and "units/pd2_dlc_drm/characters/ene_bulldozer_minigun_classic/ene_bulldozer_minigun_classic") or "units/payday2/characters/ene_bulldozer_1/ene_bulldozer_1"
-local dozer_skull =  "units/payday2/characters/ene_bulldozer_3/ene_bulldozer_3"
+local dozer = "units/payday2/characters/ene_bulldozer_1/ene_bulldozer_1"
 local shield = ((difficulty == 6 and pro_job) and "units/pd2_dlc_vip/characters/ene_phalanx_1/ene_phalanx_1") or "units/payday2/characters/ene_shield_1/ene_shield_1"
 local taser = "units/payday2/characters/ene_tazer_1/ene_tazer_1"
 local pro_job = Global.game_settings and Global.game_settings.one_down
@@ -16,8 +15,8 @@ local optsBulldozer = {
     enemy = dozer,
     enabled = (overkill_above and enabled_chance_dozer)
 }
-local optsBulldozer_skull = {
-    enemy = dozer_skull,
+local optsBulldozer_scaffold = {
+    enemy = dozer,
     enabled = (eclipse and enabled_chance_dozer_scaffold)
 }
 local optsShield_1 = {
@@ -126,14 +125,14 @@ return {
             "dozer_scaffolding_1",
             Vector3(-3102, -23325, 6519.008),
             Rotation(90, -0, -0),
-            optsBulldozer_skull
+            optsBulldozer_scaffold
         ),
 		restoration:gen_dummy(
             400008,
             "dozer_scaffolding_2",
             Vector3(-3580, -22030, 6519.008),
             Rotation(90, -0, -0),
-            optsBulldozer_skull
+            optsBulldozer_scaffold
         ),
 		restoration:gen_so(
             400009,

diff --git a/req/mission_script_add/pal.lua b/req/mission_script_add/pal.lua
@@ -1,5 +1,5 @@
 local difficulty = tweak_data:difficulty_to_index(Global.game_settings and Global.game_settings.difficulty or "normal")
-local sniper = (difficulty >= 5 and "units/payday2/characters/ene_sniper_2/ene_sniper_2") or "units/payday2/characters/ene_sniper_1/ene_sniper_1"
+local sniper = "units/payday2/characters/ene_sniper_1/ene_sniper_1"
 local eclipse = difficulty == 6
 local overkill_above = difficulty >= 5
 

diff --git a/req/mission_script_add/watchdogs_2.lua b/req/mission_script_add/watchdogs_2.lua
@@ -1,5 +1,5 @@
 local difficulty = tweak_data:difficulty_to_index(Global.game_settings and Global.game_settings.difficulty or "normal")
-local sniper = (difficulty >= 5 and "units/payday2/characters/ene_sniper_2/ene_sniper_2") or "units/payday2/characters/ene_sniper_1/ene_sniper_1"
+local sniper = "units/payday2/characters/ene_sniper_1/ene_sniper_1"
 
 local optsSniper_1 = {
 	enemy = sniper,