Faction Test 100.4.0.0

2022-11-14 18:28:28 +02:00
parent 87426b68b2
commit c772b61fc1
412 changed files with 16984 additions and 5530 deletions
@@ -0,0 +1,37 @@
+using Barotrauma.Tutorials;
+using Segment = Barotrauma.ObjectiveManager.Segment;
+
+namespace Barotrauma;
+
+partial class CheckObjectiveAction : BinaryOptionAction
+{
+    public enum CheckType
+    {
+        Added,
+        Completed
+    }
+
+    [Serialize(CheckType.Completed, IsPropertySaveable.Yes)]
+    public CheckType Type { get; set; }
+
+    [Serialize("", IsPropertySaveable.Yes)]
+    public Identifier Identifier { get; set; }
+
+    partial void DetermineSuccessProjSpecific(ref bool success)
+    {
+        success = false;
+        if (Identifier.IsEmpty)
+        {
+            success = ObjectiveManager.AllActiveObjectivesCompleted();
+        }
+        else if (ObjectiveManager.GetObjective(Identifier) is Segment segment)
+        {
+            success = Type switch
+            {
+                CheckType.Added => true,
+                CheckType.Completed => segment.IsCompleted,
+                _ => false
+            };
+        }
+    }
+}
@@ -323,7 +323,10 @@ namespace Barotrauma
                AlwaysOverrideCursor = true
            };

-            LocalizedString translatedText = TextManager.ParseInputTypes(TextManager.Get(text)).Fallback(text);
+            LocalizedString translatedText = speaker?.DisplayName is not null ?
+                TextManager.GetWithVariable(text, "[speakername]", speaker?.DisplayName) :
+                TextManager.Get(text);
+            translatedText = TextManager.ParseInputTypes(translatedText).Fallback(text);

            if (speaker?.Info != null && drawChathead)
            {
@@ -11,11 +11,13 @@ partial class MessageBoxAction : EventAction
        if (Type == ActionType.Create || Type == ActionType.ConnectObjective)
        {
            CreateMessageBox();
-            if (!ObjectiveTag.IsEmpty && GameMain.GameSession?.GameMode is TutorialMode tutorialMode)
+            if (!ObjectiveTag.IsEmpty)
            {
                Identifier id = Identifier.IfEmpty(Text);
-                var segment = Tutorial.Segment.CreateMessageBoxSegment(id, ObjectiveTag, CreateMessageBox);
-                tutorialMode.Tutorial?.TriggerTutorialSegment(segment, connectObjective: Type == ActionType.ConnectObjective);
+                var segment = ObjectiveManager.Segment.CreateMessageBoxSegment(id, ObjectiveTag, CreateMessageBox);
+                segment.CanBeCompleted = ObjectiveCanBeCompleted;
+                segment.ParentId = ParentObjectiveId;
+                ObjectiveManager.TriggerTutorialSegment(segment, connectObjective: Type == ActionType.ConnectObjective);
            }
        }
        else if (Type == ActionType.Close)
@@ -1,50 +1,43 @@
-using Barotrauma.Tutorials;
-
 namespace Barotrauma;

 partial class TutorialSegmentAction : EventAction
 {
-    private Tutorial.Segment segment;
+    private ObjectiveManager.Segment segment;

    partial void UpdateProjSpecific()
    {
        // Only need to create the segment when it's being triggered (otherwise the tutorial already has the segment instance)
        if (Type == SegmentActionType.Trigger)
        {
-            segment = Tutorial.Segment.CreateInfoBoxSegment(Identifier, ObjectiveTag, AutoPlayVideo ? Tutorials.AutoPlayVideo.Yes : Tutorials.AutoPlayVideo.No,
-                new Tutorial.Segment.Text(TextTag, Width, Height, Anchor.Center),
-                new Tutorial.Segment.Video(VideoFile, TextTag, Width, Height));
+            segment = ObjectiveManager.Segment.CreateInfoBoxSegment(Identifier, ObjectiveTag, AutoPlayVideo ? Tutorials.AutoPlayVideo.Yes : Tutorials.AutoPlayVideo.No,
+                new ObjectiveManager.Segment.Text(TextTag, Width, Height, Anchor.Center),
+                new ObjectiveManager.Segment.Video(VideoFile, TextTag, Width, Height));
        }
        else if (Type == SegmentActionType.Add)
        {
-            segment = Tutorial.Segment.CreateObjectiveSegment(Identifier, !ObjectiveTag.IsEmpty ? ObjectiveTag : Identifier);
+            segment = ObjectiveManager.Segment.CreateObjectiveSegment(Identifier, !ObjectiveTag.IsEmpty ? ObjectiveTag : Identifier);
        }
-        if (GameMain.GameSession?.GameMode is TutorialMode tutorialMode)
+        if (segment is not null)
        {
-            if (tutorialMode.Tutorial is Tutorial tutorial)
-            {
-                switch (Type)
-                {
-                    case SegmentActionType.Trigger:
-                    case SegmentActionType.Add:
-                        tutorial.TriggerTutorialSegment(segment);
-                        break;
-                    case SegmentActionType.Complete:
-                        tutorial.CompleteTutorialSegment(Identifier);
-                        break;
-                    case SegmentActionType.Remove:
-                        tutorial.RemoveTutorialSegment(Identifier);
-                        break;
-                    case SegmentActionType.CompleteAndRemove:
-                        tutorial.CompleteTutorialSegment(Identifier);
-                        tutorial.RemoveTutorialSegment(Identifier);
-                        break;
-                }
-            }
+            segment.CanBeCompleted = CanBeCompleted;
+            segment.ParentId = ParentObjectiveId;
        }
-        else
+        switch (Type)
        {
-            DebugConsole.ThrowError($"Error in event \"{ParentEvent.Prefab.Identifier}\": attempting to use TutorialSegmentAction during a non-Tutorial game mode!");
+            case SegmentActionType.Trigger:
+            case SegmentActionType.Add:
+                ObjectiveManager.TriggerTutorialSegment(segment);
+                break;
+            case SegmentActionType.Complete:
+                ObjectiveManager.CompleteTutorialSegment(Identifier);
+                break;
+            case SegmentActionType.Remove:
+                ObjectiveManager.RemoveTutorialSegment(Identifier);
+                break;
+            case SegmentActionType.CompleteAndRemove:
+                ObjectiveManager.CompleteTutorialSegment(Identifier);
+                ObjectiveManager.RemoveTutorialSegment(Identifier);
+                break;
        }
    }
 }
@@ -651,6 +651,7 @@ namespace Barotrauma
                    break;
                case NetworkEventType.MISSION:
                    Identifier missionIdentifier = msg.ReadIdentifier();
+                    int locationIndex = msg.ReadInt32();
                    string missionName = msg.ReadString();
                    MissionPrefab? prefab = MissionPrefab.Prefabs.Find(mp => mp.Identifier == missionIdentifier);
                    if (prefab != null)
@@ -660,6 +661,10 @@ namespace Barotrauma
                        {
                            IconColor = prefab.IconColor
                        };
+                        if (GameMain.GameSession?.Map is { } map && locationIndex > 0 && locationIndex < map.Locations.Count)
+                        {
+                            map.Discover(map.Locations[locationIndex], checkTalents: false);
+                        }
                    }
                    break;
                case NetworkEventType.UNLOCKPATH:
@@ -8,7 +8,7 @@ namespace Barotrauma
        public override int State
        {
            get { return base.State; }
-            protected set
+            set
            {
                if (state != value)
                {
@@ -45,7 +45,10 @@ namespace Barotrauma
                { 
                    requireRescue.Add(character);
 #if CLIENT
-                    GameMain.GameSession.CrewManager.AddCharacterToCrewList(character);
+                    if (allowOrderingRescuees)
+                    {
+                        GameMain.GameSession.CrewManager.AddCharacterToCrewList(character);
+                    }
 #endif
                }
                ushort itemCount = msg.ReadUInt16();
@@ -0,0 +1,129 @@
+using Barotrauma.Networking;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+
+namespace Barotrauma
+{
+    partial class EndMission : Mission
+    {
+        public override bool DisplayAsCompleted => false;
+
+        public override bool DisplayAsFailed => false;
+
+        partial void OnStateChangedProjSpecific()
+        {
+            if (Phase == MissionPhase.NoItemsDestroyed)
+            {
+                CoroutineManager.Invoke(() =>
+                {
+                    if (boss != null && !boss.Removed)
+                    {
+                        new CameraTransition(boss, GameMain.GameScreen.Cam, null, Alignment.Center, panDuration: 8, fadeOut: false, startZoom: 1.0f, endZoom: 0.3f * GUI.yScale)
+                        {
+                            EndWaitDuration = 3.0f
+                        };
+                    }
+                }, delay: 3.0f);
+            }
+            else if (Phase == MissionPhase.AllItemsDestroyed)
+            {
+                CoroutineManager.StartCoroutine(wakeUpCoroutine(), name: "EndMission.wakeUpCoroutine");
+            }
+            else if (Phase == MissionPhase.BossKilled)
+            {
+                CoroutineManager.Invoke(() =>
+                {
+                    new CameraTransition(boss, GameMain.GameScreen.Cam, null, Alignment.Center, panDuration: 3, fadeOut: false, endZoom: 0.1f * GUI.yScale)
+                    {
+                        EndWaitDuration = float.PositiveInfinity
+                    };
+                }, delay: 3.0f);
+            }
+
+            IEnumerable<CoroutineStatus> wakeUpCoroutine()
+            {
+                yield return new WaitForSeconds(wakeUpCinematicDelay);
+                if (boss != null && !boss.Removed)
+                {
+                    new CameraTransition(boss, GameMain.GameScreen.Cam, null, Alignment.Center, panDuration: 5.0f, fadeOut: false, losFadeIn: false, startZoom: 1.0f, endZoom: 0.4f * GUI.yScale)
+                    {
+                        EndWaitDuration = cameraWaitDuration
+                    };
+                }
+                yield return new WaitForSeconds(bossWakeUpDelay);
+                if (boss != null && !boss.Removed)
+                {
+                    foreach (var limb in boss.AnimController.Limbs)
+                    {
+                        if (!limb.FreezeBlinkState) { continue; }                        
+                        limb.FreezeBlinkState = false;
+                        if (limb.LightSource is Lights.LightSource light)
+                        {
+                            light.Enabled = true;
+                        }                        
+                    }
+                }
+            }
+        }
+
+        partial void UpdateProjSpecific()
+        {
+            if (Phase is MissionPhase.Initial or MissionPhase.NoItemsDestroyed or MissionPhase.SomeItemsDestroyed)
+            {
+                // Put asleep.
+                // Have to set the light every frame (or at least periodically), because light.Enabled is changed when Character.IsVisible changes (off/on screen). See GameScreen.Draw(). 
+                foreach (var limb in boss.AnimController.Limbs)
+                {
+                    if (limb.Params.BlinkFrequency > 0)
+                    {
+                        limb.FreezeBlinkState = true;
+                        limb.BlinkPhase = -limb.Params.BlinkHoldTime;
+                        if (limb.LightSource is Lights.LightSource light)
+                        {
+                            light.Enabled = false;
+                        }
+                    }
+                }
+            }
+
+#if DEBUG
+            if (PlayerInput.KeyHit(Microsoft.Xna.Framework.Input.Keys.O))
+            {
+                State = 0;
+            }
+            if (PlayerInput.KeyHit(Microsoft.Xna.Framework.Input.Keys.Y))
+            {
+                destructibleItems.ForEach(it => it.Condition = 0.0f);
+            }
+            if (PlayerInput.KeyHit(Microsoft.Xna.Framework.Input.Keys.U))
+            {
+                boss?.SetAllDamage(20000.0f, 0.0f, 0.0f);
+            }
+#endif
+        }
+
+        public override void ClientReadInitial(IReadMessage msg)
+        {
+            base.ClientReadInitial(msg);
+
+            boss = Character.ReadSpawnData(msg);
+
+            byte minionCount = msg.ReadByte();
+            List<Character> minionList = new List<Character>();
+            for (int i = 0; i < minionCount; i++)
+            {
+                var minion = Character.ReadSpawnData(msg);
+                if (minion == null)
+                {
+                    throw new System.Exception($"Error in EndMission.ClientReadInitial: failed to create a minion (mission: {Prefab.Identifier}, index: {i})");
+                }
+                minionList.Add(minion);
+            }
+            minions = minionList.ToImmutableArray();
+            if (minions.Length != minionCount)
+            {
+                throw new System.Exception("Error in EndMission.ClientReadInitial: minion count does not match the server count (" + minionCount + " != " + minions.Length + "mission: " + Prefab.Identifier + ")");
+            }
+        }
+    }
+}
@@ -2,7 +2,7 @@
 {
    partial class GoToMission : Mission
    {
-        public override bool DisplayAsCompleted => false;
+        public override bool DisplayAsCompleted => State >= Prefab.MaxProgressState;
        public override bool DisplayAsFailed => false;
    }
 }
@@ -43,33 +43,41 @@ namespace Barotrauma
            List<LocalizedString> reputationRewardTexts = new List<LocalizedString>();
            foreach (var reputationReward in ReputationRewards)
            {
-                LocalizedString name = "";
-                
-                if (reputationReward.Key == "location")
+                FactionPrefab targetFaction;
+                if (reputationReward.Key == "location" )
                {
-                    name = $"‖color:gui.orange‖{currLocation.Name}‖end‖";
+                    targetFaction = currLocation.Faction?.Prefab;
                }
                else
                {
-                    var faction = FactionPrefab.Prefabs.Find(f => f.Identifier == reputationReward.Key);
-                    if (faction != null)
-                    {
-                        name = $"‖color:{XMLExtensions.ColorToString(faction.IconColor)}‖{faction.Name}‖end‖";
-                    }
-                    else
-                    {
-                        name = TextManager.Get(reputationReward.Key);
-                    }
+                    FactionPrefab.Prefabs.TryGet(reputationReward.Key, out targetFaction);
+                }
+
+                LocalizedString name;
+                if (targetFaction != null)
+                {
+                    name = $"‖color:{XMLExtensions.ToStringHex(targetFaction.IconColor)}‖{targetFaction.Name}‖end‖";
+                }
+                else
+                {
+                    name = TextManager.Get(reputationReward.Key);
                }
                float normalizedValue = MathUtils.InverseLerp(-100.0f, 100.0f, reputationReward.Value);
                string formattedValue = ((int)reputationReward.Value).ToString("+#;-#;0"); //force plus sign for positive numbers
                LocalizedString rewardText = TextManager.GetWithVariables(
                    "reputationformat",
                    ("[reputationname]", name),
-                    ("[reputationvalue]", $"‖color:{XMLExtensions.ColorToString(Reputation.GetReputationColor(normalizedValue))}‖{formattedValue}‖end‖" ));
+                    ("[reputationvalue]", $"‖color:{XMLExtensions.ToStringHex(Reputation.GetReputationColor(normalizedValue))}‖{formattedValue}‖end‖" ));
                reputationRewardTexts.Add(rewardText.Value);
            }
-            return RichString.Rich(TextManager.AddPunctuation(':', TextManager.Get("reputation"), LocalizedString.Join(", ", reputationRewardTexts)));
+            if (reputationRewardTexts.Any())
+            {
+                return RichString.Rich(TextManager.AddPunctuation(':', TextManager.Get("reputation"), LocalizedString.Join(", ", reputationRewardTexts)));
+            }
+            else
+            {
+                return string.Empty;
+            }
        }

        partial void ShowMessageProjSpecific(int missionState)
@@ -8,6 +8,7 @@ namespace Barotrauma
        {
            foreach (Mission mission in missions)
            {
+                if (!mission.Prefab.ShowStartMessage) { continue; }
                new GUIMessageBox(RichString.Rich(mission.Name), RichString.Rich(mission.Description), Array.Empty<LocalizedString>(), type: GUIMessageBox.Type.InGame, icon: mission.Prefab.Icon)
                {
                    IconColor = mission.Prefab.IconColor,
@@ -13,11 +13,12 @@ namespace Barotrauma
            byte monsterCount = msg.ReadByte();
            for (int i = 0; i < monsterCount; i++)
            {
-                monsters.Add(Character.ReadSpawnData(msg));
-            }
-            if (monsters.Contains(null))
-            {
-                throw new System.Exception("Error in MonsterMission.ClientReadInitial: monster list contains null (mission: " + Prefab.Identifier + ")");
+                var monster = Character.ReadSpawnData(msg);
+                if (monster == null)
+                {
+                    throw new System.Exception($"Error in MonsterMission.ClientReadInitial: failed to create a monster (mission: {Prefab.Identifier}, index: {i})");
+                }
+                monsters.Add(monster);
            }
            if (monsters.Count != monsterCount)
            {
@@ -11,38 +11,59 @@ namespace Barotrauma
        public override void ClientReadInitial(IReadMessage msg)
        {
            base.ClientReadInitial(msg);
-            bool usedExistingItem = msg.ReadBoolean();
-            if (usedExistingItem)
+
+            foreach (var target in targets)
            {
-                ushort id = msg.ReadUInt16();
-                item = Entity.FindEntityByID(id) as Item;
-                if (item == null)
+                bool targetFound = msg.ReadBoolean();
+                if (!targetFound) { continue; }
+
+                bool usedExistingItem = msg.ReadBoolean();
+                if (usedExistingItem)
                {
-                    throw new System.Exception("Error in SalvageMission.ClientReadInitial: failed to find item " + id + " (mission: " + Prefab.Identifier + ")");
+                    ushort id = msg.ReadUInt16();
+                    target.Item = Entity.FindEntityByID(id) as Item;
+                    if (target.Item == null)
+                    {
+                        throw new System.Exception("Error in SalvageMission.ClientReadInitial: failed to find item " + id + " (mission: " + Prefab.Identifier + ")");
+                    }
+                }
+                else
+                {
+                    target.Item = Item.ReadSpawnData(msg);
+                    if (target.Item == null)
+                    {
+                        throw new System.Exception("Error in SalvageMission.ClientReadInitial: spawned item was null (mission: " + Prefab.Identifier + ")");
+                    }
+                }
+
+                int executedEffectCount = msg.ReadByte();
+                for (int i = 0; i < executedEffectCount; i++)
+                {
+                    int listIndex = msg.ReadByte();
+                    int effectIndex = msg.ReadByte();
+                    var selectedEffect = target.StatusEffects[listIndex][effectIndex];
+                    target.Item.ApplyStatusEffect(selectedEffect, selectedEffect.type, deltaTime: 1.0f, worldPosition: target.Item.Position);
+                }
+
+                if (target.Item.body != null)
+                {
+                    target.Item.body.FarseerBody.BodyType = BodyType.Kinematic;
                }
            }
-            else
+        }
+
+        public override void ClientRead(IReadMessage msg)
+        {
+            base.ClientRead(msg);
+            int targetCount = msg.ReadByte();
+            for (int i = 0; i < targetCount; i++)
            {
-                item = Item.ReadSpawnData(msg);
-                if (item == null)
+                var state = (Target.RetrievalState)msg.ReadByte();
+                if (i < targets.Count)
                {
-                    throw new System.Exception("Error in SalvageMission.ClientReadInitial: spawned item was null (mission: " + Prefab.Identifier + ")");
+                    targets[i].State = state;
                }
            }
-
-            int executedEffectCount = msg.ReadByte();
-            for (int i = 0; i < executedEffectCount; i++)
-            {
-                int index1 = msg.ReadByte();
-                int index2 = msg.ReadByte();
-                var selectedEffect = statusEffects[index1][index2];
-                item.ApplyStatusEffect(selectedEffect, selectedEffect.type, deltaTime: 1.0f, worldPosition: item.Position);
-            }
-
-            if (item.body != null)
-            {
-                item.body.FarseerBody.BodyType = BodyType.Kinematic;
-            }
        }
    }
 }