monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Smz3 min accessibility fix (#880)

This commit is contained in:
lordlou 2022-08-08 16:23:22 -04:00 committed by GitHub
parent c1e9d0ab4f
commit eb5ba72cfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
worlds/smz3/TotalSMZ3/Config.py
View File

@ -48,7 +48,6 @@ class Config:
Keysanity: bool = KeyShuffle != KeyShuffle.Null Keysanity: bool = KeyShuffle != KeyShuffle.Null
Race: bool = False Race: bool = False
GanonInvincible: GanonInvincible = GanonInvincible.BeforeCrystals GanonInvincible: GanonInvincible = GanonInvincible.BeforeCrystals
MinimalAccessibility: bool = False # AP specific accessibility: minimal
def __init__(self, options: Dict[str, str]): def __init__(self, options: Dict[str, str]):
self.GameMode = self.ParseOption(options, GameMode.Multiworld) self.GameMode = self.ParseOption(options, GameMode.Multiworld)

3
worlds/smz3/TotalSMZ3/Regions/Zelda/SwampPalace.py
View File

@ -14,8 +14,7 @@ class SwampPalace(Z3Region, IReward):
self.Reward = RewardType.Null self.Reward = RewardType.Null
self.Locations = [ self.Locations = [
Location(self, 256+135, 0x1EA9D, LocationType.Regular, "Swamp Palace - Entrance") Location(self, 256+135, 0x1EA9D, LocationType.Regular, "Swamp Palace - Entrance")
.Allow(lambda item, items: self.Config.Keysanity or self.Config.MinimalAccessibility or .Allow(lambda item, items: self.Config.Keysanity or item.Is(ItemType.KeySP, self.world)),
item.Is(ItemType.KeySP, self.world)),
Location(self, 256+136, 0x1E986, LocationType.Regular, "Swamp Palace - Map Chest", Location(self, 256+136, 0x1E986, LocationType.Regular, "Swamp Palace - Map Chest",
lambda items: items.KeySP), lambda items: items.KeySP),
Location(self, 256+137, 0x1E989, LocationType.Regular, "Swamp Palace - Big Chest", Location(self, 256+137, 0x1E989, LocationType.Regular, "Swamp Palace - Big Chest",

2
worlds/smz3/__init__.py
View File

@ -190,7 +190,6 @@ class SMZ3World(World):
config.KeyShuffle = KeyShuffle(self.world.key_shuffle[self.player].value) config.KeyShuffle = KeyShuffle(self.world.key_shuffle[self.player].value)
config.Keysanity = config.KeyShuffle != KeyShuffle.Null config.Keysanity = config.KeyShuffle != KeyShuffle.Null
config.GanonInvincible = GanonInvincible.BeforeCrystals 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.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) 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): def InitialFillInOwnWorld(self):
self.FillItemAtLocation(self.dungeon, TotalSMZ3Item.ItemType.KeySW, self.smz3World.GetLocation("Skull Woods - Pinball Room")) 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 */ # /* Check Swords option and place as needed */
if self.smz3World.Config.SwordLocation == SwordLocation.Uncle: if self.smz3World.Config.SwordLocation == SwordLocation.Uncle: