From e8da9924c6ff294a3d5c37e77e783aaec31ff297 Mon Sep 17 00:00:00 2001 From: espeon65536 Date: Thu, 26 Aug 2021 16:03:22 -0500 Subject: [PATCH] allow collecting silver bow if noglitches or swordless, even if the limit is under 2 --- worlds/alttp/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/worlds/alttp/__init__.py b/worlds/alttp/__init__.py index d2046e522a..cdea0d6d8c 100644 --- a/worlds/alttp/__init__.py +++ b/worlds/alttp/__init__.py @@ -155,9 +155,11 @@ class ALTTPWorld(World): elif self.world.difficulty_requirements[item.player].progressive_shield_limit >= 1: return 'Blue Shield' elif 'Bow' in item_name: - if state.has('Silver', item.player): + if state.has('Silver Bow', item.player): return - elif state.has('Bow', item.player) and self.world.difficulty_requirements[item.player].progressive_bow_limit >= 2: + elif state.has('Bow', item.player) and (self.world.difficulty_requirements[item.player].progressive_bow_limit >= 2 + or self.world.logic[item.player] == 'noglitches' + or self.world.swordless[item.player]): # modes where silver bow is always required for ganon return 'Silver Bow' elif self.world.difficulty_requirements[item.player].progressive_bow_limit >= 1: return 'Bow'