From 92f2b4dd85a2c976ea15e952ce64debbdb22500a Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Sat, 24 Aug 2024 07:13:50 -0500
Subject: [PATCH] Add countdown timer.

---
 assets/countdown.png | Bin 0 -> 872 bytes
 src/AnimationState.h |   1 +
 src/Hamster.cpp      |   1 +
 src/HamsterGame.cpp  |  12 ++++++++++++
 src/HamsterGame.h    |   2 ++
 src/TODO.txt         |   1 +
 6 files changed, 17 insertions(+)
 create mode 100644 assets/countdown.png

diff --git a/assets/countdown.png b/assets/countdown.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b83651c61f3bba435bd4bd455e3ad94a168150b
GIT binary patch
literal 872
zcmV-u1DE`XP)<h;3K|Lk000e1NJLTq003YB001Be1^@s6?ZACh0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ^lec2P=p;WT;Mdu_BJ8ibb$c+6t{Ym|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jfc5qU3krMxx6k5c1aNLh~_a1le0HIlBs@W3*RLwHd
ziMW`{uZn%I2w(&Qh$1L4Q%`0Vv+x{W_we!cF2b|C&;2<Dm4e9tpGX{Ix?vG-5YKK}
zI_G`j5GzXx@j3C7K^G)`<htzg8|RY40?!N?+4MYdh*&IjvE0S1Y^cOD#9>9%C|}6A
ztZ?4qtXAu+eNX<vU_o2SaGmBj5?DeKDTt6!M+H?_h|sE$Vj@lZaS#8P<4=)GCRYWF
z91EyHh2;3b|KNAGW-&VLCI#a_?~84JOaOhmK&xTf-^aGyIsyF8z?IhV*P6iGC+Urj
z7Cr)owt<W5jwbH`mpj1dlP(#OBl&3x#Uk*2M&FbNhHruXHMh6+K29HiEOoVf0~{Oz
zlO@Vt_jq@pySIPOwEO!3zgKd_4@9kz00006VoOIv00000008+zyMF)x010qNS#tmY
zE+YT{E+YYWr9XB6000McNliru=m;1L2_SH&Wg7qh02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{00BTrL_t(&-tAgJ4ul{K1h&sG`~P<tpP_NDX0s^DbSP}+
zWTMcav}H;R!QpT?njzjDFfaRh_WnIZK@z;O$KavKA!-moE&l1kkvz0H$iqor8M2#3
zn&#}CIBn~NgD|3i9d+OHJjnzWhcv45YvyEf5Umu{O8H!BAHP37*OVg$hZG!5(d`Dj
zrzmL2+k!*!;A0vw%8{0$vc@5m>@qv5O1_zwebo{OrE5lTkUNA}is;G#3?9EYXxNp|
zG1v{^oe~Uf#H_%=y%0L9)5y-Zpp;;Z*uR$@twu~njC@4dVF?Zy&H2nLXoNcKq6Aq}
zJ4m}SO5~r7)jEg~Wh#y2{MPk+s1j7t>>wMWtFbwSQ)}0+qe+chZccG`>nWU)&6L{I
yWH&nv&n6W<CjSdUADXS2GAq|04u`|xu!#@%>-v@}3-rhU0000<MNUMnLSTYuO@Vp<

literal 0
HcmV?d00001

diff --git a/src/AnimationState.h b/src/AnimationState.h
index 7cd24d6..9c4df6b 100644
--- a/src/AnimationState.h
+++ b/src/AnimationState.h
@@ -48,5 +48,6 @@ namespace AnimationState{
 		CHECKPOINT_CYCLING,
 		CHECKPOINT_COLLECTED,
 		SIDE_VIEW,
+		COUNTDOWN,
 	};
 }
\ No newline at end of file
diff --git a/src/Hamster.cpp b/src/Hamster.cpp
index 1bdfa4a..5fd5471 100644
--- a/src/Hamster.cpp
+++ b/src/Hamster.cpp
@@ -669,6 +669,7 @@ const float Hamster::GetMaxSpeed()const{
 			}break;
 		}
 	}
+	if(!HamsterGame::Game().RaceCountdownCompleted())finalMaxSpd*=0.f;
 	return finalMaxSpd;
 }
 const float Hamster::GetFriction()const{
diff --git a/src/HamsterGame.cpp b/src/HamsterGame.cpp
index 234dba5..024a96d 100644
--- a/src/HamsterGame.cpp
+++ b/src/HamsterGame.cpp
@@ -140,6 +140,7 @@ void HamsterGame::LoadAnimations(){
 	LoadAnimation(AnimationState::DEFAULT,"checkpoint.png",{{}},0.f,Animate2D::Style::OneShot,{128,128});
 	LoadAnimation(AnimationState::CHECKPOINT_CYCLING,"checkpoint.png",{{},{128,0}},0.4f,Animate2D::Style::Repeat,{128,128});
 	LoadAnimation(AnimationState::CHECKPOINT_COLLECTED,"checkpoint.png",{{128,0}},0.f,Animate2D::Style::OneShot,{128,128});
+	LoadAnimation(AnimationState::COUNTDOWN,"countdown.png",{{0,0},{32,0},{64,0}},1.f,Animate2D::Style::OneShot,{32,32});
 }
 
 void HamsterGame::LoadLevel(const std::string&mapName){
@@ -198,9 +199,11 @@ void HamsterGame::LoadLevel(const std::string&mapName){
 
 	audio.Play(bgm.at(currentMap.value().GetData().GetBGM()),true);
 	Hamster::MoveHamstersToSpawn(currentMap.value().GetData().GetSpawnZone());
+	countdownTimer=3.f;
 }
 
 void HamsterGame::UpdateGame(const float fElapsedTime){
+	countdownTimer=std::max(0.f,countdownTimer-fElapsedTime);
 	vEye.z+=(Hamster::GetPlayer().GetZ()+zoom-vEye.z)*fLazyFollowRate*fElapsedTime;
 	speedometerDisplayAmt+=(Hamster::GetPlayer().GetSpeed()-speedometerDisplayAmt)*fLazyFollowRate*fElapsedTime;
 
@@ -308,6 +311,11 @@ void HamsterGame::DrawGame(){
 	DrawDecal({2.f,4.f},GetGFX("radar.png").Decal());
 	DrawRadar();
 	DrawStringDecal({0,8.f},std::to_string(GetFPS()));
+	if(countdownTimer>0.f){
+		Pixel timerColor{fmod(countdownTimer,1.f)<0.5f?GREEN:WHITE};
+		timerColor.a=util::lerp(0.f,1.f,fmod(countdownTimer,1.f))*255;
+		DrawPartialRotatedDecal(SCREEN_FRAME.middle(),GetGFX("countdown.png").Decal(),0.f,{16.f,16.f},{int(countdownTimer)*32.f,0.f},{32,32},{4.f,4.f},timerColor);
+	}
 }
 
 const Terrain::TerrainType HamsterGame::GetTerrainTypeAtPos(const vf2d pos)const{
@@ -665,6 +673,10 @@ const int HamsterGame::GetRaceTime(){
 	return net.GetCurrentRaceTime();
 }
 
+const bool HamsterGame::RaceCountdownCompleted(){
+	return countdownTimer==0.f;
+}
+
 int main()
 {
 	HamsterGame game("Project Hamster");
diff --git a/src/HamsterGame.h b/src/HamsterGame.h
index 260dec3..cc8076c 100644
--- a/src/HamsterGame.h
+++ b/src/HamsterGame.h
@@ -102,6 +102,7 @@ public:
 	static void SavePB(const std::string&mapName,int ms);
 	static void LoadPBs();
 	const int GetRaceTime();
+	const bool RaceCountdownCompleted();
 private:
 	void UpdateGame(const float fElapsedTime);
 	void DrawGame();
@@ -141,6 +142,7 @@ private:
 	std::unordered_map<std::string,int>bgm;
 	GameMode mode{GameMode::SINGLE_RACE};
 	HamsterNet net;
+	float countdownTimer{};
 	#ifndef __EMSCRIPTEN__
 	#ifndef __DEBUG__
 	SplashScreen splash;
diff --git a/src/TODO.txt b/src/TODO.txt
index ffe218f..2dad0a9 100644
--- a/src/TODO.txt
+++ b/src/TODO.txt
@@ -167,6 +167,7 @@ Hamster Jet Landing Sound
 Powerup Collection Sound
 Hamster Wheel Boost Sound
 Checkpoint Collection Sound
+Countdown Sound Effect
 
 Hamster Jet Launch Command Sound
 Fail to Boost/Jet Launch command sound