Initial Peace Turkey support

loathers · Nov 6, 2024 · 4c26b93 · 4c26b93
1 parent 1e39a84
commit 4c26b93
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 1 deletion.
diff --git a/BUILD/familiars/drop.dat b/BUILD/familiars/drop.dat
@@ -67,3 +67,5 @@ Green Pixie	prop:_absintheDrops<5
 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
diff --git a/BUILD/familiars/gremlins.dat b/BUILD/familiars/gremlins.dat
@@ -2,5 +2,6 @@
 Nosy Nose
 Plastic Pirate Skull
 Space Jellyfish
+Peace turkey
 Gelatinous Cubeling
 Barrrnacle
diff --git a/BUILD/familiars/regen.dat b/BUILD/familiars/regen.dat
@@ -54,6 +54,7 @@ Mini-Trainbot
 # Marginally special whelps
 #Mutant Gila Monster	grimdark:2
 Pottery Barn Owl
+Peace Turkey
 # Regular old whelps
 Pet Cheezling
 Ghuol Whelp

diff --git a/RELEASE/scripts/autoscend.ash b/RELEASE/scripts/autoscend.ash
@@ -1,4 +1,4 @@
-since r28092;	// feat: add 'avoid attack' modifier
+since r28110;	// Add the NC rate for Peace Turkey consistent with spading
 /***
 	autoscend_header.ash must be first import
 	All non-accessory scripts must be imported here

diff --git a/RELEASE/scripts/autoscend/auto_buff.ash b/RELEASE/scripts/autoscend/auto_buff.ash
@@ -256,6 +256,7 @@ boolean buffMaintain(effect buff, int mp_min, int casts, int turns, boolean spec
 	case $effect[Bram\'s Bloody Bagatelle]:		useSkill = $skill[Bram\'s Bloody Bagatelle];		break;
 	case $effect[Brawnee\'s Anthem of Absorption]:useSkill = $skill[Brawnee\'s Anthem of Absorption];break;
 	case $effect[Brilliant Resolve]:			useItem = $item[Resolution: Be Smarter];		break;
+	case $effect[Brittled]:						useItem = $item[pea brittle];					break;
 	case $effect[Brooding]:						useSkill = $skill[Brood];						break;
 	case $effect[Browbeaten]:					useItem = $item[Old Eyebrow Pencil];			break;
 	case $effect[Burning Hands]:				useItem = $item[sticky lava globs];				break;

diff --git a/RELEASE/scripts/autoscend/auto_util.ash b/RELEASE/scripts/autoscend/auto_util.ash
@@ -761,6 +761,10 @@ boolean adjustForBanish(string combat_string)
 	{
 		return autoEquip($item[cursed monkey\'s paw]);
 	}
+	if(combat_string == "item " + $item[Handful of split pea soup])
+	{
+		return create(1, $item[Handful of split pea soup]);
+	}
 	return true;
 }
 

diff --git a/RELEASE/scripts/autoscend/combat/auto_combat_util.ash b/RELEASE/scripts/autoscend/combat/auto_combat_util.ash
@@ -553,6 +553,10 @@ 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)
+	{
+		return "item " + $item[Handful of split pea soup];
+	}
 	if((inCombat ? auto_have_skill($skill[Throw Latte on Opponent]) : possessEquipment($item[latte lovers member\'s mug])) && auto_is_valid($skill[Throw Latte On Opponent]) && !get_property("_latteBanishUsed").to_boolean() && !(used contains "Throw Latte on Opponent") && useFree)
 	{
 		return "skill " + $skill[Throw Latte on Opponent];