chore: remove commons assets from assetpacks

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

View file

@ -7,28 +7,13 @@ return {
{"ranks", "assets/gui/ranks"}, {"ranks", "assets/gui/ranks"},
{"qtebtn", "assets/gui/qtebtn"} {"qtebtn", "assets/gui/qtebtn"}
}, },
["sprites"] = {
{"cursorground", "assets/gui/cursor/ground"}
},
["textures"] = { ["textures"] = {
{"menucursor", "assets/gui/cursor-menulist.png"},
{"statusbar", "assets/gui/status_bar.png"},
{"expbar", "assets/gui/expbar.png"}, {"expbar", "assets/gui/expbar.png"},
{"cursorpeak", "assets/gui/cursor/peak.png"},
{"actorsShadow", "assets/sprites/shadow.png"}, {"actorsShadow", "assets/sprites/shadow.png"},
{"emptytile", "assets/backgrounds/tilemask.png"}, {"emptytile", "assets/backgrounds/tilemask.png"},
{"badnicsIcon", "assets/sprites/characters/badnics.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"}, {"hudturn", "assets/gui/strings/hudturn.png"},
{"battlecompleted", "assets/gui/strings/battle_completed.png" }, {"battlecompleted", "assets/gui/strings/battle_completed.png" },
{"egghead", "assets/gui/egghead.png"}, {"egghead", "assets/gui/egghead.png"},
@ -39,7 +24,6 @@ return {
{"crown", "assets/gui/crown.png"} {"crown", "assets/gui/crown.png"}
}, },
["fonts"] = { ["fonts"] = {
{"small", "assets/gui/fonts/PixelOperator.ttf", 16},
{"victory", "assets/gui/fonts/vipnagorgialla.ttf", 12} {"victory", "assets/gui/fonts/vipnagorgialla.ttf", 12}
}, },
["imagefonts"] = { ["imagefonts"] = {
@ -55,11 +39,6 @@ return {
{"woosh", "assets/sfx/woosh.wav"}, {"woosh", "assets/sfx/woosh.wav"},
{"spincharge", "assets/sfx/spincharge.wav"}, {"spincharge", "assets/sfx/spincharge.wav"},
{"spinrelease", "assets/sfx/spinrelease.wav"}, {"spinrelease", "assets/sfx/spinrelease.wav"},
{"badnicsBoom", "assets/sfx/badnicsDestroyed.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"},
} }
} }

View file

@ -17,6 +17,8 @@ return {
{"m_speedster", "assets/gui/emblem_speedster_mask.png"}, {"m_speedster", "assets/gui/emblem_speedster_mask.png"},
{"m_technic", "assets/gui/emblem_technic_mask.png"}, {"m_technic", "assets/gui/emblem_technic_mask.png"},
{"m_power", "assets/gui/emblem_power_mask.png"}, {"m_power", "assets/gui/emblem_power_mask.png"},
{"background", "assets/artworks/back.png"}
}, },
["fonts"] = { ["fonts"] = {
{"small", "assets/gui/fonts/PixelOperator.ttf", 16} {"small", "assets/gui/fonts/PixelOperator.ttf", 16}
@ -24,6 +26,8 @@ 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"},
{"title", "assets/gui/fonts/SA2font"},
}, },
["sfx"] = { ["sfx"] = {
{"mBack", "assets/sfx/menus/back.wav"}, {"mBack", "assets/sfx/menus/back.wav"},

View file

@ -10,25 +10,14 @@ return {
{"hitGFX", "assets/sprites/gfx/hit1"}, {"hitGFX", "assets/sprites/gfx/hit1"},
}, },
["textures"] = { ["textures"] = {
{"menucursor", "assets/gui/cursor-menulist.png"},
{"statusbar", "assets/gui/status_bar.png"}, {"statusbar", "assets/gui/status_bar.png"},
{"cursorpeak", "assets/gui/cursor/peak.png"},
{"actorsShadow", "assets/sprites/shadow.png"}, {"actorsShadow", "assets/sprites/shadow.png"},
{"emptytile", "assets/backgrounds/tilemask.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"}, {"hudturn", "assets/gui/strings/hudturn.png"},
{"battlecompleted", "assets/gui/strings/battle_completed.png" } {"battlecompleted", "assets/gui/strings/battle_completed.png" }
}, },
["fonts"] = { ["fonts"] = {
{"small", "assets/gui/fonts/PixelOperator.ttf", 16},
{"victory", "assets/gui/fonts/vipnagorgialla.ttf", 12} {"victory", "assets/gui/fonts/vipnagorgialla.ttf", 12}
}, },
["imagefonts"] = { ["imagefonts"] = {
@ -41,11 +30,6 @@ return {
{"jump", "assets/sfx/jump.wav"}, {"jump", "assets/sfx/jump.wav"},
{"woosh", "assets/sfx/woosh.wav"}, {"woosh", "assets/sfx/woosh.wav"},
{"spincharge", "assets/sfx/spincharge.wav"}, {"spincharge", "assets/sfx/spincharge.wav"},
{"spinrelease", "assets/sfx/spinrelease.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"},
} }
} }

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"},
}
}

View file

@ -15,19 +15,9 @@ return {
{"sparkles", "assets/sprites/gfx/sparkles"}, {"sparkles", "assets/sprites/gfx/sparkles"},
}, },
["textures"] = { ["textures"] = {
{"menucursor", "assets/gui/cursor-menulist.png"},
{"statusbar", "assets/gui/status_bar.png"}, {"statusbar", "assets/gui/status_bar.png"},
{"cursorpeak", "assets/gui/cursor/peak.png"},
{"actorsShadow", "assets/sprites/shadow.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"}, {"guiRing", "assets/gui/ring.png"},
{"lvl", "assets/gui/strings/lvl.png"}, {"lvl", "assets/gui/strings/lvl.png"},
{"exp", "assets/gui/strings/exp.png"}, {"exp", "assets/gui/strings/exp.png"},
@ -37,7 +27,6 @@ return {
}, },
["fonts"] = { ["fonts"] = {
{"small", "assets/gui/fonts/PixelOperator.ttf", 16},
{"victory", "assets/gui/fonts/vipnagorgialla.ttf", 12} {"victory", "assets/gui/fonts/vipnagorgialla.ttf", 12}
}, },
["imagefonts"] = { ["imagefonts"] = {
@ -56,11 +45,6 @@ return {
{"ring", "assets/sfx/ring.wav"}, {"ring", "assets/sfx/ring.wav"},
{"pop", "assets/sfx/pop.wav"}, {"pop", "assets/sfx/pop.wav"},
{"fall", "assets/sfx/fall.wav"}, {"fall", "assets/sfx/fall.wav"},
{"splash", "assets/sfx/splash.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"},
} }
} }

View file

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

View file

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

View file

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

View file

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

View file

@ -8,7 +8,8 @@ local Fighter = require "scenes.debug.viewers.choregraphy.mocks.fighter"
function ChoregraphyViewer:new() function ChoregraphyViewer:new()
ChoregraphyViewer.super.new(self) 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.world = World(self)
self:buildMenu() self:buildMenu()

View file

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

View file

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