big-refactor #106

Merged
kazhnuz merged 24 commits from big-refactor into master 2021-05-07 19:30:53 +02:00
123 changed files with 65 additions and 65 deletions
Showing only changes of commit 91c214ac15 - Show all commits

View file

@ -1,4 +1,4 @@
local TransitionParent = require "core.modules.transitions.parent" local TransitionParent = require "birb.modules.transitions.parent"
local CanvasTransition = TransitionParent:extend() local CanvasTransition = TransitionParent:extend()
function CanvasTransition:new(func, ox, oy, fadeOut, easeIn, easeOut, duration, wait) function CanvasTransition:new(func, ox, oy, fadeOut, easeIn, easeOut, duration, wait)

View file

@ -1,4 +1,4 @@
local TransitionParent = require "core.modules.transitions.canvas" local TransitionParent = require "birb.modules.transitions.canvas"
local DefaultTransition = TransitionParent:extend() local DefaultTransition = TransitionParent:extend()
function DefaultTransition:new(func, ox, oy, fadeOut) function DefaultTransition:new(func, ox, oy, fadeOut)

View file

@ -1,4 +1,4 @@
local TransitionParent = require "core.modules.transitions.canvas" local TransitionParent = require "birb.modules.transitions.canvas"
local DecalTransition = TransitionParent:extend() local DecalTransition = TransitionParent:extend()
function DecalTransition:new(func, ox, oy, fadeOut, decal) function DecalTransition:new(func, ox, oy, fadeOut, decal)

View file

@ -1,4 +1,4 @@
local TransitionParent = require "core.modules.transitions.parent" local TransitionParent = require "birb.modules.transitions.parent"
local DefaultTransition = TransitionParent:extend() local DefaultTransition = TransitionParent:extend()
function DefaultTransition:new(func, ox, oy, fadeOut) function DefaultTransition:new(func, ox, oy, fadeOut)

View file

@ -0,0 +1,4 @@
return {
default = require "birb.modules.transitions.default",
circle = require "birb.modules.transitions.circle"
}

View file

@ -1,8 +1,8 @@
local Parent = require "core.modules.world.maps.parent" local Parent = require "birb.modules.world.maps.parent"
local TiledMap = Parent:extend() local TiledMap = Parent:extend()
local StiWrapper = require "core.modules.world.maps.tiled.stiwrapper" local StiWrapper = require "birb.modules.world.maps.tiled.stiwrapper"
local TiledMixins = require "core.modules.world.maps.tiled.mixins" local TiledMixins = require "birb.modules.world.maps.tiled.mixins"
TiledMap:implement(TiledMixins) TiledMap:implement(TiledMixins)

View file

@ -1,5 +1,5 @@
local StiWrapper = Object:extend() local StiWrapper = Object:extend()
local STI = require "core.modules.world.maps.tiled.libs.sti" local STI = require "birb.modules.world.maps.tiled.libs.sti"
function StiWrapper:new(owner, mapfile, x, y, canLoadPlayer) function StiWrapper:new(owner, mapfile, x, y, canLoadPlayer)
self.sti = STI(mapfile) self.sti = STI(mapfile)

View file

@ -1,4 +1,4 @@
local Math = require "core.utils.math" local Math = require "birb.utils.math"
Time = {} Time = {}

View file

@ -1,4 +0,0 @@
return {
default = require "core.modules.transitions.default",
circle = require "core.modules.transitions.circle"
}

View file

@ -1,7 +1,7 @@
local CoreCBS = Object:extend() local CoreCBS = Object:extend()
local battleutils = require "game.utils.battle" local battleutils = require "game.utils.battle"
local defTransitions = require "core.modules.transitions" local defTransitions = require "birb.modules.transitions"
local radTransitions = require "game.modules.transitions" local radTransitions = require "game.modules.transitions"
local DEFAULTX = 424/2 local DEFAULTX = 424/2

View file

@ -1,7 +1,7 @@
local StepParent = require "game.events.event.parent" local StepParent = require "game.events.event.parent"
local DialogBox = StepParent:extend() local DialogBox = StepParent:extend()
local Talkies = require('core.libs.talkies') local Talkies = require('birb.libs.talkies')
function DialogBox:new(controller, args) function DialogBox:new(controller, args)
DialogBox.super.new(self, controller, args) DialogBox.super.new(self, controller, args)

View file

@ -1,6 +1,6 @@
local StepParent = require "game.events.event.parent" local StepParent = require "game.events.event.parent"
local SimpleMessageStep = StepParent:extend() local SimpleMessageStep = StepParent:extend()
local defTransitions = require "core.modules.transitions" local defTransitions = require "birb.modules.transitions"
function SimpleMessageStep:new(controller, args) function SimpleMessageStep:new(controller, args)
SimpleMessageStep.super.new(self, controller, args) SimpleMessageStep.super.new(self, controller, args)

View file

@ -31,7 +31,7 @@ local Loot = require "game.loot"
local CBSCore = require "game.battle" local CBSCore = require "game.battle"
local Difficulty = require "game.difficulty" local Difficulty = require "game.difficulty"
local binser = require "core.modules.gamesystem.libs.binser" local binser = require "birb.modules.gamesystem.libs.binser"
local startdata = require "datas.gamedata.startdata" local startdata = require "datas.gamedata.startdata"

View file

@ -1,5 +1,5 @@
local ParentMenu = require "game.modules.menus.parents.menu" local ParentMenu = require "game.modules.menus.parents.menu"
local Widget = require "core.modules.menusystem.widgets" local Widget = require "birb.modules.menusystem.widgets"
local list = {} local list = {}
list.ListMenu = ParentMenu:extend() list.ListMenu = ParentMenu:extend()

View file

@ -1,4 +1,4 @@
local ListBox = require "core.modules.menusystem.listbox" local ListBox = require "birb.modules.menusystem.listbox"
local TweenManager = require "game.modules.tweenmanager" local TweenManager = require "game.modules.tweenmanager"
local RadianceMenu = ListBox:extend() local RadianceMenu = ListBox:extend()

View file

@ -1,4 +1,4 @@
local Widget = require "core.modules.menusystem.widgets" local Widget = require "birb.modules.menusystem.widgets"
local RadianceWidget = Widget.Text:extend() local RadianceWidget = Widget.Text:extend()
function RadianceWidget:new(scene, name, label, color) function RadianceWidget:new(scene, name, label, color)

View file

@ -1,4 +1,4 @@
local Scene = require("core.modules.scenes") local Scene = require("birb.modules.scenes")
local PlayStyle = Scene:extend() local PlayStyle = Scene:extend()
local PauseMenu = require("game.modules.subgames.pause") local PauseMenu = require("game.modules.subgames.pause")

View file

@ -1,8 +1,8 @@
local ListBox = require "core.modules.menusystem.listbox" local ListBox = require "birb.modules.menusystem.listbox"
local RadianceListMenu = require "game.modules.menus.list" local RadianceListMenu = require "game.modules.menus.list"
local PauseMenu = RadianceListMenu.ListMenu:extend() local PauseMenu = RadianceListMenu.ListMenu:extend()
local Widget = require "core.modules.menusystem.widgets" local Widget = require "birb.modules.menusystem.widgets"
local ResumeWidget = RadianceListMenu.DualTextWidget:extend() local ResumeWidget = RadianceListMenu.DualTextWidget:extend()
local RestartWidget = RadianceListMenu.DualTextWidget:extend() local RestartWidget = RadianceListMenu.DualTextWidget:extend()

View file

@ -1,4 +1,4 @@
local DecalTransition = require "core.modules.transitions.decal" local DecalTransition = require "birb.modules.transitions.decal"
local EggmanTransition = DecalTransition:extend() local EggmanTransition = DecalTransition:extend()
function EggmanTransition:new(func, ox, oy, fadeOut) function EggmanTransition:new(func, ox, oy, fadeOut)

View file

@ -1,4 +1,4 @@
local DecalTransition = require "core.modules.transitions.decal" local DecalTransition = require "birb.modules.transitions.decal"
local SonicTransition = DecalTransition:extend() local SonicTransition = DecalTransition:extend()
function SonicTransition:new(func, ox, oy, fadeOut) function SonicTransition:new(func, ox, oy, fadeOut)

View file

@ -1,4 +1,4 @@
local CanvasTransition = require "core.modules.transitions.canvas" local CanvasTransition = require "birb.modules.transitions.canvas"
local ZigZagTransition = CanvasTransition:extend() local ZigZagTransition = CanvasTransition:extend()
function ZigZagTransition:new(func, ox, oy, fadeOut) function ZigZagTransition:new(func, ox, oy, fadeOut)

View file

@ -1,7 +1,7 @@
local TweenManager = Object:extend() local TweenManager = Object:extend()
local tween = require "game.modules.tweenmanager.libs.tween" local tween = require "game.modules.tweenmanager.libs.tween"
local Timer = require "core.modules.world.actors.utils.timer" local Timer = require "birb.modules.world.actors.utils.timer"
function TweenManager:new(subject) function TweenManager:new(subject)
self.subject = subject self.subject = subject

View file

@ -1,4 +1,4 @@
local Base = require "core.modules.world.actors.actor3D" local Base = require "birb.modules.world.actors.actor3D"
local FakeFloor = Base:extend() local FakeFloor = Base:extend()
function FakeFloor:new(world, x, y, z, w, h, d) function FakeFloor:new(world, x, y, z, w, h, d)

View file

@ -1,4 +1,4 @@
local Base = require "core.modules.world.actors.actor3D" local Base = require "birb.modules.world.actors.actor3D"
local Floor = Base:extend() local Floor = Base:extend()
function Floor:new(world, x, y, z, w, h, d) function Floor:new(world, x, y, z, w, h, d)

View file

@ -1,4 +1,4 @@
local Base = require "core.modules.world.actors.actor3D" local Base = require "birb.modules.world.actors.actor3D"
local Invisible = Base:extend() local Invisible = Base:extend()
function Invisible:new(world, x, y, z, w, h, d) function Invisible:new(world, x, y, z, w, h, d)

View file

@ -1,4 +1,4 @@
local Base = require "core.modules.world.actors.actor3D" local Base = require "birb.modules.world.actors.actor3D"
local Textured = Base:extend() local Textured = Base:extend()
function Textured:new(world, x, y, z, w, h, d, top, bottom) function Textured:new(world, x, y, z, w, h, d, top, bottom)

View file

@ -1,4 +1,4 @@
local Base = require "core.modules.world.actors.actor3D" local Base = require "birb.modules.world.actors.actor3D"
local Wall = Base:extend() local Wall = Base:extend()
function Wall:new(world, x, y, z, w, h, d) function Wall:new(world, x, y, z, w, h, d)

View file

@ -1,4 +1,4 @@
local Base = require "core.modules.world.actors.actor3D" local Base = require "birb.modules.world.actors.actor3D"
local Parent = Base:extend() local Parent = Base:extend()
function Parent:new(world, type, x, y, z, w, h, d, isSolid) function Parent:new(world, type, x, y, z, w, h, d, isSolid)

View file

@ -1,4 +1,4 @@
local BaseMap = require "core.modules.world.maps.parent" local BaseMap = require "birb.modules.world.maps.parent"
local BattleMap = BaseMap:extend() local BattleMap = BaseMap:extend()
function BattleMap:new(world, maptype, mapname) function BattleMap:new(world, maptype, mapname)

View file

@ -1,4 +1,4 @@
local BaseMap = require "core.modules.world.maps.parent" local BaseMap = require "birb.modules.world.maps.parent"
local ShootMap = BaseMap:extend() local ShootMap = BaseMap:extend()
local TILESIZE = 31 local TILESIZE = 31

View file

@ -1,4 +1,4 @@
local BaseMap = require "core.modules.world.maps.parent" local BaseMap = require "birb.modules.world.maps.parent"
local TestMap = BaseMap:extend() local TestMap = BaseMap:extend()
function TestMap:new(world) function TestMap:new(world)

Some files were not shown because too many files have changed in this diff Show more