move prep for 8-bit zones to pre-adv

loathers · Oct 12, 2023 · f57d671 · f57d671
1 parent ca94e78
commit f57d671
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/RELEASE/scripts/autoscend/auto_pre_adv.ash b/RELEASE/scripts/autoscend/auto_pre_adv.ash
@@ -223,6 +223,30 @@ boolean auto_pre_adventure()
 		prepareForSmutOrcs();
 	}
 
+	if(place == $location[Vanya\'s Castle])
+	{
+		provideInitiative(600, $location[Vanya\'s Castle], true);	
+		addToMaximize("200initiative 800max");
+	}
+	if(place == $location[The Fungus Plains])
+	{
+		buffMaintain($effect[Polka of Plenty], 30, 1, 1);
+		addToMaximize("200meat drop 550max");
+	}
+	if(place == $location[Megalo-City])
+	{
+		buffMaintain($effect[Ghostly Shell], 30, 1, 1);			//+80 DA. 6 MP
+		buffMaintain($effect[Astral Shell], 30, 1, 1);			//+80 DA, 10 MP
+		buffMaintain($effect[Feeling Peaceful], 0, 1, 1);
+		addToMaximize("200DA 600max");
+	}
+	if(place == $location[Hero\'s Field])
+	{
+		buffMaintain($effect[Fat Leon\'s Phat Loot Lyric], 30, 1, 1);
+		buffMaintain($effect[Singer\'s Faithful Ocelot], 30, 1, 1);
+		addToMaximize("200item 500max");
+	}
+
 	boolean junkyardML;
 	if($locations[Next to that Barrel with something Burning In It, Near an Abandoned Refrigerator, Over where the Old Tires Are, Out by that Rusted-Out Car] contains place)
 	{

diff --git a/RELEASE/scripts/autoscend/quests/level_13.ash b/RELEASE/scripts/autoscend/quests/level_13.ash
@@ -69,32 +69,22 @@ int EightBitScore()
 boolean EightBitRealmHandler()
 {
 	//Spend adventures to get the digital key
+	//Preparing for each zone is handled in auto_pre_adv.ash
 	boolean adv_spent = false;
 
 	string color = get_property("8BitColor");
 	switch(color)
 	{
 		case "black":	
-			provideInitiative(600, $location[Vanya\'s Castle], true);	
-			addToMaximize("200initiative 800max");
 			adv_spent = autoAdv($location[Vanya\'s Castle]);
 			break;
 		case "red":
-			buffMaintain($effect[Polka of Plenty], 30, 1, 1);
-			addToMaximize("200meat drop 550max");
 			adv_spent = autoAdv($location[The Fungus Plains]);
 			break;
 		case "blue":
-			buffMaintain($effect[Ghostly Shell], 30, 1, 1);			//+80 DA. 6 MP
-			buffMaintain($effect[Astral Shell], 30, 1, 1);			//+80 DA, 10 MP
-			buffMaintain($effect[Feeling Peaceful], 0, 1, 1);
-			addToMaximize("200DA 600max");
 			adv_spent = autoAdv($location[Megalo-City]);
 			break;
 		case "green":
-			buffMaintain($effect[Fat Leon\'s Phat Loot Lyric], 30, 1, 1);
-			buffMaintain($effect[Singer\'s Faithful Ocelot], 30, 1, 1);
-			addToMaximize("200item 500max");
 			adv_spent = autoAdv($location[Hero\'s Field]);
 			break;
 		default: