Level design - fixed buying items + global health + new title

Roche-Engine/Components/Entity.cpp

@@ -91,8 +91,6 @@ void Entity::SetComponents()
 
 	if (GetType() == "LevelTrigger")
 	{
-		for (std::shared_ptr<ProjectileManager>& pManager : m_vecProjectileManagers)
-			pManager->SetOwner(Projectile::ProjectileOwner::LevelTrigger);
 		m_levelTrigger = std::make_shared<LevelTrigger>(GetCollider());
 	}
 }

Roche-Engine/Components/EntityController.h

@@ -10,7 +10,7 @@ struct EntityData
 {
 	std::string name;
 	std::string texture;
-	std::string type;
+	std::string type; 
 	std::vector<float> position;
 	std::vector<float> scale;
 	float rotation;

Roche-Engine/Components/Health.cpp

@@ -93,12 +93,16 @@ void Health::AddToEvent() noexcept
 {
 	EventSystem::Instance()->AddClient( EVENTID::PlayerDamage, this );
 	EventSystem::Instance()->AddClient( EVENTID::PlayerHeal, this );
+	EventSystem::Instance()->AddClient(EVENTID::SavePlayerHealth, this);
+	EventSystem::Instance()->AddClient(EVENTID::GetPlayerHealth, this);
 }
 
 void Health::RemoveFromEvent() noexcept
 {
 	EventSystem::Instance()->RemoveClient( EVENTID::PlayerDamage, this );
 	EventSystem::Instance()->RemoveClient( EVENTID::PlayerHeal, this );
+	EventSystem::Instance()->RemoveClient(EVENTID::SavePlayerHealth, this);
+	EventSystem::Instance()->RemoveClient(EVENTID::GetPlayerHealth, this);
 }
 
 void Health::HandleEvent( Event* event )
@@ -113,5 +117,17 @@ void Health::HandleEvent( Event* event )
 		if ( m_sType == "Player" )
 			Heal( 1 );
 		break;
+	case EVENTID::SavePlayerHealth:
+		if (m_sType == "Player")
+		{
+			EventSystem::Instance()->AddEvent(EVENTID::SetPlayerHealth, &m_fCurrentHealth);
+		}
+		break;
+	case EVENTID::GetPlayerHealth:
+		if (m_sType == "Player")
+		{
+			m_fCurrentHealth = *static_cast<float*>(event->GetData());
+		}
+		break;
 	}
 }

Roche-Engine/Events/Event.h

@@ -50,6 +50,10 @@ enum class EVENTID
 	PlayDayMusic,
 	PlayShopMusic,
 	PlayMainMenuMusic,
+	SavePlayerHealth,
+	LoadPlayerHealth,
+	GetPlayerHealth,
+	SetPlayerHealth,
 
 	// Camera Actions
 	MoveUp,
@@ -91,6 +95,7 @@ enum class EVENTID
 	CurrentGamePhase,
 	BackToMainMenu,
 	WinWindow,
+
 	// PlayerDeath, // Added below, affects UI as well
 	// GameRestartEvent, // Added in game events, affects UI as well
 	SwapGameLevelsWindow,

Roche-Engine/Graphics/Graphics.cpp

@@ -240,7 +240,7 @@ void Graphics::EndFrame()
 	m_pBackBuffer->BindNull( m_pContext.Get() );
 
 	// Present frame
-	HRESULT hr = m_pSwapChain->GetSwapChain()->Present( 1u, NULL );
+	HRESULT hr = m_pSwapChain->GetSwapChain()->Present( 0u, NULL );
 	if ( FAILED( hr ) )
 	{
 		hr == DXGI_ERROR_DEVICE_REMOVED ?

Roche-Engine/Input/Input.cpp

@@ -111,6 +111,10 @@ void Input::UpdateKeyboard( const float dt )
 
 		if ( m_keyboard.KeyIsPressed( 'K' ) )
 			EventSystem::Instance()->AddEvent( EVENTID::PlayerHeal );
+		if (m_keyboard.KeyIsPressed('H'))
+		{
+			EventSystem::Instance()->AddEvent(EVENTID::ChangePhase);
+		}
 #endif
 
         if ( keycode == VK_ESCAPE )

Roche-Engine/Levels/GameManager.cpp

@@ -56,6 +56,8 @@ GameManager::~GameManager()
 	EventSystem::Instance()->RemoveClient(EVENTID::PlayDayMusic, this);
 	EventSystem::Instance()->RemoveClient(EVENTID::PlayShopMusic, this);
 	EventSystem::Instance()->RemoveClient(EVENTID::PlayMainMenuMusic, this);
+	EventSystem::Instance()->RemoveClient(EVENTID::SetPlayerHealth, this);
+	EventSystem::Instance()->RemoveClient(EVENTID::LoadPlayerHealth, this);
 	EventSystem::Instance()->RemoveClient(EVENTID::UpdateBrightness, this);
 	EventSystem::Instance()->RemoveClient(EVENTID::UpdateBrightness_Day, this);
 }
@@ -94,6 +96,11 @@ void GameManager::HandleEvent(Event* event)
 	case EVENTID::PlayMainMenuMusic:
 		AudioEngine::GetInstance()->PlayAudio("MusicMenu", "MainMenuMusic", MUSIC);
 		break;
+	case EVENTID::SetPlayerHealth:
+		m_fSaveCurrentHealth = *static_cast<float*>(event->GetData());
+		break;
+	case EVENTID::LoadPlayerHealth:
+		EventSystem::Instance()->AddEvent(EVENTID::GetPlayerHealth,&m_fSaveCurrentHealth);
 	case EVENTID::UpdateBrightness:
 		UpdateBrightness();
 		break;
@@ -117,6 +124,8 @@ void GameManager::AddToEvent() noexcept
 	EventSystem::Instance()->AddClient(EVENTID::PlayDayMusic, this);
 	EventSystem::Instance()->AddClient(EVENTID::PlayShopMusic, this);
 	EventSystem::Instance()->AddClient(EVENTID::PlayMainMenuMusic, this);
+	EventSystem::Instance()->AddClient(EVENTID::SetPlayerHealth, this);
+	EventSystem::Instance()->AddClient(EVENTID::LoadPlayerHealth, this);
 	EventSystem::Instance()->AddClient(EVENTID::UpdateBrightness, this);
 	EventSystem::Instance()->AddClient(EVENTID::UpdateBrightness_Day, this);
 }

Roche-Engine/Levels/GameManager.h

@@ -47,6 +47,8 @@ class GameManager : public Listener
 	float* m_fRedOverlay = new float;
 	float* m_fGreenOverlay = new float;
 	float* m_fBlueOverlay = new float;
+
+	float m_fSaveCurrentHealth;
 };
 
 #endif // !GAMEMANAGER_H

Roche-Engine/Objects/ShopItem.cpp

@@ -21,41 +21,21 @@ ShopItem::~ShopItem()
 
 void ShopItem::PlayerInRange(Collider& collider)
 {
-	if(collider.EntityType() == "Player")
-	{
-		m_bCollisionCheck = true;
-
-		if (m_bInputCheck)
-		{
-			if (m_itemName == "HealthPotion")
-			{
-				EventSystem::Instance()->AddEvent(EVENTID::BuyPotion);
-			}
-			else
-			{
-				std::pair<std::string, int>* item = new std::pair<std::string, int>();
-				item->first = m_itemName;
-				item->second = 1;
-				EventSystem::Instance()->AddEvent(EVENTID::UpdateSeed, item);
-			}
-		}
-
-		m_bInputCheck = false;
-	}
+	m_bCollisionCheck = true;
 }
 
 void ShopItem::PlayerOutRange(Collider& collider)
 {
 	m_bCollisionCheck = false;
 }
 
+
 void ShopItem::HandleEvent(Event* event)
 {
 	switch (event->GetEventID())
 	{
 	case EVENTID::BuySeed:
-		if(m_bCollisionCheck)
-			m_bInputCheck = true;
+		BuyItem();
 		break;
 	default:
 		break;
@@ -67,6 +47,24 @@ void ShopItem::AddToEvent() noexcept
 	EventSystem::Instance()->AddClient(EVENTID::BuySeed, this);
 }
 
+void ShopItem::BuyItem()
+{
+	if (m_bCollisionCheck)
+	{
+		if (m_itemName == "HealthPotion")
+		{
+			EventSystem::Instance()->AddEvent(EVENTID::BuyPotion);
+		}
+		else
+		{
+			std::pair<std::string, int>* item = new std::pair<std::string, int>();
+			item->first = m_itemName;
+			item->second = 1;
+			EventSystem::Instance()->AddEvent(EVENTID::UpdateSeed, item);
+		}
+	}
+}
+
 void ShopItem::FilterName(std::string name)
 {
 	if (name.contains("Carrot"))

Roche-Engine/Objects/ShopItem.h

@@ -16,13 +16,13 @@ class ShopItem : public Listener
 private:
 	std::string m_itemName;
 
-	bool m_bInputCheck = false;
 	bool m_bCollisionCheck = false;
 
 	// Inherited via Listener
 	virtual void HandleEvent(Event* event) override;
 	void AddToEvent() noexcept;
 
+	void BuyItem();
 	void FilterName(std::string name);
 
 	int m_iCoins;

Roche-Engine/Resources/Entity/Entity_Game.json

@@ -467,11 +467,11 @@
         "bColliderEnabled": true,
         "bColliderInteractDecoration": false,
         "bColliderInteractEnemy": false,
-        "bColliderInteractEnemyProjectile": true,
+        "bColliderInteractEnemyProjectile": false,
         "bColliderInteractPlayer": true,
-        "bColliderInteractPlayerProjectile": true,
+        "bColliderInteractPlayerProjectile": false,
         "bColliderStatic": true,
-        "bColliderTrigger": true,
+        "bColliderTrigger": false,
         "bProjectileBullet": true,
         "bProjectilePattern": true,
         "behaviour": "None",

Roche-Engine/Resources/UI/Screens/Menu_Widgets.json

@@ -12,22 +12,22 @@
             860.0
         ],
         "type": "Image",
-        "zindex": 0
+        "zindex": 1
     },
     {
         "action": "Title Card",
         "hide": false,
         "name": "Title Card",
         "position": [
-            673.0,
-            5.0
+            600.0,
+            0.0
         ],
         "scale": [
-            600.0,
-            600.0
+            700.0,
+            700.0
         ],
         "type": "Image",
-        "zindex": 1
+        "zindex": 2
     },
     {
         "action": "Link",
@@ -42,7 +42,7 @@
             120.0
         ],
         "type": "Button",
-        "zindex": 2
+        "zindex": 3
     },
     {
         "action": "Start",
@@ -57,7 +57,7 @@
             250.0
         ],
         "type": "Button",
-        "zindex": 3
+        "zindex": 4
     },
     {
         "action": "Settings",
@@ -72,7 +72,7 @@
             250.0
         ],
         "type": "Button",
-        "zindex": 4
+        "zindex": 5
     },
     {
         "action": "Close",
@@ -87,7 +87,7 @@
             250.0
         ],
         "type": "Button",
-        "zindex": 5
+        "zindex": 6
     },
     {
         "action": "Credits",
@@ -102,7 +102,7 @@
             120.0
         ],
         "type": "Button",
-        "zindex": 6
+        "zindex": 7
     },
     {
         "action": "Leaderboard",
@@ -117,6 +117,21 @@
             250.0
         ],
         "type": "Button",
-        "zindex": 7
+        "zindex": 8
+    },
+    {
+        "action": "Backdrop",
+        "hide": false,
+        "name": "Backdrop",
+        "position": [
+            0.0,
+            0.0
+        ],
+        "scale": [
+            1920.0,
+            1080.0
+        ],
+        "type": "Image",
+        "zindex": 0
     }
 ]

Roche-Engine/UI/UIManager.cpp

@@ -232,21 +232,26 @@ void UIManager::HandleEvent(Event* event)
 		case EVENTID::SwapGameLevels:
 		{
 			HideAllUI();
+			// get PLAYER HEALTH
+			EventSystem::Instance()->AddEvent(EVENTID::SavePlayerHealth);
 			if (m_sCurrentLevel == *m_vLevelNames[GAME]) {
+
 				EventSystem::Instance()->AddEvent(EVENTID::GameLevelChangeEvent, m_vLevelNames[SHOP]);
 				EventSystem::Instance()->AddEvent(EVENTID::PlayShopMusic);
 				EventSystem::Instance()->AddEvent(EVENTID::FadeFromBlack);
 				m_sCurrentLevel = *m_vLevelNames[SHOP];
 				ShowUI("HUD_Shop");
 			}
 			else {
+
 				EventSystem::Instance()->AddEvent(EVENTID::GameLevelChangeEvent, m_vLevelNames[GAME]);
 				EventSystem::Instance()->AddEvent(EVENTID::PlayDayMusic);
 				EventSystem::Instance()->AddEvent(EVENTID::FadeFromBlack);
 				m_sCurrentLevel = *m_vLevelNames[GAME];
 				ShowUI("HUD_Day");
 			}
-
+			//set
+			EventSystem::Instance()->AddEvent(EVENTID::LoadPlayerHealth);
 		}
 		break;
 		case EVENTID::CloseUIPopUp:

Roche-Engine/UI/UIScreen.cpp

@@ -656,6 +656,10 @@ void UIScreen::Update( const float dt )
 			{
 				m_vWidgets[i]->GetImageWidget()->Resolve("", Colors::AntiqueWhite, "Resources\\Textures\\UI\\Title\\Title.png");
 			}
+			if (m_vWidgets[i]->GetAction() == "Backdrop")
+			{
+				m_vWidgets[i]->GetImageWidget()->Resolve("", Colors::AntiqueWhite, "Resources\\Textures\\UI\\Backdrop\\Main menu backdrop.png");
+			}
 			if ( m_vWidgets[i]->GetAction() == "" )
 			{
 				m_vWidgets[i]->GetImageWidget()->Resolve( "", Colors::AntiqueWhite, "Resources\\Textures\\UI\\Board\\Board.png" );