diff --git a/README.md b/README.md index c1862a30..dd0ed820 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,8 @@ ## Weapons * Switch to melee weapon by pressing the new melee weapon button (same button as the Time Bomb and Maxis Drone) -* Changed grenade damage scalar to 50 multiplied by round number (normally random number between 100 and 200 added by round number) -* Capped grenade damage scalar at 3000 +* Changed grenade damage scalar to 25 multiplied by round number (normally random number between 100 and 200 added by round number) +* Capped grenade damage scalar at 1500 * Changed projectile weapon damage scalar to 50 multiplied by round number (normally random number between 0 and 100 multiplied by round number) * Capped projectile weapon damage scalar at 3000 * Changed placeable mine damage scalar to 150 multiplied by round number (normally random number between 100 and 200 multiplied by round number) diff --git a/scripts/zm/replaced/_zm_spawner.gsc b/scripts/zm/replaced/_zm_spawner.gsc index abd8c434..7f6375fb 100644 --- a/scripts/zm/replaced/_zm_spawner.gsc +++ b/scripts/zm/replaced/_zm_spawner.gsc @@ -91,7 +91,27 @@ zombie_damage( mod, hit_location, hit_origin, player, amount, team ) self dodamage( damage, self.origin, undefined, self, hit_location, mod ); } } - else if ( mod == "MOD_GRENADE" || mod == "MOD_GRENADE_SPLASH" || mod == "MOD_PROJECTILE" || mod == "MOD_PROJECTILE_SPLASH" || mod == "MOD_EXPLOSIVE" ) + else if ( mod == "MOD_GRENADE" || mod == "MOD_GRENADE_SPLASH" ) + { + damage = round_scalar * 25; + max_damage = 1500; + if(damage > max_damage) + { + damage = max_damage; + } + + if ( isDefined( player ) && isalive( player ) ) + { + player.grenade_multiattack_count++; + player.grenade_multiattack_ent = self; + self dodamage( damage, self.origin, player, self, hit_location, modname ); + } + else + { + self dodamage( damage, self.origin, undefined, self, hit_location, modname ); + } + } + else if ( mod == "MOD_PROJECTILE" || mod == "MOD_PROJECTILE_SPLASH" || mod == "MOD_EXPLOSIVE" ) { damage = round_scalar * 50; max_damage = 3000; @@ -102,11 +122,6 @@ zombie_damage( mod, hit_location, hit_origin, player, amount, team ) if ( isDefined( player ) && isalive( player ) ) { - if ( mod == "MOD_GRENADE" || mod == "MOD_GRENADE_SPLASH" ) - { - player.grenade_multiattack_count++; - player.grenade_multiattack_ent = self; - } self dodamage( damage, self.origin, player, self, hit_location, modname ); } else