From 56bbc84b1bb1eba15cce40661a34484086c0d25f Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Tue, 10 Mar 2020 17:12:17 -0700
Subject: [PATCH] MOTD Tower Trap changes

---
 README.md          |   3 +
 _zm_reimagined.gsc | 145 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+)

diff --git a/README.md b/README.md
index 79bc3346..930606c2 100644
--- a/README.md
+++ b/README.md
@@ -157,6 +157,9 @@
 
 ### Mob of the Dead
 * Acid Trap kills on any round (normally stops killing after round 158 on PC)
+* Tower Trap kills on any round in 1 shot
+* Upgraded Tower Trap kills on any round in 1-2 shots
+* Upgraded Tower Trap stays upgraded until the end of the round
 * Plane fuel automatically picked up
 
 ### Buried
diff --git a/_zm_reimagined.gsc b/_zm_reimagined.gsc
index aa0a33c0..05496e03 100644
--- a/_zm_reimagined.gsc
+++ b/_zm_reimagined.gsc
@@ -132,6 +132,8 @@ post_all_players_spawned()
 	slipgun_always_kill();
 	slipgun_disable_reslip();
 
+	prison_tower_trap_changes();
+
 	buried_turn_power_on();
 
 	borough_move_quickrevive_machine();
@@ -3095,6 +3097,149 @@ prison_auto_refuel_plane()
 	}
 }
 
+prison_tower_trap_changes()
+{
+	if(!(is_classic() && level.scr_zm_map_start_location == "prison"))
+	{
+		return;
+	}
+
+	// need to override the original function call
+	// this level var is threaded though so it doesn't work
+	level.custom_tower_trap_fires_func = ::prison_tower_trap_fires_override;
+
+	trap_trigs = getentarray( "tower_trap_activate_trigger", "targetname" );
+	foreach (trig in trap_trigs)
+	{
+		trig thread prison_tower_trap_trigger_think();
+		trig thread prison_tower_upgrade_trigger_think();
+	}
+}
+
+prison_tower_trap_fires_override( zombies )
+{
+	
+}
+
+prison_tower_trap_trigger_think()
+{
+	while (1)
+	{
+		self waittill("switch_activated");
+		self thread prison_activate_tower_trap();
+	}
+}
+
+prison_activate_tower_trap()
+{
+	self endon( "tower_trap_off" );
+
+	if ( isDefined( self.upgraded ) )
+	{
+		self.weapon_name = "tower_trap_upgraded_zm";
+		self.tag_to_target = "J_SpineLower";
+		self.trap_reload_time = 1.5;
+	}
+	else
+	{
+		self.weapon_name = "tower_trap_zm";
+		self.tag_to_target = "J_Head";
+		self.trap_reload_time = 0.75;
+	}
+
+	while ( 1 )
+	{
+		zombies = getaiarray( level.zombie_team );
+		zombies_sorted = [];
+		foreach ( zombie in zombies )
+		{
+			if ( zombie istouching( self.range_trigger ) )
+			{
+				zombies_sorted[ zombies_sorted.size ] = zombie;
+			}
+		}
+
+		if ( zombies_sorted.size <= 0 )
+		{
+			wait_network_frame();
+			continue;
+		}
+
+		self prison_tower_trap_fires( zombies_sorted );
+	}
+}
+
+prison_tower_trap_fires( zombies )
+{
+	self endon( "tower_trap_off" );
+
+	org = getstruct( self.range_trigger.target, "targetname" );
+	index = randomintrange( 0, zombies.size );
+
+	while ( isalive( zombies[ index ] ) )
+	{
+		target = zombies[ index ];
+		zombietarget = target gettagorigin( self.tag_to_target );
+
+		if ( sighttracepassed( org.origin, zombietarget, 1, undefined ) )
+		{
+			self thread prison_tower_trap_magicbullet_think( org, target, zombietarget );
+			wait self.trap_reload_time;
+			continue;
+		}
+		else
+		{
+			arrayremovevalue( zombies, target, 0 );
+			wait_network_frame();
+			if ( zombies.size <= 0 )
+			{
+				return;
+			}
+			else
+			{
+				index = randomintrange( 0, zombies.size );
+			}
+		}
+	}
+}
+
+prison_tower_trap_magicbullet_think( org, target, zombietarget )
+{
+	bullet = magicbullet( self.weapon_name, org.origin, zombietarget );
+	bullet waittill( "death" );
+
+	if ( self.weapon_name == "tower_trap_zm" )
+	{
+		if ( isDefined( target ) && isDefined( target.animname ) && target.health > 0 && target.animname != "brutus_zombie" )
+		{
+			if ( !isDefined( target.no_gib ) || !target.no_gib )
+			{
+				target maps/mp/zombies/_zm_spawner::zombie_head_gib();
+			}
+			target dodamage( target.health + 1000, target.origin );
+		}
+	}
+	else if ( self.weapon_name == "tower_trap_upgraded_zm" )
+	{
+		radiusdamage( bullet.origin, 256, level.zombie_health * 1.5, level.zombie_health / 2, self, "MOD_GRENADE_SPLASH", "tower_trap_upgraded_zm" );
+	}
+}
+
+prison_tower_upgrade_trigger_think()
+{
+	flag_wait( "initial_blackscreen_passed" );
+	flag_wait( "start_zombie_round_logic" );
+	wait 0.05;
+
+	while (1)
+	{
+		level waittill( self.upgrade_trigger.script_string );
+		self.upgraded = 1;
+		level waittill( "between_round_over" );
+		self.upgraded = undefined;
+	}
+}
+
 buried_turn_power_on()
 {
 	if(!(is_classic() && level.scr_zm_map_start_location == "processing"))