sigonasr2
/
hamster
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Whategver this is.

Browse Source
jam-submission
sigonasr2 6 months ago
parent ff444f8acd
commit e766e6c153
4 changed files with 33 additions and 32 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      src/Hamster.cpp
  2. 10
      src/HamsterGame.cpp
  3. 1
      src/HamsterGame.h
  4. 52
      src/Menu.cpp

2
src/Hamster.cpp
Unescape View File

@ -424,7 +424,7 @@ void Hamster::DrawOverlay(){
vf2d powerupInfoStrSize{HamsterGame::Game().GetTextSizeProp(HamsterGame::Game().powerupHelpDisplay)}; vf2d powerupInfoStrSize{HamsterGame::Game().GetTextSizeProp(HamsterGame::Game().powerupHelpDisplay)};
uint8_t alpha{255U}; uint8_t alpha{255U};
if(HamsterGame::Game().collectedPowerupTimer<1.f)alpha=uint8_t(util::lerp(0,255,HamsterGame::Game().collectedPowerupTimer)); if(HamsterGame::Game().collectedPowerupTimer<1.f)alpha=uint8_t(util::lerp(0,255,HamsterGame::Game().collectedPowerupTimer));
HamsterGame::Game().DrawShadowRotatedStringPropDecal(HamsterGame::SCREEN_FRAME.middle()+vf2d{0.f,-HamsterGame::SCREEN_FRAME.size.y/2+powerupInfoStrSize.y+4.f},HamsterGame::Game().powerupHelpDisplay,0.f,powerupInfoStrSize/2,{255,255,255,alpha},{0,0,0,alpha}); HamsterGame::Game().DrawShadowRotatedStringPropDecal(HamsterGame::SCREEN_FRAME.middle()+vf2d{0.f,-HamsterGame::SCREEN_FRAME.size.y/2+powerupInfoStrSize.y+4.f+16.f},HamsterGame::Game().powerupHelpDisplay,0.f,powerupInfoStrSize/2,{255,255,255,alpha},{0,0,0,alpha});
} }
} }

10
src/HamsterGame.cpp
Unescape View File

@ -297,6 +297,11 @@ void HamsterGame::DrawGame(){
SetZ(0.f); SetZ(0.f);
FloatingText::DrawFloatingText(tv); FloatingText::DrawFloatingText(tv);
border.Draw(); border.Draw();
if(HamsterGame::GetRaceTime()>=0){
std::string raceClockStr{util::timerStr(HamsterGame::GetRaceTime())};
vf2d raceClockStrSize{HamsterGame::Game().GetTextSize(raceClockStr)};
DrawShadowStringDecal(SCREEN_FRAME.pos+vf2d{SCREEN_FRAME.size.x-raceClockStrSize.x-8.f,8.f},raceClockStr);
}
Hamster::DrawOverlay(); Hamster::DrawOverlay();
HamsterAI::DrawOverlay(); HamsterAI::DrawOverlay();
#pragma region Powerup Display #pragma region Powerup Display
@ -357,11 +362,6 @@ void HamsterGame::DrawGame(){
timerColor.a=util::lerp(0.f,1.f,fmod(countdownTimer,1.f))*255; 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); 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);
} }
if(HamsterGame::GetRaceTime()>=0){
std::string raceClockStr{util::timerStr(HamsterGame::GetRaceTime())};
vf2d raceClockStrSize{HamsterGame::Game().GetTextSize(raceClockStr)};
DrawShadowStringDecal(SCREEN_FRAME.pos+vf2d{SCREEN_FRAME.size.x-raceClockStrSize.x-8.f,8.f},raceClockStr);
}
} }
const Terrain::TerrainType HamsterGame::GetTerrainTypeAtPos(const vf2d pos)const{ const Terrain::TerrainType HamsterGame::GetTerrainTypeAtPos(const vf2d pos)const{

1
src/HamsterGame.h
Unescape View File

@ -221,4 +221,5 @@ private:
float sfxVol{0.7f}; float sfxVol{0.7f};
int lastDigitPlayedSound{}; int lastDigitPlayedSound{};
float playerDifferentialTime{}; float playerDifferentialTime{};
float holdEscTimer{0.f};
}; };

52
src/Menu.cpp
Unescape View File

@ -95,9 +95,20 @@ void Menu::UpdateAndDraw(HamsterGame&game,const float fElapsedTime){
case MAIN_MENU:{ case MAIN_MENU:{
}break; }break;
case GAMEPLAY:{ case GAMEPLAY:{
if(game.GetKey(ESCAPE).bPressed)Transition(TransitionType::FADE_OUT,PAUSE,0.1f); //if(game.GetKey(ESCAPE).bPressed)Transition(TransitionType::FADE_OUT,PAUSE,0.1f);
game.UpdateGame(fElapsedTime); game.UpdateGame(fElapsedTime);
game.DrawGame(); game.DrawGame();
if(game.GetKey(ESCAPE).bHeld){
uint8_t alpha{uint8_t(abs(sin(float(geom2d::pi)*HamsterGame::Game().GetRuntime()))*255)};
game.DrawShadowStringDecal(game.SCREEN_FRAME.pos+vf2d{2.f,2.f},"Keep Holding Esc to Restart...",{255,255,0,alpha},{0,0,0,alpha},{2.f,2.f});
game.holdEscTimer+=fElapsedTime;
if(game.holdEscTimer>3.f){
game.holdEscTimer=0.f;
Transition(TransitionType::FADE_OUT,LOADING,0.1f);
}
}else{
game.holdEscTimer=0.f;
}
}break; }break;
case PAUSE:{ case PAUSE:{
if(game.GetKey(ESCAPE).bPressed)Transition(TransitionType::FADE_OUT,GAMEPLAY,0.1f); if(game.GetKey(ESCAPE).bPressed)Transition(TransitionType::FADE_OUT,GAMEPLAY,0.1f);
@ -167,15 +178,15 @@ std::vector<Menu::Button>Menu::GetMenuButtons(const MenuType type){
selectedMap="StageIX.tmx"; selectedMap="StageIX.tmx";
HamsterGame::Game().mode=HamsterGame::GameMode::GRAND_PRIX_3; HamsterGame::Game().mode=HamsterGame::GameMode::GRAND_PRIX_3;
std::queue<std::string>mapList; std::queue<std::string>mapList;
mapList.emplace("StageIV.tmx");
mapList.emplace("StageVII.tmx");
mapList.emplace("StageX.tmx"); mapList.emplace("StageX.tmx");
mapList.emplace("StageXI.tmx");
mapList.emplace("StageXII.tmx");
HamsterGame::Game().SetMapSetList(mapList); HamsterGame::Game().SetMapSetList(mapList);
HamsterGame::Game().grandPrixPoints.clear(); HamsterGame::Game().grandPrixPoints.clear();
Hamster::ClearHamsters(); Hamster::ClearHamsters();
Transition(FADE_OUT,LOADING,0.5f); Transition(FADE_OUT,LOADING,0.5f);
}); });
buttons.emplace_back(HamsterGame::SCREEN_FRAME.pos+vf2d{60.f,HamsterGame::SCREEN_FRAME.size.y/2+72.f},"Marathon (12 courses)","button3.png","highlight_button3.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){ buttons.emplace_back(HamsterGame::SCREEN_FRAME.pos+vf2d{60.f,HamsterGame::SCREEN_FRAME.size.y/2+72.f},"Marathon (10 courses)","button3.png","highlight_button3.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){
selectedMap="StageI.tmx"; selectedMap="StageI.tmx";
HamsterGame::Game().mode=HamsterGame::GameMode::MARATHON; HamsterGame::Game().mode=HamsterGame::GameMode::MARATHON;
std::queue<std::string>mapList; std::queue<std::string>mapList;
@ -188,8 +199,6 @@ std::vector<Menu::Button>Menu::GetMenuButtons(const MenuType type){
mapList.emplace("StageVIII.tmx"); mapList.emplace("StageVIII.tmx");
mapList.emplace("StageIX.tmx"); mapList.emplace("StageIX.tmx");
mapList.emplace("StageX.tmx"); mapList.emplace("StageX.tmx");
mapList.emplace("StageXI.tmx");
mapList.emplace("StageXII.tmx");
HamsterGame::Game().SetMapSetList(mapList); HamsterGame::Game().SetMapSetList(mapList);
HamsterGame::Game().grandPrixPoints.clear(); HamsterGame::Game().grandPrixPoints.clear();
Hamster::ClearHamsters(); Hamster::ClearHamsters();
@ -198,66 +207,56 @@ std::vector<Menu::Button>Menu::GetMenuButtons(const MenuType type){
buttons.emplace_back(vf2d{54.f,HamsterGame::SCREEN_FRAME.size.y-24.f},"< Back","smallbutton3.png","highlight_smallbutton3.png",Pixel{145,199,255},Pixel{145,199,255},[this](Button&self){Transition(SHIFT_RIGHT,MAIN_MENU,0.5f);}); buttons.emplace_back(vf2d{54.f,HamsterGame::SCREEN_FRAME.size.y-24.f},"< Back","smallbutton3.png","highlight_smallbutton3.png",Pixel{145,199,255},Pixel{145,199,255},[this](Button&self){Transition(SHIFT_RIGHT,MAIN_MENU,0.5f);});
}break; }break;
case SINGLE_RACE:{ case SINGLE_RACE:{
buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f},"I - Welcome to Hamster Planet!","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){ buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*1},"I - Welcome to Hamster Planet!","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){
selectedMap="StageI.tmx"; selectedMap="StageI.tmx";
Hamster::ClearHamsters(); Hamster::ClearHamsters();
Transition(FADE_OUT,LOADING,0.5f); Transition(FADE_OUT,LOADING,0.5f);
}); });
buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*1},"II - Splitting Hairs","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){ buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*2},"II - Splitting Hairs","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){
selectedMap="StageII.tmx"; selectedMap="StageII.tmx";
Hamster::ClearHamsters(); Hamster::ClearHamsters();
Transition(FADE_OUT,LOADING,0.5f); Transition(FADE_OUT,LOADING,0.5f);
}); });
buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*2},"III - The Stranger Lands","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){ buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*3},"III - The Stranger Lands","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){
selectedMap="StageIII.tmx"; selectedMap="StageIII.tmx";
Hamster::ClearHamsters(); Hamster::ClearHamsters();
Transition(FADE_OUT,LOADING,0.5f); Transition(FADE_OUT,LOADING,0.5f);
}); });
buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*3},"IV - Jet Jet Go!","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){ buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*4},"IV - Jet Jet Go!","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){
selectedMap="StageIV.tmx"; selectedMap="StageIV.tmx";
Hamster::ClearHamsters(); Hamster::ClearHamsters();
Transition(FADE_OUT,LOADING,0.5f); Transition(FADE_OUT,LOADING,0.5f);
}); });
buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*4},"V - Run Run Run!","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){ buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*5},"V - Run Run Run!","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){
selectedMap="StageV.tmx"; selectedMap="StageV.tmx";
Hamster::ClearHamsters(); Hamster::ClearHamsters();
Transition(FADE_OUT,LOADING,0.5f); Transition(FADE_OUT,LOADING,0.5f);
}); });
buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*5},"VI - A Twisty Maze","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){ buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*6},"VI - A Twisty Maze","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){
selectedMap="StageVI.tmx"; selectedMap="StageVI.tmx";
Hamster::ClearHamsters(); Hamster::ClearHamsters();
Transition(FADE_OUT,LOADING,0.5f); Transition(FADE_OUT,LOADING,0.5f);
}); });
buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*6},"VII - Dunescape","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){ buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*7},"VII - Dunescape","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){
selectedMap="StageVII.tmx"; selectedMap="StageVII.tmx";
Hamster::ClearHamsters(); Hamster::ClearHamsters();
Transition(FADE_OUT,LOADING,0.5f); Transition(FADE_OUT,LOADING,0.5f);
}); });
buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*7},"VIII - Swamps of Travesty","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){ buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*8},"VIII - Swamps of Travesty","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){
selectedMap="StageVIII.tmx"; selectedMap="StageVIII.tmx";
Hamster::ClearHamsters(); Hamster::ClearHamsters();
Transition(FADE_OUT,LOADING,0.5f); Transition(FADE_OUT,LOADING,0.5f);
}); });
buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*8},"IX - Wide Chasm","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){ buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*9},"IX - Wide Chasm","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){
selectedMap="StageIX.tmx"; selectedMap="StageIX.tmx";
Hamster::ClearHamsters(); Hamster::ClearHamsters();
Transition(FADE_OUT,LOADING,0.5f); Transition(FADE_OUT,LOADING,0.5f);
}); });
buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*9},"X - Hamster Island","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){ buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*10},"X - Hamster Island","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){
selectedMap="StageX.tmx"; selectedMap="StageX.tmx";
Hamster::ClearHamsters(); Hamster::ClearHamsters();
Transition(FADE_OUT,LOADING,0.5f); Transition(FADE_OUT,LOADING,0.5f);
}); });
buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*10},"XI - Lava Panic!","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){
selectedMap="StageXI.tmx";
Hamster::ClearHamsters();
Transition(FADE_OUT,LOADING,0.5f);
});
buttons.emplace_back(HamsterGame::SCREEN_FRAME.size/2+vf2d{0.f,-132.f+22.f*11},"XII - The Great Plunge","longbutton2.png","longhighlight_button2.png",Pixel{114,109,163},Pixel{79,81,128},[this](Button&self){
selectedMap="StageXII.tmx";
Hamster::ClearHamsters();
Transition(FADE_OUT,LOADING,0.5f);
});
buttons.emplace_back(vf2d{54.f,HamsterGame::SCREEN_FRAME.size.y-12.f},"< Back","button4.png","highlight_button4.png",Pixel{220,185,155},Pixel{180,140,152},[this](Button&self){Transition(SHIFT_DOWN,MAIN_MENU,0.5f);}); buttons.emplace_back(vf2d{54.f,HamsterGame::SCREEN_FRAME.size.y-12.f},"< Back","button4.png","highlight_button4.png",Pixel{220,185,155},Pixel{180,140,152},[this](Button&self){Transition(SHIFT_DOWN,MAIN_MENU,0.5f);});
}break; }break;
case PAUSE:{ case PAUSE:{
@ -589,6 +588,7 @@ void Menu::Draw(HamsterGame&game,const MenuType menu,const vi2d pos){
void Menu::OnLevelLoaded(){ void Menu::OnLevelLoaded(){
loading=false; loading=false;
HamsterGame::Game().holdEscTimer=0.f;
HamsterGame::Game().obtainedNewPB=false; HamsterGame::Game().obtainedNewPB=false;
HamsterGame::Game().mapImage.Decal()->Update(); HamsterGame::Game().mapImage.Decal()->Update();

Write Preview
Loading…
Cancel
Save