From 18c10dc7ad45478eb9dd7cdc8b2a04d7204c47e8 Mon Sep 17 00:00:00 2001
From: compiling <8335770+compiling@users.noreply.github.com>
Date: Sun, 15 Mar 2020 10:12:22 +1100
Subject: [PATCH] Make retro arrows always require buying the wooden arrow. The
 Silver Arrows grant the ability to shoot if they are non-progressive, but
 this is harder to model.

---
 BaseClasses.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index 39c6b679..8e46cffc 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -442,9 +442,8 @@ class CollectionState(object):
 
     def can_shoot_arrows(self, player):
         if self.world.retro:
-            #TODO: need to decide how we want to handle wooden arrows  longer-term (a can-buy-a check, or via dynamic shop location)
-            #FIXME: Should do something about hard+ ganon only silvers. For the moment, i believe they effective grant wooden, so we are safe
-            return self.has('Bow', player) and (self.has('Silver Arrows', player) or self.can_buy_unlimited('Single Arrow', player))
+            #TODO: Progressive and Non-Progressive silvers work differently (progressive is not usable until the shop arrow is bought)
+            return self.has('Bow', player) and self.can_buy_unlimited('Single Arrow', player)
         return self.has('Bow', player)
 
     def can_get_good_bee(self, player):