fix music transitioning into itself

Author: pawnishoovy

Data/Browncoats.rte/Activities/RefineryAssault.lua

@@ -147,7 +147,7 @@ function RefineryAssault:StartActivity(newGame)
 	self.MOUtility = require("Scripts/Utility/MOUtility");
 
 	self.GameIntensityCalculator = require("Activities/Utility/GameIntensityCalculator");
-	self.GameIntensityCalculator:Initialize(self, newGame, 0.15, 0.01, self.verboseLogging);
+	self.GameIntensityCalculator:Initialize(self, newGame, 0.11, 0.01, self.verboseLogging);
 
 	self.actorSpawnerReturnedActors = {};
 
@@ -540,24 +540,30 @@ function RefineryAssault:UpdateActivity()
 
 	-- Music
 	local gameIntensity = self.GameIntensityCalculator:UpdateGameIntensityCalculator();
-	print(gameIntensity)
-	print(self.saveTable.musicState)
 	if self.saveTable.musicState ~= "Boss" and self.musicGraceTimer:IsPastRealMS(20000) then
 		if gameIntensity > 0.67 then
 			if self.saveTable.musicState ~= "Intense" then
 				self.saveTable.musicState = "Intense";
-				MusicMan:SetNextDynamicSongSection("Intense", true, true, true);
+				if MusicMan:GetCurrentDynamicSongSectionType() == "Intense" then
+					MusicMan:SetNextDynamicSongSection("Intense", false, false, false);
+				else
+					MusicMan:SetNextDynamicSongSection("Intense", true, true, false);
+				end
 			end
 		elseif gameIntensity > 0.2 then
 			if self.saveTable.musicState ~= "Tense" then
 				local playImmediately = self.saveTable.musicState == "Ambient" and true or false;
 				self.saveTable.musicState = "Tense";
-				MusicMan:SetNextDynamicSongSection("Tense", playImmediately, true, true);
+				if MusicMan:GetCurrentDynamicSongSectionType() == "Tense" then
+					MusicMan:SetNextDynamicSongSection("Tense", false, false, false);
+				else
+					MusicMan:SetNextDynamicSongSection("Tense", playImmediately, true, true);
+				end
 			end
 		else
 			if self.saveTable.musicState ~= "Ambient" then
 				self.saveTable.musicState = "Ambient";
-				MusicMan:SetNextDynamicSongSection("Ambient", false, true, true);
+				MusicMan:SetNextDynamicSongSection("Ambient", false, true, false);
 			end
 		end
 	end

Source/Lua/LuaBindingsManagers.cpp

@@ -56,6 +56,7 @@ LuaBindingRegisterFunctionDefinitionForType(ManagerLuaBindings, MusicMan) {
 	    .def("SetNextDynamicSongSection", &LuaAdaptersMusicMan::SetNextDynamicSongSection4)
 	    .def("CyclePlayingSoundContainers", &LuaAdaptersMusicMan::CyclePlayingSoundContainers1)
 	    .def("CyclePlayingSoundContainers", &LuaAdaptersMusicMan::CyclePlayingSoundContainers2)
+	    .def("GetCurrentDynamicSongSectionType", &MusicMan::GetCurrentSongSectionType)
 	    .def("EndDynamicMusic", &LuaAdaptersMusicMan::EndDynamicMusic1)
 	    .def("EndDynamicMusic", &LuaAdaptersMusicMan::EndDynamicMusic2)
 	    .def("PlayInterruptingMusic", &MusicMan::PlayInterruptingMusic)

Source/Managers/MusicMan.cpp

@@ -20,8 +20,8 @@ void MusicMan::Clear() {
 	m_InterruptingMusicSoundContainer = nullptr;
 
 	m_CurrentSong = nullptr;
-	m_CurrentSongSectionType = "Default";
-	m_CurrentSongSection = nullptr;
+	m_NextSongSectionType = "Default";
+	m_NextSongSection = nullptr;
 
 	m_PreviousSoundContainer = nullptr;
 	m_CurrentSoundContainer = nullptr;
@@ -98,7 +98,7 @@ void MusicMan::ResetMusicState() {
 bool MusicMan::PlayDynamicSong(const std::string& songName, const std::string& songSectionType, bool playImmediately, bool playTransition, bool smoothFade) {
 	if (const DynamicSong* dynamicSongToPlay = dynamic_cast<const DynamicSong*>(g_PresetMan.GetEntityPreset("DynamicSong", songName))) {
 		m_CurrentSong = std::unique_ptr<DynamicSong>(dynamic_cast<DynamicSong*>(dynamicSongToPlay->Clone()));
-		SetCurrentSongSectionType(songSectionType);
+		SetNextSongSectionType(songSectionType);
 		SelectNextSongSection();
 		SelectNextSoundContainer(playTransition);
 		// If this isn't the case, then the MusicTimer's existing setup should make it play properly anyway, even if it's just instant
@@ -123,7 +123,7 @@ bool MusicMan::SetNextDynamicSongSection(const std::string& newSongSectionType,
 	if (!m_IsPlayingDynamicMusic) {
 		return false;
 	}
-	SetCurrentSongSectionType(newSongSectionType);
+	SetNextSongSectionType(newSongSectionType);
 	SelectNextSongSection();
 	SelectNextSoundContainer(playTransition);
 	if (playImmediately) {
@@ -156,6 +156,7 @@ bool MusicMan::CyclePlayingSoundContainers(bool smoothFade) {
 	double timeUntilNextShouldBePlayed = m_CurrentSoundContainer->GetMusicExitTime() - m_NextSoundContainer->GetMusicPreEntryTime();
 	m_MusicTimer.SetRealTimeLimitMS(timeUntilNextShouldBePlayed);
 	m_CurrentSoundContainer->Play();
+	m_CurrentSongSectionType = m_NextSongSectionType;
 
 	return true;
 }
@@ -235,25 +236,25 @@ void MusicMan::EndInterruptingMusic() {
 }
 
 void MusicMan::SelectNextSongSection() {
-	if (m_CurrentSongSection && m_CurrentSongSection->GetSectionType() == m_CurrentSongSectionType) {
+	if (m_NextSongSection && m_NextSongSection->GetSectionType() == m_NextSongSectionType) {
 		// Our current song section is already suitable
 		return;
 	}
 
 	for (DynamicSongSection& dynamicSongSection: m_CurrentSong->GetSongSections()) {
-		if (dynamicSongSection.GetSectionType() == m_CurrentSongSectionType) {
-			m_CurrentSongSection = &dynamicSongSection;
+		if (dynamicSongSection.GetSectionType() == m_NextSongSectionType) {
+			m_NextSongSection = &dynamicSongSection;
 			return;
 		}
 	}
 
-	m_CurrentSongSection = &m_CurrentSong->GetDefaultSongSection();
+	m_NextSongSection = &m_CurrentSong->GetDefaultSongSection();
 }
 
 void MusicMan::SelectNextSoundContainer(bool playTransition) {
 	if (playTransition) {
-		m_NextSoundContainer = &m_CurrentSongSection->SelectTransitionSoundContainer();
+		m_NextSoundContainer = &m_NextSongSection->SelectTransitionSoundContainer();
 	} else {
-		m_NextSoundContainer = &m_CurrentSongSection->SelectSoundContainer();
+		m_NextSoundContainer = &m_NextSongSection->SelectSoundContainer();
 	}
 }

Source/Managers/MusicMan.h

@@ -64,6 +64,10 @@ namespace RTE {
 		/// @return Whether the function completed successfully or not.
 		bool CyclePlayingSoundContainers(bool smoothFade = false);
 
+		/// Gets the current DynamicSongSectionType being played.
+		/// @return The current DynamicSongSectionType being played.
+		std::string GetCurrentSongSectionType() const { return m_CurrentSongSectionType; }
+
 		/// Sets the current playing dynamic music to end, disabling further playback of new music.
 		/// @param fadeOutCurrent Whether to also fade out the current playing music or not.
 		/// @return True if this was not set to end music previously, false if it already was.
@@ -85,8 +89,9 @@ namespace RTE {
 		std::unique_ptr<SoundContainer> m_InterruptingMusicSoundContainer; //!< Current interrupting music being played.
 
 		std::unique_ptr<DynamicSong> m_CurrentSong; //!< The current DynamicSong being played.
-		std::string m_CurrentSongSectionType; //!< The current type of DynamicSongSection we are trying to play.
-		DynamicSongSection* m_CurrentSongSection; //!< The current DynamicSongSection we are actually playing.
+		std::string m_NextSongSectionType; //!< The type of DynamicSongSection we will try to play next.
+		std::string m_CurrentSongSectionType; //!< The current type of DynamicSongSection we are actually playing.
+		DynamicSongSection* m_NextSongSection; //!< The DynamicSongSection we will try to play next.
 
 		std::unique_ptr<SoundContainer> m_PreviousSoundContainer; //!< The previous SoundContainer that was played as music. We keep it to allow it to play out while Current ramps up.
 		std::unique_ptr<SoundContainer> m_CurrentSoundContainer; //!< The current selected SoundContainer playing as music.
@@ -102,7 +107,7 @@ namespace RTE {
 #pragma region Internal Music Handling
 		/// Sets the current SongSectionType this wants to play.
 		/// @param newSongSectionType New SongSectionType for this to want to play.
-		void SetCurrentSongSectionType(const std::string& newSongSectionType) { m_CurrentSongSectionType = newSongSectionType; }
+		void SetNextSongSectionType(const std::string& newSongSectionType) { m_NextSongSectionType = newSongSectionType; }
 
 		/// Selects and sets the next SongSection based on the current SongSectionType.
 		void SelectNextSongSection();