feat: takerspace (#1532)

* feat: takerspace * fix: visit the takerspace if we haven't today * feat: need to restrict to Mafia after takerspace bug fix * fix: need to use pirate dinghy to unlock island * fix: correct since again * feat: don't get anchor bomb with spring shoes * feat: restore using pirate dinghy (once) * fix: don't do the CCSC Shore adventure when going for the diary
loathers · Jan 13, 2025 · 9a16fce · 9a16fce
1 parent 55871d3
commit 9a16fce
Show file tree

Hide file tree

Showing 11 changed files with 156 additions and 94 deletions.
diff --git a/BUILD/restoration/item.dat b/BUILD/restoration/item.dat
@@ -1,4 +1,5 @@
 scented massage oil	ALL	0	0	0	none	none
+pirate dinghy	1000	1000	0	0	none	none
 extra-strength red potion	200	0	0	0	none	Healthy Red Glow
 plaid bandage	135	0	0	0	none	none
 red pixel potion	110	0	0	0	none	none

diff --git a/RELEASE/data/autoscend_restoration.txt b/RELEASE/data/autoscend_restoration.txt
@@ -25,88 +25,89 @@ dwelling	16	Distant Woods Getaway Brochure	250	125	2	0	none	none
 dwelling	17	Chateau Mantegna room key	250	125	2	0	none	none
 
 item	0	scented massage oil	ALL	0	0	0	none	none
-item	1	extra-strength red potion	200	0	0	0	none	Healthy Red Glow
-item	2	plaid bandage	135	0	0	0	none	none
-item	3	red pixel potion	110	0	0	0	none	none
-item	4	gauze garter	100	0	0	5	none	none
-item	5	filthy poultice	100	0	0	5	none	none
-item	6	red potion	95	0	0	0	none	Healthy Red Glow
-item	7	green pixel potion	50	35	0	0	none	none
-item	8	cartoon heart	50	0	0	0	none	Healthy Red Glow
-item	9	Texas tea	30	30	0	0	none	Texas Elegance
-item	10	Doc Galaktik's Homeopathic Elixir	19	0	0	0	none	none
-item	11	cast	15	0	0	0	none	none
-item	12	Doc Galaktik's Restorative Balm	14	0	0	0	none	none
-item	13	Doc Galaktik's Ailment Ointment	9	0	0	0	none	none
-item	14	forest tears	7	0	0	0	Beaten Up	none
-item	15	Doc Galaktik's Pungent Unguent	4	0	0	0	none	none
-item	16	palm-frond fan	40	40	0	0	none	none
-item	17	Cloaca-Cola	0	12	0	0	none	none
-item	18	scroll of drastic healing	100000	0	0	0	none	none
-item	19	warm El Vibrato drone	ALL	0	0	0	none	Well-preserved
-item	20	Camp Scout pup tent	1000	0	0	0	none	none
-item	21	really thick bandage	110	0	0	0	none	none
-item	22	bottle of Vangoghbitussin	100	100	0	0	none	The 'Tussin
-item	23	ancient turtle shell powder	90	0	0	0	none	none
-item	24	cotton candy bale	61	61	0	0	none	none
-item	25	ancient Magi-Wipes	55	55	0	0	none	none
-item	26	cotton candy pillow	51	51	0	0	none	none
-item	27	phonics down	48	48	0	0	none	Tingly Wrists,Tingly Biceps,Tingly Elbows
-item	28	cotton candy cone	39	39	0	0	none	none
-item	29	honey-dipped locust	35	35	0	0	none	none
-item	30	cotton candy plug	28	28	0	0	none	none
-item	31	comfy pillow	25	0	0	0	none	none
-item	32	cotton candy skoshe	22	22	0	0	none	none
-item	33	tiny house	22	22	0	0	Beaten Up,Confused,Embarrassed,Hardly Poisoned at All,Sleepy,Sunburned,Wussiness	none
-item	34	cotton candy smidgen	17	17	0	0	none	none
-item	35	dueling turtle	15	15	0	0	none	none
-item	36	sugar shard	15	7	0	0	none	none
-item	37	cotton candy pinch	11	11	0	0	none	none
-item	38	pixellated candy heart	4	0	0	0	none	none
-item	39	your own black heart	ALL	ALL	0	0	Beaten Up	none
-item	40	Egnaro berry	0	HALF	0	0	none	Berry Experiential
-item	41	CSA all purpose soap	0	1000	0	0	All Negative	none
-item	42	Wolfman Nardz	0	250	0	0	none	none
-item	43	high pressure seltzer bottle	0	175	0	0	none	none
-item	44	Cloaca Cola Polar	0	150	0	0	none	Polar Express
-item	45	natural fennel soda	0	100	0	0	none	none
-item	46	can of CRIMBCOLA	0	90	0	0	none	none
-item	47	Monstar energy beverage	0	75	0	0	none	none
-item	48	carbonated soy milk	0	75	0	0	none	none
-item	49	carbonated water lily	0	65	0	0	none	none
-item	50	blue pixel potion	0	65	0	0	none	none
-item	51	Nardz energy beverage	0	60	0	0	none	none
-item	52	bottle of Monsieur Bubble	0	55	0	0	none	none
-item	53	unrefined Mountain Stream syrup	0	55	0	0	none	none
-item	54	banana spritzer	0	70	0	0	none	none
-item	55	elven magi pack	0	45	0	0	none	none
-item	56	myrrh soaked, chocolate covered bacon bath ball	0	37	0	0	none	Pork Power,[800]Chocolate Reign,Incensed
-item	57	creepy ginger ale	0	40	0	0	none	none
-item	58	grogpagne	0	40	0	0	none	none
-item	59	tonic water	0	40	0	0	none	none
-item	60	Marquis de Poivre soda	0	35	0	0	none	none
-item	61	Mountain Stream soda	0	35	0	0	none	none
-item	62	Knob Goblin superseltzer	0	27	0	0	none	none
-item	63	Blatantly Canadian	0	27	0	0	none	none
-item	64	beer scented teddy bear	0	17	0	0	none	none
-item	65	Knob Goblin seltzer	0	10	0	0	none	none
-item	66	black cherry soda	0	10	0	0	none	none
-item	67	Doc Galaktik's Invigorating Tonic	0	10	0	0	none	none
-item	68	Cherry Cloaca Cola	0	8	0	0	none	none
-item	69	Diet Cloaca Cola	0	8	0	0	none	none
-item	70	Regular Cloaca Cola	0	8	0	0	none	none
-item	71	natto marble soda	0	7	0	0	none	none
-item	72	tobiko marble soda	0	7	0	0	none	none
-item	73	wasabi marble soda	0	7	0	0	none	none
-item	74	soda water	0	4	0	0	none	none
-item	75	Wint-O-Fresh mint	0	4	0	0	none	none
-item	76	magical mystery juice	0	scaling	0	0	none	none
-item	77	generic mana potion	0	scaling	0	0	none	none
-item	78	Psychokinetic Energy Blob	0	25	0	0	none	none
+item	1	pirate dinghy	1000	1000	0	0	none	none
+item	2	extra-strength red potion	200	0	0	0	none	Healthy Red Glow
+item	3	plaid bandage	135	0	0	0	none	none
+item	4	red pixel potion	110	0	0	0	none	none
+item	5	gauze garter	100	0	0	5	none	none
+item	6	filthy poultice	100	0	0	5	none	none
+item	7	red potion	95	0	0	0	none	Healthy Red Glow
+item	8	green pixel potion	50	35	0	0	none	none
+item	9	cartoon heart	50	0	0	0	none	Healthy Red Glow
+item	10	Texas tea	30	30	0	0	none	Texas Elegance
+item	11	Doc Galaktik's Homeopathic Elixir	19	0	0	0	none	none
+item	12	cast	15	0	0	0	none	none
+item	13	Doc Galaktik's Restorative Balm	14	0	0	0	none	none
+item	14	Doc Galaktik's Ailment Ointment	9	0	0	0	none	none
+item	15	forest tears	7	0	0	0	Beaten Up	none
+item	16	Doc Galaktik's Pungent Unguent	4	0	0	0	none	none
+item	17	palm-frond fan	40	40	0	0	none	none
+item	18	Cloaca-Cola	0	12	0	0	none	none
+item	19	scroll of drastic healing	100000	0	0	0	none	none
+item	20	warm El Vibrato drone	ALL	0	0	0	none	Well-preserved
+item	21	Camp Scout pup tent	1000	0	0	0	none	none
+item	22	really thick bandage	110	0	0	0	none	none
+item	23	bottle of Vangoghbitussin	100	100	0	0	none	The 'Tussin
+item	24	ancient turtle shell powder	90	0	0	0	none	none
+item	25	cotton candy bale	61	61	0	0	none	none
+item	26	ancient Magi-Wipes	55	55	0	0	none	none
+item	27	cotton candy pillow	51	51	0	0	none	none
+item	28	phonics down	48	48	0	0	none	Tingly Wrists,Tingly Biceps,Tingly Elbows
+item	29	cotton candy cone	39	39	0	0	none	none
+item	30	honey-dipped locust	35	35	0	0	none	none
+item	31	cotton candy plug	28	28	0	0	none	none
+item	32	comfy pillow	25	0	0	0	none	none
+item	33	cotton candy skoshe	22	22	0	0	none	none
+item	34	tiny house	22	22	0	0	Beaten Up,Confused,Embarrassed,Hardly Poisoned at All,Sleepy,Sunburned,Wussiness	none
+item	35	cotton candy smidgen	17	17	0	0	none	none
+item	36	dueling turtle	15	15	0	0	none	none
+item	37	sugar shard	15	7	0	0	none	none
+item	38	cotton candy pinch	11	11	0	0	none	none
+item	39	pixellated candy heart	4	0	0	0	none	none
+item	40	your own black heart	ALL	ALL	0	0	Beaten Up	none
+item	41	Egnaro berry	0	HALF	0	0	none	Berry Experiential
+item	42	CSA all purpose soap	0	1000	0	0	All Negative	none
+item	43	Wolfman Nardz	0	250	0	0	none	none
+item	44	high pressure seltzer bottle	0	175	0	0	none	none
+item	45	Cloaca Cola Polar	0	150	0	0	none	Polar Express
+item	46	natural fennel soda	0	100	0	0	none	none
+item	47	can of CRIMBCOLA	0	90	0	0	none	none
+item	48	Monstar energy beverage	0	75	0	0	none	none
+item	49	carbonated soy milk	0	75	0	0	none	none
+item	50	carbonated water lily	0	65	0	0	none	none
+item	51	blue pixel potion	0	65	0	0	none	none
+item	52	Nardz energy beverage	0	60	0	0	none	none
+item	53	bottle of Monsieur Bubble	0	55	0	0	none	none
+item	54	unrefined Mountain Stream syrup	0	55	0	0	none	none
+item	55	banana spritzer	0	70	0	0	none	none
+item	56	elven magi pack	0	45	0	0	none	none
+item	57	myrrh soaked, chocolate covered bacon bath ball	0	37	0	0	none	Pork Power,[800]Chocolate Reign,Incensed
+item	58	creepy ginger ale	0	40	0	0	none	none
+item	59	grogpagne	0	40	0	0	none	none
+item	60	tonic water	0	40	0	0	none	none
+item	61	Marquis de Poivre soda	0	35	0	0	none	none
+item	62	Mountain Stream soda	0	35	0	0	none	none
+item	63	Knob Goblin superseltzer	0	27	0	0	none	none
+item	64	Blatantly Canadian	0	27	0	0	none	none
+item	65	beer scented teddy bear	0	17	0	0	none	none
+item	66	Knob Goblin seltzer	0	10	0	0	none	none
+item	67	black cherry soda	0	10	0	0	none	none
+item	68	Doc Galaktik's Invigorating Tonic	0	10	0	0	none	none
+item	69	Cherry Cloaca Cola	0	8	0	0	none	none
+item	70	Diet Cloaca Cola	0	8	0	0	none	none
+item	71	Regular Cloaca Cola	0	8	0	0	none	none
+item	72	natto marble soda	0	7	0	0	none	none
+item	73	tobiko marble soda	0	7	0	0	none	none
+item	74	wasabi marble soda	0	7	0	0	none	none
+item	75	soda water	0	4	0	0	none	none
+item	76	Wint-O-Fresh mint	0	4	0	0	none	none
+item	77	magical mystery juice	0	scaling	0	0	none	none
+item	78	generic mana potion	0	scaling	0	0	none	none
+item	79	Psychokinetic Energy Blob	0	25	0	0	none	none
 ## Actually Ed the Undying restores
-item	79	Holy Spring Water	0	50	0	0	none	Spiritually Awake
-item	80	Spirit Beer	0	90	0	0	none	Spiritually Aware
-item	81	Sacramental Wine	0	180	0	0	none	Spiritually Awash
+item	80	Holy Spring Water	0	50	0	0	none	Spiritually Awake
+item	81	Spirit Beer	0	90	0	0	none	Spiritually Aware
+item	82	Sacramental Wine	0	180	0	0	none	Spiritually Awash
 
 # special handling in auto_restore.ash accounts for mp restore if completed as frat warrior
 place	0	the nunnery	1000	0	3	0	none	none

diff --git a/RELEASE/scripts/autoscend.ash b/RELEASE/scripts/autoscend.ash
@@ -181,6 +181,7 @@ void initializeSettings() {
 	set_property("auto_chasmBusted", true);
 	set_property("auto_chewed", "");
 	set_property("auto_clanstuff", "0");
+	set_property("auto_considerCCSCShore", true);
 	set_property("auto_copies", "");
 	set_property("auto_dakotaFanning", false);
 	set_property("auto_day_init", 0);

diff --git a/RELEASE/scripts/autoscend/auto_acquire.ash b/RELEASE/scripts/autoscend/auto_acquire.ash
@@ -1014,6 +1014,7 @@ boolean LX_craftAcquireItems()
 
 	LX_dolphinKingMap();
 	auto_mayoItems();
+	auto_checkTakerSpace();
 
 	if(item_amount($item[Metal Meteoroid]) > 0 && !in_tcrs())
 	{

diff --git a/RELEASE/scripts/autoscend/auto_choice_adv.ash b/RELEASE/scripts/autoscend/auto_choice_adv.ash
@@ -435,7 +435,7 @@ boolean auto_run_choice(int choice, string page)
 			hiddenCityChoiceHandler(choice);
 			break;
 		case 793: // The Shore, Inc. Travel Agency. doing a vacation
-			if(options contains 5)
+			if(options contains 5 && get_property("auto_considerCCSCShore").to_boolean())
 			{
 				run_choice(5); // 2 Shore scrips, all stats, +wdmg
 			}

diff --git a/RELEASE/scripts/autoscend/auto_restore.ash b/RELEASE/scripts/autoscend/auto_restore.ash
@@ -934,6 +934,9 @@ __RestorationOptimization __calculate_objective_values(int hp_goal, int mp_goal,
 		if(metadata.type == "item")
 		{
 			item i = to_item(metadata.name);
+			if (i.dailyusesleft == 0) {
+				return false;
+			}
 			boolean mall_buyable = can_interact() && auto_mall_price(i) > 0;
 			boolean npc_meat_buyable = npc_price(i) > 0;
 			boolean coinmaster_buyable = i.seller != $coinmaster[none] && is_accessible(i.seller) && get_property("autoSatisfyWithCoinmasters").to_boolean();

diff --git a/RELEASE/scripts/autoscend/autoscend_header.ash b/RELEASE/scripts/autoscend/autoscend_header.ash
@@ -488,7 +488,6 @@ boolean auto_hasSpeakEasy();
 int auto_remainingSpeakeasyFreeFights();
 boolean speakeasyCombat();
 
-
 boolean auto_haveTrainSet();
 void auto_modifyTrainSet(int one, int two, int three, int four, int five, int six, int seven, int eight);
 void auto_checkTrainSet();
@@ -580,6 +579,8 @@ boolean auto_haveSeptEmberCenser();
 int remainingEmbers();
 void auto_buyFromSeptEmberStore();
 boolean auto_haveTearawayPants();
+boolean auto_haveTakerSpace();
+void auto_checkTakerSpace();
 
 ########################################################################################################
 //Defined in autoscend/iotms/mr2025.ash
@@ -1267,6 +1268,7 @@ boolean LX_dolphinKingMap();
 boolean LX_meatMaid();
 item LX_getDesiredWorkshed();
 boolean LX_setWorkshed();
+boolean canSetWorkshed(item it);
 boolean LX_dronesOut();
 
 ########################################################################################################

diff --git a/RELEASE/scripts/autoscend/combat/auto_combat_util.ash b/RELEASE/scripts/autoscend/combat/auto_combat_util.ash
@@ -577,6 +577,8 @@ string banisherCombatString(monster enemy, location loc, boolean inCombat)
 		Beancannon: item, no turn limit, no limit
 		Tennis Ball: item, no turn limit
 
+		anchor bomb: item, 30 turns
+
 		Breathe Out: per hot jelly usage
 	*/
 
@@ -787,6 +789,10 @@ string banisherCombatString(monster enemy, location loc, boolean inCombat)
 	{
 		return "item " + $item[divine champagne popper];
 	}
+	if((item_amount($item[anchor bomb]) > keep) && (!(used contains "anchor bomb"))&& auto_is_valid($item[anchor bomb]) && useFree)
+	{
+		return "item " + $item[anchor bomb];
+	}
 
 	return "";
 }

diff --git a/RELEASE/scripts/autoscend/iotms/mr2024.ash b/RELEASE/scripts/autoscend/iotms/mr2024.ash
@@ -459,3 +459,31 @@ boolean auto_haveTearawayPants()
 	}
 	return false;
 }
+
+boolean auto_haveTakerSpace()
+{
+	return auto_get_campground() contains $item[TakerSpace letter of Marque] && auto_is_valid($item[TakerSpace letter of Marque]);
+}
+
+void auto_checkTakerSpace()
+{
+	if(!auto_haveTakerSpace()) return;
+	if(!get_property("_takerSpaceSuppliesDelivered").to_boolean()) {
+		// visit the workshed to get the supplies
+		visit_url("campground.php?action=workshed");
+	}
+	// unlock the island if we can (6 turn save)
+	if(get_property("lastIslandUnlock").to_int() < my_ascensions() && item_amount($item[pirate dinghy]) == 0 && creatable_amount($item[pirate dinghy]) > 0) {
+		create(1, $item[pirate dinghy]);
+	}
+	// deft pirate hook would be worth it but hard for autoscend to use
+	// anchor bomb is a free banish but only for 30 turns, if we have Spring Kick we won't use it
+	if(!(auto_haveSpringShoes() && auto_is_valid($skill[Spring Kick])) && creatable_amount($item[anchor bomb]) > 0) {
+		create(1, $item[anchor bomb]);
+	}
+	// goldschlepper is EPIC booze
+	int creatableGold = creatable_amount($item[tankard of spiced Goldschlepper]);
+	if(creatableGold > 0) {
+		create(creatableGold, $item[tankard of spiced Goldschlepper]);
+	}
+}
diff --git a/RELEASE/scripts/autoscend/quests/level_11.ash b/RELEASE/scripts/autoscend/quests/level_11.ash
@@ -966,7 +966,9 @@ boolean L11_mcmuffinDiary()
 	}
 
 	auto_log_info("Getting the McMuffin Diary", "blue");
+	set_property("auto_considerCCSCShore", false);
 	LX_doVacation();
+	set_property("auto_considerCCSCShore", true);
 	foreach diary in $items[Your Father\'s Macguffin Diary, Copy of a Jerk Adventurer\'s Father\'s Diary]
 	{
 		if(item_amount(diary) > 0)