(af16ecdfa) Merge branch 'dev' into human-ai

2019-05-16 05:14:00 +03:00
parent 8be0b0676e
commit bec7aadfa9
65 changed files with 1579 additions and 1449 deletions
@@ -40,7 +40,7 @@ namespace Barotrauma
            flames = true;
            underwaterBubble = true;
        }
-
+        
        public Explosion(XElement element, string parentDebugName)
        {
            attack = new Attack(element, parentDebugName + ", Explosion");
@@ -62,6 +62,16 @@ namespace Barotrauma
            CameraShake = element.GetAttributeFloat("camerashake", attack.Range * 0.1f);
        }

+        public void DisableParticles()
+        {
+            sparks = false;
+            shockwave = false;
+            smoke = false;
+            flash = false;
+            flames = false;
+            underwaterBubble = false;
+        }
+
        public List<Triplet<Explosion, Vector2, float>> GetRecentExplosions(float maxSecondsAgo)
        {
            return prevExplosions.FindAll(e => e.Third >= Timing.TotalTime - maxSecondsAgo);