chore: reorganize scenes
This commit is contained in:
parent
abc415c7f3
commit
849d3ce537
10 changed files with 9 additions and 9 deletions
|
@ -1,9 +1,9 @@
|
||||||
return {
|
return {
|
||||||
test = require "scenes.test_scene",
|
test = require "scenes.subgames.testBattle",
|
||||||
test2 = require "scenes.test_scene2",
|
test2 = require "scenes.subgames.testShoot",
|
||||||
title = require "scenes.titlescreen",
|
title = require "scenes.menus.titlescreen",
|
||||||
cbs = require "scenes.battlesystem",
|
cbs = require "scenes.battlesystem",
|
||||||
debug = require "scenes.debug",
|
debug = require "scenes.debug",
|
||||||
options = require "scenes.options",
|
options = require "scenes.menus.options",
|
||||||
overworld = require "scenes.overworld"
|
overworld = require "scenes.overworld"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
local Scene = require "core.modules.scenes"
|
local Scene = require "core.modules.scenes"
|
||||||
local OptionsMenu = Scene:extend()
|
local OptionsMenu = Scene:extend()
|
||||||
|
|
||||||
local OptionMenu = require "scenes.options.menu"
|
local OptionMenu = require "scenes.menus.options.menu"
|
||||||
local Widgets = require "scenes.options.widgets"
|
local Widgets = require "scenes.menus.options.widgets"
|
||||||
|
|
||||||
local gui = require "game.modules.gui"
|
local gui = require "game.modules.gui"
|
||||||
|
|
||||||
function OptionsMenu:new()
|
function OptionsMenu:new()
|
||||||
OptionsMenu.super.new(self)
|
OptionsMenu.super.new(self)
|
||||||
|
|
||||||
self.assets:batchImport("scenes.options.assets")
|
self.assets:batchImport("scenes.menus.options.assets")
|
||||||
self:addMenu("main", true)
|
self:addMenu("main", true)
|
||||||
self:addSubMenu("video", "video")
|
self:addSubMenu("video", "video")
|
||||||
self:addSubMenu("audio", "audio")
|
self:addSubMenu("audio", "audio")
|
|
@ -30,7 +30,7 @@ function MovePlayer:new(map)
|
||||||
|
|
||||||
MovePlayer.super.new(self)
|
MovePlayer.super.new(self)
|
||||||
self.assets:batchImport("game.modules.gui.assets")
|
self.assets:batchImport("game.modules.gui.assets")
|
||||||
self.assets:batchImport("scenes.test_scene.assets")
|
self.assets:batchImport("scenes.subgames.testBattle.assets")
|
||||||
|
|
||||||
World(self, "battle", map)
|
World(self, "battle", map)
|
||||||
|
|
|
@ -32,7 +32,7 @@ function MovePlayer:new(playerNumber, cameraMode)
|
||||||
|
|
||||||
MovePlayer.super.new(self)
|
MovePlayer.super.new(self)
|
||||||
self.assets:batchImport("game.modules.gui.assets")
|
self.assets:batchImport("game.modules.gui.assets")
|
||||||
self.assets:batchImport("scenes.test_scene.assets")
|
self.assets:batchImport("scenes.subgames.testShoot.assets")
|
||||||
|
|
||||||
World(self, "shoot", "forest")
|
World(self, "shoot", "forest")
|
||||||
|
|
Loading…
Reference in a new issue