try new music transitions

Author: pawnishoovy

Data/Base.rte/Activities/Utility/GameIntensityCalculator.lua

@@ -87,7 +87,7 @@ function GameIntensityCalculator:UpdateGameIntensityCalculator()
 			for mo in MovableMan:GetMOsInBox(screenBox, -1, true) do
 				if IsActor(mo) then
 					mo = ToActor(mo);
-					healthLostThisFrame = healthLostThisFrame + mo.PrevHealth - mo.Health;
+					healthLostThisFrame = math.max(0, healthLostThisFrame + mo.PrevHealth - mo.Health);
 				end
 			end
 		end

Data/Browncoats.rte/Music.ini

@@ -6,7 +6,7 @@ AddSoundContainer = SoundContainer
 	Immobile = 1
 	BusRouting = Music
 	MusicPreEntryTime = 2637.4
-	MusicExitTime = 34286.2
+	MusicExitTime = 50000.0 // Arbitrary
 	AddSound = Browncoats.rte/Music/BC/BC_Intro_91_1_13_001.ogg
 
 AddSoundContainer = SoundContainer
@@ -69,8 +69,44 @@ AddSoundContainer = SoundContainer
 	Immobile = 1
 	BusRouting = Music
 	MusicPreEntryTime = 2637.4
-	MusicExitTime = 44835.8
-	AddSound = Browncoats.rte/Music/BC/BC_TenseTransition_91_1_17_001.ogg
+	MusicExitTime = 5274.8
+	AddSound = Browncoats.rte/Music/BC/BC_TenseTransition_91_1_2_001.ogg
+	
+AddSoundContainer = SoundContainer
+	PresetName = BC Tense Transition 2
+	Priority = 1
+	Immobile = 1
+	BusRouting = Music
+	MusicPreEntryTime = 2637.4
+	MusicExitTime = 5274.8
+	AddSound = Browncoats.rte/Music/BC/BC_TenseTransition_91_1_2_002.ogg
+	
+AddSoundContainer = SoundContainer
+	PresetName = BC Tense Transition 3
+	Priority = 1
+	Immobile = 1
+	BusRouting = Music
+	MusicPreEntryTime = 2637.4
+	MusicExitTime = 5274.8
+	AddSound = Browncoats.rte/Music/BC/BC_TenseTransition_91_1_2_003.ogg
+	
+AddSoundContainer = SoundContainer
+	PresetName = BC Tense Transition 4
+	Priority = 1
+	Immobile = 1
+	BusRouting = Music
+	MusicPreEntryTime = 2637.4
+	MusicExitTime = 5274.8
+	AddSound = Browncoats.rte/Music/BC/BC_TenseTransition_91_1_2_004.ogg
+	
+AddSoundContainer = SoundContainer
+	PresetName = BC Tense Transition 5
+	Priority = 1
+	Immobile = 1
+	BusRouting = Music
+	MusicPreEntryTime = 2637.4
+	MusicExitTime = 5274.8
+	AddSound = Browncoats.rte/Music/BC/BC_TenseTransition_91_1_2_005.ogg
 
 AddSoundContainer = SoundContainer
 	PresetName = BC Tense 1
@@ -163,13 +199,13 @@ AddSoundContainer = SoundContainer
 	AddSound = Browncoats.rte/Music/BC/BC_Tense_91_1_9_010.ogg
 
 AddSoundContainer = SoundContainer
-	PresetName = BC Intense Transition 1
+	PresetName = BC Tense 11
 	Priority = 1
 	Immobile = 1
 	BusRouting = Music
 	MusicPreEntryTime = 2637.4
 	MusicExitTime = 44835.8
-	AddSound = Browncoats.rte/Music/BC/BC_IntenseTransition_91_1_17_001.ogg
+	AddSound = Browncoats.rte/Music/BC/BC_Tense_91_1_17_011.ogg
 
 AddSoundContainer = SoundContainer
 	PresetName = BC Intense 1
@@ -252,6 +288,15 @@ AddSoundContainer = SoundContainer
 	MusicExitTime = 23736.6
 	AddSound = Browncoats.rte/Music/BC/BC_Intense_91_1_9_009.ogg
 
+AddSoundContainer = SoundContainer
+	PresetName = BC Intense 10
+	Priority = 1
+	Immobile = 1
+	BusRouting = Music
+	MusicPreEntryTime = 2637.4
+	MusicExitTime = 44835.8
+	AddSound = Browncoats.rte/Music/BC/BC_Intense_91_1_17_010.ogg	
+	
 AddSoundContainer = SoundContainer
 	PresetName = BC Boss Transition 1
 	Priority = 1
@@ -409,6 +454,14 @@ AddDynamicSongSection = DynamicSongSection
 	SectionType = Tense
 	AddTransitionSoundContainer = SoundContainer
 		CopyOf = BC Tense Transition 1
+	AddTransitionSoundContainer = SoundContainer
+		CopyOf = BC Tense Transition 2
+	AddTransitionSoundContainer = SoundContainer
+		CopyOf = BC Tense Transition 3
+	AddTransitionSoundContainer = SoundContainer
+		CopyOf = BC Tense Transition 4
+	AddTransitionSoundContainer = SoundContainer
+		CopyOf = BC Tense Transition 5
 	AddSoundContainer = SoundContainer
 		CopyOf = BC Tense 1
 	AddSoundContainer = SoundContainer
@@ -429,13 +482,15 @@ AddDynamicSongSection = DynamicSongSection
 		CopyOf = BC Tense 9
 	AddSoundContainer = SoundContainer
 		CopyOf = BC Tense 10
+	AddSoundContainer = SoundContainer
+		CopyOf = BC Tense 11
 	SoundContainerSelectionCycleMode = shuffle
 
 AddDynamicSongSection = DynamicSongSection
 	PresetName = BC Intense
 	SectionType = Intense
-	AddTransitionSoundContainer = SoundContainer
-		CopyOf = BC Intense Transition 1
+//	AddTransitionSoundContainer = SoundContainer
+//		CopyOf = BC Intense Transition 1
 	AddSoundContainer = SoundContainer
 		CopyOf = BC Intense 1
 	AddSoundContainer = SoundContainer
@@ -454,6 +509,8 @@ AddDynamicSongSection = DynamicSongSection
 		CopyOf = BC Intense 8
 	AddSoundContainer = SoundContainer
 		CopyOf = BC Intense 9
+	AddSoundContainer = SoundContainer
+		CopyOf = BC Intense 10
 	SoundContainerSelectionCycleMode = shuffle
 
 AddDynamicSongSection = DynamicSongSection