fix McHugeLarge slash and Monkey paw sniffs

loathers · Jan 22, 2025 · 7fd5678 · 7fd5678
1 parent 1aa782e
commit 7fd5678
Showing 1 changed file with 20 additions and 6 deletions.
diff --git 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]))
 	{