chore: general cleanup
This commit is contained in:
parent
ff752b3c02
commit
7ec3bfa065
28 changed files with 5 additions and 83 deletions
|
@ -20,18 +20,8 @@ return {
|
||||||
|
|
||||||
{"game", "assets/gui/strings/game.png"},
|
{"game", "assets/gui/strings/game.png"},
|
||||||
{"over", "assets/gui/strings/over.png"},
|
{"over", "assets/gui/strings/over.png"},
|
||||||
{"arrow", "assets/gui/arrow.png"},
|
|
||||||
{"crown", "assets/gui/crown.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"] = {
|
["sfx"] = {
|
||||||
{"hit", "assets/sfx/hit.wav"},
|
{"hit", "assets/sfx/hit.wav"},
|
||||||
{"hitconnect", "assets/sfx/hitconnect.wav"},
|
{"hitconnect", "assets/sfx/hitconnect.wav"},
|
||||||
|
|
|
@ -26,8 +26,7 @@ return {
|
||||||
["imagefonts"] = {
|
["imagefonts"] = {
|
||||||
{"hudnbrs", "assets/gui/fonts/hudnumbers"},
|
{"hudnbrs", "assets/gui/fonts/hudnumbers"},
|
||||||
{"hudnbrs_small", "assets/gui/fonts/hudsmallnumbers"},
|
{"hudnbrs_small", "assets/gui/fonts/hudsmallnumbers"},
|
||||||
|
{"SA2font", "assets/gui/fonts/SA2font"},
|
||||||
{"title", "assets/gui/fonts/SA2font"},
|
|
||||||
},
|
},
|
||||||
["sfx"] = {
|
["sfx"] = {
|
||||||
{"mBack", "assets/sfx/menus/back.wav"},
|
{"mBack", "assets/sfx/menus/back.wav"},
|
||||||
|
|
|
@ -17,13 +17,6 @@ return {
|
||||||
{"hudturn", "assets/gui/strings/hudturn.png"},
|
{"hudturn", "assets/gui/strings/hudturn.png"},
|
||||||
{"battlecompleted", "assets/gui/strings/battle_completed.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"] = {
|
["sfx"] = {
|
||||||
{"hit", "assets/sfx/hit.wav"},
|
{"hit", "assets/sfx/hit.wav"},
|
||||||
{"hitconnect", "assets/sfx/hitconnect.wav"},
|
{"hitconnect", "assets/sfx/hitconnect.wav"},
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 463 B |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,4 +0,0 @@
|
||||||
return {
|
|
||||||
glyphs = "abcdefghijklmnopqrstuvwxyz0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ",
|
|
||||||
extraspacing = 1
|
|
||||||
}
|
|
Binary file not shown.
Before Width: | Height: | Size: 3.2 KiB |
Binary file not shown.
Binary file not shown.
Before Width: | Height: | Size: 790 B |
|
@ -24,15 +24,6 @@ return {
|
||||||
|
|
||||||
{"itembox", "assets/gui/itembox.png"},
|
{"itembox", "assets/gui/itembox.png"},
|
||||||
{"shadow", "assets/sprites/owshadow.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"] = {
|
["sfx"] = {
|
||||||
{"hit", "assets/sfx/sommersault.wav"},
|
{"hit", "assets/sfx/sommersault.wav"},
|
||||||
|
|
|
@ -7,7 +7,7 @@ return {
|
||||||
turns = 2,
|
turns = 2,
|
||||||
move = 4,
|
move = 4,
|
||||||
|
|
||||||
startlevel = 10,
|
startlevel = 1,
|
||||||
|
|
||||||
isUnlockedAtStart = true,
|
isUnlockedAtStart = true,
|
||||||
canGoSuper = true,
|
canGoSuper = true,
|
||||||
|
|
|
@ -7,7 +7,7 @@ return {
|
||||||
turns = 3,
|
turns = 3,
|
||||||
move = 4,
|
move = 4,
|
||||||
|
|
||||||
startlevel = 10,
|
startlevel = 1,
|
||||||
|
|
||||||
isUnlockedAtStart = true,
|
isUnlockedAtStart = true,
|
||||||
canGoSuper = true,
|
canGoSuper = true,
|
||||||
|
|
|
@ -7,7 +7,7 @@ return {
|
||||||
turns = 2,
|
turns = 2,
|
||||||
move = 3,
|
move = 3,
|
||||||
|
|
||||||
startlevel = 10,
|
startlevel = 1,
|
||||||
|
|
||||||
isUnlockedAtStart = true,
|
isUnlockedAtStart = true,
|
||||||
canGoSuper = true,
|
canGoSuper = true,
|
||||||
|
|
|
@ -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}},
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,17 +1,11 @@
|
||||||
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 "birb.modules.menusystem.widgets"
|
|
||||||
|
|
||||||
local ResumeWidget = RadianceListMenu.DualTextWidget:extend()
|
local ResumeWidget = RadianceListMenu.DualTextWidget:extend()
|
||||||
local RestartWidget = RadianceListMenu.DualTextWidget:extend()
|
local RestartWidget = RadianceListMenu.DualTextWidget:extend()
|
||||||
local ExitWidget = RadianceListMenu.DualTextWidget:extend()
|
local ExitWidget = RadianceListMenu.DualTextWidget:extend()
|
||||||
|
|
||||||
local gui = require "game.modules.gui"
|
|
||||||
|
|
||||||
local WIDTH = 80
|
local WIDTH = 80
|
||||||
local HEIGHT = 72
|
|
||||||
|
|
||||||
function PauseMenu:new(subgame)
|
function PauseMenu:new(subgame)
|
||||||
local x, y
|
local x, y
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
local Battler = require("scenes.battlesystem.actors.battler")
|
local Battler = require("scenes.battlesystem.actors.battler")
|
||||||
local Ennemy = Battler:extend()
|
local Ennemy = Battler:extend()
|
||||||
|
|
||||||
local gui = require "game.modules.gui"
|
|
||||||
|
|
||||||
function Ennemy:new(world, x, y, owner)
|
function Ennemy:new(world, x, y, owner)
|
||||||
Ennemy.super.new(self, world, x, y, 0, owner)
|
Ennemy.super.new(self, world, x, y, 0, owner)
|
||||||
self.isEnnemy = true
|
self.isEnnemy = true
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
local ListBox = require "birb.modules.menusystem.listbox"
|
|
||||||
local Widget = require "birb.modules.menusystem.widgets"
|
|
||||||
|
|
||||||
local MenuConstructor = Object:extend()
|
local MenuConstructor = Object:extend()
|
||||||
local CharacterMenu = require "scenes.battlesystem.gui.menus.battlemenu"
|
local CharacterMenu = require "scenes.battlesystem.gui.menus.battlemenu"
|
||||||
local widgets = require "scenes.battlesystem.gui.menus.widgets"
|
local widgets = require "scenes.battlesystem.gui.menus.widgets"
|
||||||
|
|
|
@ -2,9 +2,6 @@ local VictoryScreen = Object:extend()
|
||||||
|
|
||||||
local TweenManager = require "birb.classes.time"
|
local TweenManager = require "birb.classes.time"
|
||||||
|
|
||||||
local BATTLECOMPLETE_START = 2
|
|
||||||
local BATTLECOMPLETE_STOP = 4
|
|
||||||
|
|
||||||
local gui = require "game.modules.gui"
|
local gui = require "game.modules.gui"
|
||||||
|
|
||||||
local charutils = require "game.utils.characters"
|
local charutils = require "game.utils.characters"
|
||||||
|
|
|
@ -1,21 +1,10 @@
|
||||||
local World = Object:extend()
|
local World = Object:extend()
|
||||||
|
|
||||||
local maputils = require "scenes.battlesystem.utils"
|
|
||||||
local Map = require "game.modules.drawing.parallaxBackground"
|
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 HEIGHT = 5
|
||||||
local BORDER_BOTTOM = 2
|
local BORDER_BOTTOM = 2
|
||||||
|
|
||||||
local gui = require "game.modules.gui"
|
|
||||||
|
|
||||||
-- INIT FUNCTIONS
|
-- INIT FUNCTIONS
|
||||||
-- Initialize the battle world
|
-- Initialize the battle world
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
local menu = {}
|
local menu = {}
|
||||||
|
|
||||||
local RadianceListMenu = require "game.modules.menus.fancy"
|
local RadianceListMenu = require "game.modules.menus.fancy"
|
||||||
local Widget = require "birb.modules.menusystem.widgets"
|
|
||||||
local defTransitions = require "birb.modules.transitions"
|
local defTransitions = require "birb.modules.transitions"
|
||||||
|
|
||||||
menu.MainMenu = RadianceListMenu.FancyMenu:extend()
|
menu.MainMenu = RadianceListMenu.FancyMenu:extend()
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
local ActionParent = require "scenes.battlesystem.fighters.character.actions.parent"
|
local ActionParent = require "scenes.battlesystem.fighters.character.actions.parent"
|
||||||
local ActionMock = ActionParent:extend()
|
local ActionMock = ActionParent:extend()
|
||||||
|
|
||||||
local ChoregraphySystem = require "scenes.battlesystem.choregraphy"
|
|
||||||
|
|
||||||
function ActionMock:new(fighter, data)
|
function ActionMock:new(fighter, data)
|
||||||
ActionMock.super.new(self, fighter)
|
ActionMock.super.new(self, fighter)
|
||||||
self.data = data
|
self.data = data
|
||||||
|
|
|
@ -26,11 +26,8 @@ local TitleScreen = Scene:extend()
|
||||||
local gui = require "game.modules.gui"
|
local gui = require "game.modules.gui"
|
||||||
|
|
||||||
local TweenManager = require "birb.classes.time"
|
local TweenManager = require "birb.classes.time"
|
||||||
local Background = require "game.modules.drawing.parallaxBackground"
|
|
||||||
local Menu = require "scenes.menus.titlescreen.menu"
|
local Menu = require "scenes.menus.titlescreen.menu"
|
||||||
|
|
||||||
local zoneList = require("datas.gamedata.maps.shoot.zones")
|
|
||||||
|
|
||||||
function TitleScreen:new(fromMenu)
|
function TitleScreen:new(fromMenu)
|
||||||
TitleScreen.super.new(self)
|
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)
|
self.assets:drawImage("logo", 240 - 32, 80 - self.logoX, 0, 1, 1, w/2, h/2)
|
||||||
|
|
||||||
if (self.canShowPressStart) and (self.showPressStart) then
|
if (self.canShowPressStart) and (self.showPressStart) then
|
||||||
local w = self.assets.fonts["title"]:getWidth("PRESS START")
|
self.assets.fonts["SA2font"]:print("PRESS START", 424/2, 240/1.33, "center", 0, 1, 1)
|
||||||
self.assets.fonts["title"]:print("PRESS START", 424/2, 240/1.33, "center", 0, 1, 1)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
love.graphics.setColor(1, 1, 1, self.flashOpacity)
|
love.graphics.setColor(1, 1, 1, self.flashOpacity)
|
||||||
|
|
Loading…
Reference in a new issue