Fix 1 too few progressive swords, and treasure charts not counting as progress
@@ -5,7 +5,6 @@ PROGRESS_ITEMS = [
"Spoils Bag",
"Grappling Hook",
"Deluxe Picto Box",
- "Progressive Bow",
"Power Bracelets",
"Iron Boots",
"Bait Bag",
@@ -15,13 +14,8 @@ PROGRESS_ITEMS = [
"Bombs",
"Skull Hammer",
"Deku Leaf",
- "Progressive Bow",
- "Progressive Bow",
- "Progressive Sword",
- "Progressive Sword",
"Hero's Shield",
"Mirror Shield",
- "Progressive Sword",
"Triforce Shard 1",
"Triforce Shard 2",
@@ -55,9 +49,6 @@ PROGRESS_ITEMS = [
"Moblin's Letter",
"Cabana Deed",
- "Progressive Wallet",
- "Progressive Wallet",
-
"Magic Meter Upgrade",
"Ghost Ship Chart",
@@ -70,40 +61,6 @@ PROGRESS_ITEMS = [
"Triforce Chart 3",
"Triforce Chart 2",
"Triforce Chart 1",
-] + ["Empty Bottle"]*4
-
-NONPROGRESS_ITEMS = [
- "Telescope",
- "Tingle Tuner",
- "Magic Armor",
- "Hero's Charm",
-
- "Complimentary ID",
- "Fill-Up Coupon",
-
- "Dragon Tingle Statue",
- "Forbidden Tingle Statue",
- "Goddess Tingle Statue",
- "Earth Tingle Statue",
- "Wind Tingle Statue",
-
- "Hurricane Spin",
-
- "Progressive Bomb Bag",
- "Progressive Bomb Bag",
- "Progressive Quiver",
- "Progressive Quiver",
-
- "Submarine Chart",
- "Beedle's Chart",
- "Platform Chart",
- "Light Ring Chart",
- "Secret Cave Chart",
- "Sea Hearts Chart",
- "Island Hearts Chart",
- "Great Fairy Chart",
- "Octo Chart",
- "IN-credible Chart",
"Treasure Chart 7",
"Treasure Chart 27",
@@ -120,9 +77,6 @@ NONPROGRESS_ITEMS = [
"Treasure Chart 36",
"Treasure Chart 22",
"Treasure Chart 9",
-
- "Tingle's Chart",
-
"Treasure Chart 14",
"Treasure Chart 10",
"Treasure Chart 40",
@@ -149,6 +103,42 @@ NONPROGRESS_ITEMS = [
"Treasure Chart 30",
"Treasure Chart 15",
"Treasure Chart 11",
+] + ["Progressive Sword"]*4 + ["Progressive Bow"]*3 + ["Progressive Wallet"]*2 + ["Empty Bottle"]*4
+
+NONPROGRESS_ITEMS = [
+ "Telescope",
+ "Tingle Tuner",
+ "Magic Armor",
+ "Hero's Charm",
+
+ "Complimentary ID",
+ "Fill-Up Coupon",
+
+ "Dragon Tingle Statue",
+ "Forbidden Tingle Statue",
+ "Goddess Tingle Statue",
+ "Earth Tingle Statue",
+ "Wind Tingle Statue",
+
+ "Hurricane Spin",
+
+ "Progressive Bomb Bag",
+ "Progressive Bomb Bag",
+ "Progressive Quiver",
+ "Progressive Quiver",
+
+ "Submarine Chart",
+ "Beedle's Chart",
+ "Platform Chart",
+ "Light Ring Chart",
+ "Secret Cave Chart",
+ "Sea Hearts Chart",
+ "Island Hearts Chart",
+ "Great Fairy Chart",
+ "Octo Chart",
+ "IN-credible Chart",
+
+ "Tingle's Chart",
] + ["Piece of Heart"]*44 + ["Heart Container"]*6
CONSUMABLE_ITEMS = [
