phantop/cave-story-randomizer
1
1
Fork 0
mirror of https://github.com/cave-story-randomizer/cave-story-randomizer synced 2025-12-02 09:29:26 +00:00
Code Issues Releases Wiki Activity

fixes so it doesn't just crash when trying to run

Browse source
This commit is contained in:
duncathan 2019-03-19 03:38:15 -06:00
parent 8c463a7af2
commit 86e0ae0eea
4 changed files with 172 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/database/items.lua
View file

@ -316,8 +316,11 @@ local function _itemData()
for k, t in pairs(data) do for k, t in pairs(data) do
t.key = k t.key = k
t.attributes = t.attributes or {}
table.insert(t.attributes, k) table.insert(t.attributes, k)
end end
return data
end end
local C = Class:extend() local C = Class:extend()

312
src/database/world_graph.lua
View file

@ -1,17 +1,31 @@
local Region = require 'region' local Region = require 'database.region'
local Location = require 'location' local Location = require 'database.location'
local function has(items, attribute)
for item in ipairs(items) do
if _.contains(item.attributes, attribute) then return true end
end
end
local function count(items, attribute)
local c = 0
for item in ipairs(items) do
if _.contains(item.attributes, attribute) then c = c + 1 end
end
return c
end
local firstCave = Region:extend() local firstCave = Region:extend()
function firstCave:new(worldGraph) function firstCave:new(worldGraph)
firstCave.super.new(self, worldGraph, "firstCave") firstCave.super.new(self, worldGraph, "firstCave")
self.locations = { self.locations = {
"firstCapsule" = Location("First Cave Life Capsule", "Cave", "0401", self), firstCapsule = Location("First Cave Life Capsule", "Cave", "0401", self),
"gunsmithChest" = Location("Hermit Gunsmith Chest", "Pole", "0402", self), gunsmithChest = Location("Hermit Gunsmith Chest", "Pole", "0402", self),
"gunsmith" = Location("Tetsuzou", "Pole", "0303", self) gunsmith = Location("Tetsuzou", "Pole", "0303", self)
} }
self.locations.gunsmith.requirements = function(items) self.locations.gunsmith.requirements = function(items)
return self.world.regions.mimigaVillage:canAccess(items) and items:has("flight", "polarStar", "eventCore") return self.world.regions.mimigaVillage:canAccess(items) and has(items, "flight") and has(items, "polarStar") and has(items, "eventCore")
end end
end end
@ -19,34 +33,34 @@ local mimigaVillage = Region:extend()
function mimigaVillage:new(worldGraph) function mimigaVillage:new(worldGraph)
mimigaVillage.super.new(self, worldGraph, "mimigaVillage") mimigaVillage.super.new(self, worldGraph, "mimigaVillage")
self.locations = { self.locations = {
"yamashita" = Location("Yamashita Farm", "Plant", "0401", self), yamashita = Location("Yamashita Farm", "Plant", "0401", self),
"reservoir" = Location("Reservoir", "Pool", "0301", self), reservoir = Location("Reservoir", "Pool", "0301", self),
"mapChest" = Location("Mimiga Village Chest", "Mimi", "0202", self), mapChest = Location("Mimiga Village Chest", "Mimi", "0202", self),
"assembly" = Location("Assembly Hall Fireplace", "Comu", "0303", self), assembly = Location("Assembly Hall Fireplace", "Comu", "0303", self),
"mrLittle" = Location("Mr. Little (Graveyard)", "Cemet", "0202", self), mrLittle = Location("Mr. Little (Graveyard)", "Cemet", "0202", self),
"grave" = Location("Arthur's Grave", "Cemet", "0301", self), grave = Location("Arthur's Grave", "Cemet", "0301", self),
"mushroomChest" = Location("Storage? Chest", "Mapi", "0202", self), mushroomChest = Location("Storage? Chest", "Mapi", "0202", self),
"maPignon" = Location("Ma Pignon Boss", "Mapi", "0501", self) maPignon = Location("Ma Pignon Boss", "Mapi", "0501", self)
} }
self.requirements = function(items) self.requirements = function(items)
if self.world.regions.firstCave:canAccess(items) and items:has("weaponSN") then return true end if self.world.regions.firstCave:canAccess(items) and has(items, "weaponSN") then return true end
return false return false
end end
self.locations.assembly.requirements = function(items) return items:has("juice") end self.locations.assembly.requirements = function(items) return has(items, "juice") end
self.locations.mrLittle.requirements = function(items) self.locations.mrLittle.requirements = function(items)
return self.world.regions.outerWall:canAccess(items) and items:has("flight", "locket") return self.world.regions.outerWall:canAccess(items) and has(items, "flight") and has(items, "locket")
end end
self.locations.grave.requirements = function(items) return items:has("locket") end self.locations.grave.requirements = function(items) return has(items, "locket") end
self.locations.mushroomChest.requirements = function(items) self.locations.mushroomChest.requirements = function(items)
return items:has("flight", "locket", "eventCurly") return has(items, "flight") and has(items, "locket") and has(items, "eventCurly")
end end
self.locations.maPignon.requirements = function(items) self.locations.maPignon.requirements = function(items)
-- stupid mushroom is invincible to the blade and machinegun for some reason -- stupid mushroom is invincible to the blade and machinegun for some reason
if items:has("flight", "locket", "mushroomBadge") then if has(items, "flight") and has(items, "locket") and has(items, "mushroomBadge") then
if items:has("polarStar") or items:has("fireball") or items:has("bubbler") if has(items, "polarStar") or has(items, "fireball") or has(items, "bubbler")
or items:has("machineGun") or items:has("snake") or items:has("nemesis") then or has(items, "machineGun") or has(items, "snake") or has(items, "nemesis") then
return true return true
end end
end end
@ -60,31 +74,31 @@ local arthur = Region:extend()
function arthur:new(worldGraph) function arthur:new(worldGraph)
arthur.super.new(self, worldGraph, "arthur") arthur.super.new(self, worldGraph, "arthur")
self.locations = { self.locations = {
"risenBooster" = Location("Professor Booster", "Pens1", "0652", self) risenBooster = Location("Professor Booster", "Pens1", "0652", self)
} }
self.requirements = function(items) self.requirements = function(items)
if self.world.regions.mimigaVillage:canAccess(items) and items:has("arthursKey") then return true end if self.world.regions.mimigaVillage:canAccess(items) and has(items, "arthursKey") then return true end
return false return false
end end
self.locations.booster.requirements = function(items) return items:has("eventCore") end self.locations.risenBooster.requirements = function(items) return has(items, "eventCore") end
end end
local eggCorridor1 = Region:extend() local eggCorridor1 = Region:extend()
function eggCorridor1:new(worldGraph) function eggCorridor1:new(worldGraph)
eggCorridor1.super.new(self, worldGraph, "eggCorridor1") eggCorridor1.super.new(self, worldGraph, "eggCorridor1")
self.locations = { self.locations = {
"basil" = Location("Basil Spot", "Eggs", "0403", self), basil = Location("Basil Spot", "Eggs", "0403", self),
"cthulhu" = Location("Cthulhu's Abode", "Eggs", "0404", self), cthulhu = Location("Cthulhu's Abode", "Eggs", "0404", self),
"eggItem" = Location("Egg Chest", "Egg6", "0201", self), eggItem = Location("Egg Chest", "Egg6", "0201", self),
"observationChest" = Location("Egg Observation Room Chest", "EggR", "0301", self), observationChest = Location("Egg Observation Room Chest", "EggR", "0301", self),
"eventSue" = Location("Saved Sue", nil, nil, self) eventSue = Location("Saved Sue", nil, nil, self)
} }
self.requirements = function(items) return self.world.regions.arthur:canAccess(items) end self.requirements = function(items) return self.world.regions.arthur:canAccess(items) end
self.locations.eventSue.requirements = function(items) return items:has("idCard", "weaponBoss") end self.locations.eventSue.requirements = function(items) return has(items, "idCard") and has(items, "weaponBoss") end
self.locations.eventSue:setItem(self.world.items:getByKey("eventSue")) self.locations.eventSue:setItem(self.world.items:getByKey("eventSue"))
end end
@ -92,12 +106,12 @@ local grasstownWest = Region:extend()
function grasstownWest:new(worldGraph) function grasstownWest:new(worldGraph)
grasstownWest.super.new(self, worldGraph, "grasstownWest") grasstownWest.super.new(self, worldGraph, "grasstownWest")
self.locations = { self.locations = {
"keySpot" = Location("West Grasstown Floor", "Weed", "0700", self), keySpot = Location("West Grasstown Floor", "Weed", "0700", self),
"jellyCapsule" = Location("West Grasstown Ceiling", "Weed", "0701", self), jellyCapsule = Location("West Grasstown Ceiling", "Weed", "0701", self),
"santa" = Location("Santa", "Santa", "0501", self), santa = Location("Santa", "Santa", "0501", self),
"charcoal" = Location("Santa's Fireplace", "Santa", "0302", self), charcoal = Location("Santa's Fireplace", "Santa", "0302", self),
"chaco" = Location("Chaco's Bed, where you two Had A Nap", "Chako", "0211", self), chaco = Location("Chaco's Bed, where you two Had A Nap", "Chako", "0211", self),
"kulala" = Location("Kulala Chest", "Weed", "0702", self) kulala = Location("Kulala Chest", "Weed", "0702", self)
} }
self.requirements = function(items) self.requirements = function(items)
@ -105,50 +119,50 @@ function grasstownWest:new(worldGraph)
return false return false
end end
self.locations.santa.requirements = function(items) return items:has("santaKey") end self.locations.santa.requirements = function(items) return has(items, "santaKey") end
self.locations.charcoal.requirements = function(items) return items:has("santaKey", "juice") end self.locations.charcoal.requirements = function(items) return has(items, "santaKey") and has(items, "juice") end
self.locations.chaco.requirements = function(items) return items:has("santaKey") end self.locations.chaco.requirements = function(items) return has(items, "santaKey") end
self.locations.kulala.requirements = function(items) return items:has("santaKey", "weapon") end self.locations.kulala.requirements = function(items) return has(items, "santaKey") and has(items, "weapon") end
end end
local grasstownEast = Region:extend() local grasstownEast = Region:extend()
function grasstownEast:new(worldGraph) function grasstownEast:new(worldGraph)
grasstownEast.super.new(self, worldGraph, "grasstownEast") grasstownEast.super.new(self, worldGraph, "grasstownEast")
self.locations = { self.locations = {
"kazuma1" = Location("Kazuma (Rusty Key)", "Weed", "0800", self), kazuma1 = Location("Kazuma (Rusty Key)", "Weed", "0800", self),
"kazuma2" = Location("Kazuma (Gum Key)", "Weed", "0801", self), kazuma2 = Location("Kazuma (Gum Key)", "Weed", "0801", self),
"execution" = Location("Execution Chamber", "WeedD", "0305", self), execution = Location("Execution Chamber", "WeedD", "0305", self),
"outsideHut" = Location("Grasstown East Chest", "Weed", "0303", self), outsideHut = Location("Grasstown East Chest", "Weed", "0303", self),
"hutChest" = Location("Grasstown Hut", "WeedB", "0301", self), hutChest = Location("Grasstown Hut", "WeedB", "0301", self),
"gumChest" = Location("Gum Chest", "Frog", "0300", self), gumChest = Location("Gum Chest", "Frog", "0300", self),
"malco" = Location("MALCO", "Malco", "0350", self), malco = Location("MALCO", "Malco", "0350", self),
"eventFans" = Location("Activated Grasstown Fans", nil, nil, self), eventFans = Location("Activated Grasstown Fans", nil, nil, self),
"eventKazuma" = Location("Saved Kazuma", nil, nil, self) eventKazuma = Location("Saved Kazuma", nil, nil, self)
} }
self.requirements = function(items) self.requirements = function(items)
if self.world.regions.grasstownWest:canAccess(items) then if self.world.regions.grasstownWest:canAccess(items) then
if items:has("flight") or items:has("juice") then return true end if has(items, "flight") or has(items, "juice") then return true end
end end
if self.world.regions.plantation:canAccess(items) and items:has("eventKazuma", "weaponSN") then return true end if self.world.regions.plantation:canAccess(items) and has(items, "eventKazuma") and has(items, "weaponSN") then return true end
return false return false
end end
self.locations.kazuma2.requirements = function(items) return items:has("eventFans") end self.locations.kazuma2.requirements = function(items) return has(items, "eventFans") end
self.locations.execution.requirements = function(items) return items:has("weaponSN") end self.locations.execution.requirements = function(items) return has(items, "weaponSN") end
self.locations.hutChest.requirements = function(items) return items:has("eventFans") or items:has("flight") end self.locations.hutChest.requirements = function(items) return has(items, "eventFans") or has(items, "flight") end
self.locations.gumChest.requirements = function(items) self.locations.gumChest.requirements = function(items)
if items:has("gumKey", "weaponBoss") then if has(items, "gumKey") and has(items, "weaponBoss") then
if items:has("eventFans") or items:has("flight") then return true end if has(items, "eventFans") or has(items, "flight") then return true end
end end
return false return false
end end
self.locations.malco.requirements = function(items) return items:has("eventFans", "juice", "charcoal", "gum") end self.locations.malco.requirements = function(items) return has(items, "eventFans") and has(items, "juice") and has(items, "charcoal") and has(items, "gum") end
self.locations.eventFans.requirements = function(items) return items:has("rustyKey", "weaponBoss") self.locations.eventFans.requirements = function(items) return has(items, "rustyKey") and has(items, "weaponBoss") end
self.locations.eventFans:setItem(self.world.items:getByKey("eventFans")) self.locations.eventFans:setItem(self.world.items:getByKey("eventFans"))
self.locations.eventKazuma.requirements = function(items) return items:has("bomb") end self.locations.eventKazuma.requirements = function(items) return has(items, "bomb") end
self.locations.eventKazuma:setItem(self.world.items:getByKey("eventKazuma")) self.locations.eventKazuma:setItem(self.world.items:getByKey("eventKazuma"))
end end
@ -156,48 +170,48 @@ local upperSandZone = Region:extend()
function upperSandZone:new(worldGraph) function upperSandZone:new(worldGraph)
upperSandZone.super.new(self, worldGraph, "upperSandZone") upperSandZone.super.new(self, worldGraph, "upperSandZone")
self.locations = { self.locations = {
"curly" = Location("Curly Boss", "Curly", "0518", self), curly = Location("Curly Boss", "Curly", "0518", self),
"panties" = Location("Curly's Closet", "CurlyS", "0421", self), panties = Location("Curly's Closet", "CurlyS", "0421", self),
"curlyPup" = Location("Puppy (Curly)", "CurlyS", "0401", self), curlyPup = Location("Puppy (Curly)", "CurlyS", "0401", self),
"sandCapsule" = Location("Polish Spot", "Sand", "0502", self), sandCapsule = Location("Polish Spot", "Sand", "0502", self),
"eventOmega" = Location("Defeated Omega", nil, nil, self) eventOmega = Location("Defeated Omega", nil, nil, self)
} }
self.requirements = function(items) self.requirements = function(items)
if self.world.regions.arthur:canAccess(items) and items:has("weaponSN") then return true end if self.world.regions.arthur:canAccess(items) and has(items, "weaponSN") then return true end
return false return false
end end
self.locations.curly.requirements = function(items) return items:has("polarStar") end self.locations.curly.requirements = function(items) return has(items, "polarStar") end
self.locations.eventOmega.requirements = function(items) return items:has("weaponBoss") end self.locations.eventOmega.requirements = function(items) return has(items, "weaponBoss") end
self.locations.eventOmega.setItem(self.world.items:getByKey("eventOmega")) self.locations.eventOmega:setItem(self.world.items:getByKey("eventOmega"))
end end
local lowerSandZone = Region:extend() local lowerSandZone = Region:extend()
function lowerSandZone:new(worldGraph) function lowerSandZone:new(worldGraph)
lowerSandZone.super.new(self, worldGraph, "lowerSandZone") lowerSandZone.super.new(self, worldGraph, "lowerSandZone")
self.locations = { self.locations = {
"chestPup" = Location("Puppy (Chest)", "Sand", "0421", self), chestPup = Location("Puppy (Chest)", "Sand", "0421", self),
"darkPup" = Location("Puppy (Dark)", "Dark", "0401", self), darkPup = Location("Puppy (Dark)", "Dark", "0401", self),
"runPup" = Location("Puppy (Run)", "Sand", "0422", self), runPup = Location("Puppy (Run)", "Sand", "0422", self),
"sleepyPup" = Location("Puppy (Sleep)", "Sand", "0421", self), sleepyPup = Location("Puppy (Sleep)", "Sand", "0421", self),
"pawCapsule" = Location("Pawprint Spot", "Sand", "0503", self), pawCapsule = Location("Pawprint Spot", "Sand", "0503", self),
"jenka" = Location("Jenka", "Jenka2", "0221", self), jenka = Location("Jenka", "Jenka2", "0221", self),
"king" = Location("King", "Gard", "0602", self), king = Location("King", "Gard", "0602", self),
"eventToroko" = Location("Defeated Toroko+", nil, nil, self) eventToroko = Location("Defeated Toroko+", nil, nil, self)
} }
self.requirements = function(items) self.requirements = function(items)
if self.world.regions.upperSandZone:canAccess(items) and items:has("eventOmega") then return true end if self.world.regions.upperSandZone:canAccess(items) and has(items, "eventOmega") then return true end
return false return false
end end
self.locations.jenka.requirements = function(items) return items:count("puppy") == 5 end self.locations.jenka.requirements = function(items) return count(items, "puppy") == 5 end
self.locations.king.requirements = function(items) return items:has("eventToroko") end self.locations.king.requirements = function(items) return has(items, "eventToroko") end
self.locations.eventToroko.requirements = function(items) self.locations.eventToroko.requirements = function(items)
return items:count("puppy") == 5 and items:has("weaponBoss") return count(items, "puppy") == 5 and has(items, "weaponBoss")
end end
self.locations.eventToroko:setItem(self.world.items:getByKey("eventToroko")) self.locations.eventToroko:setItem(self.world.items:getByKey("eventToroko"))
end end
@ -206,34 +220,34 @@ local labyrinthW = Region:extend()
function labyrinthW:new(worldGraph) function labyrinthW:new(worldGraph)
labyrinthW.super.new(self, worldGraph, "labyrinthW") labyrinthW.super.new(self, worldGraph, "labyrinthW")
self.locations = { self.locations = {
"mazeCapsule" = Location("Labyrinth Life Capsule", "MazeI", "0301", self), mazeCapsule = Location("Labyrinth Life Capsule", "MazeI", "0301", self),
"turboChaba" = Location("Chaba Chest (Machine Gun)", "MazeA", "0502", self), turboChaba = Location("Chaba Chest (Machine Gun)", "MazeA", "0502", self),
"snakeChaba" = Location("Chaba Chest (Fireball)", "MazeA", "0512", self), snakeChaba = Location("Chaba Chest (Fireball)", "MazeA", "0512", self),
"whimChaba" = Location("Chaba Chest (Spur)", "MazeA", "0522", self), whimChaba = Location("Chaba Chest (Spur)", "MazeA", "0522", self),
"campChest" = Location("Camp Chest", "MazeO", "0401", self), campChest = Location("Camp Chest", "MazeO", "0401", self),
"physician" = Location("Dr. Gero", "MazeO", "0305", self), physician = Location("Dr. Gero", "MazeO", "0305", self),
"puuBlack" = Location("Puu Black Boss", "MazeD", "0401", self) puuBlack = Location("Puu Black Boss", "MazeD", "0401", self)
} }
self.requirements = function(items) self.requirements = function(items)
if self.world.regions.lowerSandZone:canAccess(items) and items:has("eventToroko") then return true end if self.world.regions.lowerSandZone:canAccess(items) and has(items, "eventToroko") then return true end
if self.world.regions.labyrinthB:canAccess(items) and items:has("flight") then return true end if self.world.regions.labyrinthB:canAccess(items) and has(items, "flight") then return true end
return false return false
end end
self.locations.mazeCapsule.requirements = function(items) return items:has("weapon") end self.locations.mazeCapsule.requirements = function(items) return has(items, "weapon") end
self.locations.turboChaba.requirements = function(items) return items:has("machineGun") end self.locations.turboChaba.requirements = function(items) return has(items, "machineGun") end
self.locations.snakeChaba.requirements = function(items) return items:has("fireball") end self.locations.snakeChaba.requirements = function(items) return has(items, "fireball") end
self.locations.whimChaba.requirements = function(items) return items:count("polarStar") == 2 end self.locations.whimChaba.requirements = function(items) return count(items, "polarStar") == 2 end
self.locations.campChest.requirements = function(items) return items:has("flight") end self.locations.campChest.requirements = function(items) return has(items, "flight") end
self.locations.puuBlack.requirements = function(items) return items:has("clinicKey", "weaponBoss") end self.locations.puuBlack.requirements = function(items) return has(items, "clinicKey") and has(items, "weaponBoss") end
end end
local labyrinthB = Region:extend() local labyrinthB = Region:extend()
function labyrinthB:new(worldGraph) function labyrinthB:new(worldGraph)
labyrinthB.super.new(self, worldGraph, "labyrinthB") labyrinthB.super.new(self, worldGraph, "labyrinthB")
self.locations = { self.locations = {
"fallenBooster" = Location("Booster Chest", "MazeB", "0502", self) fallenBooster = Location("Booster Chest", "MazeB", "0502", self)
} }
self.requirements = function(items) self.requirements = function(items)
@ -247,21 +261,21 @@ local boulder = Region:extend()
function boulder:new(worldGraph) function boulder:new(worldGraph)
boulder.super.new(self, worldGraph, "boulder") boulder.super.new(self, worldGraph, "boulder")
self.locations = { --include core locations since core access reqs are identical to boulder chamber self.locations = { --include core locations since core access reqs are identical to boulder chamber
"boulderChest" = Location("Boulder Chest", "MazeS", "0202", self), boulderChest = Location("Boulder Chest", "MazeS", "0202", self),
"coreSpot" = Location("Robot's Arm", "Almond", "0243", self), coreSpot = Location("Robot's Arm", "Almond", "0243", self),
"curlyCorpse" = Location("Drowned Curly", "Almond", "1111", self), curlyCorpse = Location("Drowned Curly", "Almond", "1111", self),
"eventCore" = Location("Defeated Core", nil, nil, self) eventCore = Location("Defeated Core", nil, nil, self)
} }
self.requirements = function(items) self.requirements = function(items)
if items:has("cureAll", "weaponBoss") then if has(items, "cureAll") and has(items, "weaponBoss") then
if self.world.regions.labyrinthW:canAccess(items) then return true end if self.world.regions.labyrinthW:canAccess(items) then return true end
if self.world.regions.labyrinthB:canAccess(items) and items:has("flight") then return true end if self.world.regions.labyrinthB:canAccess(items) and has(items, "flight") then return true end
end end
return false return false
end end
self.locations.eventCore.setItem(self.world.items:getByKey("eventCore")) self.locations.eventCore:setItem(self.world.items:getByKey("eventCore"))
end end
local labyrinthM = Region:extend() local labyrinthM = Region:extend()
@ -270,7 +284,7 @@ function labyrinthM:new(worldGraph)
self.requirements = function(items) self.requirements = function(items)
if self.world.regions.boulder:canAccess(items) then return true end if self.world.regions.boulder:canAccess(items) then return true end
if self.world.regions.labyrinthW:canAccess(items) and items:has("flight") then return true end if self.world.regions.labyrinthW:canAccess(items) and has(items, "flight") then return true end
return false return false
end end
end end
@ -280,14 +294,14 @@ function waterway:new(worldGraph)
waterway.super.new(self, worldGraph, "waterway") waterway.super.new(self, worldGraph, "waterway")
self.locations = { self.locations = {
"ironhead" = Location("Ironhead Boss", "Pool", "0412", self), ironhead = Location("Ironhead Boss", "Pool", "0412", self),
"eventCurly" = Location("Saved Curly", nil, nil, self) eventCurly = Location("Saved Curly", nil, nil, self)
} }
self.requirements = function(items) return self.world.regions.labyrinthM:canAccess(items) and items:has("airTank", "weaponBoss") end self.requirements = function(items) return self.world.regions.labyrinthM:canAccess(items) and has(items, "airTank") and has(items, "weaponBoss") end
self.locations.eventCurly.requirements = function(items) return items:has("eventCore", "towRope") end self.locations.eventCurly.requirements = function(items) return has(items, "eventCore") and has(items, "towRope") end
self.locations.eventCurly.setItem(self.world.items:getByKey("eventCurly")) self.locations.eventCurly:setItem(self.world.items:getByKey("eventCurly"))
end end
local eggCorridor2 = Region:extend() local eggCorridor2 = Region:extend()
@ -295,18 +309,18 @@ function eggCorridor2:new(worldGraph)
eggCorridor2.super.new(self, worldGraph, "eggCorridor2") eggCorridor2.super.new(self, worldGraph, "eggCorridor2")
self.locations = { self.locations = {
"dragonChest" = Location("Dragon Chest", "Eggs2", "0321", self), dragonChest = Location("Dragon Chest", "Eggs2", "0321", self),
"sisters" = Location("Sisters Boss", "EggR2", "0303", self) sisters = Location("Sisters Boss", "EggR2", "0303", self)
} }
self.requirements = function(items) self.requirements = function(items)
if items:has("eventCore") and self.world.regions.arthur:canAccess(items) then return true end if has(items, "eventCore") and self.world.regions.arthur:canAccess(items) then return true end
if items:has("eventKazuma") and self.world.regions.outerWall:canAccess(items) then return true end if has(items, "eventKazuma") and self.world.regions.outerWall:canAccess(items) then return true end
return false return false
end end
self.locations.dragonChest.requirements = function(items) return items:has("weapon") end self.locations.dragonChest.requirements = function(items) return has(items, "weapon") end
self.locations.sisters.requirements = function(items) return items:has("weaponBoss") end self.locations.sisters.requirements = function(items) return has(items, "weaponBoss") end
end end
local outerWall = Region:extend() local outerWall = Region:extend()
@ -314,17 +328,17 @@ function outerWall:new(worldGraph)
outerWall.super.new(self, worldGraph, "outerWall") outerWall.super.new(self, worldGraph, "outerWall")
self.locations = { self.locations = {
"clock" = Location("Clock Room", "Clock", "0300", self), clock = Location("Clock Room", "Clock", "0300", self),
"littleHouse" = Location("Little House", "Little", "0204", self) littleHouse = Location("Little House", "Little", "0204", self)
} }
self.requirements = function(items) self.requirements = function(items)
if items:has("eventKazuma", "flight") and self.world.regions.eggCorridor2:canAccess(items) then return true end if has(items, "eventKazuma") and has(items, "flight") and self.world.regions.eggCorridor2:canAccess(items) then return true end
if items:has("teleportKey") and self.world.regions.plantation:canAccess(items) then return true end if has(items, "teleportKey") and self.world.regions.plantation:canAccess(items) then return true end
return false return false
end end
self.locations.littleHouse.requirements = function(items) return items:has("flight") end self.locations.littleHouse.requirements = function(items) return has(items, "flight") end
end end
local plantation = Region:extend() local plantation = Region:extend()
@ -332,37 +346,37 @@ function plantation:new(worldGraph)
plantation.super.new(self, worldGraph, "plantation") plantation.super.new(self, worldGraph, "plantation")
self.locations = { self.locations = {
"kanpachi" = Location("Kanpachi's Bucket", "Cent", "0268", self), kanpachi = Location("Kanpachi's Bucket", "Cent", "0268", self),
"jail1" = Location("Jail no. 1", "Jail1", "0301", self), jail1 = Location("Jail no. 1", "Jail1", "0301", self),
"momorin" = Location("Chivalry Sakamoto's Wife", "Momo", "0201", self), momorin = Location("Chivalry Sakamoto's Wife", "Momo", "0201", self),
"sprinkler" = Location("Broken Sprinkler", "Cent", "0417", self), sprinkler = Location("Broken Sprinkler", "Cent", "0417", self),
"megane" = Location("Megane", "lounge", "0204", self), megane = Location("Megane", "lounge", "0204", self),
"itoh" = Location("Itoh", "Itoh", "0405", self), itoh = Location("Itoh", "Itoh", "0405", self),
"plantCeiling" = Location("Plantation Platforming Spot", "Cent", "0501", self), plantCeiling = Location("Plantation Platforming Spot", "Cent", "0501", self),
"plantPup" = Location("Plantation Puppy", "Cent", "0452", self), plantPup = Location("Plantation Puppy", "Cent", "0452", self),
"curlyShroom" = Location("Jammed it into Curly's Mouth" "Cent", "0324", self), curlyShroom = Location("Jammed it into Curly's Mouth", "Cent", "0324", self),
"eventRocket" = Location("Built Rocket", nil, nil, self) eventRocket = Location("Built Rocket", nil, nil, self)
} }
self.requirements = function(items) self.requirements = function(items)
if items:has("teleportKey") and self.world.regions.arthur:canAccess(items) then return true end if has(items, "teleportKey") and self.world.regions.arthur:canAccess(items) then return true end
if self.world.regions.outerWall:canAccess(items) then return true end if self.world.regions.outerWall:canAccess(items) then return true end
return false return false
end end
self.locations.jail1.requirements = function(items) return items:has("letter") end self.locations.jail1.requirements = function(items) return has(items, "letter") end
self.locations.momorin.requirements = function(items) return items:has("letter", "booster") end self.locations.momorin.requirements = function(items) return has(items, "letter") and has(items, "booster") end
self.locations.sprinkler.requirements = function(items) return items:has("mask") end self.locations.sprinkler.requirements = function(items) return has(items, "mask") end
self.locations.megane.requirements = function(items) return items:has("brokenSprinkler", "mask") end self.locations.megane.requirements = function(items) return has(items, "brokenSprinkler") and has(items, "mask") end
self.locations.itoh.requirements = function(items) return items:has("letter") end self.locations.itoh.requirements = function(items) return has(items, "letter") end
self.locations.plantCeiling.requirements = function(items) return items:has("flight") end self.locations.plantCeiling.requirements = function(items) return has(items, "flight") end
self.locations.plantPup.requirements = function(items) return items:has("eventRocket") end self.locations.plantPup.requirements = function(items) return has(items, "eventRocket") end
self.locations.curlyShroom.requirements = function(items) return items:has("eventCurly", "maPignon") end self.locations.curlyShroom.requirements = function(items) return has(items, "eventCurly") and has(items, "maPignon") end
self.locations.eventRocket.requirements = function(items) self.locations.eventRocket.requirements = function(items)
return items:has("letter", "booster", "controller", "sprinkler") return has(items, "letter") and has(items, "booster") and has(items, "controller") and has(items, "sprinkler")
end end
self.locations.eventRocket.setItem(self.world.items:getByKey("eventRocket")) self.locations.eventRocket:setItem(self.world.items:getByKey("eventRocket"))
end end
local lastCave = Region:extend() local lastCave = Region:extend()
@ -370,10 +384,10 @@ function lastCave:new(worldGraph)
lastCave.super.new(self, worldGraph, "lastCave") lastCave.super.new(self, worldGraph, "lastCave")
self.locations = { self.locations = {
"redDemon" = Location("Red Demon Boss", "Priso2", "0300", self) redDemon = Location("Red Demon Boss", "Priso2", "0300", self)
} }
self.requirements = function(items) return items:has("eventRocket", "weaponBoss") end self.requirements = function(items) return has(items, "eventRocket") and has(items, "weaponBoss") end
end end
local endgame = Region:extend() local endgame = Region:extend()
@ -381,18 +395,20 @@ function endgame:new(worldGraph)
endgame.super.new(self, worldGraph, "endgame") endgame.super.new(self, worldGraph, "endgame")
self.locations = { self.locations = {
"hellB1" = Location("Hell B1 Spot", "Hell1", "0401", self), hellB1 = Location("Hell B1 Spot", "Hell1", "0401", self),
"hellB3" = Location("Hell B3 Chest", "Hell3", "0400", self) hellB3 = Location("Hell B3 Chest", "Hell3", "0400", self)
} }
self.requirements = function(items) self.requirements = function(items)
return items:has("eventSue", "ironBond") and self.world.regions.lastCave:canAccess(items) end return has(items, "eventSue") and has(items, "ironBond") and self.world.regions.lastCave:canAccess(items)
end end
end end
local worldGraph = Class:extend() local worldGraph = Class:extend()
function worldGraph:new(items) function worldGraph:new(items)
self.items = items
self.regions = { self.regions = {
firstCave = firstCave(self), firstCave = firstCave(self),
mimigaVillage = mimigaVillage(self), mimigaVillage = mimigaVillage(self),
@ -413,8 +429,6 @@ function worldGraph:new(items)
lastCave = lastCave(self), lastCave = lastCave(self),
endgame = endgame(self) endgame = endgame(self)
} }
self.items = items
end end
function worldGraph:getLocations() function worldGraph:getLocations()

8
src/randomizer.lua
View file

@ -6,7 +6,7 @@ local C = Class:extend()
local TSC_FILES = {} local TSC_FILES = {}
do do
for location in ipairs(WorldGraph():getLocations()) do for location in ipairs(WorldGraph(Items()):getLocations()) do
local filename = location.map .. '.tsc' local filename = location.map .. '.tsc'
if not _.contains(TSC_FILES, filename) then if not _.contains(TSC_FILES, filename) then
table.insert(TSC_FILES, filename) table.insert(TSC_FILES, filename)
@ -121,8 +121,10 @@ function C:_fillItems(items, locations)
for item in ipairs(items) do for item in ipairs(items) do
local assumed = self.worldGraph:collect(_.remove(itemsLeft, item)) local assumed = self.worldGraph:collect(_.remove(itemsLeft, item))
local fillable = _.filter(locations, function(location, assumed) do local fillable = {}
return not location:hasItem() and location:canAccess(assumed) end) for location in ipairs(locations) do
if not location:hasItem() and location:canAccess(assumed) then table.insert(fillable, location) end
end
assert(#fillable > 0, 'No available locations!') assert(#fillable > 0, 'No available locations!')
fillable[1]:setItem(item) fillable[1]:setItem(item)
end end

2
src/tsc_file.lua
View file

@ -2,7 +2,7 @@ local C = Class:extend()
-- local ITEM_DATA = require 'database.items' -- local ITEM_DATA = require 'database.items'
-- local OPTIONAL_REPLACES = { local OPTIONAL_REPLACES = {
'Max health increased by ', 'Max health increased by ',
'Max life increased by ', 'Max life increased by ',
'<ACH0041', -- Cave Story+ only, trigger achievement. '<ACH0041', -- Cave Story+ only, trigger achievement.