From 7aaea0fb4a8a70d6fedabeba6b024c24ac879045 Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Sat, 6 May 2023 15:59:21 -0700
Subject: [PATCH] Der Wunderfizz: moves to new location instantly

---
 README.md                                 |  1 +
 scripts/zm/replaced/_zm_perk_random.gsc   | 24 +++++++++++++++++++++++
 scripts/zm/zm_tomb/zm_tomb_reimagined.gsc |  1 +
 3 files changed, 26 insertions(+)

diff --git a/README.md b/README.md
index 8b06b32b..2a460946 100644
--- a/README.md
+++ b/README.md
@@ -737,6 +737,7 @@
 * Mystery Box: uses the same trade weapon hint string as other maps
 * Der Wunderfizz: increased cost from 1500 to 2500
 * Der Wunderfizz: all perks have an equal chance of being obtained
+* Der Wunderfizz: moves to new location instantly
 * Rituals of the Ancients: spend points challenge reward changed from Double Tap perk to a random perk that the player does not have (perk does not change if reward is reopened)
 * Soul boxes: decreased number of souls to close from 30 to 20
 * Dig spots: decreased number of digs to obtain golden shovel from 30 to 20
diff --git a/scripts/zm/replaced/_zm_perk_random.gsc b/scripts/zm/replaced/_zm_perk_random.gsc
index ccc5ff4e..18839fca 100644
--- a/scripts/zm/replaced/_zm_perk_random.gsc
+++ b/scripts/zm/replaced/_zm_perk_random.gsc
@@ -9,6 +9,30 @@
 #include maps\mp\zombies\_zm_perks;
 #include maps\mp\zombies\_zm_perk_random;
 
+machine_selector()
+{
+    while ( true )
+    {
+        level waittill( "random_perk_moving" );
+
+        machines = getentarray( "random_perk_machine", "targetname" );
+
+        if ( machines.size == 1 )
+        {
+            new_machine = machines[0];
+            new_machine thread machine_think();
+            continue;
+        }
+
+        do
+            new_machine = machines[randomint( machines.size )];
+        while ( new_machine == level.random_perk_start_machine );
+
+        level.random_perk_start_machine = new_machine;
+        new_machine thread machine_think();
+    }
+}
+
 trigger_visible_to_player( player )
 {
     self setinvisibletoplayer( player );
diff --git a/scripts/zm/zm_tomb/zm_tomb_reimagined.gsc b/scripts/zm/zm_tomb/zm_tomb_reimagined.gsc
index 4d615c9f..5a04d333 100644
--- a/scripts/zm/zm_tomb/zm_tomb_reimagined.gsc
+++ b/scripts/zm/zm_tomb/zm_tomb_reimagined.gsc
@@ -78,6 +78,7 @@ main()
     replaceFunc(maps\mp\zombies\_zm_craftables::craftable_use_hold_think_internal, scripts\zm\replaced\_zm_craftables::craftable_use_hold_think_internal);
     replaceFunc(maps\mp\zombies\_zm_craftables::player_progress_bar_update, scripts\zm\replaced\_zm_craftables::player_progress_bar_update);
     replaceFunc(maps\mp\zombies\_zm_craftables::update_open_table_status, scripts\zm\replaced\_zm_craftables::update_open_table_status);
+    replaceFunc(maps\mp\zombies\_zm_perk_random::machine_selector, scripts\zm\replaced\_zm_perk_random::machine_selector);
     replaceFunc(maps\mp\zombies\_zm_perk_random::trigger_visible_to_player, scripts\zm\replaced\_zm_perk_random::trigger_visible_to_player);
     replaceFunc(maps\mp\zombies\_zm_powerup_zombie_blood::zombie_blood_powerup, scripts\zm\replaced\_zm_powerup_zombie_blood::zombie_blood_powerup);
     replaceFunc(maps\mp\zombies\_zm_riotshield_tomb::doriotshielddeploy, scripts\zm\replaced\_zm_riotshield_tomb::doriotshielddeploy);