chore: make subgame worlds part of subgame folder

sonic-radiance.love/game/modules/subgames/init.lua

@@ -2,7 +2,7 @@ local Scene = require("birb.modules.scenes")
 local PlayStyle = Scene:extend()
 
 local PauseMenu = require("game.modules.subgames.pause")
-local TestWorld = require("game.modules.world.parent")
+local TestWorld = require("game.modules.subgames.world.parent")
 
 function PlayStyle:new(supportedLevels, missionfile)
 

sonic-radiance.love/game/modules/subgames/world/actors/items/collectible.lua

@@ -1,4 +1,4 @@
-local Parent = require "game.modules.world.actors.parent"
+local Parent = require "game.modules.subgames.world.actors.parent"
 local Collectible = Parent:extend()
 
 function Collectible:new(world, x, y, z, w, h, d)

sonic-radiance.love/game/modules/subgames/world/battle.lua

@@ -1,7 +1,7 @@
-local ParentWorld = require "game.modules.world.parent"
+local ParentWorld = require "game.modules.subgames.world.parent"
 local BattleWorld = ParentWorld:extend()
 
-local customMap = require "game.modules.world.maps"
+local customMap = require "game.modules.subgames.world.maps"
 
 function BattleWorld:new(scene, mapname)
   local mappath = game.utils.getMapPath("battle", mapname)

sonic-radiance.love/game/modules/subgames/world/maps/init.lua

@@ -0,0 +1,7 @@
+local customMap = {}
+
+customMap.Test    = require "game.modules.subgames.world.maps.test"
+customMap.Battle  = require "game.modules.subgames.world.maps.battle"
+customMap.Shoot   = require "game.modules.subgames.world.maps.shoot"
+
+return customMap

sonic-radiance.love/game/modules/subgames/world/maps/shoot.lua

@@ -7,7 +7,7 @@ local TESTZONE = "forest"
 local zoneDatas   = require "datas.gamedata.maps.shoot.zones"
 local Background  = require "game.modules.drawing.parallaxBackground"
 
-local Chunk = require "game.modules.world.maps.tools.chunk"
+local Chunk = require "game.modules.subgames.world.maps.tools.chunk"
 
 function ShootMap:new(world, maptype, mapname)
   ShootMap.super.new(self, world)

sonic-radiance.love/game/modules/subgames/world/maps/tools/chunk.lua

@@ -1,5 +1,5 @@
 local Chunk = Object:extend()
-local ChunkTerrain = require "game.modules.world.maps.tools.chunkterrain"
+local ChunkTerrain = require "game.modules.subgames.world.maps.tools.chunkterrain"
 
 function Chunk:new(map, data)
   self.map = map

sonic-radiance.love/game/modules/subgames/world/parent.lua

@@ -1,13 +1,13 @@
 local World3D = require "birb.modules.world.world3D"
 local ParentWorld = World3D:extend()
 
-local customMap = require "game.modules.world.maps"
+local customMap = require "game.modules.subgames.world.maps"
 
 function ParentWorld:new(scene, maptype, mapname)
   local mappath = game.utils.getMapPath("test", "test")
   self.customMap = customMap
 
-  ParentWorld.super.new(self, scene, "game.modules.world.actors", mappath, maptype)
+  ParentWorld.super.new(self, scene, "game.modules.subgames.world.actors", mappath, maptype)
 
   self.mapname = mapname
   self.autorun = false

sonic-radiance.love/game/modules/subgames/world/shoot.lua

@@ -1,7 +1,7 @@
-local ParentWorld = require "game.modules.world.parent"
+local ParentWorld = require "game.modules.subgames.world.parent"
 local ShootWorld = ParentWorld:extend()
 
-local customMap = require "game.modules.world.maps"
+local customMap = require "game.modules.subgames.world.maps"
 
 function ShootWorld:new(scene, mapname)
   local mappath = game.utils.getMapPath("shoot", mapname)

sonic-radiance.love/game/modules/world/maps/init.lua

@@ -1,7 +0,0 @@
-local customMap = {}
-
-customMap.Test    = require "game.modules.world.maps.test"
-customMap.Battle  = require "game.modules.world.maps.battle"
-customMap.Shoot   = require "game.modules.world.maps.shoot"
-
-return customMap

sonic-radiance.love/scenes/subgames/testBattle/init.lua

@@ -24,9 +24,7 @@
 local PlayStyle = require "game.modules.subgames"
 local MovePlayer = PlayStyle:extend()
 
-local TestWorld = require "game.modules.world.parent"
+local BattleWorld = require "game.modules.subgames.world.battle"
-local ShootWorld = require "game.modules.world.shoot"
-local BattleWorld = require "game.modules.world.battle"
 
 function MovePlayer:new(map)
   self.map = map
@@ -34,9 +32,7 @@ function MovePlayer:new(map)
 end
 
 function MovePlayer:initWorld()
-  --ShootWorld(self, "testlevel.test1")
   BattleWorld(self, self.map)
-  --TestWorld(self)
 end
 
 return MovePlayer

sonic-radiance.love/scenes/subgames/testShoot/init.lua

@@ -24,9 +24,7 @@
 local PlayStyle = require "game.modules.subgames"
 local MovePlayer = PlayStyle:extend()
 
-local TestWorld = require "game.modules.world.parent"
+local ShootWorld = require "game.modules.subgames.world.shoot"
-local ShootWorld = require "game.modules.world.shoot"
-local BattleWorld = require "game.modules.world.battle"
 
 function MovePlayer:new(map)
   self.map = map
@@ -35,8 +33,6 @@ end
 
 function MovePlayer:initWorld()
   ShootWorld(self, "testlevel.test1")
-  --BattleWorld(self, self.map)
-  --TestWorld(self)
 end
 
 return MovePlayer