temporary fixes to make dynamic music less buggy

Author: pawnishoovy

Data/Browncoats.rte/Activities/RefineryAssault.lua

@@ -99,7 +99,7 @@ end
 function RefineryAssault:StartActivity(newGame)
 	print("START! -- RefineryAssault:StartActivity()!");
 
-	self.verboseLogging = true;
+	self.verboseLogging = false;
 
 	self.humansAreControllingAlliedActors = false;
 
@@ -486,6 +486,29 @@ function RefineryAssault:UpdateActivity()
 
 	-- Debug
 	if UInputMan.FlagAltState then
+	
+		-- Force music state
+		
+		if UInputMan:KeyPressed(Key.H) then
+			self.forcedGameIntensity = nil;
+			print("REFINERY ASSAULT: Cleared forced music intensity")
+		end		
+		
+		if UInputMan:KeyPressed(Key.J) then
+			self.forcedGameIntensity = -0;
+			print("REFINERY ASSAULT: Ambient forced music intensity")
+		end
+		
+		if UInputMan:KeyPressed(Key.K) then
+			self.forcedGameIntensity = 0.5;
+			print("REFINERY ASSAULT: Tense forced music intensity")
+		end
+		
+		if UInputMan:KeyPressed(Key.L) then
+			self.forcedGameIntensity = 1.0;
+			print("REFINERY ASSAULT: Intense forced music intensity")
+		end
+	
 		-- Unlimit camera
 		if UInputMan:KeyPressed(Key.KP_8) then
 			self.HUDHandler:SetCameraMinimumAndMaximumX(self.humanTeam, 0, 999999);
@@ -540,6 +563,9 @@ function RefineryAssault:UpdateActivity()
 
 	-- Music
 	local gameIntensity = self.GameIntensityCalculator:UpdateGameIntensityCalculator();
+	if self.forcedGameIntensity then
+		gameIntensity = self.forcedGameIntensity;
+	end
 	if self.saveTable.musicState ~= "Boss" and self.musicGraceTimer:IsPastRealMS(20000) then
 		if gameIntensity > 0.67 then
 			if self.saveTable.musicState ~= "Intense" then

Data/Browncoats.rte/Activities/RefineryAssaultFunctions.lua

@@ -1542,7 +1542,7 @@ function RefineryAssault:MonitorStage3()
 			end
 		end
 
-		print(#self.saveTable.stage3Consoles)
+		--print(#self.saveTable.stage3Consoles)
 
 		if #self.saveTable.stage3Consoles == 0 then
 			self.stage3AllConsolesBroken = true;

Source/Managers/MusicMan.cpp

@@ -2,6 +2,7 @@
 
 #include "NetworkClient.h"
 #include "AudioMan.h"
+#include "ConsoleMan.h"
 #include "PresetMan.h"
 
 using namespace RTE;
@@ -51,17 +52,20 @@ void MusicMan::Update() {
 			CyclePlayingSoundContainers(false);
 		}
 		if (m_PreviousSoundContainerSetToFade && m_MusicFadeTimer.IsPastRealTimeLimit()) {
-			const int musicFadeOutTimeMs = 250;
-			m_PreviousSoundContainer->FadeOut(musicFadeOutTimeMs);
 			m_PreviousSoundContainerSetToFade = false;
+			if (m_PreviousSoundContainer) {
+				g_ConsoleMan.PrintString("MusicMan: Faded PreviousSoundContainer due to SetToFade.");
+				const int musicFadeOutTimeMs = 250;
+				m_PreviousSoundContainer->FadeOut(musicFadeOutTimeMs);
+			}
 		}
-	} else {
-		if (m_PreviousSoundContainer && m_PreviousSoundContainer->GetAudibleVolume() == 0.0F) {
-			m_PreviousSoundContainer = nullptr;
-		}
-		if (m_CurrentSoundContainer && m_CurrentSoundContainer->GetAudibleVolume() == 0.0F) {
-			m_CurrentSoundContainer = nullptr;
-		}
+	}
+	if (m_PreviousSoundContainer && m_PreviousSoundContainer->GetAudibleVolume() == 0.0F) {
+		g_ConsoleMan.PrintString("MusicMan: Inaudible PreviousSoundContainer is about to be deleted: " + m_PreviousSoundContainer->GetPresetName());
+		m_PreviousSoundContainer = nullptr;
+	}
+	if (m_CurrentSoundContainer && m_CurrentSoundContainer->GetAudibleVolume() == 0.0F) {
+		m_CurrentSoundContainer = nullptr;
 	}
 }
 
@@ -104,6 +108,7 @@ bool MusicMan::PlayDynamicSong(const std::string& songName, const std::string& s
 		// If this isn't the case, then the MusicTimer's existing setup should make it play properly anyway, even if it's just instant
 		if (playImmediately) {
 			if (m_IsPlayingDynamicMusic) {
+				g_ConsoleMan.PrintString("MusicMan: Immediately played DynamicSong has stopped PreviousSoundContainer.");
 				if (m_PreviousSoundContainer) {
 					m_PreviousSoundContainer->Stop();
 					m_PreviousSoundContainer = nullptr;
@@ -120,14 +125,24 @@ bool MusicMan::PlayDynamicSong(const std::string& songName, const std::string& s
 }
 
 bool MusicMan::SetNextDynamicSongSection(const std::string& newSongSectionType, bool playImmediately, bool playTransition, bool smoothFade) {
+	g_ConsoleMan.PrintString("MusicMan: Attempting to set next DynamicSongSection...");
+	std::string currentDynamicSongSection = "None";
+	if (m_NextSongSection) {
+		currentDynamicSongSection = m_NextSongSection->GetPresetName();
+	}
+	g_ConsoleMan.PrintString("Current DynamicSongSection: " + currentDynamicSongSection);
+	g_ConsoleMan.PrintString("Desired new DynamicSongSection: " + newSongSectionType);
+	
 	if (!m_IsPlayingDynamicMusic) {
 		return false;
 	}
 	SetNextSongSectionType(newSongSectionType);
 	SelectNextSongSection();
 	SelectNextSoundContainer(playTransition);
 	if (playImmediately) {
+		g_ConsoleMan.PrintString("Playing new song section immediately!");
 		if (m_PreviousSoundContainerSetToFade) {
+			g_ConsoleMan.PrintString("MusicMan: Immediately played new song section has stopped PreviousSoundContainer.");
 			m_PreviousSoundContainerSetToFade = false;
 			m_PreviousSoundContainer->Stop();
 			m_PreviousSoundContainer = nullptr;
@@ -138,15 +153,35 @@ bool MusicMan::SetNextDynamicSongSection(const std::string& newSongSectionType,
 }
 
 bool MusicMan::CyclePlayingSoundContainers(bool smoothFade) {
+	g_ConsoleMan.PrintString("MusicMan: Cycling SoundContainers...");
+	std::string currentSoundContainer = "None";
+	if (m_CurrentSoundContainer) {
+		currentSoundContainer = m_CurrentSoundContainer->GetPresetName();
+	}
+	g_ConsoleMan.PrintString("Current sound container: " + currentSoundContainer);
+	g_ConsoleMan.PrintString("Next sound container: " + m_NextSoundContainer->GetPresetName());
+	std::string previousSoundContainer = "None";
+	if (m_PreviousSoundContainer) {
+		previousSoundContainer = m_PreviousSoundContainer->GetPresetName();
+	}
+	g_ConsoleMan.PrintString("Previous sound container: " + previousSoundContainer);
+	
 	if (m_CurrentSoundContainer && m_CurrentSoundContainer->IsBeingPlayed()) {
 		if (smoothFade) {
 			m_CurrentSoundContainer->FadeOut(static_cast<int>(m_NextSoundContainer->GetMusicPreEntryTime()));
 		} else {
+			g_ConsoleMan.PrintString("No smoothFade means upcoming PreviousSoundContainer will be faded out at entry point.");
 			m_PreviousSoundContainerSetToFade = true;
 			m_MusicFadeTimer.Reset();
 			m_MusicFadeTimer.SetRealTimeLimitMS(static_cast<int>(m_NextSoundContainer->GetMusicPreEntryTime()));
 		}
+		if (m_PreviousSoundContainer) {
+			g_ConsoleMan.PrintString("Found unfaded PreviousSoundContainer. Stopping: " + m_PreviousSoundContainer->GetPresetName());
+			m_PreviousSoundContainer->Stop();
+			m_PreviousSoundContainer = nullptr;
+		}
 		m_PreviousSoundContainer = std::unique_ptr<SoundContainer>(m_CurrentSoundContainer.release());
+		g_ConsoleMan.PrintString("Moved CurrentSoundContainer to PreviousSoundContainer while cycling, it is now: " + m_PreviousSoundContainer->GetPresetName());
 	}
 
 	// Clone instead of just point to because we might wanna keep this around even if the DynamicSong is gone