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

Key counts for vanilla fixed

Browse Source
This commit is contained in:
aerinon
2021-08-19 16:15:05 -06:00
parent b53a005545
commit 25bc968b62
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Dungeons.py
View File

@@ -375,13 +375,6 @@ flexible_starts = {
'Skull Woods': ['Skull Left Drop', 'Skull Pinball'] 'Skull Woods': ['Skull Left Drop', 'Skull Pinball']
} }
default_key_counts = {
'Hyrule Castle': 1, 'Eastern Palace': 0, 'Desert Palace': 1,
'Tower of Hera': 1, 'Agahnims Tower': 2, 'Palace of Darkness': 6,
'Swamp Palace': 1, 'Skull Woods': 3, 'Thieves Town': 1,
'Ice Palace': 2, 'Misery Mire': 3, 'Turtle Rock': 4, 'Ganons Tower': 4
}
dungeon_keys = { dungeon_keys = {
'Hyrule Castle': 'Small Key (Escape)', 'Hyrule Castle': 'Small Key (Escape)',
'Eastern Palace': 'Small Key (Eastern Palace)', 'Eastern Palace': 'Small Key (Eastern Palace)',

5
KeyDoorShuffle.py
View File

@@ -4,7 +4,7 @@ from collections import defaultdict, deque
from BaseClasses import DoorType, dungeon_keys, KeyRuleType, RegionType from BaseClasses import DoorType, dungeon_keys, KeyRuleType, RegionType
from Regions import dungeon_events from Regions import dungeon_events
from Dungeons import dungeon_keys, dungeon_bigs, dungeon_prize, default_key_counts from Dungeons import dungeon_keys, dungeon_bigs, dungeon_prize
from DungeonGenerator import ExplorationState, special_big_key_doors from DungeonGenerator import ExplorationState, special_big_key_doors
@@ -1531,7 +1531,8 @@ def create_key_counters(key_layout, world, player):
flat_proposal = key_layout.flat_prop flat_proposal = key_layout.flat_prop
state = ExplorationState(dungeon=key_layout.sector.name) state = ExplorationState(dungeon=key_layout.sector.name)
if world.doorShuffle[player] == 'vanilla': if world.doorShuffle[player] == 'vanilla':
state.key_locations = default_key_counts[key_layout.sector.name] builder = world.dungeon_layouts[player][key_layout.sector.name]
state.key_locations = len(builder.key_door_proposal) - builder.key_drop_cnt
else: else:
builder = world.dungeon_layouts[player][key_layout.sector.name] builder = world.dungeon_layouts[player][key_layout.sector.name]
state.key_locations = builder.total_keys - builder.key_drop_cnt state.key_locations = builder.total_keys - builder.key_drop_cnt