Merge pull request #133 from Nine-Byte-Warriors/Final-Day-Conditions

Secret bonus level is no more again
Nine-Byte-Warriors · Feb 10, 2023 · 11eeff4 · 11eeff4
2 parents 7db2d69 + 79b7629
commit 11eeff4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/Roche-Engine/Events/Event.h b/Roche-Engine/Events/Event.h
@@ -57,6 +57,7 @@ enum class EVENTID
 	SetPlayerHealth,
 	ShootingDelay,
 	RemoveAllColliders,
+	ReinitializeGameManager,
 
 	// Camera Actions
 	MoveUp,

diff --git a/Roche-Engine/Levels/GameManager.cpp b/Roche-Engine/Levels/GameManager.cpp
@@ -32,21 +32,26 @@ void GameManager::SetPhase()
 		if (m_currentDay >= 5)
 		{
 			EventSystem::Instance()->AddEvent(EVENTID::WinWindow);
-			return;
 		}
-
-		m_currentPhase = Phase::DayPhase;
+		else {
+			m_currentPhase = Phase::DayPhase;
+			SetNextDay();
+		}
 	}
 
 	EventSystem::Instance()->AddEvent(EVENTID::CurrentPhase, &m_currentPhase);
 
 	if (m_currentPhase == Phase::NightPhase && m_currentDay == 5)
 		EventSystem::Instance()->AddEvent(EVENTID::FinalNight);
 
-	if (m_currentState == GameState::Unpaused) 
-		EventSystem::Instance()->AddEvent(EVENTID::HUDSwap);
+	if (m_currentDay < 5 || m_currentPhase == Phase::DayPhase)
+	{
+		if (m_currentState == GameState::Unpaused)
+			EventSystem::Instance()->AddEvent(EVENTID::HUDSwap);
+
+		UpdateBrightness();
+	}
 
-	UpdateBrightness();
 }
 
 GameManager::~GameManager()
@@ -65,6 +70,7 @@ GameManager::~GameManager()
 	EventSystem::Instance()->RemoveClient(EVENTID::LoadPlayerHealth, this);
 	EventSystem::Instance()->RemoveClient(EVENTID::UpdateBrightness, this);
 	EventSystem::Instance()->RemoveClient(EVENTID::UpdateBrightness_Day, this);
+	EventSystem::Instance()->RemoveClient(EVENTID::ReinitializeGameManager, this);
 }
 
 void GameManager::HandleEvent(Event* event)
@@ -83,6 +89,9 @@ void GameManager::HandleEvent(Event* event)
 	case EVENTID::GameRestartEvent:
 		Initialize(); // reinitialize game manager
 		break;
+	case EVENTID::ReinitializeGameManager:
+		Initialize(); // reinitialize game manager
+		break;
 	case EVENTID::PauseGame:
 		if (m_currentState == GameState::Unpaused) {
 			SetCurrentState(GameState::Paused);
@@ -92,6 +101,7 @@ void GameManager::HandleEvent(Event* event)
 		if (m_currentState == GameState::Paused) {
 			SetCurrentState(GameState::Unpaused);
 		}
+		break;
 	case EVENTID::PlayDayMusic:
 		AudioEngine::GetInstance()->PlayAudio("MusicGame", "DayPhaseMusic", MUSIC);
 		break;
@@ -106,6 +116,7 @@ void GameManager::HandleEvent(Event* event)
 		break;
 	case EVENTID::LoadPlayerHealth:
 		EventSystem::Instance()->AddEvent(EVENTID::GetPlayerHealth,&m_fSaveCurrentHealth);
+		break;
 	case EVENTID::UpdateBrightness:
 		UpdateBrightness();
 		break;
@@ -133,6 +144,7 @@ void GameManager::AddToEvent() noexcept
 	EventSystem::Instance()->AddClient(EVENTID::LoadPlayerHealth, this);
 	EventSystem::Instance()->AddClient(EVENTID::UpdateBrightness, this);
 	EventSystem::Instance()->AddClient(EVENTID::UpdateBrightness_Day, this);
+	EventSystem::Instance()->AddClient(EVENTID::ReinitializeGameManager, this);
 }
 
 void GameManager::DayPhase()

diff --git a/Roche-Engine/Roche-Engine Debug.exe b/Roche-Engine/Roche-Engine Debug.exe
diff --git a/Roche-Engine/UI/UIManager.cpp b/Roche-Engine/UI/UIManager.cpp
@@ -190,6 +190,7 @@ void UIManager::HandleEvent(Event* event)
 			EventSystem::Instance()->AddEvent(EVENTID::GameLevelChangeEvent, m_vLevelNames[MENU]);
 			EventSystem::Instance()->AddEvent(EVENTID::PlayMainMenuMusic);
 			EventSystem::Instance()->AddEvent(EVENTID::FadeFromBlack);
+			EventSystem::Instance()->AddEvent(EVENTID::ReinitializeGameManager);
 			m_sCurrentLevel = *m_vLevelNames[MENU];
 			HideAllUI();
 			ShowUI("Menu_Widgets");