38f1ddb...178a853: v0.8.9.1, removed content folder

Barotrauma/BarotraumaClient/Source/Particles/ParticleEmitter.cs

@@ -7,6 +7,7 @@ namespace Barotrauma.Particles
     class ParticleEmitter
     {
         private float emitTimer;
+        private float burstEmitTimer;
 
         public readonly ParticleEmitterPrefab Prefab;
 
@@ -21,30 +22,34 @@ namespace Barotrauma.Particles
             Prefab = prefab;
         }
 
-        public void Emit(float deltaTime, Vector2 position, Hull hullGuess = null, float angle = 0.0f, float particleRotation = 0.0f)
+        public void Emit(float deltaTime, Vector2 position, Hull hullGuess = null, float angle = 0.0f, float particleRotation = 0.0f, float velocityMultiplier = 1.0f, float sizeMultiplier = 1.0f, float amountMultiplier = 1.0f)
         {
-            emitTimer += deltaTime;
+            emitTimer += deltaTime * amountMultiplier;
+            burstEmitTimer += deltaTime;
 
             if (Prefab.ParticlesPerSecond > 0)
             {
                 float emitInterval = 1.0f / Prefab.ParticlesPerSecond;
                 while (emitTimer > emitInterval)
                 {
-                    Emit(position, hullGuess, angle, particleRotation);
+                    Emit(position, hullGuess, angle, particleRotation, velocityMultiplier, sizeMultiplier);
                     emitTimer -= emitInterval;
                 }
             }
 
-            for (int i = 0; i < Prefab.ParticleAmount; i++)
+            if (burstEmitTimer < Prefab.EmitInterval) return;
+            burstEmitTimer = 0.0f;
+
+            for (int i = 0; i < Prefab.ParticleAmount * amountMultiplier; i++)
             {
-                Emit(position, hullGuess, particleRotation);
+                Emit(position, hullGuess, angle, particleRotation, velocityMultiplier, sizeMultiplier);
             }
         }
 
-        private void Emit(Vector2 position, Hull hullGuess = null, float angle = 0.0f, float particleRotation = 0.0f)
+        private void Emit(Vector2 position, Hull hullGuess, float angle, float particleRotation, float velocityMultiplier, float sizeMultiplier)
         {
             angle += Rand.Range(Prefab.AngleMin, Prefab.AngleMax);
-            Vector2 velocity = new Vector2((float)Math.Cos(angle), (float)Math.Sin(angle)) * Rand.Range(Prefab.VelocityMin, Prefab.VelocityMax);
+            Vector2 velocity = new Vector2((float)Math.Cos(angle), (float)Math.Sin(angle)) * Rand.Range(Prefab.VelocityMin, Prefab.VelocityMax) * velocityMultiplier;
 
             var particle = GameMain.ParticleManager.CreateParticle(Prefab.ParticlePrefab, position, velocity, particleRotation, hullGuess);
 
@@ -87,9 +92,13 @@ namespace Barotrauma.Particles
         public readonly float VelocityMin, VelocityMax;
 
         public readonly float ScaleMin, ScaleMax;
-        
+
+        public readonly float EmitInterval;
         public readonly int ParticleAmount;
-        public readonly float ParticlesPerSecond;        
+
+        public readonly float ParticlesPerSecond;
+
+        public readonly bool CopyEntityAngle;
 
         public ParticleEmitterPrefab(XElement element)
         {
@@ -111,14 +120,14 @@ namespace Barotrauma.Particles
             AngleMin = MathHelper.ToRadians(MathHelper.Clamp(AngleMin, -360.0f, 360.0f));
             AngleMax = MathHelper.ToRadians(MathHelper.Clamp(AngleMax, -360.0f, 360.0f));
 
-            if (element.Attribute("scalemin")==null)
+            if (element.Attribute("scalemin") == null)
             {
                 ScaleMin = 1.0f;
                 ScaleMax = 1.0f;
             }
             else
             {
-                ScaleMin = element.GetAttributeFloat("scalemin",1.0f);
+                ScaleMin = element.GetAttributeFloat("scalemin", 1.0f);
                 ScaleMax = Math.Max(ScaleMin, element.GetAttributeFloat("scalemax", 1.0f));
             }
 
@@ -133,8 +142,11 @@ namespace Barotrauma.Particles
                 VelocityMax = VelocityMin;
             }
 
+            EmitInterval = element.GetAttributeFloat("emitinterval", 0.0f);
             ParticlesPerSecond = element.GetAttributeInt("particlespersecond", 0);
             ParticleAmount = element.GetAttributeInt("particleamount", 0);
+
+            CopyEntityAngle = element.GetAttributeBool("copyentityangle", false);
         }
     }
 }