alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Fix keyshuffle

Browse Source
This commit is contained in:
aerinon
2022-09-08 16:24:48 -06:00
parent 9caea3fc85
commit db43ce8d15
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseClasses.py
View File

@@ -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('fix_fake_world', logic[player] not in ['owglitches', 'nologic'] or shuffle[player] in ['crossed', 'insanity'])
set_player_attr('mapshuffle', False) set_player_attr('mapshuffle', False)
set_player_attr('compassshuffle', False) set_player_attr('compassshuffle', False)
set_player_attr('keyshuffle', 'standard') set_player_attr('keyshuffle', 'none')
set_player_attr('bigkeyshuffle', False) set_player_attr('bigkeyshuffle', False)
set_player_attr('restrict_boss_items', 'none') set_player_attr('restrict_boss_items', 'none')
set_player_attr('bombbag', False) set_player_attr('bombbag', False)

2
resources/app/gui/lang/en.json
View File

@@ -53,7 +53,7 @@
"randomizer.dungeon.mapshuffle": "Maps", "randomizer.dungeon.mapshuffle": "Maps",
"randomizer.dungeon.compassshuffle": "Compasses", "randomizer.dungeon.compassshuffle": "Compasses",
"randomizer.dungeon.smallkeyshuffle": "Small Keys", "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.wild": "Randomized",
"randomizer.dungeon.smallkeyshuffle.universal": "Universal", "randomizer.dungeon.smallkeyshuffle.universal": "Universal",
"randomizer.dungeon.bigkeyshuffle": "Big Keys", "randomizer.dungeon.bigkeyshuffle": "Big Keys",

2
resources/app/gui/randomize/dungeon/widgets.json
View File

@@ -3,7 +3,7 @@
"keyshuffle": { "keyshuffle": {
"type": "selectbox", "type": "selectbox",
"options": [ "options": [
"standard", "none",
"wild", "wild",
"universal" "universal"
] ]

2
source/item/FillUtil.py
View File

@@ -251,7 +251,7 @@ def previously_reserved(location, world, player):
if world.restrict_boss_items[player] == 'dungeon' and (not world.compassshuffle[player] if world.restrict_boss_items[player] == 'dungeon' and (not world.compassshuffle[player]
or not world.mapshuffle[player] or not world.mapshuffle[player]
or not world.bigkeyshuffle[player] or not world.bigkeyshuffle[player]
or world.keyshuffle[player] == 'standard'): or world.keyshuffle[player] == 'none'):
return True return True
return False return False