scenes/boost: use the new scene location

This commit is contained in:
Kazhnuz 2019-02-03 20:10:35 +01:00
parent ab09778f3a
commit e4a6f64ae6
11 changed files with 37 additions and 20 deletions

View file

@ -1,5 +1,7 @@
local ActorIndex = {} local ActorIndex = {}
local Actor = "scenes.levels.actors" local folder = "scenes.subgame.sonicboost.actors"
local Actor = folder .. "actors"
ActorIndex[1] = Actor.Ring ActorIndex[1] = Actor.Ring
ActorIndex[2] = Actor.Crystal ActorIndex[2] = Actor.Crystal

View file

@ -1,4 +1,6 @@
local Block = Entity:extend() local folder = "scenes.subgame.sonicboost.actors"
local Entity = require(folder .. "parent")
function Block:new(level, x, y, z, w, h, d) -- On enregistre une nouvelle entité, avec par défaut sa hitbox. function Block:new(level, x, y, z, w, h, d) -- On enregistre une nouvelle entité, avec par défaut sa hitbox.
Block.super.new(self, level, "block", x-16, y-10, 0, 31, 20, d) Block.super.new(self, level, "block", x-16, y-10, 0, 31, 20, d)

View file

@ -1,4 +1,6 @@
local Entity = require "scenes.levels.actors.parent" local folder = "scenes.subgame.sonicboost.actors"
local Entity = require(folder .. "parent")
local phys = require "datas.physics" local phys = require "datas.physics"
local playerHeight = 32 local playerHeight = 32
local grindheight = 32 local grindheight = 32

View file

@ -1,4 +1,6 @@
local Entity = require("scenes.levels.actors.parent") local folder = "scenes.subgame.sonicboost.actors"
local Entity = require(folder .. "parent")
local Crystal = Entity:extend() local Crystal = Entity:extend()
function Crystal:new(world, x, y, z) function Crystal:new(world, x, y, z)

View file

@ -1,9 +1,11 @@
local Actor = {} local Actor = {}
Actor.Character = require "scenes.levels.actors.character" local folder = "scenes.subgame.sonicboost.actors"
Actor.Ring = require "scenes.levels.actors.ring"
Actor.Crystal = require "scenes.levels.actors.crystal" Actor.Character = require(folder .. "character")
Actor.Rail = require "scenes.levels.actors.rail" Actor.Ring = require(folder .. "ring")
Actor.Crystal = require(folder .. "crystal")
Actor.Rail = require(folder .. "rail")
Actor.Index = {} Actor.Index = {}
Actor.Index[01] = Actor.Ring Actor.Index[01] = Actor.Ring

View file

@ -1,6 +1,7 @@
local folder = "scenes.subgame.sonicboost.actors"
local ParentEntity = Object:extend() -- On créer la classe des entitées, c'est la classe de base local ParentEntity = Object:extend() -- On créer la classe des entitées, c'est la classe de base
local Timer = require "scenes.levels.actors.utils.timers" local Timer = require(folder .. "utils.timers")
function ParentEntity:new(world, type, x, y, z, w, h, d) -- On enregistre une nouvelle entité, avec par défaut sa hitbox. function ParentEntity:new(world, type, x, y, z, w, h, d) -- On enregistre une nouvelle entité, avec par défaut sa hitbox.
self:setHitbox(x, y, z, w, h, d) self:setHitbox(x, y, z, w, h, d)

View file

@ -1,4 +1,6 @@
local Entity = require("scenes.levels.actors.parent") local folder = "scenes.subgame.sonicboost.actors"
local Entity = require(folder .. "parent")
local Rail = Entity:extend() local Rail = Entity:extend()
function Rail:new(world, x, y, z, id) function Rail:new(world, x, y, z, id)

View file

@ -1,4 +1,6 @@
local Entity = require("scenes.levels.actors.parent") local folder = "scenes.subgame.sonicboost.actors"
local Entity = require(folder .. "parent")
local Ring = Entity:extend() local Ring = Entity:extend()
function Ring:new(world, x, y, z) function Ring:new(world, x, y, z)

View file

@ -2,17 +2,19 @@ local Controller = Object:extend()
local GUI = require "modules.gui" local GUI = require "modules.gui"
local Assets = require "modules.assets" local Assets = require "modules.assets"
local HUD = require "scenes.levels.controller.hud" local folder = "scenes.subgame.sonic-boost.controller"
local Background = require "scenes.levels.controller.background"
local Camera = require "scenes.levels.controller.camera"
local World = require "scenes.levels.controller.world"
local PauseMenu = require "scenes.levels.controller.pause"
local CharacterManager = require "scenes.levels.controller.characters" local HUD = require(folder .. "hud")
local Background = require(folder .. "background")
local Camera = require(folder .. "camera")
local World = require(folder .. "world")
local PauseMenu = require(folder .. "pause")
local CharacterManager = require(folder .. "characters")
local zoneDatas = require "datas.levels.zones" local zoneDatas = require "datas.levels.zones"
local LoadAssets = require "scenes.levels.controller.loader" local LoadAssets = require(folder .. "loader")
function Controller:new(levelid, character) function Controller:new(levelid, character)
self:initMission() self:initMission()

View file

@ -4,7 +4,7 @@ local bump3dpd = require 'libs.bump-3dpd'
local bump2d = require 'libs.bump' local bump2d = require 'libs.bump'
local tsort = require 'libs.tsort' local tsort = require 'libs.tsort'
local actor = require "scenes.levels.actors" local actor = require "scenes.subgame.sonic-boost.actors"
local tilesize = 31 local tilesize = 31

View file

@ -1,6 +1,6 @@
local Scene = require "core.modules.scenes" local Scene = require "core.modules.scenes"
local BoostLevel = Scene:extend() local BoostLevel = Scene:extend()
local Controller = require "scenes.levels.controller" local Controller = require "scenes.subgame.sonic-boost.controller"
function BoostLevel:new() function BoostLevel:new()
self.controller = Controller() self.controller = Controller()