From 91834b2995193d2256a0a35c3c5b3ea4b91819fd Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Fri, 17 Dec 2021 20:20:43 -0800 Subject: [PATCH] EMP Grenade: sprinting no longer wakes up EMP'd zombies --- README.md | 1 + scripts/zm/main/_zm_reimagined.gsc | 2 + scripts/zm/replaced/_zm_ai_basic.gsc | 40 +++++++++++++++++++ .../zm/zm_transit/zm_transit_reimagined.gsc | 1 + 4 files changed, 44 insertions(+) create mode 100644 scripts/zm/replaced/_zm_ai_basic.gsc diff --git a/README.md b/README.md index e9cfdd7a..d6b5f744 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ ### EMP Grenade * Decreased perk EMP time from 90 seconds to 60 seconds * Decreased zombie EMP radius by 30% (same radius as perk EMP) +* Sprinting no longer wakes up EMP'd zombies * No longer effects players ### Jet Gun diff --git a/scripts/zm/main/_zm_reimagined.gsc b/scripts/zm/main/_zm_reimagined.gsc index eb30e87a..e9a9be89 100644 --- a/scripts/zm/main/_zm_reimagined.gsc +++ b/scripts/zm/main/_zm_reimagined.gsc @@ -8,6 +8,7 @@ #include scripts/zm/replaced/_zm_utility; #include scripts/zm/replaced/_zm_powerups; #include scripts/zm/replaced/_zm_equipment; +#include scripts/zm/replaced/_zm_ai_basic; main() { @@ -16,6 +17,7 @@ main() replaceFunc(maps/mp/zombies/_zm_utility::track_players_intersection_tracker, scripts/zm/replaced/_zm_utility::track_players_intersection_tracker); replaceFunc(maps/mp/zombies/_zm_powerups::nuke_powerup, scripts/zm/replaced/_zm_powerups::nuke_powerup); replaceFunc(maps/mp/zombies/_zm_equipment::placed_equipment_think, scripts/zm/replaced/_zm_equipment::placed_equipment_think); + replaceFunc(maps/mp/zombies/_zm_ai_basic::inert_wakeup, scripts/zm/replaced/_zm_ai_basic::inert_wakeup); } init() diff --git a/scripts/zm/replaced/_zm_ai_basic.gsc b/scripts/zm/replaced/_zm_ai_basic.gsc new file mode 100644 index 00000000..e9822c7d --- /dev/null +++ b/scripts/zm/replaced/_zm_ai_basic.gsc @@ -0,0 +1,40 @@ +#include maps\mp\_utility; +#include common_scripts\utility; +#include maps\mp\zombies\_zm_utility; + +inert_wakeup() +{ + self endon( "death" ); + self endon( "stop_zombie_inert" ); + + wait 0.1; + + self thread maps/mp/zombies/_zm_ai_basic::inert_damage(); + self thread maps/mp/zombies/_zm_ai_basic::inert_bump(); + + while ( 1 ) + { + current_time = getTime(); + players = get_players(); + foreach ( player in players ) + { + dist_sq = distancesquared( self.origin, player.origin ); + if ( dist_sq < 4096 ) + { + self maps/mp/zombies/_zm_ai_basic::stop_inert(); + return; + } + + if ( dist_sq < 5760000 ) + { + if ( ( current_time - player.lastfiretime ) < 100 ) + { + self maps/mp/zombies/_zm_ai_basic::stop_inert(); + return; + } + } + } + + wait 0.1; + } +} \ No newline at end of file diff --git a/scripts/zm/zm_transit/zm_transit_reimagined.gsc b/scripts/zm/zm_transit/zm_transit_reimagined.gsc index 20b8a8a8..87e915ae 100644 --- a/scripts/zm/zm_transit/zm_transit_reimagined.gsc +++ b/scripts/zm/zm_transit/zm_transit_reimagined.gsc @@ -3,6 +3,7 @@ #include maps\mp\zombies\_zm_utility; #include scripts/zm/replaced/zm_transit; +#include scripts/zm/replaced/_zm_weap_emp_bomb; #include scripts/zm/replaced/_zm_equip_electrictrap; #include scripts/zm/replaced/_zm_equip_turret;