Merge pull request #3 from Abhaygithub0/Feature3_LevelProgression

Abhaygithub0 · web-flow · commit 7bd827389ae3 · 2024-07-18T21:08:36.000+05:30
Feature3 level progression
diff --git a/Array-Jumper/Array-Jumper.vcxproj b/Array-Jumper/Array-Jumper.vcxproj
@@ -168,6 +168,7 @@
     <ClInclude Include="header\Global\Config.h" />
     <ClInclude Include="header\Event\EventService.h" />
     <ClInclude Include="header\Level\BlockType.h" />
+    <ClInclude Include="header\Level\LevelConfiguration.h" />
     <ClInclude Include="header\Level\LevelController.h" />
     <ClInclude Include="header\Level\LevelData.h" />
     <ClInclude Include="header\Level\LevelModel.h" />
diff --git a/Array-Jumper/header/Gameplay/GameplayController.h b/Array-Jumper/header/Gameplay/GameplayController.h
@@ -12,6 +12,9 @@ namespace Gameplay
 		void processObstacle();
 		void processEndBlock();
 
+		bool isLastLevel();
+		void loadNextLevel();
+		void gameWon();
 		void gameOver();
 
 	public:
@@ -20,6 +23,7 @@ namespace Gameplay
 		void update();
 		void render();
 
+		void startGame();
 		void onPositionChanged(int position);
 		void onDeath();
 	};
diff --git a/Array-Jumper/header/Gameplay/GameplayService.h b/Array-Jumper/header/Gameplay/GameplayService.h
@@ -18,6 +18,7 @@ namespace Gameplay
 		void update();
 		void render();
 
+		void startGame();
 		void onPositionChanged(int position);
 		void onDeath();
 	};
diff --git a/Array-Jumper/header/Global/Config.h b/Array-Jumper/header/Global/Config.h
@@ -33,5 +33,6 @@ namespace Global
         static const sf::String jump_sound_path;
         static const sf::String level_complete_sound_path;
         static const sf::String move_sound_path;
+        static const sf::String game_won_sound_path;
     };
 }
diff --git a/Array-Jumper/header/Level/LevelConfiguration.h b/Array-Jumper/header/Level/LevelConfiguration.h
@@ -0,0 +1,49 @@
+#pragma once
+#include "LevelData.h"
+#include "BlockType.h"
+
+namespace Level
+{
+    class LevelConfiguration
+    {
+    private:
+
+
+        BlockType level_1[LevelData::NUMBER_OF_BOXES] =
+        { 
+            ONE, TWO, OBSTACLE_ONE, TWO, THREE, ONE, OBSTACLE_TWO, TWO, ONE, TARGET 
+        };
+
+        BlockType level_2[LevelData::NUMBER_OF_BOXES] =
+        { 
+            ONE, TWO, OBSTACLE_TWO, ONE, TWO, OBSTACLE_ONE, THREE, OBSTACLE_ONE, ONE, TARGET 
+        };
+
+        BlockType level_3[LevelData::NUMBER_OF_BOXES] =
+        { 
+            ONE, THREE, OBSTACLE_ONE, OBSTACLE_TWO, ONE, TWO, OBSTACLE_ONE, TWO, ONE, TARGET 
+        };
+
+    public:
+        static const int NUMBER_OF_LEVELS = 3;
+        LevelData levels[NUMBER_OF_LEVELS];
+        
+        LevelConfiguration()
+        {
+            for (int i = 0; i < LevelData::NUMBER_OF_BOXES; i++)
+            {
+                levels[0].level_boxes[i] = level_1[i];
+            }
+
+            for (int i = 0; i < LevelData::NUMBER_OF_BOXES; i++)
+            {
+                levels[1].level_boxes[i] = level_2[i];
+            }
+
+            for (int i = 0; i < LevelData::NUMBER_OF_BOXES; i++)
+            {
+                levels[2].level_boxes[i] = level_3[i];
+            }
+        }
+    };
+}
diff --git a/Array-Jumper/header/Level/LevelController.h b/Array-Jumper/header/Level/LevelController.h
@@ -22,6 +22,11 @@ namespace Level
 
 		BoxDimensions getBoxDimensions();
 		BlockType getCurrentBoxValue(int currentPosition);
+		bool isLastLevel();
+		void loadNextLevel();
+		int getCurrentLevelNumber();
+
+		void reset();
 	};
 }
 
diff --git a/Array-Jumper/header/Level/LevelData.h b/Array-Jumper/header/Level/LevelData.h
@@ -8,16 +8,6 @@ namespace Level
     {
         static const int NUMBER_OF_BOXES = 10;
 
-        BlockType level_boxes[NUMBER_OF_BOXES] = {
-            BlockType::ONE,
-            BlockType::TWO,
-            BlockType::OBSTACLE_ONE,
-            BlockType::TWO,
-            BlockType::THREE,
-            BlockType::ONE,
-            BlockType::OBSTACLE_TWO,
-            BlockType::TWO,
-            BlockType::ONE,
-            BlockType::TARGET};
+        BlockType level_boxes[NUMBER_OF_BOXES];
     };
 }
diff --git a/Array-Jumper/header/Level/LevelModel.h b/Array-Jumper/header/Level/LevelModel.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "LevelData.h"
+#include "LevelConfiguration.h"
 
 namespace Level
 {
@@ -18,13 +19,21 @@ namespace Level
 	class LevelModel
 	{
 	private:
-		LevelData current_level_data;
+		const int number_of_level = LevelConfiguration::NUMBER_OF_LEVELS;
+		LevelConfiguration level_configuration;
 		
+		int current_level_index;
 	public:
 		LevelModel();
 		~LevelModel();
 
 		BlockType getCurrentBoxValue(int currentPosition);
+
+		bool isLastLevel();
+		void loadNextLevel();
+		int getCurrentLevelNumber();
+
+		void reset();
 	};
 }
 
diff --git a/Array-Jumper/header/Level/LevelService.h b/Array-Jumper/header/Level/LevelService.h
@@ -23,6 +23,11 @@ namespace Level
 
 		BoxDimensions getBoxDimensions();
 		BlockType getCurrentBoxValue(int currentPosition);
+		bool isLastLevel();
+		void loadNextLevel();
+		int getCurrentLevelNumber();
+
+		void resetLevels();
 	};
 }
 
diff --git a/Array-Jumper/header/Level/LevelView.h b/Array-Jumper/header/Level/LevelView.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "LevelModel.h"
+#include "LevelData.h"
 #include "LevelController.h"
 #include "../../header/UI/UIElement/ImageView.h"
 
diff --git a/Array-Jumper/header/Player/PlayerService.h b/Array-Jumper/header/Player/PlayerService.h
@@ -18,6 +18,7 @@ namespace Player
 		void update();
 		void render();
 
+		void resetPlayer();
 		int getCurrentLives();
 		void takeDamage();
 		void levelComplete();
diff --git a/Array-Jumper/header/Sound/SoundService.h b/Array-Jumper/header/Sound/SoundService.h
@@ -10,6 +10,7 @@ namespace Sound
 		JUMP,
 		DEATH,
 		LEVEL_COMPLETE,
+		GAME_WON
 	};
 
 	class SoundService
@@ -24,6 +25,7 @@ namespace Sound
 		sf::SoundBuffer buffer_jump;
 		sf::SoundBuffer buffer_death;
 		sf::SoundBuffer buffer_level_complete;
+		sf::SoundBuffer buffer_game_won;
 
 		void loadBackgroundMusicFromFile();
 		void loadSoundFromFile();
diff --git a/Array-Jumper/header/UI/Credits/CreditsScreenUIController.h b/Array-Jumper/header/UI/Credits/CreditsScreenUIController.h
@@ -8,7 +8,6 @@ namespace UI
 {
 	namespace Credits
 	{
-
 		class CreditsScreenUIController
 		{
 		private:
@@ -57,4 +56,4 @@ namespace UI
 			void show();
 		};
 	}
-}
+}
diff --git a/Array-Jumper/header/UI/Gameplay/GameplayUIController.h b/Array-Jumper/header/UI/Gameplay/GameplayUIController.h
@@ -16,12 +16,15 @@ namespace UI
 			const float right_offset = 250.f;
 
 			UIElement::TextView*  life_count_text;
+			UIElement::TextView*  level_number_text;
 
 			void createTexts();
 			void initializeTexts();
 			void initializeLifeCountText();
+			void initializeLevelNumberText();
 
 			void updateLifeCountText();
+			void updateLevelNumberText();
 
 			void destroy();
 
diff --git a/Array-Jumper/header/UI/Instructions/InstructionsUIController.h b/Array-Jumper/header/UI/Instructions/InstructionsUIController.h
@@ -27,7 +27,7 @@ namespace UI
 			sf::String instructions[number_of_instructions] = { "Move with 'Left' and 'Right' arrow key",
 																"Hold 'Space' while moving to 'JUMP'",
 																"Your player will 'JUMP' forward or backward by the value of your current cell",
-																"Reach the target cell to 'Win' the game" };
+																"Reach the target cell to 'Win' the game"};
 
 			UIElement::ImageView* background_image;
 			UIElement::ButtonView* menu_button;
diff --git a/Array-Jumper/header/UI/MainMenu/MainMenuUIController.h b/Array-Jumper/header/UI/MainMenu/MainMenuUIController.h
@@ -11,7 +11,6 @@ namespace UI
 		class MainMenuUIController
 		{
 		private:
-
 			// Constants:
 			const float button_width = 400.f;
 			const float button_height = 140.f;
@@ -50,4 +49,4 @@ namespace UI
 			void show();
 		};
 	}
-}
+}
diff --git a/Array-Jumper/source/Gameplay/GameplayController.cpp b/Array-Jumper/source/Gameplay/GameplayController.cpp
@@ -11,17 +11,11 @@ namespace Gameplay
 	using namespace Sound;
 	using namespace Main;
 
-	void GameplayController::intialize()
-	{//Yet to Implement
-	}
+	void GameplayController::intialize() { /*Not Implemented */ }
 
-	void GameplayController::update()
-	{//Yet to Implement
-	}
+	void GameplayController::update() { /* Not Implemented */ }
 
-	void GameplayController::render()
-	{//Yet to Implement
-	}
+	void GameplayController::render() { /* Not Implemented */ }
 
 	void GameplayController::onPositionChanged(int position)
 	{
@@ -62,9 +56,42 @@ namespace Gameplay
 	{
 		ServiceLocator::getInstance()->getPlayerService()->levelComplete();
 		ServiceLocator::getInstance()->getSoundService()->playSound(SoundType::LEVEL_COMPLETE);
+
+
+		if(isLastLevel())
+		{
+			gameWon();
+			return;
+		}
+
+		loadNextLevel();
+	}
+	
+	bool GameplayController::isLastLevel()
+	{
+		return ServiceLocator::getInstance()->getLevelService()->isLastLevel();
+	}
+
+	void GameplayController::startGame()
+	{
+		GameService::setGameState(GameState::GAMEPLAY);
+		return ServiceLocator::getInstance()->getLevelService()->resetLevels();
+		return ServiceLocator::getInstance()->getPlayerService()->resetPlayer();
+
+	}
+
+	void GameplayController::gameWon()
+	{
 		GameService::setGameState(GameState::CREDITS);
+		ServiceLocator::getInstance()->getSoundService()->playSound(SoundType::GAME_WON);
 	}
 
+	void GameplayController::loadNextLevel()
+	{
+		ServiceLocator::getInstance()->getLevelService()->loadNextLevel();
+	}
+
+
 	void GameplayController::gameOver()
 	{
 		GameService::setGameState(GameState::CREDITS);
diff --git a/Array-Jumper/source/Gameplay/GameplayService.cpp b/Array-Jumper/source/Gameplay/GameplayService.cpp
@@ -9,6 +9,8 @@ namespace Gameplay
 	void GameplayService::update() { gameplay_controller->update(); }
 	void GameplayService::render() { gameplay_controller->render(); }
 
+	void GameplayService::startGame() {	gameplay_controller->startGame(); }
+
 	void GameplayService::onPositionChanged(int position) { gameplay_controller->onPositionChanged(position); }
 
 	void GameplayService::onDeath() { gameplay_controller->onDeath(); }
diff --git a/Array-Jumper/source/Global/Config.cpp b/Array-Jumper/source/Global/Config.cpp
@@ -29,4 +29,5 @@ namespace Global
     const sf::String Config::jump_sound_path = "assets/sounds/jump.wav";
     const sf::String Config::level_complete_sound_path = "assets/sounds/level_complete.wav";
     const sf::String Config::move_sound_path = "assets/sounds/move.wav";
+    const sf::String Config::game_won_sound_path = "assets/sounds/game_won_sound.wav";
 }
diff --git a/Array-Jumper/source/Level/LevelController.cpp b/Array-Jumper/source/Level/LevelController.cpp
@@ -1,6 +1,5 @@
 #include "../../header/Level/LevelController.h"
 #include "../../header/Level/LevelView.h"
-#include "../../header/Level/LevelModel.h"
 #include "../../header/Level/LevelData.h"
 #include "../../header/Main/GameService.h"
 
@@ -9,11 +8,11 @@ namespace Level
 
 	LevelController::LevelController()
 	{
-		level_view = new LevelView(this);
 		level_model = new LevelModel();
+		level_view = new LevelView(this);
 	}
 
-	LevelController::~LevelController() {}
+	LevelController::~LevelController() { delete(level_view); delete(level_model); }
 
 	void LevelController::initialize()
 	{
@@ -40,4 +39,24 @@ namespace Level
 		return level_model->getCurrentBoxValue(currentPosition);
 	}
 
+	bool LevelController::isLastLevel()
+	{
+		return level_model->isLastLevel();
+	}
+
+	void LevelController::loadNextLevel()
+	{
+		level_model->loadNextLevel();
+	}
+
+	int LevelController::getCurrentLevelNumber()
+	{
+		return level_model->getCurrentLevelNumber();
+	}
+
+	void LevelController::reset()
+	{
+		level_model->reset();
+	}
+
 }
diff --git a/Array-Jumper/source/Level/LevelModel.cpp b/Array-Jumper/source/Level/LevelModel.cpp
diff --git a/Array-Jumper/source/Level/LevelService.cpp b/Array-Jumper/source/Level/LevelService.cpp
diff --git a/Array-Jumper/source/Level/LevelView.cpp b/Array-Jumper/source/Level/LevelView.cpp
diff --git a/Array-Jumper/source/Player/PlayerModel.cpp b/Array-Jumper/source/Player/PlayerModel.cpp
diff --git a/Array-Jumper/source/Player/PlayerService.cpp b/Array-Jumper/source/Player/PlayerService.cpp
diff --git a/Array-Jumper/source/Sound/SoundService.cpp b/Array-Jumper/source/Sound/SoundService.cpp
diff --git a/Array-Jumper/source/UI/Credits/CreditsScreenUIController.cpp b/Array-Jumper/source/UI/Credits/CreditsScreenUIController.cpp
diff --git a/Array-Jumper/source/UI/Gameplay/GameplayUIController.cpp b/Array-Jumper/source/UI/Gameplay/GameplayUIController.cpp
diff --git a/Array-Jumper/source/UI/MainMenu/MainMenuUIController.cpp b/Array-Jumper/source/UI/MainMenu/MainMenuUIController.cpp

Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,6 @@ namespace Global`
`33`	`33`	`static const sf::String jump_sound_path;`
`34`	`34`	`static const sf::String level_complete_sound_path;`
`35`	`35`	`static const sf::String move_sound_path;`
	`36`	`+ static const sf::String game_won_sound_path;`
`36`	`37`	`};`
`37`	`38`	`}`