From a5990a5c23be7906157e5a0e80f5aca0cbbf0c43 Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Tue, 4 Apr 2023 19:36:27 -0700
Subject: [PATCH] Ice Staff upgraded: fix melee sound

---
 README.md                                 |  1 +
 scripts/zm/replaced/zm_tomb.gsc           | 78 +++++++++++++++++++++++
 scripts/zm/zm_tomb/zm_tomb_reimagined.gsc |  1 +
 3 files changed, 80 insertions(+)
 create mode 100644 scripts/zm/replaced/zm_tomb.gsc

diff --git a/README.md b/README.md
index ab36ff9f..753ed72f 100644
--- a/README.md
+++ b/README.md
@@ -252,6 +252,7 @@
 * Upgraded: charged shots damage Panzersoldat
 * Upgraded: decreased alt weapon reload time to 0.5 seconds
 * Fire upgraded: charged shots no longer deal additional damage to Panzersoldat
+* Ice upgraded: fixed melee sound
 
 ## Wallbuys
 * Purchasing ammo refills clip ammo
diff --git a/scripts/zm/replaced/zm_tomb.gsc b/scripts/zm/replaced/zm_tomb.gsc
new file mode 100644
index 00000000..eafa53ea
--- /dev/null
+++ b/scripts/zm/replaced/zm_tomb.gsc
@@ -0,0 +1,78 @@
+#include common_scripts\utility;
+#include maps\mp\_utility;
+#include maps\mp\zombies\_zm_utility;
+#include maps\mp\zombies\_zm_weapons;
+#include maps\mp\zm_tomb_utility;
+#include maps\mp\zm_tomb_gamemodes;
+#include maps\mp\zm_tomb_fx;
+#include maps\mp\zm_tomb_ffotd;
+#include maps\mp\zm_tomb_tank;
+#include maps\mp\zm_tomb_quest_fire;
+#include maps\mp\zm_tomb_capture_zones;
+#include maps\mp\zm_tomb_teleporter;
+#include maps\mp\zm_tomb_giant_robot;
+#include maps\mp\zombies\_zm;
+#include maps\mp\animscripts\zm_death;
+#include maps\mp\zm_tomb_amb;
+#include maps\mp\zombies\_zm_ai_mechz;
+#include maps\mp\zombies\_zm_ai_quadrotor;
+#include maps\mp\zombies\_load;
+#include maps\mp\gametypes_zm\_spawning;
+#include maps\mp\zm_tomb_vo;
+#include maps\mp\zombies\_zm_perk_divetonuke;
+#include maps\mp\zombies\_zm_perks;
+#include maps\mp\zombies\_zm_perk_electric_cherry;
+#include maps\mp\zombies\_zm_weap_one_inch_punch;
+#include maps\mp\zombies\_zm_weap_staff_fire;
+#include maps\mp\zombies\_zm_weap_staff_water;
+#include maps\mp\zombies\_zm_weap_staff_lightning;
+#include maps\mp\zombies\_zm_weap_staff_air;
+#include maps\mp\zm_tomb;
+#include maps\mp\zm_tomb_achievement;
+#include maps\mp\zm_tomb_distance_tracking;
+#include maps\mp\zombies\_zm_magicbox_tomb;
+#include maps\mp\zombies\_zm_spawner;
+#include maps\mp\zm_tomb_challenges;
+#include maps\mp\zombies\_zm_perk_random;
+#include maps\mp\_sticky_grenade;
+#include maps\mp\zombies\_zm_weap_beacon;
+#include maps\mp\zombies\_zm_weap_claymore;
+#include maps\mp\zombies\_zm_weap_riotshield_tomb;
+#include maps\mp\zombies\_zm_weap_staff_revive;
+#include maps\mp\zombies\_zm_weap_cymbal_monkey;
+#include maps\mp\zm_tomb_ambient_scripts;
+#include maps\mp\zm_tomb_dig;
+#include maps\mp\zm_tomb_main_quest;
+#include maps\mp\zm_tomb_ee_main;
+#include maps\mp\zm_tomb_ee_side;
+#include maps\mp\zombies\_zm_zonemgr;
+#include maps\mp\zm_tomb_chamber;
+#include maps\mp\_visionset_mgr;
+#include maps\mp\zombies\_zm_audio;
+#include character\c_usa_dempsey_dlc4;
+#include character\c_rus_nikolai_dlc4;
+#include character\c_ger_richtofen_dlc4;
+#include character\c_jap_takeo_dlc4;
+#include maps\mp\zombies\_zm_powerup_zombie_blood;
+#include maps\mp\zombies\_zm_devgui;
+#include maps\mp\zombies\_zm_score;
+#include maps\mp\zombies\_zm_challenges;
+#include maps\mp\zombies\_zm_laststand;
+
+sndmeleewpn_isstaff( weapon )
+{
+    switch ( weapon )
+    {
+        case "staff_water_melee_zm":
+        case "staff_melee_zm":
+        case "staff_lightning_melee_zm":
+        case "staff_fire_melee_zm":
+        case "staff_air_melee_zm":
+            isstaff = 1;
+            break;
+        default:
+            isstaff = 0;
+    }
+
+    return isstaff;
+}
\ No newline at end of file
diff --git a/scripts/zm/zm_tomb/zm_tomb_reimagined.gsc b/scripts/zm/zm_tomb/zm_tomb_reimagined.gsc
index 86501bd1..11573043 100644
--- a/scripts/zm/zm_tomb/zm_tomb_reimagined.gsc
+++ b/scripts/zm/zm_tomb/zm_tomb_reimagined.gsc
@@ -33,6 +33,7 @@
 
 main()
 {
+    replaceFunc(maps\mp\zm_tomb::sndmeleewpn_isstaff, scripts\zm\replaced\zm_tomb::sndmeleewpn_isstaff);
 	replaceFunc(maps\mp\zm_tomb_main_quest::main_quest_init, scripts\zm\replaced\zm_tomb_main_quest::main_quest_init);
     replaceFunc(maps\mp\zm_tomb_main_quest::place_staff_in_charger, scripts\zm\replaced\zm_tomb_main_quest::place_staff_in_charger);
 	replaceFunc(maps\mp\zm_tomb_main_quest::watch_for_player_pickup_staff, scripts\zm\replaced\zm_tomb_main_quest::watch_for_player_pickup_staff);