From 95c3cac6b9e7fb47b811c4e9f1596a7162d18344 Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Thu, 9 Mar 2023 23:25:34 -0800
Subject: [PATCH] Borough: buildables can spawn at Church bench

---
 README.md                                     |  1 +
 scripts/zm/_zm_reimagined.gsc                 |  1 +
 .../zm/replaced/zm_buried_grief_street.gsc    | 46 +++++++------------
 3 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index eb2541fd..f7858c89 100644
--- a/README.md
+++ b/README.md
@@ -468,6 +468,7 @@
 * Moved Quick Revive to Speed Cola's location on Borough
 * Moved Speed Cola to its location on Buried
 * Moved Stamin-Up to Vulture Aid's location on Buried
+* Buildables can spawn at Church bench
 * Added better randomization for buildables
 
 ### Origins
diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc
index 58311bf9..fb783e3e 100644
--- a/scripts/zm/_zm_reimagined.gsc
+++ b/scripts/zm/_zm_reimagined.gsc
@@ -2774,6 +2774,7 @@ buildbuildables()
 
 			updatebuildables();
 			removebuildable( "turbine", "buried" );
+			removebuildable( "headchopper_zm", "buried" ); // TODO - remove line when headchopper anims work on Borough
 		}
 	}
 }
diff --git a/scripts/zm/replaced/zm_buried_grief_street.gsc b/scripts/zm/replaced/zm_buried_grief_street.gsc
index 7760f3af..2825089e 100644
--- a/scripts/zm/replaced/zm_buried_grief_street.gsc
+++ b/scripts/zm/replaced/zm_buried_grief_street.gsc
@@ -4,7 +4,7 @@
 #include maps\mp\zombies\_zm_equip_subwoofer;
 #include maps\mp\zombies\_zm_equip_springpad;
 #include maps\mp\zombies\_zm_equip_turbine;
-//#include maps\mp\zombies\_zm_equip_headchopper;
+#include maps\mp\zombies\_zm_equip_headchopper;
 #include maps\mp\zm_buried_buildables;
 #include maps\mp\zm_buried_gamemodes;
 #include maps\mp\zombies\_zm_race_utility;
@@ -14,27 +14,33 @@
 
 precache()
 {
-	// trig = getent("turbine_buildable_trigger", "targetname");
-    // if(isDefined(trig))
-    // {
-    //     trig.targetname = "headchopper_buildable_trigger";
-    // }
-
 	precachemodel( "collision_wall_128x128x10_standard" );
 	precachemodel( "collision_wall_256x256x10_standard" );
 	precachemodel( "collision_wall_512x512x10_standard" );
 	precachemodel( "zm_collision_buried_street_grief" );
 	precachemodel( "p6_zm_bu_buildable_bench_tarp" );
+
+	trig = spawn( "script_model", (1288, 1485, 59) );
+	trig.angles = (0, 0, 0);
+	trig.script_angles = (0, 70, 0);
+	trig.targetname = "headchopper_buildable_trigger";
+	trig.target = "buildable_headchopper";
+
+	ent = spawn( "script_model", (1271.89, 1495.38, 77.78) );
+	ent.angles = (61.5365, 340.343, 0.216167);
+	ent.targetname = "buildable_headchopper";
+	ent.target = "headchopper_bench";
+	ent setmodel( "t6_wpn_zmb_chopper" );
+
 	level.chalk_buildable_pieces_hide = 1;
-	griefbuildables = array( "chalk", "turbine", "springpad_zm", "subwoofer_zm" );
-	//griefbuildables = array( "chalk", "headchopper_zm", "springpad_zm", "subwoofer_zm" );
+	griefbuildables = array( "chalk", "turbine", "springpad_zm", "subwoofer_zm", "headchopper_zm" );
 	maps\mp\zm_buried_buildables::include_buildables( griefbuildables );
 	maps\mp\zm_buried_buildables::init_buildables( griefbuildables );
 	maps\mp\zombies\_zm_equip_turbine::init();
 	maps\mp\zombies\_zm_equip_turbine::init_animtree();
 	maps\mp\zombies\_zm_equip_springpad::init( &"ZM_BURIED_EQ_SP_PHS", &"ZM_BURIED_EQ_SP_HTS" );
 	maps\mp\zombies\_zm_equip_subwoofer::init( &"ZM_BURIED_EQ_SW_PHS", &"ZM_BURIED_EQ_SW_HTS" );
-    //maps\mp\zombies\_zm_equip_headchopper::init( &"ZM_BURIED_EQ_HC_PHS", &"ZM_BURIED_EQ_HC_HTS" );
+    maps\mp\zombies\_zm_equip_headchopper::init( &"ZM_BURIED_EQ_HC_PHS", &"ZM_BURIED_EQ_HC_HTS" );
 }
 
 street_treasure_chest_init()
@@ -62,10 +68,6 @@ main()
 	level thread maps\mp\zombies\_zm_buildables::think_buildables();
 	maps\mp\gametypes_zm\_zm_gametype::setup_standard_objects( "street" );
 	street_treasure_chest_init();
-	generatebuildabletarps();
-	deletebuildabletarp( "courthouse" );
-	deletebuildabletarp( "bar" );
-	deletebuildabletarp( "generalstore" );
 	deleteslothbarricades();
 
 	disable_tunnels();
@@ -166,21 +168,7 @@ builddynamicwallbuy( location, weaponname )
 
 buildbuildables()
 {
-    // hack for headchopper model
-    // foreach(stub in level.buildable_stubs)
-	// {
-	// 	if(stub.equipname == "headchopper_zm")
-    //     {
-    //         origin_offset = (anglesToRight(stub.angles) * 8.57037) + (anglesToUp(stub.angles) * 17.78);
-    //         angles_offset = (61.5365, 90.343, 0.216167);
-
-    //         stub.model setModel("t6_wpn_zmb_chopper");
-    //         stub.model.origin += origin_offset;
-    //         stub.model.angles = stub.angles + angles_offset;
-    //     }
-    // }
-
-	//buildbuildable( "headchopper_zm" );
+	buildbuildable( "headchopper_zm" );
 	buildbuildable( "springpad_zm" );
 	buildbuildable( "subwoofer_zm" );
 	buildbuildable( "turbine" );