mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-03-30 10:03:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Scipio Wright
2024-06-04 15:24:28 -04:00
committed by GitHub
parent 987b2920a6
commit fb4ec5ee13
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
worlds/tunic/rules.py
View File

@@ -302,8 +302,7 @@ def set_location_rules(world: "TunicWorld") -> None:
# Swamp
set_rule(multiworld.get_location("Cathedral Gauntlet - Gauntlet Reward", player),
lambda state: (state.has(fire_wand, player) and has_sword(state, player))
and (state.has(laurels, player)
or has_ice_grapple_logic(False, state, player, options, ability_unlocks)))
and (state.has(laurels, player) or has_ice_grapple_logic(False, state, world)))
set_rule(multiworld.get_location("Swamp - [Entrance] Above Entryway", player),
lambda state: state.has(laurels, player))
set_rule(multiworld.get_location("Swamp - [South Graveyard] Upper Walkway Dash Chest", player),