From d39ab786995c70f99b4d7f48da714bf2592a0f60 Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Wed, 1 Mar 2023 20:10:30 -0800
Subject: [PATCH] Staffs: upgrade only requires kills in Crazy Place

---
 README.md                                  |  1 +
 scripts/zm/replaced/zm_tomb_quest_air.gsc  | 15 +++++++++++++++
 scripts/zm/replaced/zm_tomb_quest_elec.gsc | 17 +++++++++++++++++
 scripts/zm/replaced/zm_tomb_quest_fire.gsc | 16 ++++++++++++++++
 scripts/zm/replaced/zm_tomb_quest_ice.gsc  | 15 +++++++++++++++
 scripts/zm/zm_tomb/zm_tomb_reimagined.gsc  |  4 ++++
 6 files changed, 68 insertions(+)
 create mode 100644 scripts/zm/replaced/zm_tomb_quest_air.gsc
 create mode 100644 scripts/zm/replaced/zm_tomb_quest_elec.gsc
 create mode 100644 scripts/zm/replaced/zm_tomb_quest_fire.gsc
 create mode 100644 scripts/zm/replaced/zm_tomb_quest_ice.gsc

diff --git a/README.md b/README.md
index d2fe3683..e62f2908 100644
--- a/README.md
+++ b/README.md
@@ -195,6 +195,7 @@
 * Kills on any round
 
 ### Staffs
+* Upgrade only requires getting kills in The Crazy Place
 * Max ammo no longer fills clip ammo
 
 ## Wallbuys
diff --git a/scripts/zm/replaced/zm_tomb_quest_air.gsc b/scripts/zm/replaced/zm_tomb_quest_air.gsc
new file mode 100644
index 00000000..c1d20bf9
--- /dev/null
+++ b/scripts/zm/replaced/zm_tomb_quest_air.gsc
@@ -0,0 +1,15 @@
+#include common_scripts\utility;
+#include maps\mp\_utility;
+#include maps\mp\zombies\_zm_utility;
+#include maps\mp\zm_tomb_quest_air;
+#include maps\mp\zombies\_zm_craftables;
+#include maps\mp\zombies\_zm_sidequests;
+#include maps\mp\zm_tomb_utility;
+#include maps\mp\zombies\_zm_net;
+#include maps\mp\zm_tomb_vo;
+
+air_puzzle_1_run()
+{
+    level waittill( "elemental_staff_air_crafted", player );
+    flag_set( "staff_air_zm_upgrade_unlocked" );
+}
\ No newline at end of file
diff --git a/scripts/zm/replaced/zm_tomb_quest_elec.gsc b/scripts/zm/replaced/zm_tomb_quest_elec.gsc
new file mode 100644
index 00000000..e42eb1ee
--- /dev/null
+++ b/scripts/zm/replaced/zm_tomb_quest_elec.gsc
@@ -0,0 +1,17 @@
+#include common_scripts\utility;
+#include maps\mp\_utility;
+#include maps\mp\zombies\_zm_utility;
+#include maps\mp\zm_tomb_quest_elec;
+#include maps\mp\zombies\_zm_craftables;
+#include maps\mp\zombies\_zm_sidequests;
+#include maps\mp\zm_tomb_utility;
+#include maps\mp\zombies\_zm_net;
+#include maps\mp\zm_tomb_vo;
+#include maps\mp\zm_tomb_chamber;
+#include maps\mp\zombies\_zm_unitrigger;
+
+electric_puzzle_1_run()
+{
+    level waittill( "elemental_staff_lightning_crafted", player );
+    flag_set( "staff_lightning_zm_upgrade_unlocked" );
+}
\ No newline at end of file
diff --git a/scripts/zm/replaced/zm_tomb_quest_fire.gsc b/scripts/zm/replaced/zm_tomb_quest_fire.gsc
new file mode 100644
index 00000000..396b7aee
--- /dev/null
+++ b/scripts/zm/replaced/zm_tomb_quest_fire.gsc
@@ -0,0 +1,16 @@
+#include common_scripts\utility;
+#include maps\mp\_utility;
+#include maps\mp\zombies\_zm_utility;
+#include maps\mp\zm_tomb_quest_fire;
+#include maps\mp\zombies\_zm_craftables;
+#include maps\mp\zombies\_zm_sidequests;
+#include maps\mp\zm_tomb_utility;
+#include maps\mp\zombies\_zm_net;
+#include maps\mp\zm_tomb_vo;
+#include maps\mp\zm_tomb_chamber;
+
+fire_puzzle_1_run()
+{
+    level waittill( "elemental_staff_fire_crafted", player );
+    flag_set( "staff_fire_zm_upgrade_unlocked" );
+}
\ No newline at end of file
diff --git a/scripts/zm/replaced/zm_tomb_quest_ice.gsc b/scripts/zm/replaced/zm_tomb_quest_ice.gsc
new file mode 100644
index 00000000..af2fe9d2
--- /dev/null
+++ b/scripts/zm/replaced/zm_tomb_quest_ice.gsc
@@ -0,0 +1,15 @@
+#include common_scripts\utility;
+#include maps\mp\_utility;
+#include maps\mp\zombies\_zm_utility;
+#include maps\mp\zm_tomb_quest_ice;
+#include maps\mp\zombies\_zm_craftables;
+#include maps\mp\zombies\_zm_sidequests;
+#include maps\mp\zm_tomb_utility;
+#include maps\mp\zombies\_zm_net;
+#include maps\mp\zm_tomb_vo;
+
+ice_puzzle_1_run()
+{
+    level waittill( "elemental_staff_water_crafted", player );
+    flag_set( "staff_water_zm_upgrade_unlocked" );
+}
\ 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 53d8c963..bfc4407c 100644
--- a/scripts/zm/zm_tomb/zm_tomb_reimagined.gsc
+++ b/scripts/zm/zm_tomb/zm_tomb_reimagined.gsc
@@ -9,6 +9,10 @@
 main()
 {
 	replaceFunc(maps\mp\zm_tomb_main_quest::watch_staff_ammo_reload, scripts\zm\replaced\zm_tomb_main_quest::watch_staff_ammo_reload);
+	replaceFunc(maps\mp\zm_tomb_quest_air::air_puzzle_1_run, scripts\zm\replaced\zm_tomb_quest_air::air_puzzle_1_run);
+	replaceFunc(maps\mp\zm_tomb_quest_elec::electric_puzzle_1_run, scripts\zm\replaced\zm_tomb_quest_elec::electric_puzzle_1_run);
+	replaceFunc(maps\mp\zm_tomb_quest_fire::fire_puzzle_1_run, scripts\zm\replaced\zm_tomb_quest_fire::fire_puzzle_1_run);
+	replaceFunc(maps\mp\zm_tomb_quest_ice::ice_puzzle_1_run, scripts\zm\replaced\zm_tomb_quest_ice::ice_puzzle_1_run);
 	replaceFunc(maps\mp\zm_tomb_craftables::quadrotor_control_thread, scripts\zm\replaced\zm_tomb_craftables::quadrotor_control_thread);
 	replaceFunc(maps\mp\zm_tomb_dig::increment_player_perk_purchase_limit, scripts\zm\replaced\zm_tomb_dig::increment_player_perk_purchase_limit);
 	replaceFunc(maps\mp\zm_tomb_dig::dig_disconnect_watch, scripts\zm\replaced\zm_tomb_dig::dig_disconnect_watch);