diff --git a/README.md b/README.md index ba24aab0..0adad42c 100644 --- a/README.md +++ b/README.md @@ -261,7 +261,7 @@ * Kills on any round ### Acid Gat -* Kills on any round +* Kills on any round in 1-2 bursts * Increased player damage from 10 to 25 * Vastly improved accuracy * Aiming and Deadshot improve accuracy @@ -634,7 +634,7 @@ * Acid Trap: decreased player damage from 75% of max health to 50% of max health * Acid Trap: increased time between player damage from 1 second to 1.5 seconds * Tower Trap: kills on any round in 1 shot -* Tower Trap (upgraded): kills on any round in 1 shot +* Tower Trap (upgraded): kills on any round in 1-2 shots * Tower Trap (upgraded): stays upgraded until the end of the round * Players no longer respawn in the Acid Trap * Zombies spawn in the Docks zone when in the Docks Gates zone diff --git a/scripts/zm/replaced/_zm.gsc b/scripts/zm/replaced/_zm.gsc index 04d86407..bb261029 100644 --- a/scripts/zm/replaced/_zm.gsc +++ b/scripts/zm/replaced/_zm.gsc @@ -823,7 +823,7 @@ actor_damage_override( inflictor, attacker, damage, flags, meansofdeath, weapon, } } - if ( isSubStr( weapon, "tower_trap" ) ) + if ( weapon == "tower_trap_zm" ) { if (!is_true(self.is_brutus)) { @@ -831,6 +831,20 @@ actor_damage_override( inflictor, attacker, damage, flags, meansofdeath, weapon, } } + if ( weapon == "tower_trap_upgraded_zm" ) + { + if (!is_true(self.is_brutus)) + { + damage_scalar = damage / 200; + min_damage = int(damage_scalar * level.zombie_health) + 1; + + if (damage < min_damage) + { + damage = min_damage; + } + } + } + if ( !isplayer( attacker ) && !isplayer( self ) ) { return damage; @@ -902,7 +916,13 @@ actor_damage_override( inflictor, attacker, damage, flags, meansofdeath, weapon, { if(!is_true(self.is_brutus)) { - final_damage = level.zombie_health; + damage_scalar = final_damage / 3000; + min_damage = int(damage_scalar * level.zombie_health) + 1; + + if(final_damage < min_damage) + { + final_damage = min_damage; + } } }