From 5b886c33c93e9fa7b082e6113ed0c25ed6badf09 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Thu, 20 Jan 2022 12:35:54 -0800 Subject: [PATCH] Increase grenade damage scalar --- README.md | 5 +++-- scripts/zm/replaced/_zm_spawner.gsc | 22 ++++++---------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 8f168433..e6758e77 100644 --- a/README.md +++ b/README.md @@ -66,8 +66,9 @@ * Removed hint when player is first attacked in solo ## Weapons -* Switch to melee weapon by pressing the new melee weapon button (same button as the Maxis Drone on Origins) -* Changed grenade damage scalar to 150 (normally random number between 100 and 200 added by round number) +* 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 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 0586495d..abd8c434 100644 --- a/scripts/zm/replaced/_zm_spawner.gsc +++ b/scripts/zm/replaced/_zm_spawner.gsc @@ -91,22 +91,7 @@ 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" ) - { - damage = 150; - - 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" ) + else if ( mod == "MOD_GRENADE" || mod == "MOD_GRENADE_SPLASH" || mod == "MOD_PROJECTILE" || mod == "MOD_PROJECTILE_SPLASH" || mod == "MOD_EXPLOSIVE" ) { damage = round_scalar * 50; max_damage = 3000; @@ -117,6 +102,11 @@ 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