Merge branch 'main' into EagleScepter

loathers · Nov 13, 2024 · ecbdfd1 · ecbdfd1
2 parents 33bf252 + e7eb2bc
commit ecbdfd1
Show file tree

Hide file tree

Showing 51 changed files with 1,223 additions and 430 deletions.
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/BUILD/monsters/freerun.dat b/BUILD/monsters/freerun.dat
@@ -31,3 +31,14 @@ animated rustic nightstand
 Wardröb nightstand
 drunken rat
 bunch of drunken rats
+tapdancing skeleton
+floating platter of hors d\'oeuvres
+boaraffe
+pygmy assault squad
+pygmy blowgunner
+Copperhead Club bartender
+fan dancer
+Mob Penguin Capo
+ninja snowman (chopsticks)
+ninja snowman janitor
+ninja snowman weaponmaster
diff --git a/BUILD/monsters/sniff.dat b/BUILD/monsters/sniff.dat
@@ -1,7 +1,7 @@
 pygmy shaman	loc:The Hidden Apartment Building;!effect:Thrice-Cursed;prop:hiddenApartmentProgress<7
 Writing Desk	prop:writingDesksDefeated<4
 cabinet of Dr. Limpieza
-Dairy Goat	loc:The Goatlet
+Dairy Goat	loc:The Goatlet;item:goat cheese<3
 Pygmy Bowler
 Pygmy Witch Surgeon
 pygmy witch accountant	loc:The Hidden Office Building

diff --git a/BUILD/restoration/skill.dat b/BUILD/restoration/skill.dat
@@ -4,3 +4,4 @@ Shake it Off	ALL	0	0	0	All Negative	none
 Gelatinous Reconstruction	13	0	0	0	Beaten Up	none
 Disco Nap	20	0	0	0	none	none
 Lasagna Bandages	20	0	0	0	none	none
+Rest Upside Down	1000	1000	0	0	none	none
diff --git a/RELEASE/data/autoscend_familiars.txt b/RELEASE/data/autoscend_familiars.txt
@@ -89,13 +89,16 @@ drop	29	Green Pixie	prop:_absintheDrops<5
 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	Gelatinous Cubeling
-gremlins	4	Barrrnacle
+gremlins	3	Peace Turkey
+gremlins	4	Gelatinous Cubeling
+gremlins	5	Barrrnacle
 
 init	0	Xiblaxian Holo-Companion
 init	1	Cute Meteor
@@ -313,11 +316,12 @@ regen	29	Mini-Trainbot
 # Marginally special whelps
 #Mutant Gila Monster	grimdark:2
 regen	30	Pottery Barn Owl
+regen	31	Peace Turkey
 # Regular old whelps
-regen	31	Pet Cheezling
-regen	32	Ghuol Whelp
+regen	32	Pet Cheezling
+regen	33	Ghuol Whelp
 # The absolute default that everyone should have after their first run
-regen	33	Mosquito
+regen	34	Mosquito
 
 # Sombrero is desirable with a decent amount of ML
 stat	0	Galloping Grill	ML:>=120

diff --git a/RELEASE/data/autoscend_monsters.txt b/RELEASE/data/autoscend_monsters.txt
@@ -89,6 +89,17 @@ freerun	29	animated rustic nightstand
 freerun	30	Wardröb nightstand
 freerun	31	drunken rat
 freerun	32	bunch of drunken rats
+freerun	33	tapdancing skeleton
+freerun	34	floating platter of hors d'oeuvres
+freerun	35	boaraffe
+freerun	36	pygmy assault squad
+freerun	37	pygmy blowgunner
+freerun	38	Copperhead Club bartender
+freerun	39	fan dancer
+freerun	40	Mob Penguin Capo
+freerun	41	ninja snowman (chopsticks)
+freerun	42	ninja snowman janitor
+freerun	43	ninja snowman weaponmaster
 
 replace	0	Banshee Librarian	item:Killing Jar>0
 replace	1	Beefy Bodyguard Bat	loc:The Boss Bat's Lair;turnsspent:The Boss Bat's Lair>=4;!path:Heavy Rains;!path:Actually Ed the Undying;!path:Pocket Familiars;!path:Dark Gyffte;!path:Path of the Plumber;!pathid:41;!path:Wildfire;!path:Fall of the Dinosaurs;!path:Avatar of Shadows Over Loathing;!path:Legacy of Loathing;!path:WereProfessor
@@ -131,7 +142,7 @@ replace	34	trendy bugbear chef	path:Bugbear Invasion;loc:Galley
 sniff	0	pygmy shaman	loc:The Hidden Apartment Building;!effect:Thrice-Cursed;prop:hiddenApartmentProgress<7
 sniff	1	Writing Desk	prop:writingDesksDefeated<4
 sniff	2	cabinet of Dr. Limpieza
-sniff	3	Dairy Goat	loc:The Goatlet
+sniff	3	Dairy Goat	loc:The Goatlet;item:goat cheese<3
 sniff	4	Pygmy Bowler
 sniff	5	Pygmy Witch Surgeon
 sniff	6	pygmy witch accountant	loc:The Hidden Office Building

diff --git a/RELEASE/data/autoscend_restoration.txt b/RELEASE/data/autoscend_restoration.txt
@@ -117,4 +117,5 @@ skill	2	Shake it Off	ALL	0	0	0	All Negative	none
 skill	3	Gelatinous Reconstruction	13	0	0	0	Beaten Up	none
 skill	4	Disco Nap	20	0	0	0	none	none
 skill	5	Lasagna Bandages	20	0	0	0	none	none
+skill	6	Rest Upside Down	1000	1000	0	0	none	none
 
diff --git a/RELEASE/scripts/autoscend.ash b/RELEASE/scripts/autoscend.ash
@@ -1,4 +1,4 @@
-since r28019;	// feat: add avant guard path
+since r28114;	// feat: track split pea soup banish
 /***
 	autoscend_header.ash must be first import
 	All non-accessory scripts must be imported here
@@ -1177,6 +1177,7 @@ boolean dailyEvents()
 	auto_useBlackMonolith();
 	auto_scepterSkills();
 	auto_getAprilingBandItems();
+	auto_buyFromSeptEmberStore();
 	
 	return true;
 }
@@ -1830,6 +1831,7 @@ boolean doTasks()
 	boris_buySkills();
 	pete_buySkills();
 	zombieSlayer_buySkills();
+	auto_refreshQTFam();
 	lol_buyReplicas();
 	iluh_buyEquiq();