Merge branch 'elanthia-online:main' into CT-upgrade

combat-trainer.lic

@@ -773,8 +773,6 @@ class LootProcess
 
     if ritual.eql?('butcher')
       butcher_corpse(mob_noun, ritual, game_state)
-
-      @last_ritual = ritual
       echo "Last ritual performed: #{@last_ritual}" if $debug_mode_ct
       return
     end
@@ -822,6 +820,7 @@ class LootProcess
     loop do
       result = DRC.bput("perform #{ritual} on #{mob_noun}", @rituals['butcher'], @rituals['failures'], @rituals['construct'])
       game_state.construct(mob_noun) if result.include?(@rituals['construct'])
+      @last_ritual = 'butcher' if result.include?(@rituals['butcher'])
       break if result.empty? || @rituals['failures'].any? { |msg| result.include?(msg) || result.include?(@rituals['construct']) }
 
       DRC.bput("drop my #{DRC.right_hand}", 'You drop', 'You discard', 'Please rephrase')

data/base-hunting.yaml

@@ -1074,10 +1074,14 @@ hunting_zones:
   # You'll need to remove bear's from the ignored_npcs: list otherwise it
   # just sit there not hunting.
   giant_bears:
-  - 15768
   - 15769
   - 15770
   - 15771
+  - 51570
+  - 51571
+  - 51572
+  - 51573
+  - 15768    # This room is last in the list even though it's the first room in the zone because `hunt` is broken in it.  Do not move it until hunt is fixed in the room.
   # same giant bears - premie only rooms but **you can escort in non-premie**
   # You'll need to remove bear's from the ignored_npcs: list otherwise it
   # just sit there not hunting.