diff --git a/README.md b/README.md index 2ce7811f..a0aec621 100644 --- a/README.md +++ b/README.md @@ -221,6 +221,8 @@ * Gets destroyed after being deployed for 30 seconds * Kills on any round (normally stops killing after round 50) * Can kill unlimited zombies at once +* No longer kills players without Juggernog instantly +* Decreased player damage from 75 to 25 * Decreased startup time from 2 seconds to 0.5 seconds ### Turret diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index f7b8eb04..bce1e969 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -15,6 +15,7 @@ #include scripts/zm/replaced/_zm_power; #include scripts/zm/replaced/_zm_powerups; #include scripts/zm/replaced/_zm_pers_upgrades; +#include scripts/zm/replaced/_zm_traps; #include scripts/zm/replaced/_zm_equipment; #include scripts/zm/replaced/_zm_ai_basic; @@ -49,6 +50,7 @@ main() replaceFunc(maps/mp/zombies/_zm_powerups::insta_kill_powerup, scripts/zm/replaced/_zm_powerups::insta_kill_powerup); replaceFunc(maps/mp/zombies/_zm_powerups::double_points_powerup, scripts/zm/replaced/_zm_powerups::double_points_powerup); replaceFunc(maps/mp/zombies/_zm_pers_upgrades::is_pers_system_disabled, scripts/zm/replaced/_zm_pers_upgrades::is_pers_system_disabled); + replaceFunc(maps/mp/zombies/_zm_traps::player_elec_damage, scripts/zm/replaced/_zm_traps::player_elec_damage); replaceFunc(maps/mp/zombies/_zm_equipment::show_equipment_hint, scripts/zm/replaced/_zm_equipment::show_equipment_hint); 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); diff --git a/scripts/zm/replaced/_zm_traps.gsc b/scripts/zm/replaced/_zm_traps.gsc new file mode 100644 index 00000000..0e725b20 --- /dev/null +++ b/scripts/zm/replaced/_zm_traps.gsc @@ -0,0 +1,32 @@ +#include maps\mp\_utility; +#include common_scripts\utility; +#include maps\mp\zombies\_zm_utility; + +player_elec_damage() +{ + self endon( "death" ); + self endon( "disconnect" ); + + if ( !isDefined( self.is_burning ) && is_player_valid( self ) ) + { + self.is_burning = 1; + shocktime = 1.25; + + if ( is_true( level.trap_electric_visionset_registered ) ) + { + maps/mp/_visionset_mgr::vsmgr_activate( "overlay", "zm_trap_electric", self, shocktime, shocktime ); + } + else + { + self setelectrified( shocktime ); + } + + self shellshock( "electrocution", shocktime ); + self playsound( "zmb_zombie_arc" ); + radiusdamage( self.origin, 10, 25, 25 ); + + wait 0.1; + + self.is_burning = undefined; + } +} \ No newline at end of file