Merge branch 'main' into logging-level-updates

loathers · Nov 26, 2023 · e3416fa · e3416fa
2 parents 8813d09 + b8f333b
commit e3416fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/RELEASE/scripts/autoscend/auto_restore.ash b/RELEASE/scripts/autoscend/auto_restore.ash
@@ -1619,6 +1619,8 @@ boolean __restore(string resource_type, int goal, int meat_reserve, boolean useF
 			}
 			print("Aborting due to restore failure... you can override this setting for today by entering in gCLI:" ,"blue");
 			print("set _auto_ignoreRestoreFailureToday = true" ,"blue");
+			print("You can override this setting forever by entering in gCLI:" ,"blue");
+			print("set auto_ignoreRestoreFailure = true" ,"blue");
 			abort();
 		}
 

diff --git a/RELEASE/scripts/autoscend/quests/level_06.ash b/RELEASE/scripts/autoscend/quests/level_06.ash
@@ -50,15 +50,15 @@ boolean L6_friarsGetParts()
 		auto_log_info("Getting Dodecagram", "blue");
 		boolean NCForced = auto_forceNextNoncombat($location[The Dark Neck of the Woods]);
 		// delay to day 2 if we are out of NC forcers and haven't run out of things to do
-		if(!NCForced && my_daycount() == 1 && !isAboutToPowerlevel()) return false;
+		if(!NCForced && my_daycount() == 1 && !isAboutToPowerlevel() && !get_property("auto_getSteelOrgan").to_boolean()) return false;
 		return autoAdv($location[The Dark Neck of the Woods]);
 	}
 	if(item_amount($item[eldritch butterknife]) == 0)
 	{
 		auto_log_info("Getting Eldritch Butterknife", "blue");
 		boolean NCForced = auto_forceNextNoncombat($location[The Dark Elbow of the Woods]);
 		// delay to day 2 if we are out of NC forcers and haven't run out of things to do
-		if(!NCForced && my_daycount() == 1 && !isAboutToPowerlevel()) return false;
+		if(!NCForced && my_daycount() == 1 && !isAboutToPowerlevel() && !get_property("auto_getSteelOrgan").to_boolean()) return false;
 		return autoAdv($location[The Dark Elbow of the Woods]);
 	}
 	if(item_amount($item[box of birthday candles]) == 0)
@@ -72,7 +72,7 @@ boolean L6_friarsGetParts()
 		auto_log_info("Getting Box of Birthday Candles", "blue");
 		boolean NCForced = auto_forceNextNoncombat($location[The Dark Heart of the Woods]);
 		// delay to day 2 if we are out of NC forcers and haven't run out of things to do
-		if(!NCForced && my_daycount() == 1 && !isAboutToPowerlevel()) return false;
+		if(!NCForced && my_daycount() == 1 && !isAboutToPowerlevel() && !get_property("auto_getSteelOrgan").to_boolean()) return false;
 		return autoAdv($location[The Dark Heart of the Woods]);
 	}