Faction Test 100.6.0.0

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/EndMission.cs

@@ -12,6 +12,7 @@ namespace Barotrauma
 
         partial void OnStateChangedProjSpecific()
         {
+            SoundPlayer.ForceMusicUpdate();
             if (Phase == MissionPhase.NoItemsDestroyed)
             {
                 CoroutineManager.Invoke(() =>
@@ -31,6 +32,10 @@ namespace Barotrauma
             }
             else if (Phase == MissionPhase.BossKilled)
             {
+                if (!string.IsNullOrEmpty(endCinematicSound))
+                {
+                    SoundPlayer.PlaySound(endCinematicSound);
+                }
                 CoroutineManager.Invoke(() =>
                 {
                     new CameraTransition(boss, GameMain.GameScreen.Cam, null, Alignment.Center, panDuration: 3, fadeOut: false, endZoom: 0.1f * GUI.yScale)
@@ -60,7 +65,7 @@ namespace Barotrauma
                         if (limb.LightSource is Lights.LightSource light)
                         {
                             light.Enabled = true;
-                        }                        
+                        }
                     }
                 }
             }

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/Mission.cs

@@ -115,6 +115,11 @@ namespace Barotrauma
             };
         }
 
+        public Identifier GetOverrideMusicType()
+        {
+            return Prefab.GetOverrideMusicType(State);
+        }
+
         public virtual void ClientRead(IReadMessage msg)
         {
             State = msg.ReadInt16();

Barotrauma/BarotraumaClient/ClientSource/Events/Missions/MissionPrefab.cs

@@ -1,11 +1,16 @@
 using Microsoft.Xna.Framework;
 using System;
-using System.Xml.Linq;
+using System.Collections.Generic;
+using System.Collections.Immutable;
 
 namespace Barotrauma
 {
     partial class MissionPrefab : PrefabWithUintIdentifier
     {
+        private ImmutableArray<Sprite> portraits = new ImmutableArray<Sprite>();
+
+        public bool HasPortraits => portraits.Length > 0;
+
         public Sprite Icon
         {
             get;
@@ -49,24 +54,57 @@ namespace Barotrauma
         private Sprite hudIcon;
         private Color? hudIconColor;
 
+        private ImmutableDictionary<int, Identifier> overrideMusicOnState;
+
         partial void InitProjSpecific(ContentXElement element)
         {
             DisplayTargetHudIcons = element.GetAttributeBool("displaytargethudicons", false);
             HudIconMaxDistance = element.GetAttributeFloat("hudiconmaxdistance", 1000.0f);
+            Dictionary<int, Identifier> overrideMusic = new Dictionary<int, Identifier>();
+            List<Sprite> portraits = new List<Sprite>();
             foreach (var subElement in element.Elements())
             {
-                string name = subElement.Name.ToString();
-                if (name.Equals("icon", StringComparison.OrdinalIgnoreCase))
+                switch (subElement.Name.ToString().ToLowerInvariant())
                 {
-                    Icon = new Sprite(subElement);
-                    IconColor = subElement.GetAttributeColor("color", Color.White);
-                }
-                else if (name.Equals("hudicon", StringComparison.OrdinalIgnoreCase))
-                {
-                    hudIcon = new Sprite(subElement);
-                    hudIconColor = subElement.GetAttributeColor("color");
+                    case "icon":
+                        Icon = new Sprite(subElement);
+                        IconColor = subElement.GetAttributeColor("color", Color.White);
+                        break;
+                    case "hudicon":
+                        hudIcon = new Sprite(subElement);
+                        hudIconColor = subElement.GetAttributeColor("color");
+                        break;
+                    case "overridemusic":
+                        overrideMusic.Add(
+                            subElement.GetAttributeInt("state", 0),
+                            subElement.GetAttributeIdentifier("type", Identifier.Empty));
+                        break;
+                    case "portrait":
+                        var portrait = new Sprite(subElement, lazyLoad: true);
+                        if (portrait != null)
+                        {
+                            portraits.Add(portrait);
+                        }
+                        break;
                 }
             }
+            this.portraits = portraits.ToImmutableArray();
+            overrideMusicOnState = overrideMusic.ToImmutableDictionary();
+        }
+
+        public Identifier GetOverrideMusicType(int state)
+        {
+            if (overrideMusicOnState.TryGetValue(state, out Identifier id))
+            {
+                return id;
+            }
+            return Identifier.Empty;
+        }
+
+        public Sprite GetPortrait(int randomSeed)
+        {
+            if (portraits.Length == 0) { return null; }
+            return portraits[Math.Abs(randomSeed) % portraits.Length];
         }
 
         partial void DisposeProjectSpecific()