From 64835aee2265a5615555fbc815490b8799f453e3 Mon Sep 17 00:00:00 2001
From: Deysh <61760541+Deysh@users.noreply.github.com>
Date: Fri, 17 Jan 2025 04:31:57 -0500
Subject: [PATCH] [blackarts] v1.2.7 bugfix for mortar return on grinding task

---
 scripts/BlackArts.lic | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/BlackArts.lic b/scripts/BlackArts.lic
index 1f27d5989..cf03fa4ab 100644
--- a/scripts/BlackArts.lic
+++ b/scripts/BlackArts.lic
@@ -6,16 +6,18 @@
   contributors: Deysh, Tysong, Gob
           game: Gemstone
           tags: alchemy
-       version: 1.2.6
+       version: 1.2.7
 
   Improvements:
   Major_change.feature_addition.bugfix
+  v1.2.7 (2025-01-17)
+    - bugfix for giving mortar to clerk on grinding task
+=end
+=begin
   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)
@@ -8817,7 +8819,7 @@ module BlackArts
       task_mortar = Tasks.find_mortar_for_task
       Util.get_res("get ##{task_mortar}", BlackArts.data.get_regex)
 
-      shelf = GameObj.room_desc.find { |obj| obj.noun == 'shelf' } || GameObj.loot.find { |obj| obj.noun == 'shelf' }
+      shelf = (GameObj.room_desc.to_a + GameObj.loot.to_a).find { |obj| obj.noun =~ /shelf/ }
 
       loop {
         shelf_contents = Util.check_table(shelf)
@@ -8843,7 +8845,7 @@ module BlackArts
           exit
         end
 
-        give_result = Util.get_res("give ##{task_mortar} to #{clerk}", /^\[You have/)
+        give_result = Util.get_res("give #{clerk.noun}", /^\[You have/)
         break unless give_result =~ /\[You have [0-9]+ repetitions? remaining\.\]/
       }