From ed0b9c28f144971f4930533aeaa27d515beea7f3 Mon Sep 17 00:00:00 2001
From: mdr55 <98430078+mdr55@users.noreply.github.com>
Date: Sat, 1 Feb 2025 22:44:54 +1100
Subject: [PATCH 1/2] Update combat-trainer.lic

---
 combat-trainer.lic | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/combat-trainer.lic b/combat-trainer.lic
index 3357026c3c..29b42d3ab4 100644
--- a/combat-trainer.lic
+++ b/combat-trainer.lic
@@ -795,7 +795,8 @@ 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
+        # consume ritual is requested if: wound above threshold, devour is not currently active, and we are configured to use devour and/or CF
+        if @wound_level_threshold <= game_state.wounds.keys.max && DRSpells.active_spells['Devour'] && (@necromancer_healing.key?('Devour') || (@necromancer_healing.key?('Consume Flesh')))
           do_necro_ritual(mob_noun, 'consume', game_state)
           return false
         end

From a8fcc5a9a0fe15ce648863f526dba9cb4c1ee44e Mon Sep 17 00:00:00 2001
From: mdr55 <98430078+mdr55@users.noreply.github.com>
Date: Sun, 2 Feb 2025 02:59:38 +1100
Subject: [PATCH 2/2] Update combat-trainer.lic

---
 combat-trainer.lic | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/combat-trainer.lic b/combat-trainer.lic
index 29b42d3ab4..c43bbe92a8 100644
--- a/combat-trainer.lic
+++ b/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,8 +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?
-        # consume ritual is requested if: wound above threshold, devour is not currently active, and we are configured to use devour and/or CF
-        if @wound_level_threshold <= game_state.wounds.keys.max && DRSpells.active_spells['Devour'] && (@necromancer_healing.key?('Devour') || (@necromancer_healing.key?('Consume Flesh')))
+        # 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