From 9b0f49e813e498ad6dedbc813c0c8a5e18e57c83 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Fri, 4 Dec 2020 22:44:55 +0100 Subject: [PATCH] Revert logical easy item functionality --- BaseClasses.py | 4 ++-- Bosses.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index dd7b24e2..dfb7cded 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -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: diff --git a/Bosses.py b/Bosses.py index 7d018c98..77146e53 100644 --- a/Bosses.py +++ b/Bosses.py @@ -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"}: