From 3f4f52ec1914497db093c1ecaf65fa1242f02a01 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Sun, 12 Mar 2023 04:18:23 -0700 Subject: [PATCH] Encounter: upgraded weapons stun longer --- README.md | 4 +++- scripts/zm/zgrief/zgrief_reimagined.gsc | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e6cd42e0..cb79eebf 100644 --- a/README.md +++ b/README.md @@ -503,7 +503,9 @@ * Only sprinting zombies * Unlimited powerups * Unlimited barrier rebuild points -* Decreased stun time of weapons from 0.75 seconds to 0.375 seconds +* Unupgraded weapons stun enemy players for 0.375 seconds +* Upgraded weapons stun enemy players for 0.5 seconds +* Melee weapons stun enemy players for 0.75 seconds * Meleeing enemy players that are crouched pushes 25% less * Meleeing enemy players that are prone pushes 50% less * Meleeing enemy players that are reviving pushes 50% less diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index 53a82bf7..68d50ad7 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -1864,7 +1864,7 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme self.stun_fx_ind = (self.stun_fx_ind + 1) % stun_fx_amount; } - self thread do_game_mode_shellshock(is_melee, is_reviving); + self thread do_game_mode_shellshock(is_melee, is_weapon_upgraded(sweapon)); self playsound( "zmb_player_hit_ding" ); score = 50; @@ -1884,17 +1884,21 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme } } -do_game_mode_shellshock(is_melee, is_reviving) +do_game_mode_shellshock(is_melee, is_upgraded) { self notify( "do_game_mode_shellshock" ); self endon( "do_game_mode_shellshock" ); self endon( "disconnect" ); time = 0.375; - if(is_melee) + if (is_melee) { time = 0.75; } + else if (is_upgraded) + { + time = 0.5; + } self._being_shellshocked = 1; self._being_pushed = is_melee;