From b4ac028cd9312b138be1117af29e22f00f8eca78 Mon Sep 17 00:00:00 2001 From: Sage Vaillancourt Date: Mon, 24 Feb 2025 19:58:47 -0500 Subject: [PATCH] Consolidate assets into src/assets/ --- src/announcer.lua | 2 +- src/assets.lua | 82 +++++++++--------- src/assets.lua2p | 10 +-- .../Asheville-Sans-14-Bold-table-20-20.png | Bin .../fonts/Asheville-Sans-14-Bold.fnt | 0 .../fonts/Nano Sans-table-6-10.png | Bin src/{ => assets}/fonts/Nano Sans.fnt | 0 .../fonts/Roobert-20-Medium-table-32-32.png | Bin src/{ => assets}/fonts/Roobert-20-Medium.fnt | 0 .../fonts/font-full-circle-table-12-15.png | Bin src/{ => assets}/fonts/font-full-circle.fnt | 0 .../images/game/BallBackground.png | Bin src/{ => assets}/images/game/BigBat.png | Bin .../images/game/DarkPlayerAwayBack.png | Bin .../images/game/DarkPlayerAwayBase.png | Bin .../images/game/DarkPlayerFrown.png | Bin .../images/game/DarkPlayerHomeBack.png | Bin .../images/game/DarkPlayerHomeBase.png | Bin .../images/game/DarkPlayerSmile.png | Bin src/{ => assets}/images/game/DarkSkinFan.png | Bin src/{ => assets}/images/game/GameLogo.png | Bin src/{ => assets}/images/game/Glove.png | Bin .../images/game/GloveHoldingBall.png | Bin .../images/game/GrassBackground.png | Bin .../images/game/GrassBackgroundSmall.png | Bin src/{ => assets}/images/game/Hat.png | Bin .../images/game/LightPlayerAwayBack.png | Bin .../images/game/LightPlayerAwayBase.png | Bin .../images/game/LightPlayerFrown.png | Bin .../images/game/LightPlayerHomeBack.png | Bin .../images/game/LightPlayerHomeBase.png | Bin .../images/game/LightPlayerSmile.png | Bin src/{ => assets}/images/game/LightSkinFan.png | Bin src/{ => assets}/images/game/MenuImage.png | Bin src/{ => assets}/images/game/Minimap.png | Bin .../images/game/PerfectPowerBg.png | Bin .../images/game/PerfectPowerFlickerLeft.png | Bin .../images/game/PerfectPowerFlickerRight.png | Bin src/{ => assets}/images/game/logos/Arrows.png | Bin src/{ => assets}/images/game/logos/Base.png | Bin src/{ => assets}/images/game/logos/Cats.png | Bin .../images/game/logos/Checkmarks.png | Bin .../images/game/logos/FingerGuns.png | Bin src/{ => assets}/images/game/logos/Frown.png | Bin src/{ => assets}/images/game/logos/Hearts.png | Bin src/{ => assets}/images/game/logos/Smiles.png | Bin src/{ => assets}/images/game/logos/Turds.png | Bin src/{ => assets}/images/launcher/card.png | Bin .../images/launcher/wrapping-pattern.png | Bin src/{ => assets}/music/BootTune.wav | Bin src/{ => assets}/music/BootTuneOrgany.wav | Bin src/{ => assets}/music/MenuMusic.wav | Bin src/{ => assets}/music/TinnyBackground.wav | Bin src/{ => assets}/sounds/BatCrackReverb.wav | Bin src/control-screen.lua | 4 +- src/draw/box-score.lua | 4 +- src/draw/overlay.lua | 2 +- src/graphics.lua | 2 +- src/main-menu.lua | 4 +- src/main.lua | 2 +- src/pdxinfo | 2 +- 61 files changed, 57 insertions(+), 57 deletions(-) rename src/{ => assets}/fonts/Asheville-Sans-14-Bold-table-20-20.png (100%) rename src/{ => assets}/fonts/Asheville-Sans-14-Bold.fnt (100%) rename src/{ => assets}/fonts/Nano Sans-table-6-10.png (100%) rename src/{ => assets}/fonts/Nano Sans.fnt (100%) rename src/{ => assets}/fonts/Roobert-20-Medium-table-32-32.png (100%) rename src/{ => assets}/fonts/Roobert-20-Medium.fnt (100%) rename src/{ => assets}/fonts/font-full-circle-table-12-15.png (100%) rename src/{ => assets}/fonts/font-full-circle.fnt (100%) rename src/{ => assets}/images/game/BallBackground.png (100%) rename src/{ => assets}/images/game/BigBat.png (100%) rename src/{ => assets}/images/game/DarkPlayerAwayBack.png (100%) rename src/{ => assets}/images/game/DarkPlayerAwayBase.png (100%) rename src/{ => assets}/images/game/DarkPlayerFrown.png (100%) rename src/{ => assets}/images/game/DarkPlayerHomeBack.png (100%) rename src/{ => assets}/images/game/DarkPlayerHomeBase.png (100%) rename src/{ => assets}/images/game/DarkPlayerSmile.png (100%) rename src/{ => assets}/images/game/DarkSkinFan.png (100%) rename src/{ => assets}/images/game/GameLogo.png (100%) rename src/{ => assets}/images/game/Glove.png (100%) rename src/{ => assets}/images/game/GloveHoldingBall.png (100%) rename src/{ => assets}/images/game/GrassBackground.png (100%) rename src/{ => assets}/images/game/GrassBackgroundSmall.png (100%) rename src/{ => assets}/images/game/Hat.png (100%) rename src/{ => assets}/images/game/LightPlayerAwayBack.png (100%) rename src/{ => assets}/images/game/LightPlayerAwayBase.png (100%) rename src/{ => assets}/images/game/LightPlayerFrown.png (100%) rename src/{ => assets}/images/game/LightPlayerHomeBack.png (100%) rename src/{ => assets}/images/game/LightPlayerHomeBase.png (100%) rename src/{ => assets}/images/game/LightPlayerSmile.png (100%) rename src/{ => assets}/images/game/LightSkinFan.png (100%) rename src/{ => assets}/images/game/MenuImage.png (100%) rename src/{ => assets}/images/game/Minimap.png (100%) rename src/{ => assets}/images/game/PerfectPowerBg.png (100%) rename src/{ => assets}/images/game/PerfectPowerFlickerLeft.png (100%) rename src/{ => assets}/images/game/PerfectPowerFlickerRight.png (100%) rename src/{ => assets}/images/game/logos/Arrows.png (100%) rename src/{ => assets}/images/game/logos/Base.png (100%) rename src/{ => assets}/images/game/logos/Cats.png (100%) rename src/{ => assets}/images/game/logos/Checkmarks.png (100%) rename src/{ => assets}/images/game/logos/FingerGuns.png (100%) rename src/{ => assets}/images/game/logos/Frown.png (100%) rename src/{ => assets}/images/game/logos/Hearts.png (100%) rename src/{ => assets}/images/game/logos/Smiles.png (100%) rename src/{ => assets}/images/game/logos/Turds.png (100%) rename src/{ => assets}/images/launcher/card.png (100%) rename src/{ => assets}/images/launcher/wrapping-pattern.png (100%) rename src/{ => assets}/music/BootTune.wav (100%) rename src/{ => assets}/music/BootTuneOrgany.wav (100%) rename src/{ => assets}/music/MenuMusic.wav (100%) rename src/{ => assets}/music/TinnyBackground.wav (100%) rename src/{ => assets}/sounds/BatCrackReverb.wav (100%) diff --git a/src/announcer.lua b/src/announcer.lua index fda410d..3eeba4f 100644 --- a/src/announcer.lua +++ b/src/announcer.lua @@ -1,6 +1,6 @@ local gfx = playdate.graphics -local AnnouncementFont = playdate.graphics.font.new("fonts/Roobert-20-Medium.pft") +local AnnouncementFont = playdate.graphics.font.new("assets/fonts/Roobert-20-Medium.pft") local AnnouncementTransitionMs = 300 local AnnouncerMarginX = 26 diff --git a/src/assets.lua b/src/assets.lua index f8f4e15..6888438 100644 --- a/src/assets.lua +++ b/src/assets.lua @@ -3,169 +3,169 @@ -- luacheck: ignore ---@type pd_image -BallBackground = playdate.graphics.image.new("images/game/BallBackground.png") +BallBackground = playdate.graphics.image.new("assets/images/game/BallBackground.png") -- luacheck: ignore ---@type pd_image -BigBat = playdate.graphics.image.new("images/game/BigBat.png") +BigBat = playdate.graphics.image.new("assets/images/game/BigBat.png") -- luacheck: ignore ---@type pd_image -DarkPlayerAwayBack = playdate.graphics.image.new("images/game/DarkPlayerAwayBack.png") +DarkPlayerAwayBack = playdate.graphics.image.new("assets/images/game/DarkPlayerAwayBack.png") -- luacheck: ignore ---@type pd_image -DarkPlayerAwayBase = playdate.graphics.image.new("images/game/DarkPlayerAwayBase.png") +DarkPlayerAwayBase = playdate.graphics.image.new("assets/images/game/DarkPlayerAwayBase.png") -- luacheck: ignore ---@type pd_image -DarkPlayerFrown = playdate.graphics.image.new("images/game/DarkPlayerFrown.png") +DarkPlayerFrown = playdate.graphics.image.new("assets/images/game/DarkPlayerFrown.png") -- luacheck: ignore ---@type pd_image -DarkPlayerHomeBack = playdate.graphics.image.new("images/game/DarkPlayerHomeBack.png") +DarkPlayerHomeBack = playdate.graphics.image.new("assets/images/game/DarkPlayerHomeBack.png") -- luacheck: ignore ---@type pd_image -DarkPlayerHomeBase = playdate.graphics.image.new("images/game/DarkPlayerHomeBase.png") +DarkPlayerHomeBase = playdate.graphics.image.new("assets/images/game/DarkPlayerHomeBase.png") -- luacheck: ignore ---@type pd_image -DarkPlayerSmile = playdate.graphics.image.new("images/game/DarkPlayerSmile.png") +DarkPlayerSmile = playdate.graphics.image.new("assets/images/game/DarkPlayerSmile.png") -- luacheck: ignore ---@type pd_image -DarkSkinFan = playdate.graphics.image.new("images/game/DarkSkinFan.png") +DarkSkinFan = playdate.graphics.image.new("assets/images/game/DarkSkinFan.png") -- luacheck: ignore ---@type pd_image -GameLogo = playdate.graphics.image.new("images/game/GameLogo.png") +GameLogo = playdate.graphics.image.new("assets/images/game/GameLogo.png") -- luacheck: ignore ---@type pd_image -GloveHoldingBall = playdate.graphics.image.new("images/game/GloveHoldingBall.png") +GloveHoldingBall = playdate.graphics.image.new("assets/images/game/GloveHoldingBall.png") -- luacheck: ignore ---@type pd_image -Glove = playdate.graphics.image.new("images/game/Glove.png") +Glove = playdate.graphics.image.new("assets/images/game/Glove.png") -- luacheck: ignore ---@type pd_image -GrassBackground = playdate.graphics.image.new("images/game/GrassBackground.png") +GrassBackground = playdate.graphics.image.new("assets/images/game/GrassBackground.png") -- luacheck: ignore ---@type pd_image -GrassBackgroundSmall = playdate.graphics.image.new("images/game/GrassBackgroundSmall.png") +GrassBackgroundSmall = playdate.graphics.image.new("assets/images/game/GrassBackgroundSmall.png") -- luacheck: ignore ---@type pd_image -Hat = playdate.graphics.image.new("images/game/Hat.png") +Hat = playdate.graphics.image.new("assets/images/game/Hat.png") -- luacheck: ignore ---@type pd_image -LightPlayerAwayBack = playdate.graphics.image.new("images/game/LightPlayerAwayBack.png") +LightPlayerAwayBack = playdate.graphics.image.new("assets/images/game/LightPlayerAwayBack.png") -- luacheck: ignore ---@type pd_image -LightPlayerAwayBase = playdate.graphics.image.new("images/game/LightPlayerAwayBase.png") +LightPlayerAwayBase = playdate.graphics.image.new("assets/images/game/LightPlayerAwayBase.png") -- luacheck: ignore ---@type pd_image -LightPlayerFrown = playdate.graphics.image.new("images/game/LightPlayerFrown.png") +LightPlayerFrown = playdate.graphics.image.new("assets/images/game/LightPlayerFrown.png") -- luacheck: ignore ---@type pd_image -LightPlayerHomeBack = playdate.graphics.image.new("images/game/LightPlayerHomeBack.png") +LightPlayerHomeBack = playdate.graphics.image.new("assets/images/game/LightPlayerHomeBack.png") -- luacheck: ignore ---@type pd_image -LightPlayerHomeBase = playdate.graphics.image.new("images/game/LightPlayerHomeBase.png") +LightPlayerHomeBase = playdate.graphics.image.new("assets/images/game/LightPlayerHomeBase.png") -- luacheck: ignore ---@type pd_image -LightPlayerSmile = playdate.graphics.image.new("images/game/LightPlayerSmile.png") +LightPlayerSmile = playdate.graphics.image.new("assets/images/game/LightPlayerSmile.png") -- luacheck: ignore ---@type pd_image -LightSkinFan = playdate.graphics.image.new("images/game/LightSkinFan.png") +LightSkinFan = playdate.graphics.image.new("assets/images/game/LightSkinFan.png") -- luacheck: ignore ---@type pd_image -MenuImage = playdate.graphics.image.new("images/game/MenuImage.png") +MenuImage = playdate.graphics.image.new("assets/images/game/MenuImage.png") -- luacheck: ignore ---@type pd_image -Minimap = playdate.graphics.image.new("images/game/Minimap.png") +Minimap = playdate.graphics.image.new("assets/images/game/Minimap.png") -- luacheck: ignore ---@type pd_image -PerfectPowerBg = playdate.graphics.image.new("images/game/PerfectPowerBg.png") +PerfectPowerBg = playdate.graphics.image.new("assets/images/game/PerfectPowerBg.png") -- luacheck: ignore ---@type pd_image -PerfectPowerFlickerLeft = playdate.graphics.image.new("images/game/PerfectPowerFlickerLeft.png") +PerfectPowerFlickerLeft = playdate.graphics.image.new("assets/images/game/PerfectPowerFlickerLeft.png") -- luacheck: ignore ---@type pd_image -PerfectPowerFlickerRight = playdate.graphics.image.new("images/game/PerfectPowerFlickerRight.png") +PerfectPowerFlickerRight = playdate.graphics.image.new("assets/images/game/PerfectPowerFlickerRight.png") -- luacheck: ignore ---@type pd_sampleplayer -BatCrackReverb = playdate.sound.sampleplayer.new("sounds/BatCrackReverb.wav") +BatCrackReverb = playdate.sound.sampleplayer.new("assets/sounds/BatCrackReverb.wav") -- luacheck: ignore ---@type pd_sampleplayer -BootTuneOrgany = playdate.sound.sampleplayer.new("music/BootTuneOrgany.wav") +BootTuneOrgany = playdate.sound.sampleplayer.new("assets/music/BootTuneOrgany.wav") -- luacheck: ignore ---@type pd_sampleplayer -BootTune = playdate.sound.sampleplayer.new("music/BootTune.wav") +BootTune = playdate.sound.sampleplayer.new("assets/music/BootTune.wav") -- luacheck: ignore ---@type pd_sampleplayer -MenuMusic = playdate.sound.sampleplayer.new("music/MenuMusic.wav") +MenuMusic = playdate.sound.sampleplayer.new("assets/music/MenuMusic.wav") -- luacheck: ignore ---@type pd_sampleplayer -TinnyBackground = playdate.sound.sampleplayer.new("music/TinnyBackground.wav") +TinnyBackground = playdate.sound.sampleplayer.new("assets/music/TinnyBackground.wav") Logos = { - { name = "Base", image = playdate.graphics.image.new("images/game/logos/Base.png") }, + { name = "Base", image = playdate.graphics.image.new("assets/images/game/logos/Base.png") }, -- luacheck: ignore ---@type pd_image - { name = "Arrows", image = playdate.graphics.image.new("images/game/logos/Arrows.png") }, + { name = "Arrows", image = playdate.graphics.image.new("assets/images/game/logos/Arrows.png") }, -- luacheck: ignore ---@type pd_image - { name = "Cats", image = playdate.graphics.image.new("images/game/logos/Cats.png") }, + { name = "Cats", image = playdate.graphics.image.new("assets/images/game/logos/Cats.png") }, -- luacheck: ignore ---@type pd_image - { name = "Checkmarks", image = playdate.graphics.image.new("images/game/logos/Checkmarks.png") }, + { name = "Checkmarks", image = playdate.graphics.image.new("assets/images/game/logos/Checkmarks.png") }, -- luacheck: ignore ---@type pd_image - { name = "FingerGuns", image = playdate.graphics.image.new("images/game/logos/FingerGuns.png") }, + { name = "FingerGuns", image = playdate.graphics.image.new("assets/images/game/logos/FingerGuns.png") }, -- luacheck: ignore ---@type pd_image - { name = "Frown", image = playdate.graphics.image.new("images/game/logos/Frown.png") }, + { name = "Frown", image = playdate.graphics.image.new("assets/images/game/logos/Frown.png") }, -- luacheck: ignore ---@type pd_image - { name = "Hearts", image = playdate.graphics.image.new("images/game/logos/Hearts.png") }, + { name = "Hearts", image = playdate.graphics.image.new("assets/images/game/logos/Hearts.png") }, -- luacheck: ignore ---@type pd_image - { name = "Smiles", image = playdate.graphics.image.new("images/game/logos/Smiles.png") }, + { name = "Smiles", image = playdate.graphics.image.new("assets/images/game/logos/Smiles.png") }, -- luacheck: ignore ---@type pd_image - { name = "Turds", image = playdate.graphics.image.new("images/game/logos/Turds.png") }, + { name = "Turds", image = playdate.graphics.image.new("assets/images/game/logos/Turds.png") }, } diff --git a/src/assets.lua2p b/src/assets.lua2p index e5334d7..dfb11bf 100644 --- a/src/assets.lua2p +++ b/src/assets.lua2p @@ -25,13 +25,13 @@ function generatedFileWarning() return "-- GENERATED FILE - DO NOT EDIT\n-- Instead, edit the source file directly: assets.lua2p." end)!!(generatedFileWarning()) -!!(dirLookup('images/game', 'png', 'playdate.graphics.image.new', 'pd_image')) -!!(dirLookup('sounds', 'wav', 'playdate.sound.sampleplayer.new', 'pd_sampleplayer')) -!!(dirLookup('music', 'wav', 'playdate.sound.sampleplayer.new', 'pd_sampleplayer')) +!!(dirLookup('assets/images/game', 'png', 'playdate.graphics.image.new', 'pd_image')) +!!(dirLookup('assets/sounds', 'wav', 'playdate.sound.sampleplayer.new', 'pd_sampleplayer')) +!!(dirLookup('assets/music', 'wav', 'playdate.sound.sampleplayer.new', 'pd_sampleplayer')) Logos = { - { name = "Base", image = playdate.graphics.image.new("images/game/logos/Base.png") }, + { name = "Base", image = playdate.graphics.image.new("assets/images/game/logos/Base.png") }, -!!(dirLookup('images/game/logos -not -name "Base.png"', 'png', 'playdate.graphics.image.new', 'pd_image', ",\n\n", " ", function(varName, value) +!!(dirLookup('assets/images/game/logos -not -name "Base.png"', 'png', 'playdate.graphics.image.new', 'pd_image', ",\n\n", " ", function(varName, value) return '{ name = "' .. varName .. '", image = ' .. value .. ' }' end)) } diff --git a/src/fonts/Asheville-Sans-14-Bold-table-20-20.png b/src/assets/fonts/Asheville-Sans-14-Bold-table-20-20.png similarity index 100% rename from src/fonts/Asheville-Sans-14-Bold-table-20-20.png rename to src/assets/fonts/Asheville-Sans-14-Bold-table-20-20.png diff --git a/src/fonts/Asheville-Sans-14-Bold.fnt b/src/assets/fonts/Asheville-Sans-14-Bold.fnt similarity index 100% rename from src/fonts/Asheville-Sans-14-Bold.fnt rename to src/assets/fonts/Asheville-Sans-14-Bold.fnt diff --git a/src/fonts/Nano Sans-table-6-10.png b/src/assets/fonts/Nano Sans-table-6-10.png similarity index 100% rename from src/fonts/Nano Sans-table-6-10.png rename to src/assets/fonts/Nano Sans-table-6-10.png diff --git a/src/fonts/Nano Sans.fnt b/src/assets/fonts/Nano Sans.fnt similarity index 100% rename from src/fonts/Nano Sans.fnt rename to src/assets/fonts/Nano Sans.fnt diff --git a/src/fonts/Roobert-20-Medium-table-32-32.png b/src/assets/fonts/Roobert-20-Medium-table-32-32.png similarity index 100% rename from src/fonts/Roobert-20-Medium-table-32-32.png rename to src/assets/fonts/Roobert-20-Medium-table-32-32.png diff --git a/src/fonts/Roobert-20-Medium.fnt b/src/assets/fonts/Roobert-20-Medium.fnt similarity index 100% rename from src/fonts/Roobert-20-Medium.fnt rename to src/assets/fonts/Roobert-20-Medium.fnt diff --git a/src/fonts/font-full-circle-table-12-15.png b/src/assets/fonts/font-full-circle-table-12-15.png similarity index 100% rename from src/fonts/font-full-circle-table-12-15.png rename to src/assets/fonts/font-full-circle-table-12-15.png diff --git a/src/fonts/font-full-circle.fnt b/src/assets/fonts/font-full-circle.fnt similarity index 100% rename from src/fonts/font-full-circle.fnt rename to src/assets/fonts/font-full-circle.fnt diff --git a/src/images/game/BallBackground.png b/src/assets/images/game/BallBackground.png similarity index 100% rename from src/images/game/BallBackground.png rename to src/assets/images/game/BallBackground.png diff --git a/src/images/game/BigBat.png b/src/assets/images/game/BigBat.png similarity index 100% rename from src/images/game/BigBat.png rename to src/assets/images/game/BigBat.png diff --git a/src/images/game/DarkPlayerAwayBack.png b/src/assets/images/game/DarkPlayerAwayBack.png similarity index 100% rename from src/images/game/DarkPlayerAwayBack.png rename to src/assets/images/game/DarkPlayerAwayBack.png diff --git a/src/images/game/DarkPlayerAwayBase.png b/src/assets/images/game/DarkPlayerAwayBase.png similarity index 100% rename from src/images/game/DarkPlayerAwayBase.png rename to src/assets/images/game/DarkPlayerAwayBase.png diff --git a/src/images/game/DarkPlayerFrown.png b/src/assets/images/game/DarkPlayerFrown.png similarity index 100% rename from src/images/game/DarkPlayerFrown.png rename to src/assets/images/game/DarkPlayerFrown.png diff --git a/src/images/game/DarkPlayerHomeBack.png b/src/assets/images/game/DarkPlayerHomeBack.png similarity index 100% rename from src/images/game/DarkPlayerHomeBack.png rename to src/assets/images/game/DarkPlayerHomeBack.png diff --git a/src/images/game/DarkPlayerHomeBase.png b/src/assets/images/game/DarkPlayerHomeBase.png similarity index 100% rename from src/images/game/DarkPlayerHomeBase.png rename to src/assets/images/game/DarkPlayerHomeBase.png diff --git a/src/images/game/DarkPlayerSmile.png b/src/assets/images/game/DarkPlayerSmile.png similarity index 100% rename from src/images/game/DarkPlayerSmile.png rename to src/assets/images/game/DarkPlayerSmile.png diff --git a/src/images/game/DarkSkinFan.png b/src/assets/images/game/DarkSkinFan.png similarity index 100% rename from src/images/game/DarkSkinFan.png rename to src/assets/images/game/DarkSkinFan.png diff --git a/src/images/game/GameLogo.png b/src/assets/images/game/GameLogo.png similarity index 100% rename from src/images/game/GameLogo.png rename to src/assets/images/game/GameLogo.png diff --git a/src/images/game/Glove.png b/src/assets/images/game/Glove.png similarity index 100% rename from src/images/game/Glove.png rename to src/assets/images/game/Glove.png diff --git a/src/images/game/GloveHoldingBall.png b/src/assets/images/game/GloveHoldingBall.png similarity index 100% rename from src/images/game/GloveHoldingBall.png rename to src/assets/images/game/GloveHoldingBall.png diff --git a/src/images/game/GrassBackground.png b/src/assets/images/game/GrassBackground.png similarity index 100% rename from src/images/game/GrassBackground.png rename to src/assets/images/game/GrassBackground.png diff --git a/src/images/game/GrassBackgroundSmall.png b/src/assets/images/game/GrassBackgroundSmall.png similarity index 100% rename from src/images/game/GrassBackgroundSmall.png rename to src/assets/images/game/GrassBackgroundSmall.png diff --git a/src/images/game/Hat.png b/src/assets/images/game/Hat.png similarity index 100% rename from src/images/game/Hat.png rename to src/assets/images/game/Hat.png diff --git a/src/images/game/LightPlayerAwayBack.png b/src/assets/images/game/LightPlayerAwayBack.png similarity index 100% rename from src/images/game/LightPlayerAwayBack.png rename to src/assets/images/game/LightPlayerAwayBack.png diff --git a/src/images/game/LightPlayerAwayBase.png b/src/assets/images/game/LightPlayerAwayBase.png similarity index 100% rename from src/images/game/LightPlayerAwayBase.png rename to src/assets/images/game/LightPlayerAwayBase.png diff --git a/src/images/game/LightPlayerFrown.png b/src/assets/images/game/LightPlayerFrown.png similarity index 100% rename from src/images/game/LightPlayerFrown.png rename to src/assets/images/game/LightPlayerFrown.png diff --git a/src/images/game/LightPlayerHomeBack.png b/src/assets/images/game/LightPlayerHomeBack.png similarity index 100% rename from src/images/game/LightPlayerHomeBack.png rename to src/assets/images/game/LightPlayerHomeBack.png diff --git a/src/images/game/LightPlayerHomeBase.png b/src/assets/images/game/LightPlayerHomeBase.png similarity index 100% rename from src/images/game/LightPlayerHomeBase.png rename to src/assets/images/game/LightPlayerHomeBase.png diff --git a/src/images/game/LightPlayerSmile.png b/src/assets/images/game/LightPlayerSmile.png similarity index 100% rename from src/images/game/LightPlayerSmile.png rename to src/assets/images/game/LightPlayerSmile.png diff --git a/src/images/game/LightSkinFan.png b/src/assets/images/game/LightSkinFan.png similarity index 100% rename from src/images/game/LightSkinFan.png rename to src/assets/images/game/LightSkinFan.png diff --git a/src/images/game/MenuImage.png b/src/assets/images/game/MenuImage.png similarity index 100% rename from src/images/game/MenuImage.png rename to src/assets/images/game/MenuImage.png diff --git a/src/images/game/Minimap.png b/src/assets/images/game/Minimap.png similarity index 100% rename from src/images/game/Minimap.png rename to src/assets/images/game/Minimap.png diff --git a/src/images/game/PerfectPowerBg.png b/src/assets/images/game/PerfectPowerBg.png similarity index 100% rename from src/images/game/PerfectPowerBg.png rename to src/assets/images/game/PerfectPowerBg.png diff --git a/src/images/game/PerfectPowerFlickerLeft.png b/src/assets/images/game/PerfectPowerFlickerLeft.png similarity index 100% rename from src/images/game/PerfectPowerFlickerLeft.png rename to src/assets/images/game/PerfectPowerFlickerLeft.png diff --git a/src/images/game/PerfectPowerFlickerRight.png b/src/assets/images/game/PerfectPowerFlickerRight.png similarity index 100% rename from src/images/game/PerfectPowerFlickerRight.png rename to src/assets/images/game/PerfectPowerFlickerRight.png diff --git a/src/images/game/logos/Arrows.png b/src/assets/images/game/logos/Arrows.png similarity index 100% rename from src/images/game/logos/Arrows.png rename to src/assets/images/game/logos/Arrows.png diff --git a/src/images/game/logos/Base.png b/src/assets/images/game/logos/Base.png similarity index 100% rename from src/images/game/logos/Base.png rename to src/assets/images/game/logos/Base.png diff --git a/src/images/game/logos/Cats.png b/src/assets/images/game/logos/Cats.png similarity index 100% rename from src/images/game/logos/Cats.png rename to src/assets/images/game/logos/Cats.png diff --git a/src/images/game/logos/Checkmarks.png b/src/assets/images/game/logos/Checkmarks.png similarity index 100% rename from src/images/game/logos/Checkmarks.png rename to src/assets/images/game/logos/Checkmarks.png diff --git a/src/images/game/logos/FingerGuns.png b/src/assets/images/game/logos/FingerGuns.png similarity index 100% rename from src/images/game/logos/FingerGuns.png rename to src/assets/images/game/logos/FingerGuns.png diff --git a/src/images/game/logos/Frown.png b/src/assets/images/game/logos/Frown.png similarity index 100% rename from src/images/game/logos/Frown.png rename to src/assets/images/game/logos/Frown.png diff --git a/src/images/game/logos/Hearts.png b/src/assets/images/game/logos/Hearts.png similarity index 100% rename from src/images/game/logos/Hearts.png rename to src/assets/images/game/logos/Hearts.png diff --git a/src/images/game/logos/Smiles.png b/src/assets/images/game/logos/Smiles.png similarity index 100% rename from src/images/game/logos/Smiles.png rename to src/assets/images/game/logos/Smiles.png diff --git a/src/images/game/logos/Turds.png b/src/assets/images/game/logos/Turds.png similarity index 100% rename from src/images/game/logos/Turds.png rename to src/assets/images/game/logos/Turds.png diff --git a/src/images/launcher/card.png b/src/assets/images/launcher/card.png similarity index 100% rename from src/images/launcher/card.png rename to src/assets/images/launcher/card.png diff --git a/src/images/launcher/wrapping-pattern.png b/src/assets/images/launcher/wrapping-pattern.png similarity index 100% rename from src/images/launcher/wrapping-pattern.png rename to src/assets/images/launcher/wrapping-pattern.png diff --git a/src/music/BootTune.wav b/src/assets/music/BootTune.wav similarity index 100% rename from src/music/BootTune.wav rename to src/assets/music/BootTune.wav diff --git a/src/music/BootTuneOrgany.wav b/src/assets/music/BootTuneOrgany.wav similarity index 100% rename from src/music/BootTuneOrgany.wav rename to src/assets/music/BootTuneOrgany.wav diff --git a/src/music/MenuMusic.wav b/src/assets/music/MenuMusic.wav similarity index 100% rename from src/music/MenuMusic.wav rename to src/assets/music/MenuMusic.wav diff --git a/src/music/TinnyBackground.wav b/src/assets/music/TinnyBackground.wav similarity index 100% rename from src/music/TinnyBackground.wav rename to src/assets/music/TinnyBackground.wav diff --git a/src/sounds/BatCrackReverb.wav b/src/assets/sounds/BatCrackReverb.wav similarity index 100% rename from src/sounds/BatCrackReverb.wav rename to src/assets/sounds/BatCrackReverb.wav diff --git a/src/control-screen.lua b/src/control-screen.lua index 6aa0fb6..f677f05 100644 --- a/src/control-screen.lua +++ b/src/control-screen.lua @@ -1,7 +1,7 @@ local gfx = playdate.graphics -local HeaderFont = playdate.graphics.font.new("fonts/Roobert-11-Medium.pft") -local DetailFont = playdate.graphics.font.new("fonts/font-full-circle.pft") +local HeaderFont = playdate.graphics.font.new("assets/fonts/Roobert-11-Medium.pft") +local DetailFont = playdate.graphics.font.new("assets/fonts/font-full-circle.pft") ---@alias TextObject { text: string, font: pd_font } diff --git a/src/draw/box-score.lua b/src/draw/box-score.lua index 49dbd2e..38d4bd6 100644 --- a/src/draw/box-score.lua +++ b/src/draw/box-score.lua @@ -1,7 +1,7 @@ local MarginY = 70 -local SmallFont = playdate.graphics.font.new("fonts/font-full-circle.pft") -local ScoreFont = playdate.graphics.font.new("fonts/Asheville-Sans-14-Bold.pft") +local SmallFont = playdate.graphics.font.new("assets/fonts/font-full-circle.pft") +local ScoreFont = playdate.graphics.font.new("assets/fonts/Asheville-Sans-14-Bold.pft") local NumWidth = ScoreFont:getTextWidth("0") local NumHeight = ScoreFont:getHeight() local AwayWidth = ScoreFont:getTextWidth("AWAY") diff --git a/src/draw/overlay.lua b/src/draw/overlay.lua index cfa5c4a..828aba6 100644 --- a/src/draw/overlay.lua +++ b/src/draw/overlay.lua @@ -1,7 +1,7 @@ -- selene: allow(shadowing) local gfx = playdate.graphics -local ScoreFont = playdate.graphics.font.new("fonts/font-full-circle.pft") +local ScoreFont = playdate.graphics.font.new("assets/fonts/font-full-circle.pft") local MinimapSizeX, MinimapSizeY = Minimap:getSize() local MinimapPosX, MinimapPosY = C.Screen.W - MinimapSizeX, C.Screen.H - MinimapSizeY diff --git a/src/graphics.lua b/src/graphics.lua index 6698e5e..e48ca06 100644 --- a/src/graphics.lua +++ b/src/graphics.lua @@ -1,6 +1,6 @@ local gfx = playdate.graphics -local ButtonFont = gfx.font.new("fonts/font-full-circle.pft") +local ButtonFont = gfx.font.new("assets/fonts/font-full-circle.pft") --- Assumes that background image is of size: --- diff --git a/src/main-menu.lua b/src/main-menu.lua index 67dce3c..6cb1aae 100644 --- a/src/main-menu.lua +++ b/src/main-menu.lua @@ -9,8 +9,8 @@ MainMenu = { } local gfx = playdate.graphics -local ScoreFont = playdate.graphics.font.new("fonts/font-full-circle.pft") -local TinyFont = gfx.font.new("fonts/Nano Sans.pft") +local ScoreFont = playdate.graphics.font.new("assets/fonts/font-full-circle.pft") +local TinyFont = gfx.font.new("assets/fonts/Nano Sans.pft") --- Take control of playdate.update --- Will replace playdate.update when the menu is done. diff --git a/src/main.lua b/src/main.lua index 709f7f9..b579273 100644 --- a/src/main.lua +++ b/src/main.lua @@ -124,7 +124,7 @@ Game = {} function Game.new(settings, announcer, fielding, baserunning, npc, state) announcer = announcer or Announcer.new() fielding = fielding or Fielding.new() - settings.userTeam = "away" + settings.userTeam = nil -- "away" local homeTeamBlipper = blipper.new(100, settings.homeTeamSpriteGroup) local awayTeamBlipper = blipper.new(100, settings.awayTeamSpriteGroup) diff --git a/src/pdxinfo b/src/pdxinfo index 450b7c8..3594a71 100644 --- a/src/pdxinfo +++ b/src/pdxinfo @@ -2,6 +2,6 @@ name=Batter Up! author=Sage Vaillancourt description=Crush dingers and hustle around the bases! bundleID=space.sagev.batterup -imagePath=images/launcher +imagePath=assets/images/launcher version=0.1 buildNumber=1