Merge pull request #7087 from mdr55/CT-fix

combat-trainer.lic

@@ -470,7 +470,8 @@ class LootProcess
     @last_ritual = nil
     echo("  @last_ritual: #{@last_ritual}") if $debug_mode_ct
 
-    @necro_heal = thanatology['heal'] || false
+    # necro_heal requires CF and/or devour to make it a reality, so condition it based on that
+    @necro_heal = (thanatology['heal'] && (settings.necromancer_healing['Consumed Flesh'] || settings.necromancer_healing['Devour'])) || false
     echo("  @necro_heal: #{@necro_heal}") if $debug_mode_ct
 
     @necro_store = thanatology['store'] || false
@@ -795,7 +796,10 @@ class LootProcess
       echo "Severity to Wounds: #{game_state.wounds}" if $debug_mode_ct
       echo "wound_level_threshold: #{@wound_level_threshold}" if $debug_mode_ct
       unless game_state.wounds.empty?
-        if @wound_level_threshold <= game_state.wounds.keys.max
+        # if devour is active, stop a (second) consume from being requested - has previously caused problem downstream with consume
+        # flag set but no CF/devour cast to clear hence blocking looting (and potentially other necro_casting defs)
+        # the check for !devour will also disallow concurrent use of devour and CF but that is not currently supported in CT @ 2/2/2025
+        if @wound_level_threshold <= game_state.wounds.keys.max && !DRSpells.active_spells['Devour']
           do_necro_ritual(mob_noun, 'consume', game_state)
           return false
         end