From e4a6f64ae6057e68f768a223660210a7ead0256a Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Sun, 3 Feb 2019 20:10:35 +0100 Subject: [PATCH] scenes/boost: use the new scene location --- .../subgame/sonic-boost/actors/actor-index.lua | 4 +++- .../scenes/subgame/sonic-boost/actors/block.lua | 4 +++- .../subgame/sonic-boost/actors/character.lua | 4 +++- .../subgame/sonic-boost/actors/crystal.lua | 4 +++- .../scenes/subgame/sonic-boost/actors/init.lua | 10 ++++++---- .../scenes/subgame/sonic-boost/actors/parent.lua | 3 ++- .../scenes/subgame/sonic-boost/actors/rail.lua | 4 +++- .../scenes/subgame/sonic-boost/actors/ring.lua | 4 +++- .../subgame/sonic-boost/controller/init.lua | 16 +++++++++------- .../subgame/sonic-boost/controller/world.lua | 2 +- .../scenes/subgame/sonic-boost/init.lua | 2 +- 11 files changed, 37 insertions(+), 20 deletions(-) diff --git a/sonic-boost.love/scenes/subgame/sonic-boost/actors/actor-index.lua b/sonic-boost.love/scenes/subgame/sonic-boost/actors/actor-index.lua index 454671c..53d1763 100644 --- a/sonic-boost.love/scenes/subgame/sonic-boost/actors/actor-index.lua +++ b/sonic-boost.love/scenes/subgame/sonic-boost/actors/actor-index.lua @@ -1,5 +1,7 @@ local ActorIndex = {} -local Actor = "scenes.levels.actors" +local folder = "scenes.subgame.sonicboost.actors" + +local Actor = folder .. "actors" ActorIndex[1] = Actor.Ring ActorIndex[2] = Actor.Crystal diff --git a/sonic-boost.love/scenes/subgame/sonic-boost/actors/block.lua b/sonic-boost.love/scenes/subgame/sonic-boost/actors/block.lua index 5d7f08e..da2fdf8 100644 --- a/sonic-boost.love/scenes/subgame/sonic-boost/actors/block.lua +++ b/sonic-boost.love/scenes/subgame/sonic-boost/actors/block.lua @@ -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. Block.super.new(self, level, "block", x-16, y-10, 0, 31, 20, d) diff --git a/sonic-boost.love/scenes/subgame/sonic-boost/actors/character.lua b/sonic-boost.love/scenes/subgame/sonic-boost/actors/character.lua index 355a7f7..9a7e07b 100644 --- a/sonic-boost.love/scenes/subgame/sonic-boost/actors/character.lua +++ b/sonic-boost.love/scenes/subgame/sonic-boost/actors/character.lua @@ -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 playerHeight = 32 local grindheight = 32 diff --git a/sonic-boost.love/scenes/subgame/sonic-boost/actors/crystal.lua b/sonic-boost.love/scenes/subgame/sonic-boost/actors/crystal.lua index e1cf068..fdb159d 100644 --- a/sonic-boost.love/scenes/subgame/sonic-boost/actors/crystal.lua +++ b/sonic-boost.love/scenes/subgame/sonic-boost/actors/crystal.lua @@ -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() function Crystal:new(world, x, y, z) diff --git a/sonic-boost.love/scenes/subgame/sonic-boost/actors/init.lua b/sonic-boost.love/scenes/subgame/sonic-boost/actors/init.lua index 1b06b23..5bdc421 100644 --- a/sonic-boost.love/scenes/subgame/sonic-boost/actors/init.lua +++ b/sonic-boost.love/scenes/subgame/sonic-boost/actors/init.lua @@ -1,9 +1,11 @@ local Actor = {} -Actor.Character = require "scenes.levels.actors.character" -Actor.Ring = require "scenes.levels.actors.ring" -Actor.Crystal = require "scenes.levels.actors.crystal" -Actor.Rail = require "scenes.levels.actors.rail" +local folder = "scenes.subgame.sonicboost.actors" + +Actor.Character = require(folder .. "character") +Actor.Ring = require(folder .. "ring") +Actor.Crystal = require(folder .. "crystal") +Actor.Rail = require(folder .. "rail") Actor.Index = {} Actor.Index[01] = Actor.Ring diff --git a/sonic-boost.love/scenes/subgame/sonic-boost/actors/parent.lua b/sonic-boost.love/scenes/subgame/sonic-boost/actors/parent.lua index 44d84e1..57830b8 100644 --- a/sonic-boost.love/scenes/subgame/sonic-boost/actors/parent.lua +++ b/sonic-boost.love/scenes/subgame/sonic-boost/actors/parent.lua @@ -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 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. self:setHitbox(x, y, z, w, h, d) diff --git a/sonic-boost.love/scenes/subgame/sonic-boost/actors/rail.lua b/sonic-boost.love/scenes/subgame/sonic-boost/actors/rail.lua index 51e7d9d..91dc898 100644 --- a/sonic-boost.love/scenes/subgame/sonic-boost/actors/rail.lua +++ b/sonic-boost.love/scenes/subgame/sonic-boost/actors/rail.lua @@ -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() function Rail:new(world, x, y, z, id) diff --git a/sonic-boost.love/scenes/subgame/sonic-boost/actors/ring.lua b/sonic-boost.love/scenes/subgame/sonic-boost/actors/ring.lua index 42d39ef..da30516 100644 --- a/sonic-boost.love/scenes/subgame/sonic-boost/actors/ring.lua +++ b/sonic-boost.love/scenes/subgame/sonic-boost/actors/ring.lua @@ -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() function Ring:new(world, x, y, z) diff --git a/sonic-boost.love/scenes/subgame/sonic-boost/controller/init.lua b/sonic-boost.love/scenes/subgame/sonic-boost/controller/init.lua index 6a49ec1..ccb036f 100644 --- a/sonic-boost.love/scenes/subgame/sonic-boost/controller/init.lua +++ b/sonic-boost.love/scenes/subgame/sonic-boost/controller/init.lua @@ -2,17 +2,19 @@ local Controller = Object:extend() local GUI = require "modules.gui" local Assets = require "modules.assets" -local HUD = require "scenes.levels.controller.hud" -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 folder = "scenes.subgame.sonic-boost.controller" -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 LoadAssets = require "scenes.levels.controller.loader" +local LoadAssets = require(folder .. "loader") function Controller:new(levelid, character) self:initMission() diff --git a/sonic-boost.love/scenes/subgame/sonic-boost/controller/world.lua b/sonic-boost.love/scenes/subgame/sonic-boost/controller/world.lua index 941ddc7..56e3dbc 100644 --- a/sonic-boost.love/scenes/subgame/sonic-boost/controller/world.lua +++ b/sonic-boost.love/scenes/subgame/sonic-boost/controller/world.lua @@ -4,7 +4,7 @@ local bump3dpd = require 'libs.bump-3dpd' local bump2d = require 'libs.bump' local tsort = require 'libs.tsort' -local actor = require "scenes.levels.actors" +local actor = require "scenes.subgame.sonic-boost.actors" local tilesize = 31 diff --git a/sonic-boost.love/scenes/subgame/sonic-boost/init.lua b/sonic-boost.love/scenes/subgame/sonic-boost/init.lua index 44118ce..7c10f4a 100644 --- a/sonic-boost.love/scenes/subgame/sonic-boost/init.lua +++ b/sonic-boost.love/scenes/subgame/sonic-boost/init.lua @@ -1,6 +1,6 @@ local Scene = require "core.modules.scenes" local BoostLevel = Scene:extend() -local Controller = require "scenes.levels.controller" +local Controller = require "scenes.subgame.sonic-boost.controller" function BoostLevel:new() self.controller = Controller()