From cbcff037767abf5ef969e835b407c8a72a52ad7f Mon Sep 17 00:00:00 2001 From: Daniel Simich <21962115+dsimich@users.noreply.github.com> Date: Tue, 5 Nov 2024 17:14:59 -0500 Subject: [PATCH] Don't persist purple candled across combats, handle groveling gravel in AG better --- RELEASE/scripts/autoscend.ash | 1 + RELEASE/scripts/autoscend/iotms/mr2023.ash | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/RELEASE/scripts/autoscend.ash b/RELEASE/scripts/autoscend.ash index e85e807ad..60ebeaa5a 100644 --- a/RELEASE/scripts/autoscend.ash +++ b/RELEASE/scripts/autoscend.ash @@ -1654,6 +1654,7 @@ void resetState() { set_property("_auto_tunedElement", ""); // Flavour of Magic elemental alignment set_property("auto_nextEncounter", ""); // monster that was expected last turn set_property("auto_habitatMonster", ""); // monster we want to cast Recall Facts: Monster Habitats + set_property("auto_purple_candled", ""); //monster we want to cast Blow the Purple Candle set_property("auto_nonAdvLoc", false); // location is a non-adventure.php location if(doNotBuffFamiliar100Run()) //some familiars are always bad diff --git a/RELEASE/scripts/autoscend/iotms/mr2023.ash b/RELEASE/scripts/autoscend/iotms/mr2023.ash index ae65b45d4..6f693a4d9 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2023.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2023.ash @@ -45,6 +45,21 @@ boolean wantToThrowGravel(location loc, monster enemy) // prevent overuse after breaking ronin or in casual if(can_interact()) return false; + // only want certain enemies to free-kill in Avant Guard + if(in_avantGuard()) + { + if(enemy.physical_resistance >= 100 && enemy.elemental_resistance >= 100) + { + return true; + } + //This is called in stage2 and auto_purple_candled is set in stage 4 so this should only ever show up on the purple candled enemy + if(get_property("auto_purple_candled").to_monster() == enemy) + { + return true; + } + return false; + } + // many monsters in these zones with similar names if(loc == $location[The Battlefield (Frat Uniform)] && (contains_text(enemy.to_string(), "War Hippy")) ||