From a20f5423fd426e41de298d1637c0e4cd983325f3 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@gmail.com>
Date: Fri, 28 Feb 2020 16:35:45 -0700
Subject: [PATCH] Minor gui fixes

---
 BaseClasses.py | 10 ++++++++++
 CLI.py         |  2 +-
 Rom.py         |  4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index 03c40c21..ff001247 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -769,6 +769,16 @@ class CollectionState(object):
                 else:
                     self.prog_items.add(('Bow', item.player))
                     changed = True
+            elif 'Armor' in item.name:
+                if self.has('Red Mail', item.player):
+                    pass
+                elif self.has('Blue Mail', item.player):
+                    self.prog_items.add(('Red Mail', item.player))
+                    changed = True
+                else:
+                    self.prog_items.add(('Blue Mail', item.player))
+                    changed = True
+
         elif item.name.startswith('Bottle'):
             if self.bottle_count(item.player) < self.world.difficulty_requirements[item.player].progressive_bottle_limit:
                 self.prog_items.add((item.name, item.player))
diff --git a/CLI.py b/CLI.py
index 69a00b09..45e2edb7 100644
--- a/CLI.py
+++ b/CLI.py
@@ -373,7 +373,7 @@ def get_settings():
     "uw_palettes": "default",
 
     "create_spoiler": False,
-    "skip_playthrough": True,
+    "skip_playthrough": False,
     "suppress_rom": False,
     "usestartinventory": False,
     "custom": False,
diff --git a/Rom.py b/Rom.py
index ba09a30d..84bfa05e 100644
--- a/Rom.py
+++ b/Rom.py
@@ -981,8 +981,8 @@ def patch_rom(world, rom, player, team, enemized):
     startingstate = CollectionState(world)
 
     if startingstate.has('Bow', player):
-        equip[0x340] = 1
-        equip[0x38E] |= 0x20 # progressive flag to get the correct hint in all cases
+        equip[0x340] = 3 if startingstate.has('Silver Arrows', player) else 1
+        equip[0x38E] |= 0x20  # progressive flag to get the correct hint in all cases
         if not world.retro[player]:
             equip[0x38E] |= 0x80
     if startingstate.has('Silver Arrows', player):