From c8f128f27735d7bd854f972d6f088f4a1bf8ec11 Mon Sep 17 00:00:00 2001 From: Sage Vaillancourt Date: Wed, 12 Feb 2025 23:10:38 -0500 Subject: [PATCH] Add alternate logos. Tweak assets.lua2p to put them in their own table. --- src/assets.lua | 38 +++++++++++++++--- src/assets.lua2p | 12 ++++-- src/draw/player.lua | 4 +- src/images/game/logos/Arrows.png | Bin 0 -> 592 bytes .../game/{BaseLogo.png => logos/Base.png} | Bin src/images/game/logos/Cats.png | Bin 0 -> 600 bytes src/images/game/logos/Checkmarks.png | Bin 0 -> 579 bytes src/images/game/logos/FingerGuns.png | Bin 0 -> 589 bytes .../game/{FrownLogo.png => logos/Frown.png} | Bin src/images/game/logos/Hearts.png | Bin 0 -> 596 bytes src/images/game/logos/Smiles.png | Bin 0 -> 587 bytes src/images/game/logos/Turds.png | Bin 0 -> 598 bytes 12 files changed, 43 insertions(+), 11 deletions(-) create mode 100644 src/images/game/logos/Arrows.png rename src/images/game/{BaseLogo.png => logos/Base.png} (100%) create mode 100644 src/images/game/logos/Cats.png create mode 100644 src/images/game/logos/Checkmarks.png create mode 100644 src/images/game/logos/FingerGuns.png rename src/images/game/{FrownLogo.png => logos/Frown.png} (100%) create mode 100644 src/images/game/logos/Hearts.png create mode 100644 src/images/game/logos/Smiles.png create mode 100644 src/images/game/logos/Turds.png diff --git a/src/assets.lua b/src/assets.lua index b921f7e..4ff3650 100644 --- a/src/assets.lua +++ b/src/assets.lua @@ -12,9 +12,6 @@ Glove = playdate.graphics.image.new("images/game/Glove.png") PlayerFrown = playdate.graphics.image.new("images/game/PlayerFrown.png") --selene: allow(unused_variable) --selene: allow(unscoped_variables) -BaseLogo = playdate.graphics.image.new("images/game/BaseLogo.png") ---selene: allow(unused_variable) ---selene: allow(unscoped_variables) GloveHoldingBall = playdate.graphics.image.new("images/game/GloveHoldingBall.png") --selene: allow(unused_variable) --selene: allow(unscoped_variables) @@ -33,9 +30,6 @@ PlayerSmile = playdate.graphics.image.new("images/game/PlayerSmile.png") Minimap = playdate.graphics.image.new("images/game/Minimap.png") --selene: allow(unused_variable) --selene: allow(unscoped_variables) -FrownLogo = playdate.graphics.image.new("images/game/FrownLogo.png") ---selene: allow(unused_variable) ---selene: allow(unscoped_variables) GrassBackground = playdate.graphics.image.new("images/game/GrassBackground.png") --selene: allow(unused_variable) --selene: allow(unscoped_variables) @@ -58,3 +52,35 @@ BootTuneOrgany = playdate.sound.sampleplayer.new("music/BootTuneOrgany.wav") --selene: allow(unscoped_variables) TinnyBackground = playdate.sound.sampleplayer.new("music/TinnyBackground.wav") +--selene: allow(unused_variable) +--selene: allow(unscoped_variables) +Logos = { +--selene: allow(unused_variable) +--selene: allow(unscoped_variables) +Cats = playdate.graphics.image.new("images/game/logos/Cats.png"), +--selene: allow(unused_variable) +--selene: allow(unscoped_variables) +Hearts = playdate.graphics.image.new("images/game/logos/Hearts.png"), +--selene: allow(unused_variable) +--selene: allow(unscoped_variables) +Checkmarks = playdate.graphics.image.new("images/game/logos/Checkmarks.png"), +--selene: allow(unused_variable) +--selene: allow(unscoped_variables) +Smiles = playdate.graphics.image.new("images/game/logos/Smiles.png"), +--selene: allow(unused_variable) +--selene: allow(unscoped_variables) +FingerGuns = playdate.graphics.image.new("images/game/logos/FingerGuns.png"), +--selene: allow(unused_variable) +--selene: allow(unscoped_variables) +Base = playdate.graphics.image.new("images/game/logos/Base.png"), +--selene: allow(unused_variable) +--selene: allow(unscoped_variables) +Frown = playdate.graphics.image.new("images/game/logos/Frown.png"), +--selene: allow(unused_variable) +--selene: allow(unscoped_variables) +Arrows = playdate.graphics.image.new("images/game/logos/Arrows.png"), +--selene: allow(unused_variable) +--selene: allow(unscoped_variables) +Turds = playdate.graphics.image.new("images/game/logos/Turds.png"), + +} diff --git a/src/assets.lua2p b/src/assets.lua2p index 37459b3..431b745 100644 --- a/src/assets.lua2p +++ b/src/assets.lua2p @@ -1,6 +1,7 @@ -!(function dirLookup(dir, extension, newFunc) +!(function dirLookup(dir, extension, newFunc, sep) + sep = sep or "\n" --Open directory look for files, save data in p. By giving '-type f' as parameter, it returns all files. - local p = io.popen('find src/' .. dir .. ' -type f') + local p = io.popen('find src/' .. dir .. ' -type f -maxdepth 1') local assetCode = "" --Loop through all files @@ -10,7 +11,7 @@ file = file:gsub("src/", "") assetCode = assetCode .. '--selene: allow(unused_variable)\n' assetCode = assetCode .. '--selene: allow(unscoped_variables)\n' - assetCode = assetCode .. varName .. ' = ' .. newFunc .. '("' .. file .. '")\n' + assetCode = assetCode .. varName .. ' = ' .. newFunc .. '("' .. file .. '")' .. sep end end return assetCode @@ -23,3 +24,8 @@ end)!!(generatedFileWarning()) !!(dirLookup('images/game', 'png', 'playdate.graphics.image.new')) !!(dirLookup('sounds', 'wav', 'playdate.sound.sampleplayer.new')) !!(dirLookup('music', 'wav', 'playdate.sound.sampleplayer.new')) +--selene: allow(unused_variable) +--selene: allow(unscoped_variables) +Logos = { +!!(dirLookup('images/game/logos', 'png', 'playdate.graphics.image.new', ",\n")) +} diff --git a/src/draw/player.lua b/src/draw/player.lua index 4ded261..bde0fdc 100644 --- a/src/draw/player.lua +++ b/src/draw/player.lua @@ -52,7 +52,7 @@ function buildCollection(base, back, logo, isDark) end --selene: allow(unscoped_variables) -AwayTeamSprites = buildCollection(DarkPlayerBase, DarkPlayerBack, BaseLogo, true) +AwayTeamSprites = buildCollection(DarkPlayerBase, DarkPlayerBack, Logos.Base, true) --selene: allow(unscoped_variables) -HomeTeamSprites = buildCollection(LightPlayerBase, LightPlayerBack, FrownLogo, false) +HomeTeamSprites = buildCollection(LightPlayerBase, LightPlayerBack, Logos.Frown, false) diff --git a/src/images/game/logos/Arrows.png b/src/images/game/logos/Arrows.png new file mode 100644 index 0000000000000000000000000000000000000000..d21d3a0764e59ebed575a374d993a6fb8cdbad12 GIT binary patch literal 592 zcmV-W0EX>4Tx04R}tkv&MmKpe$i)0T=>9PA+CkfA!+MMcD^R-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwcfm=~MN0f%T4)jD!Ery{-Fw`<1B6C}X;vT(Xu55t zlL;}KTNOjE5YUGJf|!+=Wz0!Z3ZCQZ9zMR_#dwzYxj#q0nztC>6N%%@Fm2)u;^|G> z;Ji;9VI^55J|`YG>4LzBx-kgE(v zjs;YqL3aJ%fAG6ot1vmyN(v`{;EUsYi~^xupjmgE?_iP|2NWl#fiVC802y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{001aSL_t&-(_>)31pgUG08BWEX>4Tx04R}tkv&MmKpe$i)0T=>9PA+CkfA!+MMcD^R-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwcfm=~MN0f%T4)jD!Ery{-Fw`<1B6C}X;vT(Xu55t zlL;}KTNOjE5YUGJf|!+=Wz0!Z3ZCQZ9zMR_#dwzYxj#q0nztC>6N%%@Fm2)u;^|G> z;Ji;9VI^55J|`YG>4LzBx-kgE(v zjs;YqL3aJ%fAG6ot1vmyN(v`{;EUsYi~^xupjmgE?_iP|2LjV`G++P#02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{001yaL_t&-(_>(u0{D-G|DQ;G{~2)@!oa}5z(|B;3`{so mXCzXbkqJ$bkw|aD)d2vuHwOmK>S|E{0000EX>4Tx04R}tkv&MmKpe$i)0T=>9PA+CkfA!+MMcD^R-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwcfm=~MN0f%T4)jD!Ery{-Fw`<1B6C}X;vT(Xu55t zlL;}KTNOjE5YUGJf|!+=Wz0!Z3ZCQZ9zMR_#dwzYxj#q0nztC>6N%%@Fm2)u;^|G> z;Ji;9VI^55J|`YG>4LzBx-kgE(v zjs;YqL3aJ%fAG6ot1vmyN(v`{;EUsYi~^xupjmgE?_iP|2M9B!-F^T702y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{000|FL_t&-(_>(u5%^Du;{W96{ZE2soNCFk8332&3HNWq R)pq~@002ovPDHLkV1fs_?RWqH literal 0 HcmV?d00001 diff --git a/src/images/game/logos/FingerGuns.png b/src/images/game/logos/FingerGuns.png new file mode 100644 index 0000000000000000000000000000000000000000..4f3c275e06d839f61eab8ab300b27521c6fd1d30 GIT binary patch literal 589 zcmV-T0EX>4Tx04R}tkv&MmKpe$i)0T=>9PA+CkfA!+MMcD^R-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwcfm=~MN0f%T4)jD!Ery{-Fw`<1B6C}X;vT(Xu55t zlL;}KTNOjE5YUGJf|!+=Wz0!Z3ZCQZ9zMR_#dwzYxj#q0nztC>6N%%@Fm2)u;^|G> z;Ji;9VI^55J|`YG>4LzBx-kgE(v zjs;YqL3aJ%fAG6ot1vmyN(v`{;EUsYi~^xupjmgE?_iP|1~?34+>-zR02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{001RPL_t&-(_>&jfd34{1Griy1_}Wq9@`lS*^bWzjKn&C bVlMyylZFHbdODHQ00000NkvXXu0mjfcU|g` literal 0 HcmV?d00001 diff --git a/src/images/game/FrownLogo.png b/src/images/game/logos/Frown.png similarity index 100% rename from src/images/game/FrownLogo.png rename to src/images/game/logos/Frown.png diff --git a/src/images/game/logos/Hearts.png b/src/images/game/logos/Hearts.png new file mode 100644 index 0000000000000000000000000000000000000000..0662d71d903a7a4a4e7fa5ee6c9aa5b5b5a17be3 GIT binary patch literal 596 zcmV-a0;~OrP)EX>4Tx04R}tkv&MmKpe$i)0T=>9PA+CkfA!+MMcD^R-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwcfm=~MN0f%T4)jD!Ery{-Fw`<1B6C}X;vT(Xu55t zlL;}KTNOjE5YUGJf|!+=Wz0!Z3ZCQZ9zMR_#dwzYxj#q0nztC>6N%%@Fm2)u;^|G> z;Ji;9VI^55J|`YG>4LzBx-kgE(v zjs;YqL3aJ%fAG6ot1vmyN(v`{;EUsYi~^xupjmgE?_iP|2OKGU2?GEC02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{001mWL_t&-(_>(Ofd6PT(SQkyWEX>4Tx04R}tkv&MmKpe$i)0T=>9PA+CkfA!+MMcD^R-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwcfm=~MN0f%T4)jD!Ery{-Fw`<1B6C}X;vT(Xu55t zlL;}KTNOjE5YUGJf|!+=Wz0!Z3ZCQZ9zMR_#dwzYxj#q0nztC>6N%%@Fm2)u;^|G> z;Ji;9VI^55J|`YG>4LzBx-kgE(v zjs;YqL3aJ%fAG6ot1vmyN(v`{;EUsYi~^xupjmgE?_iP|2M*fBcuN2P02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{001LNL_t&-(_>(u68MjUjZf`=23puo$Q9_~{~2*eFcN7Y ZBLG6R3Hr`J1f~E0002ovPDHLkV1hdA?O*@^ literal 0 HcmV?d00001 diff --git a/src/images/game/logos/Turds.png b/src/images/game/logos/Turds.png new file mode 100644 index 0000000000000000000000000000000000000000..7493de0f7b011ebc707203f6db5dcad908a4e1cf GIT binary patch literal 598 zcmV-c0;&CpP)EX>4Tx04R}tkv&MmKpe$i)0T=>9PA+CkfA!+MMcD^R-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwcfm=~MN0f%T4)jD!Ery{-Fw`<1B6C}X;vT(Xu55t zlL;}KTNOjE5YUGJf|!+=Wz0!Z3ZCQZ9zMR_#dwzYxj#q0nztC>6N%%@Fm2)u;^|G> z;Ji;9VI^55J|`YG>4LzBx-kgE(v zjs;YqL3aJ%fAG6ot1vmyN(v`{;EUsYi~^xupjmgE?_iP|1~3A@RG|O>02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{001sYL_t&-(_>(Ofd32#fXt=|z_9E;5{G2l8F84*NTdrG k8S(g=k$`3f1_lNO05u5;`?R+8O#lD@07*qoM6N<$f>4L>+yDRo literal 0 HcmV?d00001