diff --git a/README.md b/README.md index c2070b69..39ac4088 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,8 @@ * Sprinting no longer wakes up EMP'd zombies ### Ray Gun +* Unupgraded: increased impact damage from 1000 to 1500 (same as max splash damage) +* Upgraded: increased impact damage from 1000 to 2000 (same as max splash damage) * No longer limited to 4 players ### Ray Gun Mark 2 diff --git a/scripts/zm/replaced/_zm.gsc b/scripts/zm/replaced/_zm.gsc index 4abcc9a9..cfe78e58 100644 --- a/scripts/zm/replaced/_zm.gsc +++ b/scripts/zm/replaced/_zm.gsc @@ -120,6 +120,16 @@ actor_damage_override( inflictor, attacker, damage, flags, meansofdeath, weapon, attacker thread maps/mp/gametypes_zm/_weapons::checkhit( weapon ); + if(weapon == "ray_gun_zm" && meansofdeath == "MOD_PROJECTILE") + { + final_damage = 1500; + } + + if(weapon == "ray_gun_upgraded_zm" && meansofdeath == "MOD_PROJECTILE") + { + final_damage = 2000; + } + if(maps/mp/zombies/_zm_weapons::get_base_weapon_name(weapon, 1) == "saritch_zm") { final_damage *= 2; diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index a781be63..84149668 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -1772,7 +1772,7 @@ zombie_damage( mod, hit_location, hit_origin, player, amount, team ) self dodamage( damage, self.origin, undefined, self, hit_location, modname ); } } - else if ( mod != "MOD_PROJECTILE" || mod == "MOD_EXPLOSIVE" && mod == "MOD_PROJECTILE_SPLASH" ) + else if ( mod == "MOD_PROJECTILE" || mod == "MOD_PROJECTILE_SPLASH" || mod == "MOD_EXPLOSIVE" ) { damage = 1000; if ( isDefined( player ) && isalive( player ) ) @@ -1968,4 +1968,9 @@ spawn_bots(num) level.bots[i] = addtestclient(); } } + + flag_wait( "initial_blackscreen_passed" ); + + player giveWeapon("ray_gun_zm"); + player giveMaxAmmo("ray_gun_zm"); } \ No newline at end of file