Hylics2:Logic Fixes (#1281)
Added Juice Ranch and Worm Pod to logic Extra parenthesis removed * Delete log.txt Not used Transitioned all whitespace characters to Linux /n from Windows /r/n Updated rules for Rescue Blerol 1 and 2 to avoid impossible seed generation. Fixed member requirements for Vault Bomb. Added Juice Ranch: Fridge for consistency with other checks behind combat. Added party_shuffle rules to vault medallions, removed jail key requirement (not needed)
This commit is contained in:
parent
d81fd280fa
commit
45719eb7e0
|
@ -84,7 +84,7 @@ class Hylics2Logic(LogicMixin):
|
|||
return self._hylics2_enter_wormpod(player)
|
||||
|
||||
def _hylics2_enter_hylemxylem(self, player):
|
||||
return self._hylics2_can_air_dash(player) and self._hylics2_enter_wormpod(player) and\
|
||||
return self._hylics2_can_air_dash(player) and self._hylics2_enter_foglast(player) and\
|
||||
self._hylics2_has_bridge_key(player)
|
||||
|
||||
|
||||
|
@ -108,19 +108,19 @@ def set_rules(hylics2world):
|
|||
|
||||
# New Muldul Vault
|
||||
add_rule(world.get_location("New Muldul: Rescued Blerol 1", player),
|
||||
lambda state: (state._hylics2_can_air_dash(player) or state._hylics2_has_airship(player)) and\
|
||||
((state._hylics2_has_jail_key(player) and state._hylics2_has_paddle(player)) or\
|
||||
(state._hylics2_has_bridge_key(player) and state._hylics2_has_worm_room_key(player))))
|
||||
lambda state: ((state._hylics2_has_jail_key(player) and state._hylics2_has_paddle(player)) and\
|
||||
(state._hylics2_can_air_dash(player) or state._hylics2_has_airship(player))) or\
|
||||
state._hylics2_enter_hylemxylem(player))
|
||||
add_rule(world.get_location("New Muldul: Rescued Blerol 2", player),
|
||||
lambda state: (state._hylics2_can_air_dash(player) or state._hylics2_has_airship(player)) and\
|
||||
((state._hylics2_has_jail_key(player) and state._hylics2_has_paddle(player)) or\
|
||||
(state._hylics2_has_bridge_key(player) and state._hylics2_has_worm_room_key(player))))
|
||||
lambda state: ((state._hylics2_has_jail_key(player) and state._hylics2_has_paddle(player)) and\
|
||||
(state._hylics2_can_air_dash(player) or state._hylics2_has_airship(player))) or\
|
||||
state._hylics2_enter_hylemxylem(player))
|
||||
add_rule(world.get_location("New Muldul: Vault Left Chest", player),
|
||||
lambda state: state._hylics2_enter_foglast(player) and state._hylics2_has_bridge_key(player))
|
||||
lambda state: state._hylics2_enter_hylemxylem(player))
|
||||
add_rule(world.get_location("New Muldul: Vault Right Chest", player),
|
||||
lambda state: state._hylics2_enter_foglast(player) and state._hylics2_has_bridge_key(player))
|
||||
lambda state: state._hylics2_enter_hylemxylem(player))
|
||||
add_rule(world.get_location("New Muldul: Vault Bomb", player),
|
||||
lambda state: state._hylics2_enter_foglast(player) and state._hylics2_has_bridge_key(player))
|
||||
lambda state: state._hylics2_enter_hylemxylem(player))
|
||||
|
||||
# Viewax's Edifice
|
||||
add_rule(world.get_location("Viewax's Edifice: Canopic Jar", player),
|
||||
|
@ -292,7 +292,7 @@ def set_rules(hylics2world):
|
|||
add_rule(world.get_location("New Muldul: Vault Right Chest", player),
|
||||
lambda state: state._hylics2_has_3_members(player))
|
||||
add_rule(world.get_location("New Muldul: Vault Bomb", player),
|
||||
lambda state: state._hylics2_has_2_members(player))
|
||||
lambda state: state._hylics2_has_3_members(player))
|
||||
add_rule(world.get_location("Juice Ranch: Battle with Somsnosa", player),
|
||||
lambda state: state._hylics2_has_2_members(player))
|
||||
add_rule(world.get_location("Juice Ranch: Somsnosa Joins", player),
|
||||
|
@ -338,15 +338,15 @@ def set_rules(hylics2world):
|
|||
# extra rules is Shuffle Red Medallions and Party Shuffle are enabled
|
||||
if world.party_shuffle[player] and world.medallion_shuffle[player]:
|
||||
add_rule(world.get_location("New Muldul: Vault Rear Left Medallion", player),
|
||||
lambda state: state._hylics2_has_jail_key(player))
|
||||
lambda state: state._hylics2_has_3_members(player))
|
||||
add_rule(world.get_location("New Muldul: Vault Rear Right Medallion", player),
|
||||
lambda state: state._hylics2_has_jail_key(player))
|
||||
lambda state: state._hylics2_has_3_members(player))
|
||||
add_rule(world.get_location("New Muldul: Vault Center Medallion", player),
|
||||
lambda state: state._hylics2_has_jail_key(player))
|
||||
lambda state: state._hylics2_has_3_members(player))
|
||||
add_rule(world.get_location("New Muldul: Vault Front Left Medallion", player),
|
||||
lambda state: state._hylics2_has_jail_key(player))
|
||||
lambda state: state._hylics2_has_3_members(player))
|
||||
add_rule(world.get_location("New Muldul: Vault Front Right Medallion", player),
|
||||
lambda state: state._hylics2_has_jail_key(player))
|
||||
lambda state: state._hylics2_has_3_members(player))
|
||||
|
||||
# entrances
|
||||
for i in world.get_region("Airship", player).entrances:
|
||||
|
|
Loading…
Reference in New Issue