Unstable 0.15.15.0 (and the one before it I forgor)

2021-11-18 21:34:30 +09:00
parent 10e5fd5f3e
commit 80f39cd2a3
257 changed files with 4916 additions and 2582 deletions
@@ -147,7 +147,7 @@ namespace Barotrauma
                   MathUtils.NearlyEqual(rangeA, rangeB);
        }

-        public static IEnumerable<object> Init()
+        public static IEnumerable<CoroutineStatus> Init()
        {
            OverrideMusicType = null;

@@ -826,7 +826,7 @@ namespace Barotrauma
                //find appropriate music for the current situation
                string currentMusicType = GetCurrentMusicType();
                float currentIntensity = GameMain.GameSession?.EventManager != null ?
-                    GameMain.GameSession.EventManager.CurrentIntensity * 100.0f : 0.0f;
+                    GameMain.GameSession.EventManager.MusicIntensity * 100.0f : 0.0f;

                IEnumerable<BackgroundMusic> suitableMusic = GetSuitableMusicClips(currentMusicType, currentIntensity);
                int mainTrackIndex = 0;