Addressing comments

BUILD/familiars/drop.dat

@@ -68,4 +68,4 @@ Galloping Grill	prop:_hotAshesDrops<5
 # If all else fails, keep generating CBB ingredients
 Cookbookbat	!prop_boolean:auto_dontUseCookBookBat
 # use a Peace turkey if all else fails
-Peace Turkey
+Peace Turkey

BUILD/familiars/gremlins.dat

@@ -2,6 +2,6 @@
 Nosy Nose
 Plastic Pirate Skull
 Space Jellyfish
-Peace turkey
+Peace Turkey
 Gelatinous Cubeling
 Barrrnacle

RELEASE/data/autoscend_familiars.txt

@@ -90,12 +90,13 @@ drop	30	Galloping Grill	prop:_hotAshesDrops<5
 # If all else fails, keep generating CBB ingredients
 drop	31	Cookbookbat	!prop_boolean:auto_dontUseCookBookBat
 # use a Peace turkey if all else fails
+drop	32	Peace Turkey
 
 # We want to delevel, but don't want to deal damage
 gremlins	0	Nosy Nose
 gremlins	1	Plastic Pirate Skull
 gremlins	2	Space Jellyfish
-gremlins	3	Peace turkey
+gremlins	3	Peace Turkey
 gremlins	4	Gelatinous Cubeling
 gremlins	5	Barrrnacle
 

RELEASE/scripts/autoscend/auto_providers.ash

@@ -146,6 +146,14 @@ float providePlusCombat(int amt, location loc, boolean doEquips, boolean specula
 		return result();
 	}
 
+	if (!speculative)
+	{
+		handleFamiliar($familiar[Jumpsuited Hound Dog]);
+		if(pass()) {
+			return result();
+		}
+	}
+
 	return result();
 }
 
@@ -355,6 +363,18 @@ float providePlusNonCombat(int amt, location loc, boolean doEquips, boolean spec
 		return result();
 	}
 
+	if (!speculative)
+	{
+		foreach fam in $familiars[Peace Turkey, Disgeist]
+		{
+			if(auto_have_familiar(fam))
+			{
+				handleFamiliar(fam);
+				return result();
+			}
+		}
+	}
+
 	return result();
 }
 

RELEASE/scripts/autoscend/auto_util.ash

@@ -761,7 +761,7 @@ boolean adjustForBanish(string combat_string)
 	{
 		return autoEquip($item[cursed monkey\'s paw]);
 	}
-	if(combat_string == "item " + $item[Handful of split pea soup])
+	if(combat_string == "item " + $item[Handful of split pea soup] && item_amount($item[Handful of split pea soup]) == 0)
 	{
 		return create(1, $item[Handful of split pea soup]);
 	}

RELEASE/scripts/autoscend/combat/auto_combat_default_stage3.ash

@@ -583,6 +583,12 @@ string auto_combatDefaultStage3(int round, monster enemy, string text)
 			return useItem($item[Tomayohawk-Style Reflex Hammer]);
 		}
 
+		//If you have tearaway pants equipped, use its skill
+		if(canUse($skill[Tear Away your Pants!]))
+		{
+			return useSkill($skill[Tear Away your Pants!]);
+		}
+
 		// skills from Lathe weapons
 		// Ebony Epee
 		if(canUse($skill[Disarming Thrust]))
@@ -696,12 +702,6 @@ string auto_combatDefaultStage3(int round, monster enemy, string text)
 		}
 	}
 
-	//If you have tearaway pants equipped, use its skill
-	if(canUse($skill[Tear Away your Pants!]))
-	{
-		return useSkill($skill[Tear Away your Pants!]);
-	}
-
 	// Multi-round stuns
 	if(canUse($skill[Thunderstrike]) && enemy_la <= 150 && !canSurvive(5.0))
 	{

RELEASE/scripts/autoscend/combat/auto_combat_util.ash

@@ -553,7 +553,7 @@ string banisherCombatString(monster enemy, location loc, boolean inCombat)
 		return "skill " + $skill[Howl of the Alpha];
 	}
 
-	if(item_amount($item[Handful of split pea soup]) > 0 && (!(used contains "Handful of split pea soup")) && auto_is_valid($item[Handful of split pea soup]) && useFree)
+	if(inCombat ? item_amount($item[Handful of split pea soup]) > 0 && (!(used contains "Handful of split pea soup")) && auto_is_valid($item[Handful of split pea soup]) && useFree : (item_amount($item[Handful of split pea soup]) > 0 || item_amount($item[Whirled peas]) >= 2))
 	{
 		return "item " + $item[Handful of split pea soup];
 	}

RELEASE/scripts/autoscend/quests/level_11.ash

@@ -2155,18 +2155,6 @@ boolean L11_hiddenCityZones()
 		}
 		return false;
 	}
-	boolean equipTearawayPants()
-	{
-		if(in_ag() || is_boris() || in_wotsf())
-		{
-			//Since we won't have a machete equipped, we can actually use the Tearaway Pants skill and maybe get some adventures
-			if(auto_haveTearawayPants())
-			{
-				return autoForceEquip($item[Tearaway Pants]);
-			}
-		}
-		return false;
-	}
 
 	L11_hiddenTavernUnlock();
 
@@ -2197,9 +2185,9 @@ boolean L11_hiddenCityZones()
 		if (canUseMachete && !equipMachete()) {
 			return false;
 		}
-		if(!canUseMachete && !equipTearawayPants())
+		if(!canUseMachete && auto_haveTearawayPants())
 		{
-			return false;
+			autoForceEquip($item[Tearaway Pants]);
 		}
 		return autoAdv($location[An Overgrown Shrine (Northwest)]);
 	}
@@ -2208,9 +2196,9 @@ boolean L11_hiddenCityZones()
 		if (canUseMachete && !equipMachete()) {
 			return false;
 		}
-		if(!canUseMachete && !equipTearawayPants())
+		if(!canUseMachete && auto_haveTearawayPants())
 		{
-			return false;
+			autoForceEquip($item[Tearaway Pants]);
 		}
 		return autoAdv($location[An Overgrown Shrine (Northeast)]);
 	}
@@ -2219,9 +2207,9 @@ boolean L11_hiddenCityZones()
 		if (canUseMachete && !equipMachete()) {
 			return false;
 		}
-		if(!canUseMachete && !equipTearawayPants())
+		if(!canUseMachete && auto_haveTearawayPants())
 		{
-			return false;
+			autoForceEquip($item[Tearaway Pants]);
 		}
 		return autoAdv($location[An Overgrown Shrine (Southwest)]);
 	}
@@ -2230,9 +2218,9 @@ boolean L11_hiddenCityZones()
 		if (canUseMachete && !equipMachete()) {
 			return false;
 		}
-		if(!canUseMachete && !equipTearawayPants())
+		if(!canUseMachete && auto_haveTearawayPants())
 		{
-			return false;
+			autoForceEquip($item[Tearaway Pants]);
 		}
 		return autoAdv($location[An Overgrown Shrine (Southeast)]);
 	}
@@ -2241,9 +2229,9 @@ boolean L11_hiddenCityZones()
 		if (canUseMachete && !equipMachete()) {
 			return false;
 		}
-		if(!canUseMachete && !equipTearawayPants())
+		if(!canUseMachete && auto_haveTearawayPants())
 		{
-			return false;
+			autoForceEquip($item[Tearaway Pants]);
 		}
 		boolean advSpent = autoAdv($location[A Massive Ziggurat]);
 		if (get_property("lastEncounter") == "Legend of the Temple in the Hidden City" || (isActuallyEd() && get_property("lastEncounter") == "Temple of the Legend in the Hidden City")) {

RELEASE/scripts/autoscend/quests/optional.ash

@@ -353,7 +353,7 @@ boolean LX_guildUnlock()
 	{
 		return false;
 	}
-	if(!(in_picky() || in_lowkeysummer()) && get_property('auto_skipUnlockGuild').to_boolean())
+	if(!(in_picky() || in_lowkeysummer()) && get_property('auto_skipUnlockGuild').to_boolean() && !(my_primestat() == $stat[Moxie] && auto_haveTearawayPants()))
 	{
 		return false;
 	}