diff --git a/sonic-radiance.love/scenes/battlesystem/assets.lua b/sonic-radiance.love/assets/battle.lua similarity index 100% rename from sonic-radiance.love/scenes/battlesystem/assets.lua rename to sonic-radiance.love/assets/battle.lua diff --git a/sonic-radiance.love/game/modules/gui/assets.lua b/sonic-radiance.love/assets/commons.lua similarity index 100% rename from sonic-radiance.love/game/modules/gui/assets.lua rename to sonic-radiance.love/assets/commons.lua diff --git a/sonic-radiance.love/scenes/debug/commons/assets.lua b/sonic-radiance.love/assets/debug.lua similarity index 100% rename from sonic-radiance.love/scenes/debug/commons/assets.lua rename to sonic-radiance.love/assets/debug.lua diff --git a/sonic-radiance.love/scenes/menus/assets.lua b/sonic-radiance.love/assets/menus.lua similarity index 100% rename from sonic-radiance.love/scenes/menus/assets.lua rename to sonic-radiance.love/assets/menus.lua diff --git a/sonic-radiance.love/scenes/overworld/assets.lua b/sonic-radiance.love/assets/overworld.lua similarity index 100% rename from sonic-radiance.love/scenes/overworld/assets.lua rename to sonic-radiance.love/assets/overworld.lua diff --git a/sonic-radiance.love/game/modules/subgames/assets.lua b/sonic-radiance.love/assets/subgames.lua similarity index 100% rename from sonic-radiance.love/game/modules/subgames/assets.lua rename to sonic-radiance.love/assets/subgames.lua diff --git a/sonic-radiance.love/game/modules/subgames/init.lua b/sonic-radiance.love/game/modules/subgames/init.lua index ea36e8d..3e73704 100644 --- a/sonic-radiance.love/game/modules/subgames/init.lua +++ b/sonic-radiance.love/game/modules/subgames/init.lua @@ -8,8 +8,8 @@ function PlayStyle:new(supportedLevels, missionfile) PlayStyle.super.new(self) self.timer = 0 - self.assets:batchImport("game.modules.gui.assets") - self.assets:batchImport("game.modules.subgames.assets") + self.assets:batchImport("assets.commons") + self.assets:batchImport("assets.subgames") --self:loadMissionFile(supportedLevels, missionfile) PauseMenu(self) diff --git a/sonic-radiance.love/scenes/battlesystem/init.lua b/sonic-radiance.love/scenes/battlesystem/init.lua index e37bf3b..ed8e9ff 100644 --- a/sonic-radiance.love/scenes/battlesystem/init.lua +++ b/sonic-radiance.love/scenes/battlesystem/init.lua @@ -14,7 +14,7 @@ local TweenManager = require "birb.classes.time" function BattleSystem:new(battleData) BattleSystem.super.new(self) - self.assets:batchImport("scenes.battlesystem.assets") + self.assets:batchImport("assets.battle") self:playMusic(battleData.music) diff --git a/sonic-radiance.love/scenes/debug/menu/init.lua b/sonic-radiance.love/scenes/debug/menu/init.lua index 10cf03e..a434168 100644 --- a/sonic-radiance.love/scenes/debug/menu/init.lua +++ b/sonic-radiance.love/scenes/debug/menu/init.lua @@ -11,7 +11,7 @@ local TweenManager = require "birb.classes.time" function DebugMenu:new() DebugMenu.super.new(self) - self.assets:batchImport("scenes.menus.assets") + self.assets:batchImport("assets.menus") menu.commons.MainMenu(self, "BaseMenu") menu.StartGameWidget(self, "BaseMenu") menu.commons.SceneWidget(self, "BaseMenu", scenes.options, "Options") diff --git a/sonic-radiance.love/scenes/debug/viewers/animation/init.lua b/sonic-radiance.love/scenes/debug/viewers/animation/init.lua index 51c10ba..069af42 100644 --- a/sonic-radiance.love/scenes/debug/viewers/animation/init.lua +++ b/sonic-radiance.love/scenes/debug/viewers/animation/init.lua @@ -8,7 +8,7 @@ local Sprite = require "birb.modules.assets.types.sprites" function CharAnimViewer:new() CharAnimViewer.super.new(self) - self.assets:batchImport("scenes.debug.commons.assets") + self.assets:batchImport("assets.debug") local mainMenu = menu.commons.DebugMenu(self, "MainMenu") self:setBackground("city") diff --git a/sonic-radiance.love/scenes/debug/viewers/battleBack/init.lua b/sonic-radiance.love/scenes/debug/viewers/battleBack/init.lua index 1342873..1f02833 100644 --- a/sonic-radiance.love/scenes/debug/viewers/battleBack/init.lua +++ b/sonic-radiance.love/scenes/debug/viewers/battleBack/init.lua @@ -8,7 +8,7 @@ local backgroundList = require "datas.gamedata.maps.shoot.zones" function BackgroundViewer:new() BackgroundViewer.super.new(self) - self.assets:batchImport("scenes.debug.commons.assets") + self.assets:batchImport("assets.debug") menu.commons.DebugMenu(self, "MainMenu") self:setBackground("city") diff --git a/sonic-radiance.love/scenes/menus/options/init.lua b/sonic-radiance.love/scenes/menus/options/init.lua index 1542101..9dcc909 100644 --- a/sonic-radiance.love/scenes/menus/options/init.lua +++ b/sonic-radiance.love/scenes/menus/options/init.lua @@ -10,7 +10,7 @@ local MenuBack = require "game.modules.gui.menuback" function OptionsMenu:new() OptionsMenu.super.new(self) - self.assets:batchImport("scenes.menus.assets") + self.assets:batchImport("assets.menus") self:addMenu("main", true) self:addSubMenu("video", "Video") self:addSubMenu("audio", "Audio") diff --git a/sonic-radiance.love/scenes/menus/titlescreen/init.lua b/sonic-radiance.love/scenes/menus/titlescreen/init.lua index efb710a..010c14f 100644 --- a/sonic-radiance.love/scenes/menus/titlescreen/init.lua +++ b/sonic-radiance.love/scenes/menus/titlescreen/init.lua @@ -37,7 +37,7 @@ function TitleScreen:new(fromMenu) local fromMenu = (fromMenu == true) self.borders = gui.newBorder(424, 30, 8) - self.assets:batchImport("scenes.menus.assets") + self.assets:batchImport("assets.menus") self.assets:addImage("logo", "assets/artworks/logo.png") self.assets:addTileset("charicons", "assets/sprites/characters/charicons") self.assets.fonts["small"]:setLineHeight(16/18) diff --git a/sonic-radiance.love/scenes/overworld/init.lua b/sonic-radiance.love/scenes/overworld/init.lua index 36abcb0..004ea9e 100644 --- a/sonic-radiance.love/scenes/overworld/init.lua +++ b/sonic-radiance.love/scenes/overworld/init.lua @@ -38,8 +38,8 @@ local MessageQueue = require "game.modules.messagequeue" function OverWorld:new(area, playerx, playery) OverWorld.super.new(self) self.charsetManager = CharsetManager(self) - self.assets:batchImport("game.modules.gui.assets") - self.assets:batchImport("scenes.overworld.assets") + self.assets:batchImport("assets.commons") + self.assets:batchImport("assets.overworld") self.assets.fonts["small"]:setLineHeight(16/18) self.assets.fonts["small"]:setFilter("shadow")