From f353c624cf2152d4273f4545e72912859708b3af Mon Sep 17 00:00:00 2001
From: Deysh <61760541+Deysh@users.noreply.github.com>
Date: Sat, 11 Jan 2025 21:50:46 -0500
Subject: [PATCH 1/2] [blackarts] v1.2.6 bugfixes for FWI sorcerer guild

- remove Sorcerer Guild rooms in FWI that don't have crucibles
    - add a 1 minute delay if character has cycled thru all guilds
    - add check for FWI Sorcerer guildmaster that wanders
---
 scripts/BlackArts.lic | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/scripts/BlackArts.lic b/scripts/BlackArts.lic
index 47230a2d4..9a03026a2 100644
--- a/scripts/BlackArts.lic
+++ b/scripts/BlackArts.lic
@@ -6,14 +6,18 @@
   contributors: Deysh, Tysong, Gob
           game: Gemstone
           tags: alchemy
-       version: 1.2.5
+       version: 1.2.6
 
   Improvements:
   Major_change.feature_addition.bugfix
-  v1.2.5 (2025-01-10)
-    - bugfix for finding correct mortar for grinding tasks
+  v1.2.6 (2025-01-11)
+    - remove Sorcerer Guild rooms in FWI that don't have crucibles
+    - add a 1 minute delay if character has cycled thru all guilds
+    - add check for FWI Sorcerer guildmaster that wanders
 =end
 =begin
+  v1.2.5 (2025-01-10)
+    - bugfix for finding correct mortar for grinding tasks
   v1.2.4 (2025-01-09)
     - added messaging for moth cloak
   v1.2.3 (2024-12-31)
@@ -4110,6 +4114,10 @@ module BlackArts
           exit
         end
 
+        Util.go2("#{Char.prof.downcase} alchemy administrator")
+        Util.msg("yellow", " Sleeping 1 minute before moving to the next guild. \n")
+        sleep 60
+
         Util.travel(3669)
         if UserVars.mapdb_fwi_return_room.nil?
           worn = GameObj[UserVars.mapdb_fwi_trinket].nil? ? false : true
@@ -4162,7 +4170,7 @@ module BlackArts
     def self.find_workshops
       location_list = BlackArts.data.current_room.find_all_nearest_by_tag("#{Char.prof.downcase} alchemy workshop")
       _previous, shortest_distances = BlackArts.data.current_room.dijkstra
-      location_list.delete_if { |room_id| shortest_distances[room_id].nil? || shortest_distances[room_id].to_i > 10 }
+      location_list.delete_if { |room_id| shortest_distances[room_id].nil? || shortest_distances[room_id].to_i > 10 || room_id == 34600 || room_id == 34601 }
       location_list = location_list.sort { |a, b| shortest_distances[a] <=> shortest_distances[b] }
 
       if location_list.empty?
@@ -7014,6 +7022,12 @@ module BlackArts
     def self.get_promoted(skill, location = nil)
       Util.travel(BlackArts.data.current_admin)
       Util.travel("#{Char.prof.downcase} alchemy guildmaster")
+      
+      guildmaster = GameObj.npcs.find { |npc| npc.name =~ /guild/i }
+      # The Guild Master in the FWI Sorcerer Guild wanders 
+      if guildmaster.nil? && Room.current.id == 34597
+        Util.travel(34583)
+      end
 
       lines = Util.get_command("ask ##{GameObj.npcs.find { |npc| npc.name =~ /guild/i }.id} about next #{skill}", /You ask/i)
 

From 60f9e46172402c3fb8fc9cce913e05363506ede3 Mon Sep 17 00:00:00 2001
From: Deysh <61760541+Deysh@users.noreply.github.com>
Date: Sat, 11 Jan 2025 21:54:17 -0500
Subject: [PATCH 2/2] rubocop cleanup

---
 scripts/BlackArts.lic | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/BlackArts.lic b/scripts/BlackArts.lic
index 9a03026a2..1f27d5989 100644
--- a/scripts/BlackArts.lic
+++ b/scripts/BlackArts.lic
@@ -7022,9 +7022,9 @@ module BlackArts
     def self.get_promoted(skill, location = nil)
       Util.travel(BlackArts.data.current_admin)
       Util.travel("#{Char.prof.downcase} alchemy guildmaster")
-      
+
       guildmaster = GameObj.npcs.find { |npc| npc.name =~ /guild/i }
-      # The Guild Master in the FWI Sorcerer Guild wanders 
+      # The Guild Master in the FWI Sorcerer Guild wanders
       if guildmaster.nil? && Room.current.id == 34597
         Util.travel(34583)
       end