From 5e743e1c33442c487ebbb6fe1dd24303c111c4ec Mon Sep 17 00:00:00 2001
From: AmazingAmpharos <AmazingAmpharos1@gmail.com>
Date: Sun, 11 Feb 2018 22:35:02 -0600
Subject: [PATCH] Powder patch fixes

Last quick and dirty fix push was a little too quick and dirty. My bad.
---
 BaseClasses.py     | 2 +-
 EntranceShuffle.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index 43e6ce88..233b2fc3 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -31,6 +31,7 @@ class World(object):
         self.place_dungeon_items = place_dungeon_items  # configurable in future
         self.shuffle_bonk_prizes = False
         self.swamp_patch_required = False
+        self.powder_patch_required = False
         self.ganon_at_pyramid = True
         self.sewer_light_cone = mode == 'standard'
         self.light_world_light_cone = False
@@ -59,7 +60,6 @@ class World(object):
         self.can_take_damage = True
         self.difficulty_requirements = None
         self.fix_fake_world = True
-        self.powder_patch_required = self.shuffle not in ['vanilla', 'dungeonssimple', 'dungeonsfull']
         self.spoiler = Spoiler(self)
 
     def intialize_regions(self):
diff --git a/EntranceShuffle.py b/EntranceShuffle.py
index 446294da..cc708dfc 100644
--- a/EntranceShuffle.py
+++ b/EntranceShuffle.py
@@ -825,6 +825,10 @@ def link_entrances(world):
     if world.get_entrance('Dam').connected_region.name != 'Dam' or world.get_entrance('Swamp Palace').connected_region.name != 'Swamp Palace (Entrance)':
         world.swamp_patch_required = True
 
+    # check for
+    if world.get_entrance('Potion Shop').connected_region.name != 'Potion Shop':
+        world.powder_patch_required = True
+
     # check for ganon location
     if world.get_entrance('Pyramid Hole').connected_region.name != 'Pyramid':
         world.ganon_at_pyramid = False