loathers · dsimich · Oct 7, 2023 · Oct 7, 2023 · Oct 7, 2023 · Oct 7, 2023
diff --git a/BUILD/phylums/banish.dat b/BUILD/phylums/banish.dat
@@ -0,0 +1,13 @@
+dude	loc:The Black Forest
+dude	loc:Twin Peak
+dude	loc:The Red Zeppelin;item:Glark Cable>2
+dude	loc:Whitey's Grove;quest:questL11Palindome<=3
+beast	loc:The Hidden Park
+beast	loc:Inside the Palindome;quest:questL11Palindome<=3
+beast	loc:The Penultimate Fantasy Airship
+undead	loc:The Haunted Library	item:Killing Jar>0
+undead	loc:The Haunted Wine Cellar
+undead	loc:The Unquiet Garves
+undead	loc:The Haunted Boiler Room
+undead	loc:The Middle Chamber
+construct	loc:Noob Cave
diff --git a/BUILD/phylums/header.txt b/BUILD/phylums/header.txt
@@ -0,0 +1 @@
+# See auto_check_conditions for conditional options
diff --git a/BUILD/task_order/A Shrunken Adventurer am I.dat b/BUILD/task_order/A Shrunken Adventurer am I.dat
@@ -82,6 +82,8 @@ L3_tavern
 L2_mosquito
 # "win" the contests, navigate the maze, unlock the door, climb the tower, commit sorceresscide.
 L13_towerAscent
+# not powerlevelling but something that needs to be done if nothing else is available
+LX_lastChance
 # release the hounds!
 auto_softBlockHandler
 # if all else fails, powerlevel like there's no tomorrow.

diff --git a/BUILD/task_order/Avatar of Jarlsberg.dat b/BUILD/task_order/Avatar of Jarlsberg.dat
@@ -53,5 +53,6 @@ L5_slayTheGoblinKing
 L4_batCave
 L3_tavern
 L13_towerAscent
+LX_lastChance
 auto_softBlockHandler
 LX_attemptPowerLevel
diff --git a/BUILD/task_order/Legacy of Loathing.dat b/BUILD/task_order/Legacy of Loathing.dat
@@ -94,5 +94,6 @@ L13_sorceressDoor
 L13_towerNSTower
 L13_towerNSNagamar
 L13_towerNSFinal
+LX_lastChance
 auto_softBlockHandler
 LX_attemptPowerLevel
diff --git a/BUILD/task_order/Quantum Terrarium.dat b/BUILD/task_order/Quantum Terrarium.dat
@@ -57,5 +57,7 @@ L5_slayTheGoblinKing
 L4_batCave
 L3_tavern
 L13_towerAscent
+# not powerlevelling but something that needs to be done if nothing else is available
+LX_lastChance
 auto_softBlockHandler
 LX_attemptPowerLevel
diff --git a/BUILD/task_order/WereProfessor.dat b/BUILD/task_order/WereProfessor.dat
@@ -98,6 +98,8 @@ LX_getStarKey
 LX_getDigitalKey
 # "win" the contests, navigate the maze, unlock the door, climb the tower, commit sorceresscide.
 L13_towerAscent
+# not powerlevelling but something that needs to be done if nothing else is available
+LX_lastChance
 # release the hounds!
 auto_softBlockHandler
 # if all else fails, powerlevel like there's no tomorrow.

diff --git a/BUILD/task_order/Zombie Slayer.dat b/BUILD/task_order/Zombie Slayer.dat
@@ -53,5 +53,7 @@ L5_slayTheGoblinKing
 L4_batCave
 L3_tavern
 L13_towerAscent
+# not powerlevelling but something that needs to be done if nothing else is available
+LX_lastChance
 auto_softBlockHandler
 LX_attemptPowerLevel
diff --git a/BUILD/task_order/default.dat b/BUILD/task_order/default.dat
@@ -88,6 +88,8 @@ L2_mosquito
 LX_koeInvaderHandler
 # "win" the contests, navigate the maze, unlock the door, climb the tower, commit sorceresscide.
 L13_towerAscent
+# not powerlevelling but something that needs to be done if nothing else is available
+LX_lastChance
 # release the hounds!
 auto_softBlockHandler
 # if all else fails, powerlevel like there's no tomorrow.

diff --git a/RELEASE/data/autoscend_phylums.txt b/RELEASE/data/autoscend_phylums.txt
@@ -0,0 +1,17 @@
+# THIS FILE IS GENERATED BY BUILD/assemble.sh
+# DO NOT EDIT THIS FILE DIRECTLY. EDIT THE .DAT FILES IN THE /BUILD/ FOLDER THEN RUN assemble.sh
+
+# See auto_check_conditions for conditional options
+banish	0	dude	loc:The Black Forest
+banish	1	dude	loc:Twin Peak
+banish	2	dude	loc:The Red Zeppelin;item:Glark Cable>2
+banish	3	dude	loc:Whitey's Grove;quest:questL11Palindome<=3
+banish	4	beast	loc:The Hidden Park
+banish	5	beast	loc:Inside the Palindome;quest:questL11Palindome<=3
+banish	6	beast	loc:The Penultimate Fantasy Airship
+banish	7	undead	loc:The Haunted Library	item:Killing Jar>0
+banish	8	undead	loc:The Haunted Wine Cellar
+banish	9	undead	loc:The Haunted Boiler Room
+banish	10	undead	loc:The Middle Chamber
+banish	11	construct	loc:Noob Cave
+
diff --git a/RELEASE/data/autoscend_task_order.txt b/RELEASE/data/autoscend_task_order.txt
@@ -88,10 +88,12 @@ A Shrunken Adventurer am I	53	L3_tavern
 A Shrunken Adventurer am I	54	L2_mosquito
 # "win" the contests, navigate the maze, unlock the door, climb the tower, commit sorceresscide.
 A Shrunken Adventurer am I	55	L13_towerAscent
+# not powerlevelling but something that needs to be done if nothing else is available
+A Shrunken Adventurer am I	56	LX_lastChance
 # release the hounds!
-A Shrunken Adventurer am I	56	auto_softBlockHandler
+A Shrunken Adventurer am I	57	auto_softBlockHandler
 # if all else fails, powerlevel like there's no tomorrow.
-A Shrunken Adventurer am I	57	LX_attemptPowerLevel
+A Shrunken Adventurer am I	58	LX_attemptPowerLevel
 
 Avant Guard	0	LX_freeCombatsTask
 Avant Guard	1	woods_questStart
@@ -250,8 +252,106 @@ Avatar of Jarlsberg	51	L5_slayTheGoblinKing
 Avatar of Jarlsberg	52	L4_batCave
 Avatar of Jarlsberg	53	L3_tavern
 Avatar of Jarlsberg	54	L13_towerAscent
-Avatar of Jarlsberg	55	auto_softBlockHandler
-Avatar of Jarlsberg	56	LX_attemptPowerLevel
+Avatar of Jarlsberg	55	LX_lastChance
+Avatar of Jarlsberg	56	auto_softBlockHandler
+Avatar of Jarlsberg	57	LX_attemptPowerLevel
+
+default	0	LX_freeCombatsTask
+default	1	woods_questStart
+default	2	LX_unlockPirateRealm
+default	3	catBurglarHeist
+default	4	auto_breakfastCounterVisit
+default	5	chateauPainting
+default	6	LX_setWorkshed
+default	7	LX_galaktikSubQuest
+default	8	L9_leafletQuest
+default	9	L5_findKnob
+default	10	L12_sonofaPrefix
+default	11	LX_burnDelay
+default	12	LX_summonMonster
+# path handling which should be in it's own task order but pre-dates task order functionality (tech debt FTW).
+default	13	LM_edTheUndying
+default	14	LX_bugbearInvasion
+default	15	LX_lowkeySummer
+# make sure we don't waste turns of Ultrahydrated doing something else.
+default	16	L11_aridDesert	L11_hasUltrahydrated
+# Lock in the Shen zones as soon as we can as it (potentially) unlocks a bunch of stuff.
+default	17	L11_shenStartQuest
+# Build the Bridge when we have enough parts as we may want to spend daily resources at the peaks.
+default	18	finishBuildingSmutOrcBridge
+# Call quest handlers based on current state if applicable
+default	19	auto_earlyRoutingHandling
+# Guild access.
+default	20	LX_guildUnlock
+#	Desert access, Daily Dungeon and other early random stuff that we don't want to miss.
+default	21	LX_unlockDesert
+default	22	LX_lockPicking
+default	23	LX_fatLootToken
+#	Get the Steel Organ if the user wants it (needs L6 quest complete)
+default	24	LX_steelOrgan
+# open up delay zones.
+default	25	LX_spookyravenManorFirstFloor
+# open up zones where we want to force non-combats.
+# Open up underground zones so they are available for Breathitin.
+default	26	L5_getEncryptionKey
+default	27	L5_findKnob
+#	Do the War early. Access to the Orchard is useful for booze/potions and maybe we can make use of the green smoke bombs?
+default	28	L12_islandWar
+# Start the macguffin quest
+default	29	L11_blackMarket
+default	30	L11_forgedDocuments
+default	31	L11_mcmuffinDiary
+default	32	L11_getBeehive
+# open the hidden city up (delay zones)
+default	33	L2_mosquito
+default	34	LX_unlockHiddenTemple
+default	35	L6_dakotaFanning
+default	36	L11_unlockHiddenCity
+# Murder pygmies for the ancient amulet.
+default	37	L11_hiddenCityZones
+default	38	L11_hiddenCity
+# Dance with lady spookyraven so we can go murder her undead husband and take the Eye of Ed
+default	39	LX_spookyravenManorSecondFloor
+default	40	L11_mauriceSpookyraven
+# Lay the smack down on those Jerk Copperhead twins
+default	41	L11_talismanOfNam
+# Open up the top of the beanstalk.
+default	42	L10_plantThatBean
+# Clean up the plains
+default	43	L10_rainOnThePlains
+# Get Black Angus his pizza
+default	44	L9_chasmBuild
+default	45	L9_highLandlord
+#  Kill Groar because *we* are the monsters.
+default	46	L8_trapperQuest
+# Kill the undead? Is this an oxymoron?
+default	47	L7_crypt
+# Cleanse the taint.
+default	48	L6_friarsGetParts
+# Finish the other Macguffin zones so we can beat Ed to death repeatedly and waste all his Ka coins.
+default	49	L11_palindome
+default	50	L11_aridDesert
+default	51	L11_unlockPyramid
+default	52	L11_unlockEd
+default	53	L11_defeatEd
+#	Finish off the Goblin King.
+default	54	L5_slayTheGoblinKing
+# Show the Boss bat who's boss.
+default	55	L4_batCave
+# Fix that dripping tap.
+default	56	L3_tavern
+# Basic fetch quest is the first thing the council demand of you. Is this 2002 or what?
+default	57	L2_mosquito
+# There's an extra task in KoE
+default	58	LX_koeInvaderHandler
+# "win" the contests, navigate the maze, unlock the door, climb the tower, commit sorceresscide.
+default	59	L13_towerAscent
+# not powerlevelling but something that needs to be done if nothing else is available
+default	60	LX_lastChance
+# release the hounds!
+default	61	auto_softBlockHandler
+# if all else fails, powerlevel like there's no tomorrow.
+default	62	LX_attemptPowerLevel
 
 Legacy of Loathing	0	LX_freeCombatsTask
 Legacy of Loathing	1	woods_questStart
@@ -349,8 +449,9 @@ Legacy of Loathing	84	L13_sorceressDoor
 Legacy of Loathing	85	L13_towerNSTower
 Legacy of Loathing	86	L13_towerNSNagamar
 Legacy of Loathing	87	L13_towerNSFinal
-Legacy of Loathing	88	auto_softBlockHandler
-Legacy of Loathing	89	LX_attemptPowerLevel
+Legacy of Loathing	88	LX_lastChance
+Legacy of Loathing	89	auto_softBlockHandler
+Legacy of Loathing	90	LX_attemptPowerLevel
 
 Quantum Terrarium	0	LX_freeCombatsTask
 Quantum Terrarium	1	woods_questStart
@@ -411,8 +512,10 @@ Quantum Terrarium	55	L5_slayTheGoblinKing
 Quantum Terrarium	56	L4_batCave
 Quantum Terrarium	57	L3_tavern
 Quantum Terrarium	58	L13_towerAscent
-Quantum Terrarium	59	auto_softBlockHandler
-Quantum Terrarium	60	LX_attemptPowerLevel
+# not powerlevelling but something that needs to be done if nothing else is available
+Quantum Terrarium	59	LX_lastChance
+Quantum Terrarium	60	auto_softBlockHandler
+Quantum Terrarium	61	LX_attemptPowerLevel
 
 WereProfessor	0	LM_wereprof
 WereProfessor	1	LX_freeCombatsTask
@@ -514,10 +617,12 @@ WereProfessor	65	LX_getStarKey
 WereProfessor	66	LX_getDigitalKey
 # "win" the contests, navigate the maze, unlock the door, climb the tower, commit sorceresscide.
 WereProfessor	67	L13_towerAscent
+# not powerlevelling but something that needs to be done if nothing else is available
+WereProfessor	68	LX_lastChance
 # release the hounds!
-WereProfessor	68	auto_softBlockHandler
+WereProfessor	69	auto_softBlockHandler
 # if all else fails, powerlevel like there's no tomorrow.
-WereProfessor	69	LX_attemptPowerLevel
+WereProfessor	70	LX_attemptPowerLevel
 
 Zombie Slayer	0	LM_zombieSlayer
 Zombie Slayer	1	woods_questStart
@@ -574,101 +679,8 @@ Zombie Slayer	51	L5_slayTheGoblinKing
 Zombie Slayer	52	L4_batCave
 Zombie Slayer	53	L3_tavern
 Zombie Slayer	54	L13_towerAscent
-Zombie Slayer	55	auto_softBlockHandler
-Zombie Slayer	56	LX_attemptPowerLevel
-
-default	0	LX_freeCombatsTask
-default	1	woods_questStart
-default	2	LX_unlockPirateRealm
-default	3	catBurglarHeist
-default	4	auto_breakfastCounterVisit
-default	5	chateauPainting
-default	6	LX_setWorkshed
-default	7	LX_galaktikSubQuest
-default	8	L9_leafletQuest
-default	9	L5_findKnob
-default	10	L12_sonofaPrefix
-default	11	LX_burnDelay
-default	12	LX_summonMonster
-# path handling which should be in it's own task order but pre-dates task order functionality (tech debt FTW).
-default	13	LM_edTheUndying
-default	14	LX_bugbearInvasion
-default	15	LX_lowkeySummer
-# make sure we don't waste turns of Ultrahydrated doing something else.
-default	16	L11_aridDesert	L11_hasUltrahydrated
-# Lock in the Shen zones as soon as we can as it (potentially) unlocks a bunch of stuff.
-default	17	L11_shenStartQuest
-# Build the Bridge when we have enough parts as we may want to spend daily resources at the peaks.
-default	18	finishBuildingSmutOrcBridge
-# Call quest handlers based on current state if applicable
-default	19	auto_earlyRoutingHandling
-# Guild access.
-default	20	LX_guildUnlock
-#	Desert access, Daily Dungeon and other early random stuff that we don't want to miss.
-default	21	LX_unlockDesert
-default	22	LX_lockPicking
-default	23	LX_fatLootToken
-#	Get the Steel Organ if the user wants it (needs L6 quest complete)
-default	24	LX_steelOrgan
-# open up delay zones.
-default	25	LX_spookyravenManorFirstFloor
-# open up zones where we want to force non-combats.
-# Open up underground zones so they are available for Breathitin.
-default	26	L5_getEncryptionKey
-default	27	L5_findKnob
-#	Do the War early. Access to the Orchard is useful for booze/potions and maybe we can make use of the green smoke bombs?
-default	28	L12_islandWar
-# Start the macguffin quest
-default	29	L11_blackMarket
-default	30	L11_forgedDocuments
-default	31	L11_mcmuffinDiary
-default	32	L11_getBeehive
-# open the hidden city up (delay zones)
-default	33	L2_mosquito
-default	34	LX_unlockHiddenTemple
-default	35	L6_dakotaFanning
-default	36	L11_unlockHiddenCity
-# Murder pygmies for the ancient amulet.
-default	37	L11_hiddenCityZones
-default	38	L11_hiddenCity
-# Dance with lady spookyraven so we can go murder her undead husband and take the Eye of Ed
-default	39	LX_spookyravenManorSecondFloor
-default	40	L11_mauriceSpookyraven
-# Lay the smack down on those Jerk Copperhead twins
-default	41	L11_talismanOfNam
-# Open up the top of the beanstalk.
-default	42	L10_plantThatBean
-# Clean up the plains
-default	43	L10_rainOnThePlains
-# Get Black Angus his pizza
-default	44	L9_chasmBuild
-default	45	L9_highLandlord
-#  Kill Groar because *we* are the monsters.
-default	46	L8_trapperQuest
-# Kill the undead? Is this an oxymoron?
-default	47	L7_crypt
-# Cleanse the taint.
-default	48	L6_friarsGetParts
-# Finish the other Macguffin zones so we can beat Ed to death repeatedly and waste all his Ka coins.
-default	49	L11_palindome
-default	50	L11_aridDesert
-default	51	L11_unlockPyramid
-default	52	L11_unlockEd
-default	53	L11_defeatEd
-#	Finish off the Goblin King.
-default	54	L5_slayTheGoblinKing
-# Show the Boss bat who's boss.
-default	55	L4_batCave
-# Fix that dripping tap.
-default	56	L3_tavern
-# Basic fetch quest is the first thing the council demand of you. Is this 2002 or what?
-default	57	L2_mosquito
-# There's an extra task in KoE
-default	58	LX_koeInvaderHandler
-# "win" the contests, navigate the maze, unlock the door, climb the tower, commit sorceresscide.
-default	59	L13_towerAscent
-# release the hounds!
-default	60	auto_softBlockHandler
-# if all else fails, powerlevel like there's no tomorrow.
-default	61	LX_attemptPowerLevel
+# not powerlevelling but something that needs to be done if nothing else is available
+Zombie Slayer	55	LX_lastChance
+Zombie Slayer	56	auto_softBlockHandler
+Zombie Slayer	57	LX_attemptPowerLevel
 
diff --git a/RELEASE/scripts/autoscend.ash b/RELEASE/scripts/autoscend.ash
@@ -1,4 +1,4 @@
-since r28258;	// fix: noncomforcers avalanche name
+since r28270;	// feat: add function is_banished(phylum)
 /***
 	autoscend_header.ash must be first import
 	All non-accessory scripts must be imported here
@@ -1438,7 +1438,7 @@ boolean adventureFailureHandler()
 		}
 	}
 
-	if(last_monster() == $monster[Crate] && (in_wereprof() && !($location[Noob Cave].turns_spent < 8))) //want 7 turns of Noob Cave in Wereprof for Smashed Scientific Equipment
+	if(last_monster() == $monster[Crate] && !(get_property("screechDelay").to_boolean()) && (in_wereprof() && !($location[Noob Cave].turns_spent < 8))) //want 7 turns of Noob Cave in Wereprof for Smashed Scientific Equipment
 	{
 		if(get_property("auto_newbieOverride").to_boolean())
 		{

diff --git a/RELEASE/scripts/autoscend/auto_bedtime.ash b/RELEASE/scripts/autoscend/auto_bedtime.ash
@@ -725,6 +725,7 @@ boolean doBedtime()
 	}
 
 	//We are committing to end of day now...
+	auto_scepterRollover(); //Use the rest of the August Scepter's charges
 	getSpaceJelly();
 	while(acquireHermitItem($item[11-leaf Clover]));
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		# See auto_check_conditions for conditional options