diff --git a/BaseClasses.py b/BaseClasses.py index a601a3c5..60d04d82 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -113,7 +113,7 @@ class World(object): set_player_attr('fix_fake_world', logic[player] not in ['owglitches', 'nologic'] or shuffle[player] in ['crossed', 'insanity']) set_player_attr('mapshuffle', False) set_player_attr('compassshuffle', False) - set_player_attr('keyshuffle', 'standard') + set_player_attr('keyshuffle', 'none') set_player_attr('bigkeyshuffle', False) set_player_attr('restrict_boss_items', 'none') set_player_attr('bombbag', False) diff --git a/resources/app/gui/lang/en.json b/resources/app/gui/lang/en.json index 9c7f9dfa..9a55893a 100644 --- a/resources/app/gui/lang/en.json +++ b/resources/app/gui/lang/en.json @@ -53,7 +53,7 @@ "randomizer.dungeon.mapshuffle": "Maps", "randomizer.dungeon.compassshuffle": "Compasses", "randomizer.dungeon.smallkeyshuffle": "Small Keys", - "randomizer.dungeon.smallkeyshuffle.standard": "In Dungeon", + "randomizer.dungeon.smallkeyshuffle.none": "In Dungeon", "randomizer.dungeon.smallkeyshuffle.wild": "Randomized", "randomizer.dungeon.smallkeyshuffle.universal": "Universal", "randomizer.dungeon.bigkeyshuffle": "Big Keys", diff --git a/resources/app/gui/randomize/dungeon/widgets.json b/resources/app/gui/randomize/dungeon/widgets.json index 02a7f262..19606b23 100644 --- a/resources/app/gui/randomize/dungeon/widgets.json +++ b/resources/app/gui/randomize/dungeon/widgets.json @@ -3,7 +3,7 @@ "keyshuffle": { "type": "selectbox", "options": [ - "standard", + "none", "wild", "universal" ] diff --git a/source/item/FillUtil.py b/source/item/FillUtil.py index 8cb74805..040497a2 100644 --- a/source/item/FillUtil.py +++ b/source/item/FillUtil.py @@ -251,7 +251,7 @@ def previously_reserved(location, world, player): if world.restrict_boss_items[player] == 'dungeon' and (not world.compassshuffle[player] or not world.mapshuffle[player] or not world.bigkeyshuffle[player] - or world.keyshuffle[player] == 'standard'): + or world.keyshuffle[player] == 'none'): return True return False