renames game mode to objective

This commit is contained in:
duncathan 2020-02-27 18:21:21 -06:00
parent ca655e2e55
commit 36f282df63
4 changed files with 19 additions and 19 deletions

View file

@ -36,10 +36,10 @@ local function event(n)
} }
end end
local function gameMode(n, eve) local function objective(n, eve)
return { return {
name = "Game Mode: " .. n, name = n,
attributes = {"gamemode"}, attributes = {"objective"},
placed = true, placed = true,
script = eve script = eve
} }
@ -359,10 +359,10 @@ local function _itemData()
---------------- ----------------
-- GAME MODES -- -- GAME MODES --
---------------- ----------------
gameBadEnd = gameMode("Bad Ending", "<FL+6003<EVE0091"), objBadEnd = objective("Bad Ending", "<FL+6003<EVE0091"),
gameNormalEnd = gameMode("Normal Ending", "<FL+6000<EVE0091"), objNormalEnd = objective("Normal Ending", "<FL+6000<EVE0091"),
gameBestEnd = gameMode("Best Ending", "<FL+6001<EVE0091"), objBestEnd = objective("Best Ending", "<FL+6001<EVE0091"),
gameAllBosses = gameMode("All Bosses", "<FL+6002<IT+0005<EVE0091") objAllBosses = objective("All Bosses", "<FL+6002<IT+0005<EVE0091")
} }
local array = {} local array = {}

View file

@ -16,7 +16,7 @@ function firstCave:new(worldGraph)
firstCapsule = Location("First Cave Life Capsule", "Cave", "0401", self), firstCapsule = Location("First Cave Life Capsule", "Cave", "0401", self),
gunsmithChest = Location("Hermit Gunsmith Chest", "Pole", "0202", self), gunsmithChest = Location("Hermit Gunsmith Chest", "Pole", "0202", self),
gunsmith = Location("Tetsuzou", "Pole", "0303", self), gunsmith = Location("Tetsuzou", "Pole", "0303", self),
gameMode = Location("Game Mode Setup Script", "Start", "0201", self) objective = Location("Objective", "Start", "0201", self)
} }
self.locations.gunsmith.requirements = function(self, items) self.locations.gunsmith.requirements = function(self, items)
@ -442,8 +442,8 @@ function worldGraph:getLocations()
return locations return locations
end end
function worldGraph:getGameModeSpot() function worldGraph:getObjectiveSpot()
return {self.regions.firstCave.locations.gameMode} return {self.regions.firstCave.locations.objective}
end end
function worldGraph:getPuppySpots() function worldGraph:getPuppySpots()

View file

@ -34,7 +34,7 @@ function C:new()
self.worldGraph = WorldGraph(self.itemDeck) self.worldGraph = WorldGraph(self.itemDeck)
self.customseed = nil self.customseed = nil
self.puppy = false self.puppy = false
self.game = "" self.obj = ""
end end
function C:setPath(path) function C:setPath(path)
@ -129,13 +129,13 @@ function C:_writePlaintext(tscFiles)
end end
end end
function C:getGameMode() function C:getObjective()
return {self.itemDeck:getByKey(self.game)} return {self.itemDeck:getByKey(self.obj)}
end end
function C:_shuffleItems(tscFiles) function C:_shuffleItems(tscFiles)
-- place the game mode scripts in Start Point -- place the objective scripts in Start Point
self:_fastFillItems(self:getGameMode(), self.worldGraph:getGameModeSpot()) self:_fastFillItems(self:getObjective(), self.worldGraph:getObjectiveSpot())
local mandatory = _.compact(_.shuffle(self.itemDeck:getMandatoryItems(true))) local mandatory = _.compact(_.shuffle(self.itemDeck:getMandatoryItems(true)))
local optional = _.compact(_.shuffle(self.itemDeck:getOptionalItems(true))) local optional = _.compact(_.shuffle(self.itemDeck:getOptionalItems(true)))

View file

@ -30,13 +30,13 @@ layout.go:onPress(function()
end end
--if settings.bad.value then --if settings.bad.value then
-- Randomizer.game = "gameBadEnd" -- Randomizer.obj = "objBadEnd"
if settings.norm.value then if settings.norm.value then
Randomizer.game = "gameNormalEnd" Randomizer.obj = "objNormalEnd"
elseif settings.boss.value then elseif settings.boss.value then
Randomizer.game = "gameAllBosses" Randomizer.obj = "objAllBosses"
else else
Randomizer.game = "gameBestEnd" Randomizer.obj = "objBestEnd"
end end
Randomizer.puppy = settings.puppy.value Randomizer.puppy = settings.puppy.value