v0.10.5.1

2020-09-22 11:31:56 -03:00
parent 44032d0ae0
commit 0002ad2c50
343 changed files with 12276 additions and 5023 deletions
@@ -67,6 +67,11 @@ namespace Barotrauma
            return false;
        }

+        protected bool HasBeenDetermined()
+        {
+            return succeeded.HasValue;
+        }
+
        public override bool SetGoToTarget(string goTo)
        {
            if (Success != null && Success.SetGoToTarget(goTo))
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;

@@ -34,11 +33,11 @@ namespace Barotrauma
                if (!(target is Character chr)) { continue; }
                if (chr.Inventory == null) { continue; }

-                if (itemTags.Any(tag => chr.Inventory.Items.Any(item => item != null && item.HasTag(tag)))) { return true; }
+                if (itemTags.Any(tag => chr.Inventory.FindItemByTag(tag, recursive: true) != null)) { return true; }

                foreach (var identifier in itemIdentifierSplit)
                {
-                    if (chr.Inventory.Items.Any(it => it != null && it.Prefab.Identifier.Equals(identifier, StringComparison.InvariantCultureIgnoreCase)))
+                    if (chr.Inventory.FindItemByIdentifier(identifier, recursive: true) != null)
                    {
                        return true;
                    }
@@ -50,15 +49,9 @@ namespace Barotrauma

        public override string ToDebugString()
        {
-            string subActionStr = "";
-            if (succeeded.HasValue)
-            {
-                subActionStr = $"\n            Sub action: {(succeeded.Value ? Success : Failure)?.CurrentSubAction.ColorizeObject()}";
-            }
-            return $"{ToolBox.GetDebugSymbol(DetermineFinished())} {nameof(CheckItemAction)} -> (TargetTag: {TargetTag.ColorizeObject()}, " +
+            return $"{ToolBox.GetDebugSymbol(HasBeenDetermined())} {nameof(CheckItemAction)} -> (TargetTag: {TargetTag.ColorizeObject()}, " +
                   $"ItemIdentifiers: {ItemIdentifiers.ColorizeObject()}" +
-                   $"Succeeded: {(succeeded.HasValue ? succeeded.Value.ToString() : "not determined").ColorizeObject()})" +
-                   subActionStr;
+                   $"Succeeded: {succeeded.ColorizeObject()})";
        }
    }
 }
@@ -0,0 +1,35 @@
+using System.Xml.Linq;
+
+namespace Barotrauma
+{
+    class CheckMoneyAction : BinaryOptionAction
+    {
+        [Serialize(0, true)]
+        public int Amount { get; set; }
+
+        public CheckMoneyAction(ScriptedEvent parentEvent, XElement element) : base(parentEvent, element)
+        {
+        }
+
+        protected override bool? DetermineSuccess()
+        {
+            if (GameMain.GameSession?.GameMode is CampaignMode campaign)
+            {
+                return campaign.Money >= Amount;
+            }
+            return false;
+        }
+
+        public override string ToDebugString()
+        {
+            string subActionStr = "";
+            if (succeeded.HasValue)
+            {
+                subActionStr = $"\n            Sub action: {(succeeded.Value ? Success : Failure)?.CurrentSubAction.ColorizeObject()}";
+            }
+            return $"{ToolBox.GetDebugSymbol(DetermineFinished())} {nameof(CheckMoneyAction)} -> (Amount: {Amount.ColorizeObject()}" +
+                   $" Succeeded: {(succeeded.HasValue ? succeeded.Value.ToString() : "not determined").ColorizeObject()})" +
+                   subActionStr;
+        }
+    }
+}
@@ -10,6 +10,15 @@ namespace Barotrauma
        [Serialize(AIObjectiveCombat.CombatMode.Offensive, true)]
        public AIObjectiveCombat.CombatMode CombatMode { get; set; }

+        [Serialize(false, true, description: "Did this NPC start the fight (as an aggressor)?")]
+        public bool IsInstigator { get; set; }
+
+        [Serialize(AIObjectiveCombat.CombatMode.None, true)]
+        public AIObjectiveCombat.CombatMode GuardReaction { get; set; }
+
+        [Serialize(AIObjectiveCombat.CombatMode.None, true)]
+        public AIObjectiveCombat.CombatMode WitnessReaction { get; set; }
+
        [Serialize("", true)]
        public string NPCTag { get; set; }

@@ -50,7 +59,8 @@ namespace Barotrauma
                }
                if (enemy == null) { continue; }

-                npc.TurnedHostileByEvent = true;
+                npc.CombatAction = this;
+
                var objectiveManager = humanAiController.ObjectiveManager;
                foreach (var goToObjective in objectiveManager.GetActiveObjectives<AIObjectiveGoTo>())
                {
@@ -55,6 +55,7 @@ namespace Barotrauma
        private Character speaker;

        private OrderInfo? prevSpeakerOrder;
+        private AIObjective prevIdleObjective, prevGotoObjective;

        public List<SubactionGroup> Options { get; private set; }

@@ -169,13 +170,19 @@ namespace Barotrauma
 #if SERVER
            GameMain.NetworkMember.CreateEntityEvent(speaker, new object[] { NetEntityEvent.Type.AssignCampaignInteraction });
 #endif
-            if (prevSpeakerOrder != null)
+            var humanAI = speaker.AIController as HumanAIController;
+            if (humanAI != null)
            {
-                (speaker.AIController as HumanAIController)?.SetOrder(prevSpeakerOrder.Value.Order, prevSpeakerOrder.Value.OrderOption, orderGiver: null, speak: false);
-            }
-            else
-            {
-                (speaker.AIController as HumanAIController)?.SetOrder(null, string.Empty, orderGiver: null, speak: false);
+                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);
+                }
+                if (prevIdleObjective != null) { humanAI.ObjectiveManager.AddObjective(prevIdleObjective); }
+                if (prevGotoObjective != null) { humanAI.ObjectiveManager.AddObjective(prevGotoObjective); }
            }
        }

@@ -246,9 +253,12 @@ namespace Barotrauma
                    TryStartConversation(null);
                }
            }
-            else if (Options.Any())
+            else
            {
-                Options[selectedOption].Update(deltaTime);
+                if (Options.Any())
+                {
+                    Options[selectedOption].Update(deltaTime);
+                }
            }
        }

@@ -300,6 +310,8 @@ namespace Barotrauma
                {
                    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);
@@ -334,25 +346,11 @@ namespace Barotrauma
        {
            if (!interrupt)
            {
-                SubactionGroup selOtion = null;
-                if (selectedOption >= 0 && Options.Count > selectedOption)
-                {
-                    selOtion = Options[selectedOption];
-                }
-
-                EventAction subAction = null;
-                if (selOtion != null)
-                {
-                    subAction = selOtion.CurrentSubAction;
-                }
-
-                return $"{ToolBox.GetDebugSymbol(selectedOption > -1)} {nameof(ConversationAction)} -> (Selected option: {selOtion?.Text.ColorizeObject()})\n" +
-                       $"            Sub action: {subAction.ColorizeObject()}";
+                return $"{ToolBox.GetDebugSymbol(selectedOption > -1, selectedOption < 0 && dialogOpened)} {nameof(ConversationAction)} -> (Selected option: {selectedOption.ColorizeObject()})";
            }
            else
            {
-                return $"{ToolBox.GetDebugSymbol(true)} {nameof(ConversationAction)} -> (Interrupted)\n" +
-                       $"            Sub action: {Interrupted?.CurrentSubAction.ColorizeObject()}";
+                return $"{ToolBox.GetDebugSymbol(true, selectedOption < 0 && dialogOpened)} {nameof(ConversationAction)} -> (Interrupted)";
            }
        }
    }
@@ -42,7 +42,7 @@ namespace Barotrauma
            var targets = ParentEvent.GetTargets(TargetTag).Where(e => e is Character).Select(e => e as Character);
            foreach (var target in targets)
            {
-                target.Info?.IncreaseSkillLevel(Skill, Amount, target.WorldPosition + Vector2.UnitY * 150.0f);
+                target.Info?.IncreaseSkillLevel(Skill?.ToLowerInvariant(), Amount, target.WorldPosition + Vector2.UnitY * 150.0f);
            }
            isFinished = true;
        }
@@ -19,6 +19,8 @@ namespace Barotrauma

        private List<Character> affectedNpcs = null;

+        private AIObjectiveGoTo gotoObjective;
+
        public override void Update(float deltaTime)
        {
            if (isFinished) { return; }
@@ -31,21 +33,18 @@ namespace Barotrauma

                if (Wait)
                {
-                    var newObjective = new AIObjectiveGoTo(npc, npc, humanAiController.ObjectiveManager, repeat: true)
+                    gotoObjective = new AIObjectiveGoTo(npc, npc, humanAiController.ObjectiveManager, repeat: true)
                    {
                        OverridePriority = 100.0f
                    };
-                    humanAiController.ObjectiveManager.AddObjective(newObjective);
+                    humanAiController.ObjectiveManager.AddObjective(gotoObjective);
                    humanAiController.ObjectiveManager.WaitTimer = 0.0f;
                }
                else
                {
-                    foreach (var goToObjective in humanAiController.ObjectiveManager.GetActiveObjectives<AIObjectiveGoTo>())
+                    if (gotoObjective != null)
                    {
-                        if (goToObjective.Target == npc)
-                        {
-                            goToObjective.Abandon = true;
-                        }
+                        gotoObjective.Abandon = true;
                    }
                }
            }
@@ -64,13 +63,10 @@ namespace Barotrauma
                foreach (var npc in affectedNpcs)
                {
                    if (npc.Removed || !(npc.AIController is HumanAIController humanAiController)) { continue; }
-                    foreach (var goToObjective in humanAiController.ObjectiveManager.GetActiveObjectives<AIObjectiveGoTo>())
+                    if (gotoObjective != null)
                    {
-                        if (goToObjective.Target == npc)
-                        {
-                            goToObjective.Abandon = true;
-                        }
-                    }
+                        gotoObjective.Abandon = true;
+                    }                    
                }
                affectedNpcs = null;
            }
@@ -11,21 +11,18 @@ namespace Barotrauma

        public RNGAction(ScriptedEvent parentEvent, XElement element) : base(parentEvent, element) { }

+        private bool isFinished;
+
        protected override bool? DetermineSuccess()
        {
+            isFinished = true;
            return Rand.Range(0.0, 1.0) <= Chance;
        }

        public override string ToDebugString()
        {
-            string subActionStr = "";
-            if (succeeded.HasValue)
-            {
-                subActionStr = $"\n            Sub action: {(succeeded.Value ? Success : Failure)?.CurrentSubAction.ColorizeObject()}";
-            }
-            return $"{ToolBox.GetDebugSymbol(DetermineFinished())} {nameof(RNGAction)} -> (Chance: {Chance.ColorizeObject()}, "+
-                   $"Succeeded: {(succeeded.HasValue ? succeeded.Value.ToString() : "not determined").ColorizeObject()})" +
-                   subActionStr;
+            return $"{ToolBox.GetDebugSymbol(isFinished)} {nameof(RNGAction)} -> (Chance: {Chance.ColorizeObject()}, "+
+                   $"Succeeded: {succeeded.ColorizeObject()})";
        }
    }
 }
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;

@@ -15,7 +16,17 @@ namespace Barotrauma
        [Serialize(1, true)]
        public int Amount { get; set; }

-        public RemoveItemAction(ScriptedEvent parentEvent, XElement element) : base(parentEvent, element) { }
+        public RemoveItemAction(ScriptedEvent parentEvent, XElement element) : base(parentEvent, element) 
+        { 
+            if (string.IsNullOrWhiteSpace(ItemIdentifier))
+            {
+                ItemIdentifier = element.GetAttributeString("itemidentifiers", "");
+            }
+            if (string.IsNullOrWhiteSpace(ItemIdentifier))
+            {
+                DebugConsole.ThrowError($"Error in event \"{parentEvent.Prefab.Identifier}\" - RemoveItemAction without an item identifier.");
+            }
+        }

        private bool isFinished = false;

@@ -32,25 +43,33 @@ namespace Barotrauma
        {
            if (isFinished) { return; }

-            var targets = ParentEvent.GetTargets(TargetTag)
-                .Where(t => t is Character chr && chr.Inventory != null)
-                .Select(t => t as Character).ToList();
-            if (targets.Count <= 0) { return; }
-
-            int count = Amount;
-            while (count > 0 && targets.Count > 0)
+            var targets = ParentEvent.GetTargets(TargetTag);
+            bool hasValidTargets = false;
+            foreach (Entity target in targets)
            {
-                var items = targets[0].Inventory.Items;
-                for (int i = 0; i < items.Length; i++)
+                if (target is Character character && character.Inventory != null) 
                {
-                    if (items[i] != null && items[i].Prefab.Identifier.Equals(ItemIdentifier, StringComparison.InvariantCultureIgnoreCase))
-                    {
-                        Entity.Spawner.AddToRemoveQueue(items[i]);
-                        count--;
-                        if (count <= 0) { break; }
-                    }
+                    hasValidTargets = true;
+                    break;
+                }
+            }
+            if (!hasValidTargets) { return; }
+
+            List<Item> usedItems = new List<Item>();
+            foreach (Entity target in targets)
+            {
+                Inventory inventory = (target as Character)?.Inventory;
+                if (inventory == null) { continue; }
+                while (usedItems.Count < Amount)
+                {
+                    var item = inventory.FindItem(it => 
+                        it != null && 
+                        !usedItems.Contains(it) &&
+                        it.Prefab.Identifier.Equals(ItemIdentifier, StringComparison.InvariantCultureIgnoreCase), recursive: true);
+                    if (item == null) { break; }
+                    Entity.Spawner.AddToRemoveQueue(item);
+                    usedItems.Add(item);
                }
-                targets.RemoveAt(0);
            }
            isFinished = true;
        }
@@ -40,38 +40,42 @@ namespace Barotrauma

            if (GameMain.GameSession?.GameMode is CampaignMode campaign)
            {
-                object currentValue = campaign.CampaignMetadata.GetValue(Identifier);
-                object xmlValue = ConvertXMLValue();
-
-                float? originalValue = ConvertValueToFloat(currentValue ?? 0);
-                float? newValue = ConvertValueToFloat(xmlValue);
-
-                if ((originalValue == null || newValue == null) && Operation != OperationType.Set)
-                {
-                    DebugConsole.ThrowError($"Tried to perform numeric operations to a non number via SetDataAction (Existing: {currentValue?.GetType()}, New: {xmlValue.GetType()})");
-                    return;
-                }
-
-                if (Identifier != null)
-                {
-                    switch (Operation)
-                    {
-                        case OperationType.Set:
-                            campaign.CampaignMetadata.SetValue(Identifier, xmlValue);
-                            break;
-                        case OperationType.Add:
-                            campaign.CampaignMetadata.SetValue(Identifier, originalValue + newValue ?? 0);
-                            break;
-                        case OperationType.Multiply:
-                            campaign.CampaignMetadata.SetValue(Identifier, originalValue * newValue ?? 0);
-                            break;
-                    }
-                }
+                object xmlValue = ConvertXMLValue(Value);
+                PerformOperation(campaign.CampaignMetadata, Identifier, xmlValue, Operation);
            }

            isFinished = true;
        }

+        public static void PerformOperation(CampaignMetadata metadata, string identifier, object value, OperationType operation)
+        {
+            if (metadata == null) { return; }
+
+            object currentValue = metadata.GetValue(identifier);
+
+            float? originalValue = ConvertValueToFloat(currentValue ?? 0);
+            float? newValue = ConvertValueToFloat(value);
+
+            if ((originalValue == null || newValue == null) && operation != OperationType.Set)
+            {
+                DebugConsole.ThrowError($"Tried to perform numeric operations to a non number via SetDataAction (Existing: {currentValue?.GetType()}, New: {value.GetType()})");
+                return;
+            }
+
+            switch (operation)
+            {
+                case OperationType.Set:
+                    metadata.SetValue(identifier, value);
+                    break;
+                case OperationType.Add:
+                    metadata.SetValue(identifier, originalValue + newValue ?? 0);
+                    break;
+                case OperationType.Multiply:
+                    metadata.SetValue(identifier, originalValue * newValue ?? 0);
+                    break;
+            }
+        }
+
        private static float? ConvertValueToFloat(object value)
        {
            if (value is float || value is int)
@@ -82,24 +86,24 @@ namespace Barotrauma
            return null;
        }

-        private object ConvertXMLValue()
+        public static object ConvertXMLValue(string value)
        {
-            if (bool.TryParse(Value, out bool b))
+            if (bool.TryParse(value, out bool b))
            {
                return b;
            }
            
-            if (float.TryParse(Value, out float f))
+            if (float.TryParse(value, out float f))
            {
                return f;
            }

-            return Value;
+            return value;
        }

        public override string ToDebugString()
        {
-            return $"{ToolBox.GetDebugSymbol(isFinished)} {nameof(SetDataAction)} -> (Identifier: {Identifier.ColorizeObject()}, Value: {ConvertXMLValue().ColorizeObject()}, Operation: {Operation.ColorizeObject()})";
+            return $"{ToolBox.GetDebugSymbol(isFinished)} {nameof(SetDataAction)} -> (Identifier: {Identifier.ColorizeObject()}, Value: {ConvertXMLValue(Value).ColorizeObject()}, Operation: {Operation.ColorizeObject()})";
        }
    }
 }
@@ -32,15 +32,9 @@ namespace Barotrauma

        public override string ToDebugString()
        {
-            string subActionStr = "";
-            if (succeeded.HasValue)
-            {
-                subActionStr = $"\n            Sub action: {(succeeded.Value ? Success : Failure)?.CurrentSubAction.ColorizeObject()}";
-            }
-            return $"{ToolBox.GetDebugSymbol(DetermineFinished())} {nameof(SkillCheckAction)} -> (TargetTag: {TargetTag.ColorizeObject()}, " +
-                   $"Required skill: {RequiredSkill.ColorizeObject()}, Required level: {RequiredLevel.ColorizeObject()}, " +
-                   $"Succeeded: {(succeeded.HasValue ? succeeded.Value.ToString() : "not determined").ColorizeObject()})" +
-                   subActionStr;
+            return $"{ToolBox.GetDebugSymbol(HasBeenDetermined())} {nameof(SkillCheckAction)} -> (Target: {TargetTag.ColorizeObject()}, " +
+                   $"Skill: {RequiredSkill.ColorizeObject()}, Level: {RequiredLevel.ColorizeObject()}, " +
+                   $"Succeeded: {succeeded.ColorizeObject()})";
        }
    }
 }
@@ -41,13 +41,18 @@ namespace Barotrauma
        }
        public override void Reset()
        {
+            isRunning = false;
            isFinished = false;
        }

+        public bool isRunning = false;
+
        public override void Update(float deltaTime)
        {
            if (isFinished) { return; }

+            isRunning = true;
+
            var targets1 = ParentEvent.GetTargets(Target1Tag);
            if (!targets1.Any()) { return; }
            
@@ -155,6 +160,8 @@ namespace Barotrauma
            {
                ParentEvent.AddTarget(ApplyToTarget2, entity2);
            }
+
+            isRunning = false;
            isFinished = true;
        }

@@ -162,11 +169,11 @@ namespace Barotrauma
        {
            if (string.IsNullOrEmpty(TargetModuleType))
            {
-                return $"{ToolBox.GetDebugSymbol(isFinished)} {nameof(TriggerAction)} -> (Distance: {((int)distance).ColorizeObject()}, Radius: {Radius.ColorizeObject()}, TargetTags: {Target1Tag.ColorizeObject()}, {Target2Tag.ColorizeObject()})";
+                return $"{ToolBox.GetDebugSymbol(isFinished, isRunning)} {nameof(TriggerAction)} -> (Distance: {((int)distance).ColorizeObject()}, Radius: {Radius.ColorizeObject()}, TargetTags: {Target1Tag.ColorizeObject()}, {Target2Tag.ColorizeObject()})";
            }
            else
            {
-                return $"{ToolBox.GetDebugSymbol(isFinished)} {nameof(TriggerAction)} -> (TargetTags: {Target1Tag.ColorizeObject()}, {TargetModuleType.ColorizeObject()})";
+                return $"{ToolBox.GetDebugSymbol(isFinished, isRunning)} {nameof(TriggerAction)} -> (TargetTags: {Target1Tag.ColorizeObject()}, {TargetModuleType.ColorizeObject()})";
            }
        }
    }