Adjust the map scripts, we rely on the map spawning the vehicle now

GMLambda · Jul 30, 2024 · e443868 · e443868
1 parent 998b118
commit e443868
Show file tree

Hide file tree

Showing 14 changed files with 55 additions and 15 deletions.
diff --git a/gamemode/gametypes/hl2/mapscripts/d1_canals_06.lua b/gamemode/gametypes/hl2/mapscripts/d1_canals_06.lua
@@ -19,7 +19,12 @@ MAPSCRIPT.InputFilters = {}
 MAPSCRIPT.EntityFilterByClass = {}
 
 MAPSCRIPT.EntityFilterByName = {
-    ["global_newgame_entmaker"] = true
+    ["global_newgame_spawner_suit"] = true,
+    ["global_newgame_spawner_crowbar"] = true,
+    ["global_newgame_spawner_pistol"] = true,
+    ["global_newgame_spawner_smg"] = true,
+    ["global_newgame_spawner_smg"] = true,
+    ["global_newgame_ammo"] = true,
 }
 
 function MAPSCRIPT:PostInit()

diff --git a/gamemode/gametypes/hl2/mapscripts/d1_canals_07.lua b/gamemode/gametypes/hl2/mapscripts/d1_canals_07.lua
@@ -19,7 +19,10 @@ MAPSCRIPT.InputFilters = {}
 MAPSCRIPT.EntityFilterByClass = {}
 
 MAPSCRIPT.EntityFilterByName = {
-    ["global_newgame_entmaker"] = true
+    ["global_newgame_spawner_suit"] = true,
+    ["global_newgame_spawner_crowbar"] = true,
+    ["global_newgame_spawner_pistol"] = true,
+    ["global_newgame_spawner_smg"] = true,
 }
 
 function MAPSCRIPT:PostInit()

diff --git a/gamemode/gametypes/hl2/mapscripts/d1_canals_08.lua b/gamemode/gametypes/hl2/mapscripts/d1_canals_08.lua
@@ -19,7 +19,10 @@ MAPSCRIPT.InputFilters = {}
 MAPSCRIPT.EntityFilterByClass = {}
 
 MAPSCRIPT.EntityFilterByName = {
-    ["global_newgame_entmaker"] = true,
+    ["global_newgame_spawner_suit"] = true,
+    ["global_newgame_spawner_crowbar"] = true,
+    ["global_newgame_spawner_pistol"] = true,
+    ["global_newgame_spawner_smg1"] = true,
     ["relay_locks_closegates"] = true -- Dont close the doors if we pass thru the gate
 }
 

diff --git a/gamemode/gametypes/hl2/mapscripts/d1_canals_09.lua b/gamemode/gametypes/hl2/mapscripts/d1_canals_09.lua
@@ -19,7 +19,11 @@ MAPSCRIPT.InputFilters = {}
 MAPSCRIPT.EntityFilterByClass = {}
 
 MAPSCRIPT.EntityFilterByName = {
-    ["global_newgame_entmaker"] = true
+    ["global_newgame_spawner_suit"] = true,
+    ["global_newgame_spawner_crowbar"] = true,
+    ["global_newgame_spawner_pistol"] = true,
+    ["global_newgame_spawner_smg"] = true,
+    ["global_newgame_spawner_357"] = true,
 }
 
 function MAPSCRIPT:PostInit()

diff --git a/gamemode/gametypes/hl2/mapscripts/d1_canals_10.lua b/gamemode/gametypes/hl2/mapscripts/d1_canals_10.lua
@@ -21,7 +21,11 @@ MAPSCRIPT.InputFilters = {}
 MAPSCRIPT.EntityFilterByClass = {}
 
 MAPSCRIPT.EntityFilterByName = {
-    ["global_newgame_entmaker"] = true
+    ["global_newgame_spawner_suit"] = true,
+    ["global_newgame_spawner_crowbar"] = true,
+    ["global_newgame_spawner_pistol"] = true,
+    ["global_newgame_spawner_smg"] = true,
+    ["global_newgame_spawner_357"] = true,
 }
 
 function MAPSCRIPT:PostInit()

diff --git a/gamemode/gametypes/hl2/mapscripts/d1_canals_11.lua b/gamemode/gametypes/hl2/mapscripts/d1_canals_11.lua
@@ -23,7 +23,11 @@ MAPSCRIPT.InputFilters = {
 MAPSCRIPT.EntityFilterByClass = {}
 
 MAPSCRIPT.EntityFilterByName = {
-    ["global_newgame_template"] = true,
+    ["global_newgame_spawner_suit"] = true,
+    ["global_newgame_spawner_crowbar"] = true,
+    ["global_newgame_spawner_pistol"] = true,
+    ["global_newgame_spawner_smg"] = true,
+    ["global_newgame_spawner_357"] = true,
     ["relay_guncave_gate_exit_close"] = true,
     ["filter_invulnerable"] = true
 }

diff --git a/gamemode/gametypes/hl2/mapscripts/d1_canals_12.lua b/gamemode/gametypes/hl2/mapscripts/d1_canals_12.lua
@@ -20,8 +20,11 @@ MAPSCRIPT.InputFilters = {}
 MAPSCRIPT.EntityFilterByClass = {}
 
 MAPSCRIPT.EntityFilterByName = {
-    ["global_newgame_entmaker"] = true,
-    ["spawnitems_template"] = true
+    ["global_newgame_spawner_suit"] = true,
+    ["global_newgame_spawner_crowbar"] = true,
+    ["global_newgame_spawner_pistol"] = true,
+    ["global_newgame_spawner_smg1"] = true,
+    ["global_newgame_spawner_357"] = true,
 }
 
 MAPSCRIPT.VehicleGuns = true

diff --git a/gamemode/gametypes/hl2/mapscripts/d1_canals_13.lua b/gamemode/gametypes/hl2/mapscripts/d1_canals_13.lua
@@ -21,7 +21,11 @@ MAPSCRIPT.InputFilters = {}
 MAPSCRIPT.EntityFilterByClass = {}
 
 MAPSCRIPT.EntityFilterByName = {
-    ["global_newgame_entmaker"] = true,
+    ["global_newgame_spawner_suit"] = true,
+    ["global_newgame_spawner_crowbar"] = true,
+    ["global_newgame_spawner_pistol"] = true,
+    ["global_newgame_spawner_smg"] = true,
+    ["global_newgame_spawner_357"] = true,
     ["canals_trigger_elitrans"] = true -- Do not changelevel based on the output.
 }
 

diff --git a/gamemode/gametypes/hl2/mapscripts/d1_eli_01.lua b/gamemode/gametypes/hl2/mapscripts/d1_eli_01.lua
@@ -26,7 +26,11 @@ MAPSCRIPT.InputFilters = {
 MAPSCRIPT.EntityFilterByClass = {}
 
 MAPSCRIPT.EntityFilterByName = {
-    ["global_newgame_template_base_items"] = true,
+    ["global_newgame_spawner_suit"] = true,
+    ["global_newgame_spawner_crowbar"] = true,
+    ["global_newgame_spawner_pistol"] = true,
+    ["global_newgame_spawner_smg1"] = true,
+    ["global_newgame_spawner_357"] = true,
     ["global_newgame_template_local_items"] = true,
     ["global_newgame_template_ammo"] = true,
     ["trigger_startScene"] = true,

diff --git a/gamemode/gametypes/hl2/mapscripts/d2_coast_03.lua b/gamemode/gametypes/hl2/mapscripts/d2_coast_03.lua
@@ -28,7 +28,6 @@ MAPSCRIPT.EntityFilterByClass = {}
 
 MAPSCRIPT.EntityFilterByName = {
     ["player_spawn_items"] = true,
-    ["player_spawn_items_maker"] = true,
     ["invulnerable"] = true
 }
 

diff --git a/gamemode/gametypes/hl2/mapscripts/d2_coast_04.lua b/gamemode/gametypes/hl2/mapscripts/d2_coast_04.lua
@@ -26,7 +26,11 @@ MAPSCRIPT.EntityFilterByClass = {}
 
 MAPSCRIPT.EntityFilterByName = {
     ["global_newgame_template_base_items"] = true,
-    ["global_newgame_template_local_items"] = true,
+    ["global_newgame_spawner_shotgun"] = true,
+    ["global_newgame_spawner_smg1"] = true,
+    ["global_newgame_spawner_ar2"] = true,
+    ["global_newgame_spawner_rpg"] = true,
+    ["global_newgame_spawner_357"] = true,
     ["global_newgame_template_ammo"] = true,
     ["fall_trigger"] = true, -- We replaced it by a more friendly variant
     ["crane_soldier_kill"] = true -- Why?

diff --git a/gamemode/gametypes/hl2/mapscripts/d2_coast_07.lua b/gamemode/gametypes/hl2/mapscripts/d2_coast_07.lua
@@ -25,7 +25,7 @@ MAPSCRIPT.InputFilters = {}
 MAPSCRIPT.EntityFilterByClass = {}
 
 MAPSCRIPT.EntityFilterByName = {
-    ["player_spawn_items_maker"] = true
+    ["player_spawn_items"] = true
 }
 
 MAPSCRIPT.VehicleGuns = true

diff --git a/gamemode/gametypes/hl2/mapscripts/d2_coast_09.lua b/gamemode/gametypes/hl2/mapscripts/d2_coast_09.lua
@@ -28,7 +28,10 @@ MAPSCRIPT.EntityFilterByClass = {}
 MAPSCRIPT.EntityFilterByName = {
     ["global_newgame_spawner_ammo"] = true,
     ["global_newgame_template_local_items"] = true,
-    ["global_newgame_template_base_items"] = true
+    ["global_newgame_spawner_suit"] = true,
+    ["global_newgame_spawner_crowbar"] = true,
+    ["global_newgame_spawner_pistol"] = true,
+    ["global_newgame_spawner_physcannon"] = true,
 }
 
 MAPSCRIPT.VehicleGuns = true

diff --git a/gamemode/gametypes/hl2/mapscripts/d2_coast_10.lua b/gamemode/gametypes/hl2/mapscripts/d2_coast_10.lua
@@ -23,7 +23,7 @@ MAPSCRIPT.DefaultLoadout = {
 }
 
 MAPSCRIPT.EntityFilterByName = {
-    ["player_spawn_items_maker"] = true
+    ["player_spawn_items"] = true
 }
 
 MAPSCRIPT.ImportantPlayerNPCNames = {