Build 1.1.4.0

Barotrauma/BarotraumaClient/ClientSource/Particles/ParticleEmitter.cs

@@ -85,6 +85,9 @@ namespace Barotrauma.Particles
         [Editable, Serialize(true, IsPropertySaveable.Yes, description: "Should the entity heading direction be applied to the particle rotation? Only affects after flipping the texture and when CopyEntityAngle is true.")]
         public bool CopyEntityDir { get; set; }
 
+        [Editable, Serialize(false, IsPropertySaveable.Yes, description: "Only relevant for status effects. Makes the emitter copy the angle from the target of the effect instead of the entity applying the effect.")]
+        public bool CopyTargetAngle { get; set; }
+
         [Editable, Serialize("1,1,1,1", IsPropertySaveable.Yes)]
         public Color ColorMultiplier { get; set; }
 
@@ -203,7 +206,7 @@ namespace Barotrauma.Particles
                 position += dir * Rand.Range(Prefab.Properties.DistanceMin, Prefab.Properties.DistanceMax);
             }
 
-            var particle = GameMain.ParticleManager.CreateParticle(particlePrefab, position, velocity, particleRotation, hullGuess, Prefab.DrawOnTop, lifeTimeMultiplier: Prefab.Properties.LifeTimeMultiplier, tracerPoints: tracerPoints);
+            var particle = GameMain.ParticleManager.CreateParticle(particlePrefab, position, velocity, particleRotation, hullGuess, lifeTimeMultiplier: Prefab.Properties.LifeTimeMultiplier, tracerPoints: tracerPoints);
 
             if (particle != null)
             {

Barotrauma/BarotraumaClient/ClientSource/Particles/ParticleManager.cs

@@ -75,21 +75,21 @@ namespace Barotrauma.Particles
             return CreateParticle(prefab, position, velocity, rotation, hullGuess, collisionIgnoreTimer: collisionIgnoreTimer, tracerPoints:tracerPoints);
         }
 
-        public Particle CreateParticle(ParticlePrefab prefab, Vector2 position, Vector2 velocity, float rotation = 0.0f, Hull hullGuess = null, bool drawOnTop = false, float collisionIgnoreTimer = 0f, float lifeTimeMultiplier = 1f, Tuple<Vector2, Vector2> tracerPoints = null)
+        public Particle CreateParticle(ParticlePrefab prefab, Vector2 position, Vector2 velocity, float rotation = 0.0f, Hull hullGuess = null, float collisionIgnoreTimer = 0f, float lifeTimeMultiplier = 1f, Tuple<Vector2, Vector2> tracerPoints = null)
         {
             if (prefab == null || prefab.Sprites.Count == 0) { return null; }
-
             if (particleCount >= MaxParticles)
             {
                 for (int i = 0; i < particleCount; i++)
                 {
-                    if (particles[i].Prefab.Priority < prefab.Priority)
+                    if (particles[i].Prefab.Priority < prefab.Priority ||
+                        (!particles[i].Prefab.DrawAlways && prefab.DrawAlways))
                     {
                         RemoveParticle(i);
                         break;
                     }
                 }
-                if (particleCount >= MaxParticles) { return null; }
+                if (particleCount >= MaxParticles) { return null; }                
             }
 
             Vector2 particleEndPos = prefab.CalculateEndPosition(position, velocity);
@@ -109,26 +109,30 @@ namespace Barotrauma.Particles
 
             Rectangle expandedViewRect = MathUtils.ExpandRect(cam.WorldView, MaxOutOfViewDist);
 
-            if (minPos.X > expandedViewRect.Right || maxPos.X < expandedViewRect.X) { return null; }
-            if (minPos.Y > expandedViewRect.Y || maxPos.Y < expandedViewRect.Y - expandedViewRect.Height) { return null; }
+            if (!prefab.DrawAlways)
+            {
+                if (minPos.X > expandedViewRect.Right || maxPos.X < expandedViewRect.X) { return null; }
+                if (minPos.Y > expandedViewRect.Y || maxPos.Y < expandedViewRect.Y - expandedViewRect.Height) { return null; }
+            }
 
             if (particles[particleCount] == null) { particles[particleCount] = new Particle(); }
 
-            particles[particleCount].Init(prefab, position, velocity, rotation, hullGuess, drawOnTop, collisionIgnoreTimer, lifeTimeMultiplier, tracerPoints: tracerPoints);
+            particles[particleCount].Init(prefab, position, velocity, rotation, hullGuess, prefab.DrawOnTop, collisionIgnoreTimer, lifeTimeMultiplier, tracerPoints: tracerPoints);
 
             particleCount++;
 
             return particles[particleCount - 1];
         }
 
-        public List<ParticlePrefab> GetPrefabList()
+        public static List<ParticlePrefab> GetPrefabList()
         {
             return ParticlePrefab.Prefabs.ToList();
         }
 
-        public ParticlePrefab FindPrefab(string prefabName)
+        public static ParticlePrefab FindPrefab(string prefabName)
         {
-            return ParticlePrefab.Prefabs.Find(p => p.Identifier == prefabName);
+            ParticlePrefab.Prefabs.TryGet(prefabName, out ParticlePrefab prefab);
+            return prefab;
         }
 
         private void RemoveParticle(int index)
@@ -170,7 +174,7 @@ namespace Barotrauma.Particles
                     remove = true;
                 }
 
-                if (remove) RemoveParticle(i);
+                if (remove) { RemoveParticle(i); }
             }
         }
 

Barotrauma/BarotraumaClient/ClientSource/Particles/ParticlePrefab.cs

@@ -185,6 +185,9 @@ namespace Barotrauma.Particles
         [Editable, Serialize(false, IsPropertySaveable.No, description: "Should the particle be always rendered on top of entities?")]
         public bool DrawOnTop { get; private set; }
 
+        [Editable, Serialize(false, IsPropertySaveable.No, description: "Draw the particle even when it's calculated to be outside of view (the formula doesn't take scales into account). ")]
+        public bool DrawAlways { get; private set; }
+
         [Editable, Serialize(ParticleBlendState.AlphaBlend, IsPropertySaveable.No, description: "The type of blending to use when rendering the particle.")]
         public ParticleBlendState BlendState { get; private set; }