Unstable v0.1300.0.0 (February 19th 2021)

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/ConversationAction.cs

@@ -1,3 +1,4 @@
+using Barotrauma.Extensions;
 using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using System;
@@ -40,9 +41,15 @@ namespace Barotrauma
         [Serialize(true, true)]
         public bool WaitForInteraction { get; set; }
 
+        [Serialize("", true, "Tag to assign to whoever invokes the conversation")]
+        public string InvokerTag { get; set; }
+
         [Serialize(false, true)]
         public bool FadeToBlack { get; set; }
 
+        [Serialize(true, true, "Should the event end if the conversations is interrupted (e.g. if the speaker dies or falls unconscious mid-conversation). Defaults to true.")]
+        public bool EndEventIfInterrupted { get; set; }
+
         [Serialize("", true)]
         public string EventSprite { get; set; }
         
@@ -54,7 +61,6 @@ namespace Barotrauma
 
         private Character speaker;
 
-        private OrderInfo? prevSpeakerOrder;
         private AIObjective prevIdleObjective, prevGotoObjective;
 
         public List<SubactionGroup> Options { get; private set; }
@@ -104,19 +110,26 @@ namespace Barotrauma
                 {
 #if CLIENT
                     dialogBox?.Close();
+                    GUIMessageBox.MessageBoxes.ForEachMod(mb => 
+                    { 
+                        if (mb.UserData as string == "ConversationAction")
+                        {
+                            (mb as GUIMessageBox)?.Close();
+                        }
+                    });
 #else
                     foreach (Client c in GameMain.Server.ConnectedClients)
                     {
                         if (c.InGame && c.Character != null) { ServerWrite(speaker, c); }
                     }
-# endif
+#endif
                     ResetSpeaker();
                     dialogOpened = false;
                 }
 
                 if (Interrupted == null)
                 {
-                    goTo = "_end";
+                    if (EndEventIfInterrupted) { goTo = "_end"; }
                     return true;
                 }
                 else
@@ -171,16 +184,9 @@ namespace Barotrauma
             GameMain.NetworkMember.CreateEntityEvent(speaker, new object[] { NetEntityEvent.Type.AssignCampaignInteraction });
 #endif
             var humanAI = speaker.AIController as HumanAIController;
-            if (humanAI != null)
+            if (humanAI != null && !speaker.IsDead && !speaker.Removed)
             {
-                if (prevSpeakerOrder != null)
-                {
-                    humanAI.SetOrder(prevSpeakerOrder.Value.Order, prevSpeakerOrder.Value.OrderOption, orderGiver: null, speak: false);
-                }
-                else
-                {
-                    humanAI.SetOrder(null, string.Empty, orderGiver: null, speak: false);
-                }
+                humanAI.ClearForcedOrder();
                 if (prevIdleObjective != null) { humanAI.ObjectiveManager.AddObjective(prevIdleObjective); }
                 if (prevGotoObjective != null) { humanAI.ObjectiveManager.AddObjective(prevGotoObjective); }
             }
@@ -255,7 +261,12 @@ namespace Barotrauma
             }
             else
             {
-                if (Options.Any())
+                if (ShouldInterrupt())
+                {
+                    ResetSpeaker();
+                    interrupt = true;
+                }
+                else if (Options.Any())
                 {
                     Options[selectedOption].Update(deltaTime);
                 }
@@ -305,16 +316,11 @@ namespace Barotrauma
 
             if (speaker?.AIController is HumanAIController humanAI)
             {
-                prevSpeakerOrder = null;
-                if (humanAI.CurrentOrder != null)
-                {
-                    prevSpeakerOrder = new OrderInfo(humanAI.CurrentOrder, humanAI.CurrentOrderOption);
-                }
                 prevIdleObjective = humanAI.ObjectiveManager.GetObjective<AIObjectiveIdle>();
                 prevGotoObjective = humanAI.ObjectiveManager.GetObjective<AIObjectiveGoTo>();
-                humanAI.SetOrder(
-                    Order.PrefabList.Find(o => o.Identifier.Equals("wait", StringComparison.OrdinalIgnoreCase)), 
-                    option: string.Empty, orderGiver: null, speak: false);
+                humanAI.SetForcedOrder(
+                    Order.PrefabList.Find(o => o.Identifier.Equals("wait", StringComparison.OrdinalIgnoreCase)),
+                    option: string.Empty, orderGiver: null);
                 if (targets.Any()) 
                 {
                     Entity closestTarget = null;
@@ -335,6 +341,11 @@ namespace Barotrauma
                 }
             }
 
+            if (targetCharacter != null && !string.IsNullOrWhiteSpace(InvokerTag))
+            {
+                ParentEvent.AddTarget(InvokerTag, targetCharacter);
+            }
+            
             ShowDialog(speaker, targetCharacter);
 
             dialogOpened = true;