monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into website-redesign

This commit is contained in:
Chris Wilson 2020-12-04 17:12:15 -05:00
parent db5b8ad52c 9b0f49e813
commit 31a31ac34b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BaseClasses.py
View File

@ -628,7 +628,7 @@ class CollectionState(object):
def can_retrieve_tablet(self, player:int) -> bool:
return self.has('Book of Mudora', player) and (self.has_beam_sword(player) or
((self.world.swords[player] == "swordless" or self.world.difficulty_adjustments[player] == "easy") and
(self.world.swords[player] == "swordless" and
self.has("Hammer", player)))
def has_sword(self, player: int) -> bool:
@ -662,7 +662,7 @@ class CollectionState(object):
def can_melt_things(self, player: int) -> bool:
return self.has('Fire Rod', player) or \
(self.has('Bombos', player) and
(self.world.difficulty_adjustments[player] == "easy" or self.world.swords[player] == "swordless" or
(self.world.swords[player] == "swordless" or
self.has_sword(player)))
def can_avoid_lasers(self, player: int) -> bool:

5
Bosses.py
View File

@ -122,9 +122,8 @@ def GanonDefeatRule(state, player: int):
state.has_fire_source(player) and \
state.has('Silver Bow', player) and \
state.can_shoot_arrows(player)
easy_hammer = state.world.difficulty_adjustments[player] == "easy" and state.has("Hammer", player) and \
state.has('Silver Bow', player) and state.can_shoot_arrows(player)
can_hurt = state.has_beam_sword(player) or easy_hammer
can_hurt = state.has_beam_sword(player)
common = can_hurt and state.has_fire_source(player)
# silverless ganon may be needed in minor glitches
if state.world.logic[player] in {"owglitches", "minorglitches", "none"}: