Adjust mystery milk bottle logic

Make it more likely to work with entrance shuffle.
Z3DR · Mar 7, 2024 · 5294c0e · 5294c0e
1 parent 672d2ac
commit 5294c0e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/source/include/logic.hpp b/source/include/logic.hpp
@@ -310,6 +310,7 @@ namespace Logic {
 	extern bool WoodfallFrog;
 	extern bool GreatBayFrog;
 	extern bool ThinBridgeCrystalChest;
+	extern bool MilkQuestStart;
 
 	extern bool CanGoToMoon;
 

diff --git a/source/location_access.cpp b/source/location_access.cpp
@@ -295,6 +295,7 @@ void AreaTable_Init() {
 
 	areaTable[STOCKPOTINN] = Area("Stock Pot Inn", "Stock Pot Inn", STOCKPOTINN, {
 		//Events
+		EventAccess(&MilkQuestStart, {[] {return CircusLeadersMask;}}),
 	}, 
 	{
 		//Locations
@@ -1283,12 +1284,13 @@ void AreaTable_Init() {
 
 	areaTable[GORMAN_TRACK] = Area("Gorman Track", "Gorman Track", NONE, {
 		//Events
+		EventAccess(&UsableMysteryMilkBottle, {[] {return MilkQuestStart && CircusLeadersMask && MysteryMilkBottle;}}), // Assumes that if you could start the quest, you can finish it
 	},
 	{
 		//Locations
 		LocationAccess(MILK_ROAD_GORMAN_RACE,     {[]{return CanPlay(EponasSong);}}),
 		LocationAccess(MILK_ROAD_GORMAN_MILK_BUY, {[]{return AnyBottle;}}),
-		LocationAccess(GORMAN_TRACK_MYSTERY_MILK_QUEST, {[] {return CircusLeadersMask;}}),
+		LocationAccess(GORMAN_TRACK_MYSTERY_MILK_QUEST, {[] {return MilkQuestStart && CircusLeadersMask;}}),
 	},
 	{
 		//Exits

diff --git a/source/logic.cpp b/source/logic.cpp
@@ -301,6 +301,7 @@ namespace Logic {
 	bool WoodfallFrog = false;
 	bool GreatBayFrog = false;
 	bool ThinBridgeCrystalChest = false;
+	bool MilkQuestStart = false;
 
 	bool CanGoToMoon = false;
 
@@ -497,7 +498,6 @@ namespace Logic {
 		//Item Helpers
 		AnyMagicBean = MagicBean || LimitlessBeans;
 		AnyWallet = Townwallet200 || OceanWallet500 || (ProgressiveWallet >= 1);
-		UsableMysteryMilkBottle = MysteryMilkBottle && CircusLeadersMask;
 		AnyBottle = WitchBottle || AlienBottle || BeaverRaceBottle || ArcheryBottle || GoronRaceBottle || ChateauBottle || UsableMysteryMilkBottle || HasBottle;
 		MagicMeter = (ProgressiveMagic >= 1) || MagicPower || ExtendedMagicPower;
 		WaterForBeans = (AnyBottle && (SpringWater || HotSpringWater)) || SongOfStorms;
@@ -833,6 +833,7 @@ namespace Logic {
 	WoodfallFrog = false;
 	GreatBayFrog = false;
 	ThinBridgeCrystalChest = false;
+	MilkQuestStart = false;
 
 
 	ZoraEgg = 0;