Merge branch 'main' into groar

taltamir · Sep 11, 2023 · 94a1094 · 94a1094
2 parents aba2be3 + 2d6c32f
commit 94a1094
Show file tree

Hide file tree

Showing 33 changed files with 420 additions and 148 deletions.
diff --git a/BUILD/familiars/item.dat b/BUILD/familiars/item.dat
@@ -14,6 +14,8 @@ Steam-Powered Cheerleader	prop:_cheerleaderSteam>100
 Steam-Powered Cheerleader	prop:_cheerleaderSteam>50
 # 1.1x multiplier fairy
 Steam-Powered Cheerleader	prop:_cheerleaderSteam>0
+# fairy with useful special powers above a certain weight so we want to preload it
+Grey Goose	prop_boolean:auto_prioritizeGoose
 # fairy that generates extra adventures
 Reagnimated Gnome	!path:Heavy Rains
 # Fairywhelp that drops x and o without limit. 1 each per 9 combats. 3 o for food. 3 x for drink, 23 x to skip half bridge.

diff --git a/BUILD/task_order/Avatar of Jarlsberg.dat b/BUILD/task_order/Avatar of Jarlsberg.dat
@@ -54,6 +54,5 @@ L5_slayTheGoblinKing
 L4_batCave
 L3_tavern
 setSoftblockDelay	allowSoftblockDelay
-setSoftblockShen	allowSoftblockShen
 L13_towerAscent
 LX_attemptPowerLevel
diff --git a/BUILD/task_order/Legacy of Loathing.dat b/BUILD/task_order/Legacy of Loathing.dat
@@ -91,7 +91,6 @@ L12_finalizeWar
 L12_clearBattlefield
 LX_koeInvaderHandler
 setSoftblockDelay	allowSoftblockDelay
-setSoftblockShen	allowSoftblockShen
 LX_getDigitalKey
 LX_getStarKey
 L12_lastDitchFlyer

diff --git a/BUILD/task_order/Quantum Terrarium.dat b/BUILD/task_order/Quantum Terrarium.dat
@@ -58,6 +58,5 @@ L5_slayTheGoblinKing
 L4_batCave
 L3_tavern
 setSoftblockDelay	allowSoftblockDelay
-setSoftblockShen	allowSoftblockShen
 L13_towerAscent
 LX_attemptPowerLevel
diff --git a/BUILD/task_order/Zombie Slayer.dat b/BUILD/task_order/Zombie Slayer.dat
@@ -54,6 +54,5 @@ L5_slayTheGoblinKing
 L4_batCave
 L3_tavern
 setSoftblockDelay	allowSoftblockDelay
-setSoftblockShen	allowSoftblockShen
 L13_towerAscent
 LX_attemptPowerLevel
diff --git a/BUILD/task_order/default.dat b/BUILD/task_order/default.dat
@@ -83,7 +83,6 @@ L12_finalizeWar
 L12_clearBattlefield
 LX_koeInvaderHandler
 setSoftblockDelay	allowSoftblockDelay
-setSoftblockShen	allowSoftblockShen
 LX_getDigitalKey
 LX_getStarKey
 L12_lastDitchFlyer

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ This work is licensed under a [Creative Commons Attribution-NonCommercial-ShareA
 
 Run this command in the graphical CLI:
 ```
-git checkout https://github.com/Loathing-Associates-Scripting-Society/autoscend.git
+git checkout loathers/autoscend
 ```
 Will require [a recent build of KoLMafia](http://builds.kolmafia.us/job/Kolmafia/lastSuccessfulBuild/).
 

diff --git a/RELEASE/data/autoscend_familiars.txt b/RELEASE/data/autoscend_familiars.txt
@@ -113,53 +113,55 @@ item	2	Steam-Powered Cheerleader	prop:_cheerleaderSteam>100
 item	3	Steam-Powered Cheerleader	prop:_cheerleaderSteam>50
 # 1.1x multiplier fairy
 item	4	Steam-Powered Cheerleader	prop:_cheerleaderSteam>0
+# fairy with useful special powers above a certain weight so we want to preload it
+item	5	Grey Goose	prop_boolean:auto_prioritizeGoose
 # fairy that generates extra adventures
-item	5	Reagnimated Gnome	!path:Heavy Rains
+item	6	Reagnimated Gnome	!path:Heavy Rains
 # Fairywhelp that drops x and o without limit. 1 each per 9 combats. 3 o for food. 3 x for drink, 23 x to skip half bridge.
-item	6	XO Skeleton
+item	7	XO Skeleton
 # Fairy that drops bacon with no limit. 1 per combat
-item	7	Intergnat
+item	8	Intergnat
 # Fairyballs
-item	8	Elf Operative
-item	9	Optimistic Candle
-item	10	Rockin' Robin
-item	11	God Lobster	item:God Lobster's Crown>0
-item	12	Hobo in Sheep's Clothing
+item	9	Elf Operative
+item	10	Optimistic Candle
+item	11	Rockin' Robin
+item	12	God Lobster	item:God Lobster's Crown>0
+item	13	Hobo in Sheep's Clothing
 # Fairywhelps
-item	13	Pocket Professor
-item	14	Garbage Fire
-item	15	Dandy Lion
-item	16	Choctopus
+item	14	Pocket Professor
+item	15	Garbage Fire
+item	16	Dandy Lion
+item	17	Choctopus
 # Fairychauns
-item	17	Fist Turkey
-item	18	Cat Burglar
-item	19	Angry Jung Man
-item	20	Grimstone Golem
-item	21	Adventurous Spelunker
-item	22	Blavious Kloop
-item	23	Hippo Ballerina
-item	24	Dancing Frog
-item	25	Coffee Pixie
-item	26	Attention-Deficit Demon
-item	27	Jitterbug
-item	28	Casagnova Gnome
-item	29	Psychedelic Bear
-item	30	Piano Cat
+item	18	Fist Turkey
+item	19	Cat Burglar
+item	20	Angry Jung Man
+item	21	Grimstone Golem
+item	22	Adventurous Spelunker
+item	23	Blavious Kloop
+item	24	Hippo Ballerina
+item	25	Dancing Frog
+item	26	Coffee Pixie
+item	27	Attention-Deficit Demon
+item	28	Jitterbug
+item	29	Casagnova Gnome
+item	30	Psychedelic Bear
+item	31	Piano Cat
 # Slightly special fairies
-item	31	Grey Goose
-item	32	Ghost of Crimbo Carols
-item	33	Red-Nosed Snapper
-item	34	Pair of Stomping Boots	!path:G-Lover
-item	35	Gelatinous Cubeling
-item	36	Steam-Powered Cheerleader
-item	37	Obtuse Angel
-item	38	Green Pixie
+item	32	Grey Goose
+item	33	Ghost of Crimbo Carols
+item	34	Red-Nosed Snapper
+item	35	Pair of Stomping Boots	!path:G-Lover
+item	36	Gelatinous Cubeling
+item	37	Steam-Powered Cheerleader
+item	38	Obtuse Angel
+item	39	Green Pixie
 # Elemental fairies
-item	39	Sleazy Gravy Fairy
-item	40	Stinky Gravy Fairy
-item	41	Flaming Gravy Fairy
-item	42	Frozen Gravy Fairy
-item	43	Spooky Gravy Fairy
+item	40	Sleazy Gravy Fairy
+item	41	Stinky Gravy Fairy
+item	42	Flaming Gravy Fairy
+item	43	Frozen Gravy Fairy
+item	44	Spooky Gravy Fairy
 # Physical damage fairy
 item	44	Bowlet
 item	45	Crimbo Elf

diff --git a/RELEASE/data/autoscend_properties.txt b/RELEASE/data/autoscend_properties.txt
@@ -227,3 +227,5 @@
 224	auto_wishes
 225	auto_restoreUseBloodBond
 226	auto_aosolLastSkill
+227 auto_skipStage2
+228 auto_skipStage4
diff --git a/RELEASE/data/autoscend_task_order.txt b/RELEASE/data/autoscend_task_order.txt
@@ -60,9 +60,8 @@ Avatar of Jarlsberg	52	L5_slayTheGoblinKing
 Avatar of Jarlsberg	53	L4_batCave
 Avatar of Jarlsberg	54	L3_tavern
 Avatar of Jarlsberg	55	setSoftblockDelay	allowSoftblockDelay
-Avatar of Jarlsberg	56	setSoftblockShen	allowSoftblockShen
-Avatar of Jarlsberg	57	L13_towerAscent
-Avatar of Jarlsberg	58	LX_attemptPowerLevel
+Avatar of Jarlsberg	56	L13_towerAscent
+Avatar of Jarlsberg	57	LX_attemptPowerLevel
 
 Legacy of Loathing	0	LX_freeCombatsTask
 Legacy of Loathing	1	LX_unlockPirateRealm
@@ -157,18 +156,17 @@ Legacy of Loathing	81	L12_finalizeWar
 Legacy of Loathing	82	L12_clearBattlefield
 Legacy of Loathing	83	LX_koeInvaderHandler
 Legacy of Loathing	84	setSoftblockDelay	allowSoftblockDelay
-Legacy of Loathing	85	setSoftblockShen	allowSoftblockShen
-Legacy of Loathing	86	LX_getDigitalKey
-Legacy of Loathing	87	LX_getStarKey
-Legacy of Loathing	88	L12_lastDitchFlyer
-Legacy of Loathing	89	LX_bugbearInvasionFinale
-Legacy of Loathing	90	L13_towerNSContests
-Legacy of Loathing	91	L13_towerNSHedge
-Legacy of Loathing	92	L13_sorceressDoor
-Legacy of Loathing	93	L13_towerNSTower
-Legacy of Loathing	94	L13_towerNSNagamar
-Legacy of Loathing	95	L13_towerNSFinal
-Legacy of Loathing	96	LX_attemptPowerLevel
+Legacy of Loathing	85	LX_getDigitalKey
+Legacy of Loathing	86	LX_getStarKey
+Legacy of Loathing	87	L12_lastDitchFlyer
+Legacy of Loathing	88	LX_bugbearInvasionFinale
+Legacy of Loathing	89	L13_towerNSContests
+Legacy of Loathing	90	L13_towerNSHedge
+Legacy of Loathing	91	L13_sorceressDoor
+Legacy of Loathing	92	L13_towerNSTower
+Legacy of Loathing	93	L13_towerNSNagamar
+Legacy of Loathing	94	L13_towerNSFinal
+Legacy of Loathing	95	LX_attemptPowerLevel
 
 Quantum Terrarium	0	LX_freeCombatsTask
 Quantum Terrarium	1	LX_unlockPirateRealm
@@ -230,9 +228,8 @@ Quantum Terrarium	56	L5_slayTheGoblinKing
 Quantum Terrarium	57	L4_batCave
 Quantum Terrarium	58	L3_tavern
 Quantum Terrarium	59	setSoftblockDelay	allowSoftblockDelay
-Quantum Terrarium	60	setSoftblockShen	allowSoftblockShen
-Quantum Terrarium	61	L13_towerAscent
-Quantum Terrarium	62	LX_attemptPowerLevel
+Quantum Terrarium	60	L13_towerAscent
+Quantum Terrarium	61	LX_attemptPowerLevel
 
 Zombie Slayer	0	LM_zombieSlayer
 Zombie Slayer	1	LX_unlockPirateRealm
@@ -290,9 +287,8 @@ Zombie Slayer	52	L5_slayTheGoblinKing
 Zombie Slayer	53	L4_batCave
 Zombie Slayer	54	L3_tavern
 Zombie Slayer	55	setSoftblockDelay	allowSoftblockDelay
-Zombie Slayer	56	setSoftblockShen	allowSoftblockShen
-Zombie Slayer	57	L13_towerAscent
-Zombie Slayer	58	LX_attemptPowerLevel
+Zombie Slayer	56	L13_towerAscent
+Zombie Slayer	57	LX_attemptPowerLevel
 
 default	0	LX_freeCombatsTask
 default	1	LX_unlockPirateRealm
@@ -379,16 +375,15 @@ default	81	L12_finalizeWar
 default	82	L12_clearBattlefield
 default	83	LX_koeInvaderHandler
 default	84	setSoftblockDelay	allowSoftblockDelay
-default	85	setSoftblockShen	allowSoftblockShen
-default	86	LX_getDigitalKey
-default	87	LX_getStarKey
-default	88	L12_lastDitchFlyer
-default	89	LX_bugbearInvasionFinale
-default	90	L13_towerNSContests
-default	91	L13_towerNSHedge
-default	92	L13_sorceressDoor
-default	93	L13_towerNSTower
-default	94	L13_towerNSNagamar
-default	95	L13_towerNSFinal
-default	96	LX_attemptPowerLevel
+default	85	LX_getDigitalKey
+default	86	LX_getStarKey
+default	87	L12_lastDitchFlyer
+default	88	LX_bugbearInvasionFinale
+default	89	L13_towerNSContests
+default	90	L13_towerNSHedge
+default	91	L13_sorceressDoor
+default	92	L13_towerNSTower
+default	93	L13_towerNSNagamar
+default	94	L13_towerNSFinal
+default	95	LX_attemptPowerLevel
 
diff --git a/RELEASE/dependencies.txt b/RELEASE/dependencies.txt
@@ -3,4 +3,4 @@ github Ezandora/Helix-Fossil Release
 github Ezandora/Far-Future Release
 github gausie/excavator
 github midgleyc/Voting-Booth
-github Loathing-Associates-Scripting-Society/combo release
+github loathers/combo release
diff --git a/RELEASE/scripts/autoscend.ash b/RELEASE/scripts/autoscend.ash
@@ -199,6 +199,7 @@ void initializeSettings() {
 	set_property("auto_doMeatsmith", false);
 	set_property("auto_L8_ninjaAssassinFail", false);
 	set_property("auto_L8_extremeInstead", false);
+	set_property("auto_L9_smutOrcPervert", false);
 	set_property("auto_haveSourceTerminal", false);
 	set_property("auto_hedge", "fast");
 	set_property("auto_hippyInstead", false);
@@ -219,7 +220,6 @@ void initializeSettings() {
 	set_property("auto_pulls", "");
 
 	// Last level during which we ran out of stuff to do without pre-completing some Shen quests.
-	set_property("auto_shenSkipLastLevel", 0); 
 	remove_property("auto_shenZonesTurnsSpent");
 	remove_property("auto_lastShenTurn");
 
@@ -1846,6 +1846,8 @@ boolean doTasks()
 	auto_voteSetup(0,0,0);
 	auto_setSongboom();
 	if(LX_ForceNC())					return true;
+	prioritizeGoose();
+	if(LX_dronesOut())					return true;
 	if(LM_bond())						return true;
 	if(LX_calculateTheUniverse(false))	return true;
 	rockGardenEnd();
@@ -2005,15 +2007,15 @@ void print_help_text()
 {
 	print_html("Thank you for using autoscend!");
 	print_html("If you need to configure or interrupt the script, choose <b>autoscend</b> from the drop-down \"run script\" menu in your browser.");
-	print_html("If you want to contribute, please open an issue <a href=\"https://github.com/Loathing-Associates-Scripting-Society/autoscend/issues\">on Github</a>");
+	print_html("If you want to contribute, please open an issue <a href=\"https://github.com/loathers/autoscend/issues\">on Github</a>");
 	print_html("A FAQ with common issues (and tips for a great bug report) <a href=\"https://docs.google.com/document/d/1AfyKDHSDl-fogGSeNXTwbC6A06BG-gTkXUAdUta9_Ns\">can be found here</a>");
 	print_html("The developers also hang around <a href=\"https://discord.gg/96xZxv3\">on the Ascension Speed Society discord server</a>");
 	print_html("");
 }
 
 void sad_times()
 {
-	print_html('autoscend (formerly sl_ascend) is under new management. Soolar (the maintainer of sl_ascend) and Jeparo (the most active contributor) have decided to cease development of sl_ascend in response to Jick\'s behavior that has recently <a href="https://www.reddit.com/r/kol/comments/d0cq9s/allegations_of_misconduct_by_asymmetric_members/">come to light</a>. New developers have taken over maintenance and rebranded sl_ascend to autoscend as per Soolar\'s request. Please be patient with us during this transition period. Please see the readme on the <a href="https://github.com/Loathing-Associates-Scripting-Society/autoscend">github</a> page for more information.');
+	print_html('autoscend (formerly sl_ascend) is under new management. Soolar (the maintainer of sl_ascend) and Jeparo (the most active contributor) have decided to cease development of sl_ascend in response to Jick\'s behavior that has recently <a href="https://www.reddit.com/r/kol/comments/d0cq9s/allegations_of_misconduct_by_asymmetric_members/">come to light</a>. New developers have taken over maintenance and rebranded sl_ascend to autoscend as per Soolar\'s request. Please be patient with us during this transition period. Please see the readme on the <a href="https://github.com/loathers/autoscend">github</a> page for more information.');
 }
 
 void safe_preference_reset_wrapper(int level)

diff --git a/RELEASE/scripts/autoscend/auto_familiar.ash b/RELEASE/scripts/autoscend/auto_familiar.ash
@@ -449,7 +449,11 @@ boolean autoChooseFamiliar(location place)
 	}
 
 	// The World's Biggest Jerk can send us here so only use +item if we're farming sonars.
-	if ($location[The Batrat and Ratbat Burrow] == place && internalQuestStatus("questL04Bat") < 3) {
+	if ($location[The Batrat and Ratbat Burrow] == place && internalQuestStatus("questL04Bat") < 3 && auto_haveGreyGoose()) {
+		auto_log_info("Bringing the Grey Goose to emit some drones at a bat to get Sonar.");
+		famChoice = $familiar[Grey Goose];
+	}
+	else if ($location[The Batrat and Ratbat Burrow] == place && internalQuestStatus("questL04Bat") < 3) {
 		famChoice = lookupFamiliarDatafile("item");
 	}
 
@@ -470,6 +474,13 @@ boolean autoChooseFamiliar(location place)
 		famChoice = lookupFamiliarDatafile("item");
 	}
 
+	// If we have Grey Goose and we're farming bridge parts and Smut Orc Pervert is coming up, we should use the Goose to dupe the Keepsake box
+	if ($location[The Smut Orc Logging Camp] == place && internalQuestStatus("questL09Topping") < 1 && is_integer(($location[The Smut Orc Logging Camp].turns_spent - 1)/20) && auto_haveGreyGoose())
+	{
+		auto_log_info("Bringing the Grey Goose to emit some drones at smut orc pervert to dupe a Box.");
+		famChoice = $familiar[Grey Goose];
+	}
+
 	// The World's Biggest Jerk can also send us here so only use +item if we're farming bridge parts.
 	if ($location[The Smut Orc Logging Camp] == place && internalQuestStatus("questL09Topping") < 1) {
 		famChoice = lookupFamiliarDatafile("item");

diff --git a/RELEASE/scripts/autoscend/auto_util.ash b/RELEASE/scripts/autoscend/auto_util.ash
@@ -1619,27 +1619,6 @@ boolean inGnomeSign()
 	return $strings[Blender, Packrat, Wombat] contains my_sign();
 }
 
-boolean allowSoftblockShen()
-{
-	//Some quests have a softblock on doing them because shen might need them. When we run out of things to do this softblock is released.
-	//Return true means the softblock is active. Return false means the softblock is released.
-	if(get_property("questL11Shen") == "finished")
-	{
-		return false;		//shen quest is over. softblock not needed
-	}
-	
-	//We tell users to disable the shen softblock by setting auto_shenSkipLastLevel to 999.
-	//This is why we want to return < my_level() and not != my_level()
-	return get_property("auto_shenSkipLastLevel").to_int() < my_level();
-}
-
-boolean setSoftblockShen()
-{
-	auto_log_warning("I was trying to avoid zones that Shen might need, but I've run out of stuff to do. Releasing softblock.", "red");
-	set_property("auto_shenSkipLastLevel", my_level());
-	return true;
-}
-
 boolean instakillable(monster mon)
 {
 	if(mon.boss)
@@ -1930,6 +1909,9 @@ boolean LX_summonMonster()
 		(lumberCount() < 30 || fastenerCount() < 30) && canSummonMonster($monster[smut orc pervert]))
 	{
 		// summon pervert here but handling of L9 quest will open box
+		if(auto_haveGreyGoose()){
+			handleFamiliar($familiar[Grey Goose]);
+		}
 		if(summonMonster($monster[smut orc pervert])) return true;
 	}
 

diff --git a/RELEASE/scripts/autoscend/autoscend_header.ash b/RELEASE/scripts/autoscend/autoscend_header.ash
@@ -463,6 +463,10 @@ int auto_CombatLoversLocketCharges();
 boolean auto_haveReminiscedMonster(monster mon);
 boolean auto_monsterInLocket(monster mon);
 boolean auto_fightLocketMonster(monster mon, boolean speculative);
+boolean auto_haveGreyGoose();
+int gooseExpectedDrones();
+boolean dronesOut();
+void prioritizeGoose();
 boolean canUseCleaver();
 void juneCleaverChoiceHandler(int choice);
 boolean canUseSweatpants();
@@ -1163,6 +1167,7 @@ boolean LX_dolphinKingMap();
 boolean LX_meatMaid();
 item LX_getDesiredWorkshed();
 boolean LX_setWorkshed();
+boolean LX_dronesOut();
 
 ########################################################################################################
 //Defined in autoscend/quests/optional.ash
@@ -1666,8 +1671,6 @@ boolean isDesertAvailable();
 boolean inKnollSign();
 boolean inCanadiaSign();
 boolean inGnomeSign();
-boolean allowSoftblockShen();
-boolean setSoftblockShen();
 boolean instakillable(monster mon);
 boolean stunnable(monster mon);
 float combatItemDamageMultiplier();