(965c31410a) Unstable v0.10.4.0

2020-07-21 08:57:50 -03:00
parent 4f8bd39789
commit 33d3a41104
546 changed files with 45952 additions and 25762 deletions
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;

 namespace Barotrauma
 {
@@ -8,6 +9,7 @@ namespace Barotrauma
        protected override float IgnoreListClearInterval => 30;
        public override bool IgnoreUnsafeHulls => true;

+
        public AIObjectiveFightIntruders(Character character, AIObjectiveManager objectiveManager, float priorityModifier = 1) 
            : base(character, objectiveManager, priorityModifier) { }

@@ -21,8 +23,25 @@ namespace Barotrauma
            return 100;
        }

-        protected override AIObjective ObjectiveConstructor(Character target) 
-            => new AIObjectiveCombat(character, target, AIObjectiveCombat.CombatMode.Offensive, objectiveManager, PriorityModifier);
+        protected override AIObjective ObjectiveConstructor(Character target)
+        {
+            var combatObjective = new AIObjectiveCombat(character, target, AIObjectiveCombat.CombatMode.Offensive, objectiveManager, PriorityModifier);
+            if (character.TeamID == Character.TeamType.FriendlyNPC && target.TeamID == Character.TeamType.Team1 && GameMain.GameSession?.GameMode is CampaignMode campaign)
+            {
+                var reputation = campaign.Map?.CurrentLocation?.Reputation;
+                if (reputation != null && reputation.NormalizedValue < Reputation.HostileThreshold)
+                {
+                    combatObjective.holdFireCondition = () =>
+                    {
+                        //hold fire while the enemy is in the airlock (except if they've attacked us)
+                        if (HumanAIController.GetDamageDoneByAttacker(target) > 0.0f) { return false; }
+                        return target.CurrentHull == null || target.CurrentHull.OutpostModuleTags.Any(t => t.Equals("airlock", System.StringComparison.OrdinalIgnoreCase));
+                    };
+                    character.Speak(TextManager.Get("dialogenteroutpostwarning"), null, Rand.Range(0.5f, 1.0f), "leaveoutpostwarning", 30.0f);
+                }
+            }
+            return combatObjective;
+        }

        protected override void OnObjectiveCompleted(AIObjective objective, Character target)
            => HumanAIController.RemoveTargets<AIObjectiveFightIntruders, Character>(character, target);