(d5ea3c7d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-03-29 17:24:17 +02:00
parent ca08b803dc
commit ddfd7274e9
22 changed files with 230 additions and 99 deletions
@@ -81,6 +81,9 @@ namespace Barotrauma
        [Serialize(AIBehaviorAfterAttack.FallBack, true), Editable(ToolTip = "The preferred AI behavior after the attack.")]
        public AIBehaviorAfterAttack AfterAttack { get; private set; }

+        [Serialize(false, true), Editable(ToolTip = "Should the ai try to reverse when aiming with this attack?")]
+        public bool Reverse { get; private set; }
+
        [Serialize(0.0f, true), Editable(MinValueFloat = 0.0f, MaxValueFloat = 2000.0f, ToolTip = "Min distance from the attack limb to the target before the AI tries to attack.")]
        public float Range { get; private set; }