(fdc49c8c) Unstable 0.9.7.1

2020-02-29 14:45:16 -03:00
parent 27e10f7c2e
commit c81486a993
74 changed files with 666 additions and 468 deletions
@@ -1271,16 +1271,42 @@ namespace Barotrauma

            if (attackResult.Damage > 0.0f)
            {
+                bool canAttack = attacker.Submarine == Character.Submarine && canAttackCharacters || attacker.Submarine != null && canAttackSub;
                if (Character.Params.AI.AttackWhenProvoked)
                {
-                    if (attacker.Submarine == Character.Submarine && canAttackCharacters || attacker.Submarine != null && canAttackSub)
+                    if (canAttack)
                    {
                        ChangeTargetState(attacker, AIState.Attack, 100);
                    }
                }
                else if (!AIParams.HasTag(attacker.SpeciesName))
                {
-                    ChangeTargetState(attacker, AIState.Flee, 100);
+                    if (attacker.AIController is EnemyAIController enemyAI)
+                    {
+                        if (enemyAI.CombatStrength > CombatStrength)
+                        {
+                            if (!AIParams.HasTag("stronger"))
+                            {
+                                ChangeTargetState(attacker, AIState.Escape, 100);
+                            }
+                        }
+                        else if (enemyAI.CombatStrength < CombatStrength)
+                        {
+                            if (!AIParams.HasTag("weaker"))
+                            {
+                                ChangeTargetState(attacker, canAttack ? AIState.Attack : AIState.Escape, 100);
+                            }
+                        }
+                        else
+                        {
+                            // Equal strength
+                            ChangeTargetState(attacker, canAttack ? AIState.Attack : AIState.Escape, 100);
+                        }
+                    }
+                    else
+                    {
+                        ChangeTargetState(attacker, AIState.Escape, 100);
+                    }
                }
            }

@@ -1850,7 +1876,7 @@ namespace Barotrauma
            SetStateResetTimer();
            ChangeParams(target.SpeciesName);
            // Target also items, because if we are blind and the target doesn't move, we can only perceive the target when it uses items
-            if (state == AIState.Attack || state == AIState.Flee)
+            if (state == AIState.Attack || state == AIState.Escape)
            {
                ChangeParams("weapon");
                ChangeParams("tool");
@@ -100,6 +100,14 @@ namespace Barotrauma
                    return;
                }
            }
+            if (targetItem == null || targetItem.Removed)
+            {
+#if DEBUG
+                DebugConsole.NewMessage($"{character.Name}: Target null or removed. Aborting.", Color.Red);
+#endif
+                Abandon = true;
+                return;
+            }
            if (character.IsItemTakenBySomeoneElse(targetItem))
            {
 #if DEBUG