(d9829ac) v0.9.4.0

2019-10-24 18:05:42 +02:00
parent 9aa12bcac2
commit b39922a074
319 changed files with 12516 additions and 6815 deletions
@@ -21,7 +21,9 @@ namespace Barotrauma
        /// <summary>
        /// How long does it take for the ai target to fade out if not kept alive.
        /// </summary>
-        public float FadeOutTime { get; private set; } = 3;
+        public float FadeOutTime { get; private set; }
+
+        public bool Static { get; private set; }
        
        public float SoundRange
        {
@@ -128,6 +130,19 @@ namespace Barotrauma
            MaxSightRange = element.GetAttributeFloat("maxsightrange", SightRange);
            MaxSoundRange = element.GetAttributeFloat("maxsoundrange", SoundRange);
            FadeOutTime = element.GetAttributeFloat("fadeouttime", FadeOutTime);
+            Static = element.GetAttributeBool("static", Static);
+            if (Static)
+            {
+                SightRange = MaxSightRange;
+                SoundRange = MaxSoundRange;
+            }
+            else
+            {
+                // Non-static ai targets must be kept alive by a custom logic (e.g. item components)
+                SightRange = MinSightRange;
+                SoundRange = MinSoundRange;
+            }
+
            SonarDisruption = element.GetAttributeFloat("sonardisruption", 0.0f);
            SonarLabel = element.GetAttributeString("sonarlabel", "");
            string typeString = element.GetAttributeString("type", "Any");
@@ -143,6 +158,16 @@ namespace Barotrauma
            List.Add(this);
        }

+        public void Update(float deltaTime)
+        {
+            if (!Static && FadeOutTime > 0)
+            {
+                // The aitarget goes silent/invisible if the components don't keep it active
+                SightRange -= deltaTime * (MaxSightRange / FadeOutTime);
+                SoundRange -= deltaTime * (MaxSoundRange / FadeOutTime);
+            }
+        }
+
        public bool IsWithinSector(Vector2 worldPosition)
        {
            if (sectorRad >= MathHelper.TwoPi) return true;