Reset mayam calendar reset. Update prop to be more generic

loathers · Nov 5, 2024 · f19458a · f19458a
1 parent ce508a4
commit f19458a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 24 deletions.
diff --git a/RELEASE/scripts/autoscend.ash b/RELEASE/scripts/autoscend.ash
@@ -254,7 +254,7 @@ void initializeSettings() {
 	set_property("auto_dontUseCookBookBat", false);
 	set_property("auto_turbo", "false");
 	set_property("auto_dietpills", 0);
-	set_property("auto_mayamReset", "false");
+	set_property("auto_topofthetemple", "false");
 	beehiveConsider();
 
 	eudora_initializeSettings();

diff --git a/RELEASE/scripts/autoscend/autoscend_header.ash b/RELEASE/scripts/autoscend/autoscend_header.ash
@@ -568,7 +568,6 @@ boolean auto_MayamClaimStinkBomb();
 boolean auto_MayamClaimBelt();
 boolean auto_MayamClaimWhatever();
 boolean auto_MayamClaimAll();
-boolean auto_MayamReset();
 boolean auto_haveRoman();
 boolean auto_haveBatWings();
 boolean auto_canLeapBridge();

diff --git a/RELEASE/scripts/autoscend/iotms/mr2022.ash b/RELEASE/scripts/autoscend/iotms/mr2022.ash
@@ -743,8 +743,8 @@ boolean auto_autumnatonQuest()
 	// a location of last resort for those without shadow rifts
 	if(get_property("shadowRiftIngress") == "")
 	{
-		//Cookbookbat materials if you have a Cookbookbat and Autumn Fest Ale or Autumn Leaves
-		if(item_amount($item[Stone Wool]) == 0 && !(get_property("auto_mayamReset").to_boolean()))
+		//Cookbookbat materials if you have a Cookbookbat and Autumn Fest Ale+stone wool or Autumn Leaves
+		if(item_amount($item[Stone Wool]) == 0 && !(get_property("auto_topofthetemple").to_boolean()))
 		{
 			if(auto_sendAutumnaton($location[The Hidden Temple])) return false;
 		}

diff --git a/RELEASE/scripts/autoscend/iotms/mr2024.ash b/RELEASE/scripts/autoscend/iotms/mr2024.ash
@@ -337,10 +337,6 @@ boolean auto_MayamClaimAll()
 	{
 		return false;
 	}
-	if(!(auto_MayamReset()))
-	{
-		return false;
-	}
 	if(auto_MayamAllUsed())
 	{
 		return false;
@@ -354,21 +350,6 @@ boolean auto_MayamClaimAll()
 	return true;
 }
 
-boolean auto_MayamReset()
-{
-	if(get_property("auto_mayamReset").to_boolean())
-	{
-		return false;
-	}
-	//Head towards the top of the temple if we've already opened the city
-	if(item_amount($item[stone wool]) > 0  && internalQuestStatus("questL11Worship") > 4)
-	{
-		use(1, $item[stone wool]);
-		return autoAdv($location[The Hidden Temple]);
-	}
-	return false;
-}
-
 boolean auto_haveRoman()
 {
 	if(auto_is_valid($item[Roman Candelabra]) && possessEquipment($item[Roman Candelabra]))

diff --git a/RELEASE/scripts/autoscend/quests/level_11.ash b/RELEASE/scripts/autoscend/quests/level_11.ash
@@ -1503,7 +1503,7 @@ void hiddenTempleChoiceHandler(int choice, string page) {
 		if (item_amount($item[The Nostril of the Serpent]) == 0 && internalQuestStatus("questL11Worship") < 3) {
 			run_choice(2); // Get The Nostril of the Serpent
 		} else {
-			if(auto_haveMayamCalendar()) set_property("auto_mayamReset", "true");
+			if(auto_haveMayamCalendar()) set_property("auto_topofthetemple", "true");
 			run_choice(3); // +3 adventures and extend 10 effects (first time) or skip
 		}
 	} else if (choice == 580) { // The Hidden Heart of the Hidden Temple