From 3ed52dc1ffd3321294177806515dd0efe078dfa3 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Wed, 10 Jan 2024 05:02:49 -0800 Subject: [PATCH] Cell Block: fix issues --- README.md | 4 ++++ ...d3dbsp => so_zencounter_zm_prison.mapents} | 0 .../replaced/zm_alcatraz_grief_cellblock.gsc | 1 + scripts/zm/zm_prison/zm_prison_reimagined.gsc | 22 +++++++++++-------- 4 files changed, 18 insertions(+), 9 deletions(-) rename maps/mp/{so_zencounter_zm_prison.d3dbsp => so_zencounter_zm_prison.mapents} (100%) diff --git a/README.md b/README.md index 9e5d47be..6fbfa6fc 100644 --- a/README.md +++ b/README.md @@ -826,6 +826,10 @@ * Fixed being able to hit a death barrier when jumping off the Docks Bridge zone * Fixed locked hint string not showing on Blundergat Upgrade buildable table +### Cell Block +* Zombies spawn in the Cell Block 3rd Floor zone +* Fixed the electric fence in the Warden's Office making noise when bumping into it + #### Docks * Wallbuys: M14, Olympia, MP5, Uzi, M1927 * Perks: Juggernog diff --git a/maps/mp/so_zencounter_zm_prison.d3dbsp b/maps/mp/so_zencounter_zm_prison.mapents similarity index 100% rename from maps/mp/so_zencounter_zm_prison.d3dbsp rename to maps/mp/so_zencounter_zm_prison.mapents diff --git a/scripts/zm/replaced/zm_alcatraz_grief_cellblock.gsc b/scripts/zm/replaced/zm_alcatraz_grief_cellblock.gsc index f9816b66..12463d3e 100644 --- a/scripts/zm/replaced/zm_alcatraz_grief_cellblock.gsc +++ b/scripts/zm/replaced/zm_alcatraz_grief_cellblock.gsc @@ -296,6 +296,7 @@ main() t_warden_fence = getent("warden_fence_damage", "targetname"); t_warden_fence delete(); + level setclientfield("warden_fence_down", 1); m_plane_about_to_crash = getent("plane_about_to_crash", "targetname"); m_plane_about_to_crash delete(); m_plane_craftable = getent("plane_craftable", "targetname"); diff --git a/scripts/zm/zm_prison/zm_prison_reimagined.gsc b/scripts/zm/zm_prison/zm_prison_reimagined.gsc index 8a78faf0..babd2b54 100644 --- a/scripts/zm/zm_prison/zm_prison_reimagined.gsc +++ b/scripts/zm/zm_prison/zm_prison_reimagined.gsc @@ -804,15 +804,22 @@ working_zone_init() flag_init("always_on"); flag_set("always_on"); - if (is_gametype_active("zgrief")) + if (!is_classic()) { a_s_spawner = getstructarray("zone_cellblock_west_roof_spawner", "targetname"); + spawners_to_keep = []; foreach (spawner in a_s_spawner) { if (isdefined(spawner.script_parameters) && spawner.script_parameters == "zclassic_prison") - spawner structdelete(); + { + continue; + } + + spawners_to_keep[spawners_to_keep.size] = spawner; } + + level.struct_class_names["targetname"]["zone_cellblock_west_roof_spawner"] = spawners_to_keep; } if (is_classic()) @@ -885,19 +892,16 @@ working_zone_init() add_adjacent_zone("zone_cellblock_west_gondola", "zone_cellblock_west_gondola_dock", "activate_cellblock_gondola"); add_adjacent_zone("zone_cellblock_west_gondola", "zone_cellblock_west_gondola_dock", "gondola_dock_to_roof"); } - - /* - else if ( is_gametype_active( "zgrief" ) ) + else { - playable_area = getentarray( "player_volume", "script_noteworthy" ); + playable_area = getentarray("player_volume", "script_noteworthy"); - foreach ( area in playable_area ) + foreach (area in playable_area) { - if ( isdefined( area.script_parameters ) && area.script_parameters == "classic_only" ) + if (isdefined(area.script_parameters) && area.script_parameters == "classic_only") area delete(); } } - */ add_adjacent_zone("zone_golden_gate_bridge", "zone_golden_gate_bridge", "activate_player_zone_bridge");