From 811a1b73c483332ee71c3487ee5ab98887f47bab Mon Sep 17 00:00:00 2001
From: periwinkle <generic.username.625.125.25.5@gmail.com>
Date: Wed, 10 Jul 2019 13:35:14 -0400
Subject: [PATCH] Fix certain valid seeds being impossible to generate This
 does break compatibility with 0.8B seeds, unfortunately

---
 src/database/items.lua       | 24 ++++++++++++------------
 src/database/world_graph.lua |  3 ++-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/database/items.lua b/src/database/items.lua
index 8890214..38c1dd3 100644
--- a/src/database/items.lua
+++ b/src/database/items.lua
@@ -24,7 +24,7 @@ local function missiles()
   return {
     name = "Missile Expansion",
     script = "<EVE0030",
-    attributes = {"missileLauncher", "nonProgressive"}
+    attributes = {"weapon", "missileLauncher", "nonProgressive"}
   }
 end
 
@@ -44,52 +44,52 @@ local function _itemData()
     polarStar1 = {
       name = "Polar Star",
       script = "<EVE0002",
-      attributes = {"weaponBoss", "weaponSN", "polarStar", "mandatory"}
+      attributes = {"weapon", "weaponBoss", "weaponSN", "polarStar", "mandatory"}
     },
     polarStar2 = {
       name = "Polar Star",
       script = "<EVE0002",
-      attributes = {"weaponBoss", "weaponSN", "polarStar", "mandatory"}
+      attributes = {"weapon", "weaponBoss", "weaponSN", "polarStar", "mandatory"}
     },
     missileLauncher = {
       name = "Missile Launcher",
       script = "<EVE0030",
-      attributes = {"weaponSN", "nonProgressive"}
+      attributes = {"weapon", "weaponSN", "nonProgressive"}
     },
     superMissileLauncher = {
       name = "Super Missile Launcher",
       script = "<EVE0033",
-      attributes = {"weaponSN", "missileLauncher", "nonProgressive"}
+      attributes = {"weapon", "weaponSN", "missileLauncher", "nonProgressive"}
     },
     fireball = {
       name = "Fireball",
       script = "<EVE0004",
-      attributes = {"weaponBoss", "mandatory"}
+      attributes = {"weapon", "weaponBoss", "mandatory"}
     },
     snake = {
       name = "Snake",
       script = "<EVE0005",
-      attributes = {"weaponBoss", "nonProgressive"}
+      attributes = {"weapon", "weaponBoss", "nonProgressive"}
     },
     bubbler = {
       name = "Bubbler",
       script = "<EVE0007",
-      attributes = {"weaponBoss", "nonProgressive"}
+      attributes = {"weapon", "weaponBoss", "nonProgressive"}
     },
     machineGun = {
       name = "Machine Gun",
       script = "<EVE0008",
-      attributes = {"weaponBoss", "weaponSN", "flight", "mandatory"}
+      attributes = {"weapon", "weaponBoss", "weaponSN", "flight", "mandatory"}
     },
     blade = {
       name = "Blade",
       script = "<EVE0009",
-      attributes = {"weaponBoss", "weaponSN", "mandatory"}
+      attributes = {"weapon", "weaponBoss", "weaponSN", "mandatory"}
     },
     nemesis = {
       name = "Nemesis",
       script = "<EVE0010",
-      attributes = {"weaponBoss", "weaponSN", "nonProgressive"}
+      attributes = {"weapon", "weaponBoss", "weaponSN", "nonProgressive"}
     },
 
     ---------------
@@ -328,7 +328,7 @@ local function _itemData()
     missileHell = {
       name = "Missile Expansion",
       script = "<EVE0035",
-      attributes = {"missileLauncher", "nonProgressive"}
+      attributes = {"weapon", "missileLauncher", "nonProgressive"}
     },
 
     ------------
diff --git a/src/database/world_graph.lua b/src/database/world_graph.lua
index f4e4790..d210fdc 100644
--- a/src/database/world_graph.lua
+++ b/src/database/world_graph.lua
@@ -359,6 +359,7 @@ function plantation:new(worldGraph)
     if not self.world.regions.arthur:canAccess(items) then return false end
     if _has(items, "teleportKey") then return true end
     if self.world.regions.outerWall:canAccess(items) then return true end
+    if _has(items, "bomb") and _has(items, "weaponSN") and self.world.regions.grasstownEast:canAccess(items) then return true end
     return false
   end
 
@@ -511,7 +512,7 @@ function worldGraph:collect(preCollectedItems)
         table.insert(_i, i)
       end
     end
-    for i, v in ipairs(_i) do table.remove(availableLocations, i) end
+    for i = #_i, 1, -1 do table.remove(availableLocations, _i[i]) end
 
     foundItems = #accessible
     for i, location in ipairs(accessible) do