From eb5ba72cfc95e17b148c267fc24f94eeee3e5ba2 Mon Sep 17 00:00:00 2001
From: lordlou <87331798+lordlou@users.noreply.github.com>
Date: Mon, 8 Aug 2022 16:23:22 -0400
Subject: [PATCH] Smz3 min accessibility fix (#880)

---
 worlds/smz3/TotalSMZ3/Config.py                    | 1 -
 worlds/smz3/TotalSMZ3/Regions/Zelda/SwampPalace.py | 3 +--
 worlds/smz3/__init__.py                            | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/worlds/smz3/TotalSMZ3/Config.py b/worlds/smz3/TotalSMZ3/Config.py
index 1c3bddb1..bfcd541b 100644
--- a/worlds/smz3/TotalSMZ3/Config.py
+++ b/worlds/smz3/TotalSMZ3/Config.py
@@ -48,7 +48,6 @@ class Config:
     Keysanity: bool = KeyShuffle != KeyShuffle.Null
     Race: bool = False
     GanonInvincible: GanonInvincible = GanonInvincible.BeforeCrystals
-    MinimalAccessibility: bool = False  # AP specific accessibility: minimal
 
     def __init__(self, options: Dict[str, str]):
         self.GameMode = self.ParseOption(options, GameMode.Multiworld)
diff --git a/worlds/smz3/TotalSMZ3/Regions/Zelda/SwampPalace.py b/worlds/smz3/TotalSMZ3/Regions/Zelda/SwampPalace.py
index ab7c86a6..1805e74d 100644
--- a/worlds/smz3/TotalSMZ3/Regions/Zelda/SwampPalace.py
+++ b/worlds/smz3/TotalSMZ3/Regions/Zelda/SwampPalace.py
@@ -14,8 +14,7 @@ class SwampPalace(Z3Region, IReward):
         self.Reward = RewardType.Null
         self.Locations = [
             Location(self, 256+135, 0x1EA9D, LocationType.Regular, "Swamp Palace - Entrance")
-                .Allow(lambda item, items: self.Config.Keysanity or self.Config.MinimalAccessibility or
-                                           item.Is(ItemType.KeySP, self.world)),
+                .Allow(lambda item, items: self.Config.Keysanity or item.Is(ItemType.KeySP, self.world)),
             Location(self, 256+136, 0x1E986, LocationType.Regular, "Swamp Palace - Map Chest",
                 lambda items: items.KeySP),
             Location(self, 256+137, 0x1E989, LocationType.Regular, "Swamp Palace - Big Chest",
diff --git a/worlds/smz3/__init__.py b/worlds/smz3/__init__.py
index fcedfd45..9a0fcad9 100644
--- a/worlds/smz3/__init__.py
+++ b/worlds/smz3/__init__.py
@@ -190,7 +190,6 @@ class SMZ3World(World):
         config.KeyShuffle = KeyShuffle(self.world.key_shuffle[self.player].value)
         config.Keysanity = config.KeyShuffle != KeyShuffle.Null
         config.GanonInvincible = GanonInvincible.BeforeCrystals
-        config.MinimalAccessibility = self.world.accessibility[self.player] == Accessibility.option_minimal
 
         self.local_random = random.Random(self.world.random.randint(0, 1000))
         self.smz3World = TotalSMZ3World(config, self.world.get_player_name(self.player), self.player, self.world.seed_name)
@@ -525,6 +524,7 @@ class SMZ3World(World):
 
     def InitialFillInOwnWorld(self):
         self.FillItemAtLocation(self.dungeon, TotalSMZ3Item.ItemType.KeySW, self.smz3World.GetLocation("Skull Woods - Pinball Room"))
+        self.FillItemAtLocation(self.dungeon, TotalSMZ3Item.ItemType.KeySP, self.smz3World.GetLocation("Swamp Palace - Entrance"))
 
         # /* Check Swords option and place as needed */
         if self.smz3World.Config.SwordLocation == SwordLocation.Uncle: