Merge branch 'rpherbig:master' into desertkaz-patch-1

alchemy.lic

@@ -80,7 +80,7 @@ class Alchemy
         waitrt?
       end
       quantity_needed -= 6 # Forage forages 6 units.
-      fput("put my #{ingredient['name']} in my #{@alchemy_herb_storage}")
+      DRCI.put_away_item?(ingredient['name'], @alchemy_herb_storage)
       # Track the count down to make sure it stops when enough foraged.
       echo("quantity_needed = #{quantity_needed}") if @debug
     end
@@ -107,9 +107,9 @@ class Alchemy
             f_stack = DRC.bput("count my first #{ingredient['output']}", 'You count out \d+ pieces').scan(/\d+/).first.to_i
             s_stack = DRC.bput("count my second #{ingredient['output']}", 'I could not find', 'You count out \d+ pieces').scan(/\d+/).first.to_i
             if f_stack == 75
-              DRC.bput("stow my first #{ingredient['output']}", "You put")
+              DRCI.put_away_item?("first #{ingredient['output']}", @herb_container)
             elsif s_stack == 75
-              DRC.bput("stow my second #{ingredient['output']}", "You put", "Stow what?")
+              DRCI.put_away_item?("second #{ingredient['output']}", @herb_container)
             end
           end
         end

attunement.lic

@@ -153,7 +153,7 @@ class Attunement
       end
       return true
     end
-    case DRC.bput(get_perceive_command, "You fail to sense", "You're not ready to do that again, yet", "You reach out", "You sense:", "Roundtime")
+    case DRC.bput(get_perceive_command, "You fail to sense", "You're not ready to do that again, yet", "You reach out", "You sense:", "Roundtime", "Something in the area is interfering")
     when "You reach out", "You sense:"
       true
     else

combat-trainer.lic

@@ -956,8 +956,9 @@ class LootProcess
                   /You learn something/i,
                   'A failed or completed ritual has rendered',
                   'You realize after a few seconds',
-                  'prevents a meaningful dissection')
-    when /You succeed in dissecting the corpse/, /You learn something/i
+                  'prevents a meaningful dissection',
+                  "With less concern than you'd give a fresh corpse")
+    when /You succeed in dissecting the corpse/, /You learn something/i, "With less concern than you'd give a fresh corpse"
       return true
     when /You'll gain no insights from this attempt/
       waitrt?
@@ -1061,12 +1062,13 @@ class SafetyProcess
     Flags.add('ct-parasite', 'blood mite on your (?<body_part>.*)\.')
     @equipment_manager = equipment_manager
     @health_threshold = settings.health_threshold
+    @stop_on_bleeding = settings.stop_hunting_if_bleeding
     echo("  @health_threshold: #{@health_threshold}") if $debug_mode_ct
     @untendable_counter = 0
   end
 
   def execute(game_state)
-    if @untendable_counter >= 3
+    if @untendable_counter >= 3 && @stop_on_bleeding
       echo('Skipping tendme check due to untendable backoff') if $debug_mode_ct
       echo("Couldn't tend bleeders after trying three times. Stopping hunt to heal.")
       $HUNTING_BUDDY.stop_hunting

crossing-repair.lic

@@ -64,7 +64,7 @@ class CrossingRepair
     @hometown_data = get_data('town')[settings.hometown]
 
     # Start performance script for some sweet TDPs.
-    start_script('performance', ['noclean']) unless settings.instrument
+    start_script('performance', ['noclean']) unless settings.instrument || DRSkill.getrank('Performance') >= 1750
 
     # Call our main repair handler function.
     repair_handler(town, settings)

inventory-manager.lic

@@ -523,7 +523,7 @@ class InventoryManager
   end
 
   def strip_nesting(item)
-    if (match = /^(?<tap>[a-z "':!-]*(?<closed>\(closed\))?)\s\((?<nest1>(?<nest2>nested container[A-Za-z "':!-]*)\s\()?(?<main>in container[a-z '-]*)\)?\)\s(?<origin>\(.*\))$/i.match(item))
+    if (match = /^(?<tap>[a-z "':!-]*(?<closed>\(closed\))?)\s\((?<nest1>(?<nest2>nested container[a-z "':!-]*)\s\()?(?<main>in container[a-z "':!-]*)\)?\)\s(?<origin>\(.*\))$/i.match(item))
       return "#{match["tap"]} #{match["origin"]}"
     else
       return item