diff --git a/useherbs.lic b/useherbs.lic index c1aa0a8..630b812 100644 --- a/useherbs.lic +++ b/useherbs.lic @@ -165,6 +165,7 @@ $known_herbs = [ { :name=>"barrel of Bearded Ladies' ale", :type=>"minor limb scar", :short_name => "Bearded Ladies' ale" }, # fixme { :name=>"some sovyn clove", :type=>"severed limb", :short_name => "sovyn clove", :store_doses=>1 }, + { :name=>"small sovyn clove", :type=>"severed limb", :short_name => "sovyn clove", :store_doses=>1 }, { :name=>"sovyn clove", :type=>"severed limb", }, { :name=>"tincture of sovyn", :type=>"severed limb", }, { :name=>"candied ptarmigan feather", :type=>"severed limb", :short_name => 'ptarmigan feather', :store_doses=>1 }, @@ -625,7 +626,7 @@ elsif script.vars[1].downcase == 'fill' unless silvers > 4000 withdraw.call end - Script.run('go2', '325') + go_to_herbalist.call herb_shop_menu = read_menu.call for herb_type in [ 'blood', 'major head wound', 'minor head wound', 'major head scar', 'minor head scar', 'major organ wound', 'minor organ wound', 'major organ scar', 'minor organ scar', 'missing eye', 'major limb wound', 'minor limb wound', 'major limb scar', 'minor limb scar', 'severed limb', 'major nerve wound', 'minor nerve wound', 'major nerve scar', 'minor nerve scar' ] unless herb_container.contents.any? { |obj| $known_herbs.any? { |herb| (herb[:name] == obj.name) and herb[:type] == herb_type } } @@ -656,6 +657,7 @@ elsif script.vars[1].downcase == 'fill' end end fput "close ##{herb_container.id}" if close_herbsack + deposit.call Script.run('go2', start_room.id.to_s) exit elsif script.vars[1].downcase == 'escort' @@ -680,7 +682,7 @@ elsif script.vars[1].downcase == 'escort' if open_result =~ /^You open/ close_herbsack = true else - dothistimeout "look in ##{herb_container.id}", 10, /In the .*? you see/ + dothistimeout "look in ##{herb_container.id}", 10, /In the .*? you see|In the .*?\:/ if herb_container.contents.nil? echo "error: failed to find herb container contents (#{herb_container.name}, #{herb_container.id})" exit @@ -915,7 +917,7 @@ elsif script.vars[1].downcase == 'stock' if open_result =~ /^You open/ close_herbsack = true else - dothistimeout "look in ##{herb_container.id}", 10, /In the .*? you see/ + dothistimeout "look in ##{herb_container.id}", 10, /In the .*? you see|In the .*?\:/ if herb_container.contents.nil? echo "error: timeout while trying to look in herb container (#{herb_container.name}, #{herb_container.id})" exit @@ -1293,7 +1295,7 @@ else if open_result =~ /^You open/ close_herbsack = true else - dothistimeout "look in ##{herb_container.id}", 10, /In the .*? you see/ + dothistimeout "look in ##{herb_container.id}", 10, /In the .*? you see|In the .*?\:/ if herb_container.contents.nil? echo 'fixme 38923' exit