From e37456f757987dabdaa64e9b391473b0de921c03 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Wed, 21 Aug 2024 00:04:42 -0500 Subject: [PATCH] Add display names for powerups. --- assets/border.png | Bin 4538 -> 11670 bytes assets/border.xcf | Bin 140043 -> 130334 bytes src/HamsterGame.cpp | 12 ++++++++++++ src/Powerup.cpp | 14 ++++++++++++++ src/Powerup.h | 2 ++ 5 files changed, 28 insertions(+) diff --git a/assets/border.png b/assets/border.png index e916c43aa9337b4356b0673461ead84d9ecc7460..55aa2aa73410919a76891a3e2bf39b2a453d8489 100644 GIT binary patch delta 11247 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 A2LJ#7 literal 4538 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 diff --git a/assets/border.xcf b/assets/border.xcf index a8dd3da6ef5e1dadde0b2afa7ea5276160ba6e85..5d65e757523d667cc6c3c9e8ad1ac9a4967e3991 100644 GIT binary patch delta 1704 zcmX}sZAep590u@vR#<*8SC%r?@C6DYb&;==w#=jt;S{7dBAH=ON;(NE5@cC^D9t5Z zA`40*Lcho`1uJl}sEA-?AY#E(I`=-$y0HE3^FQZ$@6P=nyPmJUv$U$G zOym#mP8FsLihdM4g0^;D;r5NRiew==)lP%ilDo9cW-38zN%Ii!grt~$f1?;(;z>Y+PPz@^`kmr zYf;l{s~sg?S>j>1tSF*i25q`LN?z&+x3)HN$lXP6(0i({Hq~P<)1zXqh7~FB03ZI~ zALK)c)C3Q2fUdppIDb@q7`c9)#$ekx^y0A;?>jwv6z?|3vnD18cj zd|-CH5`2hyklh%ZVg3Rq*|k$=kVEB|@UbvKU(+z1r!nYGrs>p5chV~AqHbM94UDE-EUgi683xmPT7 F{sUes<5&Oy delta 10025 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 diff --git a/src/HamsterGame.cpp b/src/HamsterGame.cpp index df4f946..85f71b8 100644 --- a/src/HamsterGame.cpp +++ b/src/HamsterGame.cpp @@ -194,13 +194,25 @@ void HamsterGame::DrawGame(){ const float drawY{y*32.f+12.f+96.f}; const Powerup::PowerupType powerupType{Powerup::PowerupType(powerupInd)}; const geom2d::rectpowerupSubimageRect{Powerup::GetPowerupSubimageRect(powerupType)}; + const Powerup tempPowerup{{},powerupType}; + const std::string powerupName{tempPowerup.GetName()}; + const vf2d powerupTextSize{GetTextSize(powerupName)}; if(Hamster::GetPlayer().HasPowerup(powerupType)){ SetDecalMode(DecalMode::ADDITIVE); DrawPartialRotatedDecal(vf2d{drawX,drawY}+16,GetGFX("gametiles.png").Decal(),0.f,{16.f,16.f},powerupSubimageRect.pos,powerupSubimageRect.size,{1.1f,1.1f}); SetDecalMode(DecalMode::NORMAL); DrawPartialDecal({drawX,drawY},GetGFX("gametiles.png").Decal(),powerupSubimageRect.pos,powerupSubimageRect.size); + SetDecalMode(DecalMode::ADDITIVE); + for(int y:std::ranges::iota_view(-1,2)){ + for(int x:std::ranges::iota_view(-1,2)){ + DrawRotatedStringDecal(vf2d{drawX+16.f,drawY+32.f}+vi2d{x,y},powerupName,0.f,powerupTextSize/2,CYAN,{0.5f,1.f}); + } + } + SetDecalMode(DecalMode::NORMAL); + DrawRotatedStringDecal({drawX+16.f,drawY+32.f},powerupName,0.f,powerupTextSize/2,VERY_DARK_BLUE,{0.5f,1.f}); }else{ DrawPartialDecal({drawX,drawY},GetGFX("gametiles.png").Decal(),powerupSubimageRect.pos,powerupSubimageRect.size,{1.f,1.f},VERY_DARK_GREY); + DrawRotatedStringDecal({drawX+16.f,drawY+32.f},powerupName,0.f,powerupTextSize/2,DARK_GREY,{0.5f,1.f}); } } } diff --git a/src/Powerup.cpp b/src/Powerup.cpp index 85cc9be..b61a4df 100644 --- a/src/Powerup.cpp +++ b/src/Powerup.cpp @@ -43,6 +43,16 @@ All rights reserved. std::vectorPowerup::powerupList; std::unordered_map>Powerup::powerupIds; const vf2d Powerup::POWERUP_TILESET_STARTING_POS{144.f,816.f}; +std::unordered_mapPowerup::powerupNames{ + {WHEEL,"WHEEL"}, + {GRASS,"GRASS"}, + {SAND,"SAND"}, + {SWAMP,"SWAMP"}, + {LAVA,"LAVA"}, + {FOREST,"FOREST"}, + {ICE,"ICE"}, + {JET,"JET"}, +}; Powerup::Powerup(const vf2d pos,const PowerupType type) :pos(pos),type(type){} @@ -116,4 +126,8 @@ const geom2d::rectPowerup::GetPowerupSubimageRect(const PowerupType power void Powerup::OnPowerupObtain(Hamster&pickupHamster){ spinSpd=0.3f; if(type==JET)pickupHamster.SetJetFuel(1.f); +} + +const std::string&Powerup::GetName()const{ + return powerupNames.at(type); } \ No newline at end of file diff --git a/src/Powerup.h b/src/Powerup.h index 69107a2..4f00c0c 100644 --- a/src/Powerup.h +++ b/src/Powerup.h @@ -63,6 +63,7 @@ private: static std::vectorpowerupList; static std::unordered_map>powerupIds; static const vf2d POWERUP_TILESET_STARTING_POS; + static std::unordered_mappowerupNames; vf2d pos; float z{5.f}; float spinSpd{}; @@ -72,6 +73,7 @@ public: static void Initialize(const std::vector&powerupList); const vf2d&GetPos()const; const PowerupType&GetType()const; + const std::string&GetName()const; static std::vector&GetPowerups(); static void AddOrUpdatePowerupIdList(const int powerupId,const PowerupType powerupType); static void AddOrUpdatePowerupIdList(const int powerupId,const TileType powerupTileType);