From 7d9cd1aaf6568a2553b7fac2788b27e892a797e5 Mon Sep 17 00:00:00 2001
From: Deysh <61760541+Deysh@users.noreply.github.com>
Date: Tue, 21 Nov 2023 05:30:56 -0500
Subject: [PATCH 1/4] [bigshot] v5.2.2 bugfix in bs_wander

---
 scripts/bigshot.lic | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/scripts/bigshot.lic b/scripts/bigshot.lic
index 205136024..2848d9ae8 100644
--- a/scripts/bigshot.lic
+++ b/scripts/bigshot.lic
@@ -8,7 +8,7 @@
   contributors: SpiffyJr, Tillmen, Kalros, Hazado, Tysong, Athias, Falicor, Deysh, Nisugi
           game: Gemstone
           tags: hunting, bigshot, combat
-       version: 5.2.1
+       version: 5.2.2
       required: Lich >= 5.5.0, infomon >= 1.18.11
 
   Setup Instructions: https://gswiki.play.net/Script_Bigshot
@@ -17,6 +17,9 @@
 
   Version Control:
     Major_change.feature_addition.bugfix
+  v5.2.2 (2023-11-21)
+    - bugfix causing bs_wander to delay 0.5 seconds longer than needed
+    - added Roa'ter and Ooze escape check in bs_wander 
   v5.2.1 (2023-11-15)
     - add new efury, caststop, and wield cmd
     - redo unravel/barddispel cmd
@@ -591,14 +594,8 @@ class Bigshot
 
     def all_present?
       @members.each_pair { |k, _v|
-        begin
-          return false if !checkpcs.include?(k) && k != @leader.name
-        rescue
-          @leader.message("yellow", "Error polling member(all_present?). Removing #{k}!")
-          @members.delete(k)
-        end
+        return false unless checkpcs.include?(k)
       }
-      sleep 0.5
       return true
     end
 
@@ -5623,10 +5620,10 @@ class Bigshot
       else
         way.call
       end
+      
+      escape_rooms
       set_room_claimed([])
-
       check_for_deaders_prone
-
       cast_signs(true)
     }
 
@@ -5674,7 +5671,8 @@ class Bigshot
         cmd_hide(1) unless hidden
         wait_rt
       end
-
+      
+      escape_rooms
       wait_while { @followers.roundtime? }
 
       if (Char.prof == "Ranger") && !Effects::Cooldowns.active?("Tracking") && !@TRACKING_CREATURE.empty?

From 7b044f432492a711ae568bd1fbced5fc6c126a98 Mon Sep 17 00:00:00 2001
From: Deysh <61760541+Deysh@users.noreply.github.com>
Date: Tue, 21 Nov 2023 05:36:31 -0500
Subject: [PATCH 2/4] rubocop cleanup

---
 scripts/bigshot.lic | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/bigshot.lic b/scripts/bigshot.lic
index 2848d9ae8..3d3673367 100644
--- a/scripts/bigshot.lic
+++ b/scripts/bigshot.lic
@@ -19,7 +19,7 @@
     Major_change.feature_addition.bugfix
   v5.2.2 (2023-11-21)
     - bugfix causing bs_wander to delay 0.5 seconds longer than needed
-    - added Roa'ter and Ooze escape check in bs_wander 
+    - added Roa'ter and Ooze escape check in bs_wander
   v5.2.1 (2023-11-15)
     - add new efury, caststop, and wield cmd
     - redo unravel/barddispel cmd
@@ -5620,7 +5620,7 @@ class Bigshot
       else
         way.call
       end
-      
+
       escape_rooms
       set_room_claimed([])
       check_for_deaders_prone
@@ -5671,7 +5671,7 @@ class Bigshot
         cmd_hide(1) unless hidden
         wait_rt
       end
-      
+
       escape_rooms
       wait_while { @followers.roundtime? }
 

From a2691f3eb0d3ae94312982d24ca22518ac316044 Mon Sep 17 00:00:00 2001
From: Deysh <61760541+Deysh@users.noreply.github.com>
Date: Tue, 21 Nov 2023 06:25:21 -0500
Subject: [PATCH 3/4] short delay added at end of single_stop() to prevent
 bleed over

---
 scripts/bigshot.lic | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/bigshot.lic b/scripts/bigshot.lic
index 3d3673367..3a525b317 100644
--- a/scripts/bigshot.lic
+++ b/scripts/bigshot.lic
@@ -4800,6 +4800,7 @@ class Bigshot
 
   def single_stop()
     Script.self.kill
+    sleep 0.5
   end
 
   def room_id()

From 5ccf2bf5fd444b45e47b932ad2398086a38ad06d Mon Sep 17 00:00:00 2001
From: Deysh <61760541+Deysh@users.noreply.github.com>
Date: Tue, 21 Nov 2023 08:05:20 -0500
Subject: [PATCH 4/4] add escape rooms check after resting travel

Sometimes they will eat you as you are trying to return from hunting.
---
 scripts/bigshot.lic | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/bigshot.lic b/scripts/bigshot.lic
index 3a525b317..28a079069 100644
--- a/scripts/bigshot.lic
+++ b/scripts/bigshot.lic
@@ -4529,6 +4529,8 @@ class Bigshot
       go2(@RESTING_ROOM_ID)
     end
 
+    escape_rooms
+
     if (@QUIET_FOLLOWERS) && !any_wounded
       @followers.add_event(:FOLLOW_NOW)
       message("yellow", "Waiting for followers....") if !@followers.all_present?