@@ -23,11 +23,11 @@ Level::Level(Window& _window)
2323 hurtSFX = Audio::Sound (" assets/sounds/hurt.wav" );
2424 hurtSFX.setVolume (0 .5f );
2525 coinSFX = Audio::Sound (" assets/sounds/coinpickup.wav" );
26- coinSFX.setVolume (0 .5f );
26+ coinSFX.setVolume (0 .1f );
2727 hpSFX = Audio::Sound (" assets/sounds/hppickup.wav" );
28- hpSFX.setVolume (0 .5f );
28+ hpSFX.setVolume (0 .1f );
2929 mpSFX = Audio::Sound (" assets/sounds/mppickup.wav" );
30- mpSFX.setVolume (0 .5f );
30+ mpSFX.setVolume (0 .1f );
3131
3232 bgm1 = Audio::Sound (" assets/sounds/stage1.ogg" );
3333 bgm1.setVolume (0 .1f );
@@ -43,24 +43,21 @@ Level::Level(Window& _window)
4343 helpScreen = Sprite (ResourceManager::loadImage (" assets/textures/helpScreen.png" ), BlendMode::AlphaBlend);
4444
4545 // Buttons
46- SpriteSheet playBtnSheet{ " assets/textures/play_btn_sheet.png" ,136 , 52 ,0 ,0 ,BlendMode::AlphaBlend };
46+ SpriteSheet playBtnSheet{ " assets/textures/play_btn_sheet.png" ,95 , 36 ,0 ,0 ,BlendMode::AlphaBlend };
4747 playButton = Button{ playBtnSheet};
4848
49- SpriteSheet quitBtnSheet{ " assets/textures/quit_btn_sheet.png" ,136 , 52 ,0 ,0 ,BlendMode::AlphaBlend };
49+ SpriteSheet quitBtnSheet{ " assets/textures/quit_btn_sheet.png" ,95 , 36 ,0 ,0 ,BlendMode::AlphaBlend };
5050 quitButton = Button{ quitBtnSheet };
5151
52- SpriteSheet changelvlBtnSheet{ " assets/textures/changelvl_btn.png" ,136 ,52 ,0 ,0 ,BlendMode::AlphaBlend };
53- changelvlButton = Button{ changelvlBtnSheet };
54-
55- SpriteSheet helpBtnSheet{ " assets/textures/help_btn_sheet.png" ,136 ,52 ,0 ,0 ,BlendMode::AlphaBlend };
52+ SpriteSheet helpBtnSheet{ " assets/textures/help_btn_sheet.png" ,95 ,36 ,0 ,0 ,BlendMode::AlphaBlend };
5653 helpButton = Button{ helpBtnSheet };
5754
5855 SpriteSheet backBtnSheet{ " assets/textures/back_btn_sheet.png" ,136 ,52 ,0 ,0 ,BlendMode::AlphaBlend };
5956 backButton = Button{ backBtnSheet };
6057
61- SpriteSheet lvl1BtnSheet{ " assets/textures/lvl1_btn_sheet.png" ,46 , 52 ,0 ,0 ,BlendMode::AlphaBlend };
62- SpriteSheet lvl2BtnSheet{ " assets/textures/lvl2_btn_sheet.png" ,46 , 52 ,0 ,0 ,BlendMode::AlphaBlend };
63- SpriteSheet lvl3BtnSheet{ " assets/textures/lvl3_btn_sheet.png" ,46 , 52 ,0 ,0 ,BlendMode::AlphaBlend };
58+ SpriteSheet lvl1BtnSheet{ " assets/textures/lvl1_btn_sheet.png" ,32 , 36 ,0 ,0 ,BlendMode::AlphaBlend };
59+ SpriteSheet lvl2BtnSheet{ " assets/textures/lvl2_btn_sheet.png" ,32 , 36 ,0 ,0 ,BlendMode::AlphaBlend };
60+ SpriteSheet lvl3BtnSheet{ " assets/textures/lvl3_btn_sheet.png" ,32 , 36 ,0 ,0 ,BlendMode::AlphaBlend };
6461 std::vector lvlBtnSheets{ lvl1BtnSheet, lvl2BtnSheet, lvl3BtnSheet }; /* Deduce type using CTAD C++17 */
6562
6663 for (int i = 0 ; i < 3 ; ++i)
@@ -207,12 +204,13 @@ void Level::draw(Image& image)
207204 image.copy (*startScreen, 0 , 0 );
208205 playButton.draw (image);
209206 quitButton.draw (image);
210- changelvlButton.draw (image);
211207 helpButton.draw (image);
212208 for (auto & lvlbtn : levelButtons)
213209 {
214210 lvlbtn.draw (image);
215211 }
212+ image.drawText (tafelSans, " LEVEL SELECT:" , glm::vec2{ 103 ,238 }, Color::Black);
213+ image.drawText (tafelSans, " LEVEL SELECT:" , glm::vec2{ 103 ,235 }, {230 ,157 ,107 });
216214 break ;
217215 case GameState::HelpScreen:
218216 image.drawSprite (helpScreen,{0 ,0 });
@@ -305,7 +303,6 @@ void Level::processEvents(const Event& e)
305303 {
306304 playButton.processEvents (event);
307305 quitButton.processEvents (event);
308- changelvlButton.processEvents (event);
309306 helpButton.processEvents (event);
310307 for (auto & lvlbtn : levelButtons)
311308 {
@@ -361,13 +358,12 @@ void Level::onResized(ResizeEventArgs& args)
361358
362359 // Update any UI elements or positions that depend on the game rectangle.
363360
364- playButton.setTransform (Transform2D{ { 100 , 170 },{0 .8f ,0 .8f } });
365- helpButton.setTransform (Transform2D{ { 230 , 170 },{0 .8f ,0 .8f } });
366- quitButton.setTransform (Transform2D{ { 355 , 170 },{0 .8f ,0 .8f } });
367- changelvlButton.setTransform (Transform2D{ { 100 , 215 },{0 .8f ,0 .8f } });
361+ playButton.setTransform (Transform2D{ { 120 , 170 }/* ,{0.8f,0.8f}*/ });
362+ helpButton.setTransform (Transform2D{ { 220 , 170 }/* ,{0.8f,0.8f}*/ });
363+ quitButton.setTransform (Transform2D{ { 320 , 170 }/* ,{0.8f,0.8f}*/ });
368364 for (int i = 0 ; i < 3 ; ++i)
369365 {
370- levelButtons[i].setTransform (Transform2D{ { 230 + i * 40 , 215 },{0 .8f ,0 .8f } });
366+ levelButtons[i].setTransform (Transform2D{ { 230 + i * 35 , 215 }/* ,{0.8f,0.8f}*/ });
371367 }
372368 backButton.setTransform (Transform2D{ { 285 , 1 },{0 .7f ,0 .7f } });
373369}
0 commit comments