From 9bca471a8e8e54fdcd755793de873dfc917adec7 Mon Sep 17 00:00:00 2001 From: mdr55 <98430078+mdr55@users.noreply.github.com> Date: Thu, 6 Feb 2025 10:51:23 +1100 Subject: [PATCH 1/4] Update combat-trainer.lic --- combat-trainer.lic | 2 ++ 1 file changed, 2 insertions(+) diff --git a/combat-trainer.lic b/combat-trainer.lic index c43bbe92a8..aa69204ec1 100644 --- a/combat-trainer.lic +++ b/combat-trainer.lic @@ -1163,6 +1163,8 @@ class SafetyProcess echo("Couldn't tend bleeders after trying three times. Stopping hunt. Get healed!") $HUNTING_BUDDY.stop_hunting $COMBAT_TRAINER.stop + # special handling for devour - if its active, don't bother going to tendme. Otherwise, fall through to tendme as the default + elsif DRSpells.active_spells['Devour'] && bleeding? elsif bleeding? && !Script.running?('tendme') echo('Checking for tendable bleeders...') if $debug_mode_ct if DRCH.has_tendable_bleeders? From 019a9bd916717b12ba24c2015fd3f150ad27f88b Mon Sep 17 00:00:00 2001 From: mdr55 <98430078+mdr55@users.noreply.github.com> Date: Thu, 6 Feb 2025 11:11:18 +1100 Subject: [PATCH 2/4] Update combat-trainer.lic --- combat-trainer.lic | 1 + 1 file changed, 1 insertion(+) diff --git a/combat-trainer.lic b/combat-trainer.lic index aa69204ec1..fd72310d7e 100644 --- a/combat-trainer.lic +++ b/combat-trainer.lic @@ -1165,6 +1165,7 @@ class SafetyProcess $COMBAT_TRAINER.stop # special handling for devour - if its active, don't bother going to tendme. Otherwise, fall through to tendme as the default elsif DRSpells.active_spells['Devour'] && bleeding? + echo('Letting devour heal bleeders over time...') if $debug_mode_ct elsif bleeding? && !Script.running?('tendme') echo('Checking for tendable bleeders...') if $debug_mode_ct if DRCH.has_tendable_bleeders? From 63cc2f32fc969cb7c6affdbe963983955f7d1369 Mon Sep 17 00:00:00 2001 From: mdr55 <98430078+mdr55@users.noreply.github.com> Date: Thu, 6 Feb 2025 11:36:09 +1100 Subject: [PATCH 3/4] Update combat-trainer.lic --- combat-trainer.lic | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/combat-trainer.lic b/combat-trainer.lic index fd72310d7e..cc780c80a4 100644 --- a/combat-trainer.lic +++ b/combat-trainer.lic @@ -1163,10 +1163,8 @@ class SafetyProcess echo("Couldn't tend bleeders after trying three times. Stopping hunt. Get healed!") $HUNTING_BUDDY.stop_hunting $COMBAT_TRAINER.stop - # special handling for devour - if its active, don't bother going to tendme. Otherwise, fall through to tendme as the default - elsif DRSpells.active_spells['Devour'] && bleeding? - echo('Letting devour heal bleeders over time...') if $debug_mode_ct - elsif bleeding? && !Script.running?('tendme') + # If no heal-over-time spells are active then attempt to tend using ;tendme + elsif bleeding? && !Script.running?('tendme') && !(DRSpells.active_spells['Devour'] || DRSpells.active_spells['Heal'] || DRSpells.active_spells['Regenerate']) echo('Checking for tendable bleeders...') if $debug_mode_ct if DRCH.has_tendable_bleeders? DRC.wait_for_script_to_complete('tendme') From e3f826fd164cae9d7db52944291c9f8289540965 Mon Sep 17 00:00:00 2001 From: mdr55 <98430078+mdr55@users.noreply.github.com> Date: Thu, 6 Feb 2025 18:01:59 +1100 Subject: [PATCH 4/4] Update combat-trainer.lic --- combat-trainer.lic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/combat-trainer.lic b/combat-trainer.lic index cc780c80a4..62453c0907 100644 --- a/combat-trainer.lic +++ b/combat-trainer.lic @@ -1163,7 +1163,7 @@ class SafetyProcess echo("Couldn't tend bleeders after trying three times. Stopping hunt. Get healed!") $HUNTING_BUDDY.stop_hunting $COMBAT_TRAINER.stop - # If no heal-over-time spells are active then attempt to tend using ;tendme + # If no heal-over-time spells are active then attempt to tend bleeders using ;tendme elsif bleeding? && !Script.running?('tendme') && !(DRSpells.active_spells['Devour'] || DRSpells.active_spells['Heal'] || DRSpells.active_spells['Regenerate']) echo('Checking for tendable bleeders...') if $debug_mode_ct if DRCH.has_tendable_bleeders?