From 65cd5a1d8bb1ba9514f6f003b1988c6e22c8a3a6 Mon Sep 17 00:00:00 2001 From: HapaxL Date: Tue, 2 Mar 2021 11:10:55 +0100 Subject: [PATCH] reformatting first cave access requirements in prevision of entrance rando, and also to remove redundancies --- src/database/world_graph.lua | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/database/world_graph.lua b/src/database/world_graph.lua index f9c85be..2be3707 100644 --- a/src/database/world_graph.lua +++ b/src/database/world_graph.lua @@ -28,15 +28,22 @@ function firstCave:new(worldGraph) } self.requirements = function(self, items) - if self.world:StartPoint() then - return true - elseif self.world:Arthur() or self.world:Camp() then - return _has(items, "flight") and _has(items, "weaponSN") and self.world.regions.mimigaVillage:canAccess(items) - end + return _has(items, "flight") and _has(items, "weaponSN") and self.world.regions.mimigaVillage:canAccess(items) end self.locations.gunsmith.requirements = function(self, items) - return _has(items, "flight") and _has(items, "polarStar") and _has(items, "eventCore") and self.region.world.regions.mimigaVillage:canAccess(items) + return _has(items, "polarStar") and _has(items, "eventCore") + end + + -- individual location access requirement overrides + self.locations.firstCapsule.canAccess = function(self, items) + if self.region.world:StartPoint() then return true end + return Location.canAccess(self, items) + end + + self.locations.gunsmithChest.canAccess = function(self, items) + if self.region.world:StartPoint() then return true end + return Location.canAccess(self, items) end end