game-projects/sonic-radiance
1
0
Fork 0
Code Issues 33 Pull requests Projects 3 Releases Wiki Activity

chore: remove commons assets from assetpacks

Browse source
This commit is contained in:
Kazhnuz 2021-08-15 16:13:20 +02:00
parent 7a0eeaed1a
commit e5742fa500
12 changed files with 15 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
sonic-radiance.love/assets/battle.lua
View file

@ -7,28 +7,13 @@ return {
{"ranks", "assets/gui/ranks"},
{"qtebtn", "assets/gui/qtebtn"}
},
["sprites"] = {
{"cursorground", "assets/gui/cursor/ground"}
},
["textures"] = {
{"menucursor", "assets/gui/cursor-menulist.png"},
{"statusbar", "assets/gui/status_bar.png"},
{"expbar", "assets/gui/expbar.png"},
{"cursorpeak", "assets/gui/cursor/peak.png"},
{"actorsShadow", "assets/sprites/shadow.png"},
{"emptytile", "assets/backgrounds/tilemask.png"},
{"badnicsIcon", "assets/sprites/characters/badnics.png"},
{"e_speedster", "assets/gui/emblem_speedster.png"},
{"e_technic", "assets/gui/emblem_technic.png"},
{"e_power", "assets/gui/emblem_power.png"},
{"m_speedster", "assets/gui/emblem_speedster_mask.png"},
{"m_technic", "assets/gui/emblem_technic_mask.png"},
{"m_power", "assets/gui/emblem_power_mask.png"},
{"hudturn", "assets/gui/strings/hudturn.png"},
{"battlecompleted", "assets/gui/strings/battle_completed.png" },
{"egghead", "assets/gui/egghead.png"},
@ -39,7 +24,6 @@ return {
{"crown", "assets/gui/crown.png"}
},
["fonts"] = {
{"small", "assets/gui/fonts/PixelOperator.ttf", 16},
{"victory", "assets/gui/fonts/vipnagorgialla.ttf", 12}
},
["imagefonts"] = {
@ -55,11 +39,6 @@ return {
{"woosh", "assets/sfx/woosh.wav"},
{"spincharge", "assets/sfx/spincharge.wav"},
{"spinrelease", "assets/sfx/spinrelease.wav"},
{"badnicsBoom", "assets/sfx/badnicsDestroyed.wav"},
{"mBack", "assets/sfx/menus/back.wav"},
{"mBeep", "assets/sfx/menus/beep.wav"},
{"mSelect", "assets/sfx/menus/select.wav"},
{"mError", "assets/sfx/menus/error.wav"},
{"badnicsBoom", "assets/sfx/badnicsDestroyed.wav"}
}
}

4
sonic-radiance.love/assets/commons.lua
View file

@ -17,6 +17,8 @@ return {
{"m_speedster", "assets/gui/emblem_speedster_mask.png"},
{"m_technic", "assets/gui/emblem_technic_mask.png"},
{"m_power", "assets/gui/emblem_power_mask.png"},
{"background", "assets/artworks/back.png"}
},
["fonts"] = {
{"small", "assets/gui/fonts/PixelOperator.ttf", 16}
@ -24,6 +26,8 @@ return {
["imagefonts"] = {
{"hudnbrs", "assets/gui/fonts/hudnumbers"},
{"hudnbrs_small", "assets/gui/fonts/hudsmallnumbers"},
{"title", "assets/gui/fonts/SA2font"},
},
["sfx"] = {
{"mBack", "assets/sfx/menus/back.wav"},

18
sonic-radiance.love/assets/debug.lua
View file

@ -10,25 +10,14 @@ return {
{"hitGFX", "assets/sprites/gfx/hit1"},
},
["textures"] = {
{"menucursor", "assets/gui/cursor-menulist.png"},
{"statusbar", "assets/gui/status_bar.png"},
{"cursorpeak", "assets/gui/cursor/peak.png"},
{"actorsShadow", "assets/sprites/shadow.png"},
{"emptytile", "assets/backgrounds/tilemask.png"},
{"e_speedster", "assets/gui/emblem_speedster.png"},
{"e_technic", "assets/gui/emblem_technic.png"},
{"e_power", "assets/gui/emblem_power.png"},
{"m_speedster", "assets/gui/emblem_speedster_mask.png"},
{"m_technic", "assets/gui/emblem_technic_mask.png"},
{"m_power", "assets/gui/emblem_power_mask.png"},
{"hudturn", "assets/gui/strings/hudturn.png"},
{"battlecompleted", "assets/gui/strings/battle_completed.png" }
},
["fonts"] = {
{"small", "assets/gui/fonts/PixelOperator.ttf", 16},
{"victory", "assets/gui/fonts/vipnagorgialla.ttf", 12}
},
["imagefonts"] = {
@ -41,11 +30,6 @@ return {
{"jump", "assets/sfx/jump.wav"},
{"woosh", "assets/sfx/woosh.wav"},
{"spincharge", "assets/sfx/spincharge.wav"},
{"spinrelease", "assets/sfx/spinrelease.wav"},
{"mBack", "assets/sfx/menus/back.wav"},
{"mBeep", "assets/sfx/menus/beep.wav"},
{"mSelect", "assets/sfx/menus/select.wav"},
{"mError", "assets/sfx/menus/error.wav"},
{"spinrelease", "assets/sfx/spinrelease.wav"}
}
}

21
sonic-radiance.love/assets/menus.lua
View file

@ -1,21 +0,0 @@
return {
["sprites"] = {
{"cursorground", "assets/gui/cursor/ground"},
{"hitGFX", "assets/sprites/gfx/hit1"},
},
["textures"] = {
{"background", "assets/artworks/back.png"}
},
["fonts"] = {
{"small", "assets/gui/fonts/PixelOperator.ttf", 16}
},
["imagefonts"] = {
{"title", "assets/gui/fonts/SA2font"},
},
["sfx"] = {
{"mBack", "assets/sfx/menus/back.wav"},
{"mBeep", "assets/sfx/menus/beep.wav"},
{"mSelect", "assets/sfx/menus/select.wav"},
{"mError", "assets/sfx/menus/error.wav"},
}
}

18
sonic-radiance.love/assets/overworld.lua
View file

@ -15,19 +15,9 @@ return {
{"sparkles", "assets/sprites/gfx/sparkles"},
},
["textures"] = {
{"menucursor", "assets/gui/cursor-menulist.png"},
{"statusbar", "assets/gui/status_bar.png"},
{"cursorpeak", "assets/gui/cursor/peak.png"},
{"actorsShadow", "assets/sprites/shadow.png"},
{"e_speedster", "assets/gui/emblem_speedster.png"},
{"e_technic", "assets/gui/emblem_technic.png"},
{"e_power", "assets/gui/emblem_power.png"},
{"m_speedster", "assets/gui/emblem_speedster_mask.png"},
{"m_technic", "assets/gui/emblem_technic_mask.png"},
{"m_power", "assets/gui/emblem_power_mask.png"},
{"guiRing", "assets/gui/ring.png"},
{"lvl", "assets/gui/strings/lvl.png"},
{"exp", "assets/gui/strings/exp.png"},
@ -37,7 +27,6 @@ return {
},
["fonts"] = {
{"small", "assets/gui/fonts/PixelOperator.ttf", 16},
{"victory", "assets/gui/fonts/vipnagorgialla.ttf", 12}
},
["imagefonts"] = {
@ -56,11 +45,6 @@ return {
{"ring", "assets/sfx/ring.wav"},
{"pop", "assets/sfx/pop.wav"},
{"fall", "assets/sfx/fall.wav"},
{"splash", "assets/sfx/splash.wav"},
{"mBack", "assets/sfx/menus/back.wav"},
{"mBeep", "assets/sfx/menus/beep.wav"},
{"mSelect", "assets/sfx/menus/select.wav"},
{"mError", "assets/sfx/menus/error.wav"},
{"splash", "assets/sfx/splash.wav"}
}
}

1
sonic-radiance.love/scenes/battlesystem/init.lua
View file

@ -14,6 +14,7 @@ local TweenManager = require "birb.classes.time"
function BattleSystem:new(battleData)
BattleSystem.super.new(self)
self.assets:batchImport("assets.commons")
self.assets:batchImport("assets.battle")
self:playMusic(battleData.music)

2
sonic-radiance.love/scenes/debug/menu/init.lua
View file

@ -11,7 +11,7 @@ local TweenManager = require "birb.classes.time"
function DebugMenu:new()
DebugMenu.super.new(self)
self.assets:batchImport("assets.menus")
self.assets:batchImport("assets.commons")
menu.commons.MainMenu(self, "BaseMenu")
menu.StartGameWidget(self, "BaseMenu")
menu.commons.SceneWidget(self, "BaseMenu", scenes.options, "Options")

1
sonic-radiance.love/scenes/debug/viewers/animation/init.lua
View file

@ -8,6 +8,7 @@ local Sprite = require "birb.modules.assets.types.sprites"
function CharAnimViewer:new()
CharAnimViewer.super.new(self)
self.assets:batchImport("assets.commons")
self.assets:batchImport("assets.debug")
local mainMenu = menu.commons.DebugMenu(self, "MainMenu")

1
sonic-radiance.love/scenes/debug/viewers/battleBack/init.lua
View file

@ -8,6 +8,7 @@ local backgroundList = require "datas.gamedata.maps.shoot.zones"
function BackgroundViewer:new()
BackgroundViewer.super.new(self)
self.assets:batchImport("assets.commons")
self.assets:batchImport("assets.debug")
menu.commons.DebugMenu(self, "MainMenu")

3
sonic-radiance.love/scenes/debug/viewers/choregraphy/init.lua
View file

@ -8,7 +8,8 @@ local Fighter = require "scenes.debug.viewers.choregraphy.mocks.fighter"
function ChoregraphyViewer:new()
ChoregraphyViewer.super.new(self)
self.assets:batchImport("scenes.battlesystem.assets")
self.assets:batchImport("assets.commons")
self.assets:batchImport("assets.battle")
self.world = World(self)
self:buildMenu()

2
sonic-radiance.love/scenes/menus/options/init.lua
View file

@ -10,7 +10,7 @@ local MenuBack = require "game.modules.gui.menuback"
function OptionsMenu:new()
OptionsMenu.super.new(self)
self.assets:batchImport("assets.menus")
self.assets:batchImport("assets.commons")
self:addMenu("main", true)
self:addSubMenu("video", "Video")
self:addSubMenu("audio", "Audio")

2
sonic-radiance.love/scenes/menus/titlescreen/init.lua
View file

@ -37,7 +37,7 @@ function TitleScreen:new(fromMenu)
local fromMenu = (fromMenu == true)
self.borders = gui.newBorder(424, 30, 8)
self.assets:batchImport("assets.menus")
self.assets:batchImport("assets.commons")
self.assets:addImage("logo", "assets/artworks/logo.png")
self.assets:addTileset("charicons", "assets/sprites/characters/charicons")
self.assets.fonts["small"]:setLineHeight(16/18)