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

fix lamp rules for multis

Browse Source
This commit is contained in:
karafruit
2025-03-17 17:01:20 -05:00
parent ca4829db87
commit 3c8b08329b
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ItemList.py
View File

@@ -1081,10 +1081,7 @@ def get_pool_core(world, player, progressive, shuffle, difficulty, treasure_hunt
else: else:
pool.extend(basicgloves) pool.extend(basicgloves)
if world.dark_rooms[player] in ['require_lamp']: lamps_needed_for_dark_rooms = 1
lamps_needed_for_dark_rooms = 1
else:
lamps_needed_for_dark_rooms = 0
# old insanity shuffle didn't have fake LW/DW logic so this used to be conditional # old insanity shuffle didn't have fake LW/DW logic so this used to be conditional
pool.extend(['Magic Mirror', 'Moon Pearl']) pool.extend(['Magic Mirror', 'Moon Pearl'])
@@ -1304,10 +1301,7 @@ def make_custom_item_pool(world, player, progressive, shuffle, difficulty, timer
diff = difficulties[difficulty] diff = difficulties[difficulty]
if world.dark_rooms[player] in ['require_lamp']: lamps_needed_for_dark_rooms = 1
lamps_needed_for_dark_rooms = 1
else:
lamps_needed_for_dark_rooms = 0
# expert+ difficulties produce the same contents for # expert+ difficulties produce the same contents for
# all bottles, since only one bottle is available # all bottles, since only one bottle is available
@@ -1517,12 +1511,7 @@ def make_customizer_pool(world, player):
pool.remove('Fighter Sword') pool.remove('Fighter Sword')
pool.append('Rupees (50)') pool.append('Rupees (50)')
if world.dark_rooms[player] in ['require_lamp']: return pool, placed_items, precollected_items, clock_mode, 1
lamps_needed_for_dark_rooms = 1
else:
lamps_needed_for_dark_rooms = 0
return pool, placed_items, precollected_items, clock_mode, lamps_needed_for_dark_rooms
filler_items = { filler_items = {

2
Rules.py
View File

@@ -189,7 +189,7 @@ def and_rule(rule1, rule2):
def add_lamp_requirement(spot, player): def add_lamp_requirement(spot, player):
add_rule(spot, lambda state: state.has('Lamp', player, state.world.lamps_needed_for_dark_rooms)) add_rule(spot, lambda state: state.world.dark_rooms[player] not in ['require_lamp'] or state.has('Lamp', player, state.world.lamps_needed_for_dark_rooms))
def forbid_item(location, item, player): def forbid_item(location, item, player):