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

Merge in unstable changes

Browse Source
This commit is contained in:
aerinon
2021-08-12 13:50:34 -06:00
parent 7623de396c de6f3683d0
commit 6205dc2cb0
5 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
KeyDoorShuffle.py
View File

@@ -4,7 +4,7 @@ from collections import defaultdict, deque
from BaseClasses import DoorType, dungeon_keys, KeyRuleType, RegionType
from Regions import dungeon_events
from Dungeons import dungeon_bigs, dungeon_prize
from Dungeons import dungeon_keys, dungeon_bigs, dungeon_prize, default_key_counts
from DungeonGenerator import ExplorationState, special_big_key_doors
@@ -1516,9 +1516,10 @@ def create_key_counters(key_layout, world, player):
flat_proposal = key_layout.flat_prop
state = ExplorationState(dungeon=key_layout.sector.name)
if world.doorShuffle[player] == 'vanilla':
state.key_locations = len(world.get_dungeon(key_layout.sector.name, player).small_keys)
state.key_locations = default_key_counts[key_layout.sector.name]
else:
state.key_locations = world.dungeon_layouts[player][key_layout.sector.name].key_doors_num
builder = world.dungeon_layouts[player][key_layout.sector.name]
state.key_locations = builder.key_doors_num - builder.key_drop_cnt
state.big_key_special = False
for region in key_layout.sector.regions:
for location in region.locations: