From 7fd56787f871a022aede9e28da73295fe0677b38 Mon Sep 17 00:00:00 2001 From: HippoKingKoL Date: Wed, 22 Jan 2025 13:20:08 +0000 Subject: [PATCH] fix McHugeLarge slash and Monkey paw sniffs --- .../autoscend/combat/auto_combat_util.ash | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/RELEASE/scripts/autoscend/combat/auto_combat_util.ash b/RELEASE/scripts/autoscend/combat/auto_combat_util.ash index 1c57fbdf6..301b5029b 100644 --- a/RELEASE/scripts/autoscend/combat/auto_combat_util.ash +++ b/RELEASE/scripts/autoscend/combat/auto_combat_util.ash @@ -253,17 +253,31 @@ skill getSniffer(monster enemy, boolean inCombat) { return $skill[Motif]; } - if(canUse($skill[Gallapagosian Mating Call], true , inCombat) && !isSniffed(enemy, $skill[Gallapagosian Mating Call])) + if (inCombat) { - return $skill[Gallapagosian Mating Call]; + if(canUse($skill[Monkey Point], true , inCombat) && !isSniffed(enemy, $skill[Monkey Point])) + { + return $skill[Monkey Point]; + } + if(canUse($skill[McHugeLarge Slash], true , inCombat) && !isSniffed(enemy, $skill[McHugeLarge Slash])) + { + return $skill[McHugeLarge Slash]; + } } - if(canUse($skill[Monkey Point], true , inCombat) && !isSniffed(enemy, $skill[Monkey Point])) + else { - return $skill[Monkey Point]; + if (auto_monkeyPawWishesLeft()==1 && !isSniffed(enemy, $skill[Monkey Point])) + { + return $skill[Monkey Point]; + } + if (possessEquipment($item[McHugeLarge left pole]) && !isSniffed(enemy, $skill[McHugeLarge Slash])) + { + return $skill[McHugeLarge Slash]; + } } - if(canUse($skill[McHugeLarge Slash], true , inCombat) && !isSniffed(enemy, $skill[McHugeLarge Slash])) + if(canUse($skill[Gallapagosian Mating Call], true , inCombat) && !isSniffed(enemy, $skill[Gallapagosian Mating Call])) { - return $skill[McHugeLarge Slash]; + return $skill[Gallapagosian Mating Call]; } if(my_familiar() == $familiar[Nosy Nose] && canUse($skill[Get a Good Whiff of This Guy]) && !isSniffed(enemy,$skill[Get a Good Whiff of This Guy])) {