From e5c169ef08cc8e8851b9114c7e6e3b52770ce6d7 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Wed, 17 Apr 2024 02:02:23 -0700 Subject: [PATCH] Encounter: fix alternate weapons not being counted as upgraded weapons --- scripts/zm/zgrief/zgrief_reimagined.gsc | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index 39ad5041..ec1107e2 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -1696,6 +1696,8 @@ game_module_player_damage_callback(einflictor, eattacker, idamage, idflags, smea return; } + sweapon = get_real_nonalternate_weapon(sweapon); + if (!is_true(self._being_shellshocked)) { self do_game_mode_stun_score_steal(eattacker); @@ -1923,6 +1925,25 @@ remove_player_damage_info() self.last_griefed_by = undefined; } +get_real_nonalternate_weapon(sweapon) +{ + sweapon = get_nonalternate_weapon(sweapon); + + if (issubstr(sweapon, "metalstorm")) + { + if (issubstr(sweapon, "upgraded")) + { + sweapon = "metalstorm_mms_upgraded_zm"; + } + else + { + sweapon = "metalstorm_mms_zm"; + } + } + + return sweapon; +} + grief_laststand_weapon_save(einflictor, attacker, idamage, smeansofdeath, sweapon, vdir, shitloc, psoffsettime, deathanimduration) { self.grief_savedweapon_weapons = self getweaponslist();