diff --git a/RELEASE/scripts/autoscend/autoscend_header.ash b/RELEASE/scripts/autoscend/autoscend_header.ash index 50eecda5d..b753ce0be 100644 --- a/RELEASE/scripts/autoscend/autoscend_header.ash +++ b/RELEASE/scripts/autoscend/autoscend_header.ash @@ -612,6 +612,7 @@ boolean auto_haveMcHugeLargeSkis(); boolean auto_equipAllMcHugeLarge(); boolean auto_openMcLargeHugeSkis(); int auto_McLargeHugeForcesLeft(); +int auto_McLargeHugeSniffsLeft(); ######################################################################################################## //Defined in autoscend/paths/actually_ed_the_undying.ash diff --git a/RELEASE/scripts/autoscend/combat/auto_combat_util.ash b/RELEASE/scripts/autoscend/combat/auto_combat_util.ash index 301b5029b..66a31f853 100644 --- a/RELEASE/scripts/autoscend/combat/auto_combat_util.ash +++ b/RELEASE/scripts/autoscend/combat/auto_combat_util.ash @@ -259,7 +259,7 @@ skill getSniffer(monster enemy, boolean inCombat) { return $skill[Monkey Point]; } - if(canUse($skill[McHugeLarge Slash], true , inCombat) && !isSniffed(enemy, $skill[McHugeLarge Slash])) + if(canUse($skill[McHugeLarge Slash], true , inCombat) && !isSniffed(enemy, $skill[McHugeLarge Slash]) && auto_McLargeHugeSniffsLeft()>0) { return $skill[McHugeLarge Slash]; } @@ -270,7 +270,7 @@ skill getSniffer(monster enemy, boolean inCombat) { return $skill[Monkey Point]; } - if (possessEquipment($item[McHugeLarge left pole]) && !isSniffed(enemy, $skill[McHugeLarge Slash])) + if (possessEquipment($item[McHugeLarge left pole]) && !isSniffed(enemy, $skill[McHugeLarge Slash]) && auto_McLargeHugeSniffsLeft()>0) { return $skill[McHugeLarge Slash]; } diff --git a/RELEASE/scripts/autoscend/iotms/mr2025.ash b/RELEASE/scripts/autoscend/iotms/mr2025.ash index e14a9f93b..8c85bc343 100644 --- a/RELEASE/scripts/autoscend/iotms/mr2025.ash +++ b/RELEASE/scripts/autoscend/iotms/mr2025.ash @@ -51,3 +51,13 @@ int auto_McLargeHugeForcesLeft() int used = get_property("_mcHugeLargeAvalancheUses").to_int(); return 3-used; } + +int auto_McLargeHugeSniffsLeft() +{ + if (!auto_haveMcHugeLargeSkis()) + { + return 0; + } + int used = get_property("_mcHugeLargeSlashUses").to_int(); + return 3-used; +}