diff --git a/sonic-radiance.love/assets/battle.lua b/sonic-radiance.love/assets/battle.lua index 7de9bed..0a54950 100644 --- a/sonic-radiance.love/assets/battle.lua +++ b/sonic-radiance.love/assets/battle.lua @@ -20,18 +20,8 @@ return { {"game", "assets/gui/strings/game.png"}, {"over", "assets/gui/strings/over.png"}, - {"arrow", "assets/gui/arrow.png"}, {"crown", "assets/gui/crown.png"} }, - ["fonts"] = { - {"victory", "assets/gui/fonts/vipnagorgialla.ttf", 12} - }, - ["imagefonts"] = { - {"hudnbrs", "assets/gui/fonts/hudnumbers"}, - {"hudnbrs_small", "assets/gui/fonts/hudsmallnumbers"}, - {"SA2font", "assets/gui/fonts/SA2font"}, - {"sadv", "assets/gui/fonts/sadv"} - }, ["sfx"] = { {"hit", "assets/sfx/hit.wav"}, {"hitconnect", "assets/sfx/hitconnect.wav"}, diff --git a/sonic-radiance.love/assets/commons.lua b/sonic-radiance.love/assets/commons.lua index 5a2c364..0697474 100644 --- a/sonic-radiance.love/assets/commons.lua +++ b/sonic-radiance.love/assets/commons.lua @@ -26,8 +26,7 @@ return { ["imagefonts"] = { {"hudnbrs", "assets/gui/fonts/hudnumbers"}, {"hudnbrs_small", "assets/gui/fonts/hudsmallnumbers"}, - - {"title", "assets/gui/fonts/SA2font"}, + {"SA2font", "assets/gui/fonts/SA2font"}, }, ["sfx"] = { {"mBack", "assets/sfx/menus/back.wav"}, diff --git a/sonic-radiance.love/assets/debug.lua b/sonic-radiance.love/assets/debug.lua index cd60076..d528b73 100644 --- a/sonic-radiance.love/assets/debug.lua +++ b/sonic-radiance.love/assets/debug.lua @@ -17,13 +17,6 @@ return { {"hudturn", "assets/gui/strings/hudturn.png"}, {"battlecompleted", "assets/gui/strings/battle_completed.png" } }, - ["fonts"] = { - {"victory", "assets/gui/fonts/vipnagorgialla.ttf", 12} - }, - ["imagefonts"] = { - {"hudnbrs", "assets/gui/fonts/hudnumbers"}, - {"hudnbrs_small", "assets/gui/fonts/hudsmallnumbers"}, - }, ["sfx"] = { {"hit", "assets/sfx/hit.wav"}, {"hitconnect", "assets/sfx/hitconnect.wav"}, diff --git a/sonic-radiance.love/assets/gui/arrow.png b/sonic-radiance.love/assets/gui/arrow.png deleted file mode 100644 index d82187c..0000000 Binary files a/sonic-radiance.love/assets/gui/arrow.png and /dev/null differ diff --git a/sonic-radiance.love/assets/gui/fonts/Pokemon DPPt.ttf b/sonic-radiance.love/assets/gui/fonts/Pokemon DPPt.ttf deleted file mode 100644 index f7a5fab..0000000 Binary files a/sonic-radiance.love/assets/gui/fonts/Pokemon DPPt.ttf and /dev/null differ diff --git a/sonic-radiance.love/assets/gui/fonts/RussoOne-Regular.ttf b/sonic-radiance.love/assets/gui/fonts/RussoOne-Regular.ttf deleted file mode 100644 index ba83727..0000000 Binary files a/sonic-radiance.love/assets/gui/fonts/RussoOne-Regular.ttf and /dev/null differ diff --git a/sonic-radiance.love/assets/gui/fonts/Teko-Bold.ttf b/sonic-radiance.love/assets/gui/fonts/Teko-Bold.ttf deleted file mode 100644 index d061824..0000000 Binary files a/sonic-radiance.love/assets/gui/fonts/Teko-Bold.ttf and /dev/null differ diff --git a/sonic-radiance.love/assets/gui/fonts/kimberley bl.ttf b/sonic-radiance.love/assets/gui/fonts/kimberley bl.ttf deleted file mode 100644 index 09a597a..0000000 Binary files a/sonic-radiance.love/assets/gui/fonts/kimberley bl.ttf and /dev/null differ diff --git a/sonic-radiance.love/assets/gui/fonts/sadv.lua b/sonic-radiance.love/assets/gui/fonts/sadv.lua deleted file mode 100644 index 956a37b..0000000 --- a/sonic-radiance.love/assets/gui/fonts/sadv.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - glyphs = "abcdefghijklmnopqrstuvwxyz0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ", - extraspacing = 1 -} diff --git a/sonic-radiance.love/assets/gui/fonts/sadv.png b/sonic-radiance.love/assets/gui/fonts/sadv.png deleted file mode 100644 index 7520004..0000000 Binary files a/sonic-radiance.love/assets/gui/fonts/sadv.png and /dev/null differ diff --git a/sonic-radiance.love/assets/gui/fonts/vipnagorgialla.ttf b/sonic-radiance.love/assets/gui/fonts/vipnagorgialla.ttf deleted file mode 100644 index 674ebd8..0000000 Binary files a/sonic-radiance.love/assets/gui/fonts/vipnagorgialla.ttf and /dev/null differ diff --git a/sonic-radiance.love/assets/gui/progressbar.png b/sonic-radiance.love/assets/gui/progressbar.png deleted file mode 100644 index d9e53e7..0000000 Binary files a/sonic-radiance.love/assets/gui/progressbar.png and /dev/null differ diff --git a/sonic-radiance.love/assets/overworld.lua b/sonic-radiance.love/assets/overworld.lua index 3da8335..740098d 100644 --- a/sonic-radiance.love/assets/overworld.lua +++ b/sonic-radiance.love/assets/overworld.lua @@ -24,15 +24,6 @@ return { {"itembox", "assets/gui/itembox.png"}, {"shadow", "assets/sprites/owshadow.png"}, - - }, - ["fonts"] = { - {"victory", "assets/gui/fonts/vipnagorgialla.ttf", 12} - }, - ["imagefonts"] = { - {"hudnbrs", "assets/gui/fonts/hudnumbers"}, - {"hudnbrs_small", "assets/gui/fonts/hudsmallnumbers"}, - {"SA2font", "assets/gui/fonts/SA2font"}, }, ["sfx"] = { {"hit", "assets/sfx/sommersault.wav"}, diff --git a/sonic-radiance.love/datas/gamedata/characters/amy/init.lua b/sonic-radiance.love/datas/gamedata/characters/amy/init.lua index 0621f24..a6975e4 100644 --- a/sonic-radiance.love/datas/gamedata/characters/amy/init.lua +++ b/sonic-radiance.love/datas/gamedata/characters/amy/init.lua @@ -7,7 +7,7 @@ return { turns = 2, move = 4, - startlevel = 10, + startlevel = 1, isUnlockedAtStart = true, canGoSuper = true, diff --git a/sonic-radiance.love/datas/gamedata/characters/sonic/init.lua b/sonic-radiance.love/datas/gamedata/characters/sonic/init.lua index 80f68cc..b4e8d10 100644 --- a/sonic-radiance.love/datas/gamedata/characters/sonic/init.lua +++ b/sonic-radiance.love/datas/gamedata/characters/sonic/init.lua @@ -7,7 +7,7 @@ return { turns = 3, move = 4, - startlevel = 10, + startlevel = 1, isUnlockedAtStart = true, canGoSuper = true, diff --git a/sonic-radiance.love/datas/gamedata/characters/tails/init.lua b/sonic-radiance.love/datas/gamedata/characters/tails/init.lua index 56b76a6..e5fe46c 100644 --- a/sonic-radiance.love/datas/gamedata/characters/tails/init.lua +++ b/sonic-radiance.love/datas/gamedata/characters/tails/init.lua @@ -7,7 +7,7 @@ return { turns = 2, move = 3, - startlevel = 10, + startlevel = 1, isUnlockedAtStart = true, canGoSuper = true, diff --git a/sonic-radiance.love/datas/gamedata/skills/init.lua b/sonic-radiance.love/datas/gamedata/skills/init.lua deleted file mode 100644 index cd3e25b..0000000 --- a/sonic-radiance.love/datas/gamedata/skills/init.lua +++ /dev/null @@ -1,15 +0,0 @@ -return { - actions = { - ["wait"] = {"wait", {"duration"}}, - ["addGFX"] = {"addGFX", {'sprite', "dx", "dy", "affectedByDirection", 'blockProcess'}}, - ["playSFX"] = {"playSFX", {"sfx"}}, - ["sendDamage"] = {"sendDamage", {"power", "accuracy", "isSpecial", "isAerial"}}, - ["sendDamageFromPos"] = {"sendDamageToPoint", {"dx", "dy", "power", "accuracy", "isSpecial", "isAerial", "affectedByDirection"}}, - ["sendDamageFromCursor"] = {"sendDamageToPoint", {"dx", "dy", "power", "accuracy", "isSpecial", "isAerial", "affectedByDirection"}}, - ["dashForward"] = {"dashForward", {"speed", "blockProcess"}}, - ["setAnimation"] = {"setAnimation", {"animation", "blockProcess"}}, - ["jumpBack"] = {"jump", {"blockProcess"}}, - ["jumpToCursor"] = {"jump", {"blockProcess"}}, - --[name] = {type, {args}}, - } -} diff --git a/sonic-radiance.love/game/modules/subgames/pause.lua b/sonic-radiance.love/game/modules/subgames/pause.lua index 7518c11..ecf113f 100644 --- a/sonic-radiance.love/game/modules/subgames/pause.lua +++ b/sonic-radiance.love/game/modules/subgames/pause.lua @@ -1,17 +1,11 @@ -local ListBox = require "birb.modules.menusystem.listbox" local RadianceListMenu = require "game.modules.menus.list" local PauseMenu = RadianceListMenu.ListMenu:extend() -local Widget = require "birb.modules.menusystem.widgets" - local ResumeWidget = RadianceListMenu.DualTextWidget:extend() local RestartWidget = RadianceListMenu.DualTextWidget:extend() local ExitWidget = RadianceListMenu.DualTextWidget:extend() -local gui = require "game.modules.gui" - local WIDTH = 80 -local HEIGHT = 72 function PauseMenu:new(subgame) local x, y diff --git a/sonic-radiance.love/scenes/battlesystem/actors/ennemy.lua b/sonic-radiance.love/scenes/battlesystem/actors/ennemy.lua index 50fcb4a..fcc0b96 100644 --- a/sonic-radiance.love/scenes/battlesystem/actors/ennemy.lua +++ b/sonic-radiance.love/scenes/battlesystem/actors/ennemy.lua @@ -1,8 +1,6 @@ local Battler = require("scenes.battlesystem.actors.battler") local Ennemy = Battler:extend() -local gui = require "game.modules.gui" - function Ennemy:new(world, x, y, owner) Ennemy.super.new(self, world, x, y, 0, owner) self.isEnnemy = true diff --git a/sonic-radiance.love/scenes/battlesystem/gui/menus/controller.lua b/sonic-radiance.love/scenes/battlesystem/gui/menus/controller.lua index bc2886f..2d47122 100644 --- a/sonic-radiance.love/scenes/battlesystem/gui/menus/controller.lua +++ b/sonic-radiance.love/scenes/battlesystem/gui/menus/controller.lua @@ -1,6 +1,3 @@ -local ListBox = require "birb.modules.menusystem.listbox" -local Widget = require "birb.modules.menusystem.widgets" - local MenuConstructor = Object:extend() local CharacterMenu = require "scenes.battlesystem.gui.menus.battlemenu" local widgets = require "scenes.battlesystem.gui.menus.widgets" diff --git a/sonic-radiance.love/scenes/battlesystem/gui/screens/victory.lua b/sonic-radiance.love/scenes/battlesystem/gui/screens/victory.lua index 17f97c5..e8c9e01 100644 --- a/sonic-radiance.love/scenes/battlesystem/gui/screens/victory.lua +++ b/sonic-radiance.love/scenes/battlesystem/gui/screens/victory.lua @@ -2,9 +2,6 @@ local VictoryScreen = Object:extend() local TweenManager = require "birb.classes.time" -local BATTLECOMPLETE_START = 2 -local BATTLECOMPLETE_STOP = 4 - local gui = require "game.modules.gui" local charutils = require "game.utils.characters" diff --git a/sonic-radiance.love/scenes/battlesystem/world.lua b/sonic-radiance.love/scenes/battlesystem/world.lua index a65bc3b..41d5cce 100644 --- a/sonic-radiance.love/scenes/battlesystem/world.lua +++ b/sonic-radiance.love/scenes/battlesystem/world.lua @@ -1,21 +1,10 @@ local World = Object:extend() -local maputils = require "scenes.battlesystem.utils" local Map = require "game.modules.drawing.parallaxBackground" -local TweenManager = require "birb.classes.time" - -local POSITIONS = { - {x = 3, y = 4}, - {x = 2, y = 2}, - {x = 2, y = 6}, -} - local HEIGHT = 5 local BORDER_BOTTOM = 2 -local gui = require "game.modules.gui" - -- INIT FUNCTIONS -- Initialize the battle world diff --git a/sonic-radiance.love/scenes/menus/commons/menu.lua b/sonic-radiance.love/scenes/menus/commons/menu.lua index be859d4..e5da981 100644 --- a/sonic-radiance.love/scenes/menus/commons/menu.lua +++ b/sonic-radiance.love/scenes/menus/commons/menu.lua @@ -1,7 +1,6 @@ local menu = {} local RadianceListMenu = require "game.modules.menus.fancy" -local Widget = require "birb.modules.menusystem.widgets" local defTransitions = require "birb.modules.transitions" menu.MainMenu = RadianceListMenu.FancyMenu:extend() diff --git a/sonic-radiance.love/scenes/menus/debugmenus/choregraphy/mocks/action.lua b/sonic-radiance.love/scenes/menus/debugmenus/choregraphy/mocks/action.lua index 59314ae..19e785e 100644 --- a/sonic-radiance.love/scenes/menus/debugmenus/choregraphy/mocks/action.lua +++ b/sonic-radiance.love/scenes/menus/debugmenus/choregraphy/mocks/action.lua @@ -1,8 +1,6 @@ local ActionParent = require "scenes.battlesystem.fighters.character.actions.parent" local ActionMock = ActionParent:extend() -local ChoregraphySystem = require "scenes.battlesystem.choregraphy" - function ActionMock:new(fighter, data) ActionMock.super.new(self, fighter) self.data = data diff --git a/sonic-radiance.love/scenes/menus/mainmenu/builders/debugmenu.lua b/sonic-radiance.love/scenes/menus/mainmenu/builders/debugmenu.lua deleted file mode 100644 index e69de29..0000000 diff --git a/sonic-radiance.love/scenes/menus/mainmenu/builders/mainmenu.lua b/sonic-radiance.love/scenes/menus/mainmenu/builders/mainmenu.lua deleted file mode 100644 index e69de29..0000000 diff --git a/sonic-radiance.love/scenes/menus/mainmenu/builders/parent.lua b/sonic-radiance.love/scenes/menus/mainmenu/builders/parent.lua deleted file mode 100644 index e69de29..0000000 diff --git a/sonic-radiance.love/scenes/menus/titlescreen/init.lua b/sonic-radiance.love/scenes/menus/titlescreen/init.lua index f459382..abca10b 100644 --- a/sonic-radiance.love/scenes/menus/titlescreen/init.lua +++ b/sonic-radiance.love/scenes/menus/titlescreen/init.lua @@ -26,11 +26,8 @@ local TitleScreen = Scene:extend() local gui = require "game.modules.gui" local TweenManager = require "birb.classes.time" -local Background = require "game.modules.drawing.parallaxBackground" local Menu = require "scenes.menus.titlescreen.menu" -local zoneList = require("datas.gamedata.maps.shoot.zones") - function TitleScreen:new(fromMenu) TitleScreen.super.new(self) @@ -108,8 +105,7 @@ function TitleScreen:draw() self.assets:drawImage("logo", 240 - 32, 80 - self.logoX, 0, 1, 1, w/2, h/2) if (self.canShowPressStart) and (self.showPressStart) then - local w = self.assets.fonts["title"]:getWidth("PRESS START") - self.assets.fonts["title"]:print("PRESS START", 424/2, 240/1.33, "center", 0, 1, 1) + self.assets.fonts["SA2font"]:print("PRESS START", 424/2, 240/1.33, "center", 0, 1, 1) end love.graphics.setColor(1, 1, 1, self.flashOpacity)