v1.4.4.1 (Blood in the Water Update)

This commit is contained in:
Regalis11
2024-04-24 18:09:05 +03:00
parent 89b91d1c3e
commit ff1b8951a7
397 changed files with 15250 additions and 6479 deletions
@@ -70,6 +70,8 @@ namespace Barotrauma.Particles
public Vector4 ColorMultiplier;
public float VelocityChangeMultiplier;
public bool DrawOnTop { get; private set; }
public ParticlePrefab.DrawTargetType DrawTarget
@@ -121,8 +123,8 @@ namespace Barotrauma.Particles
animState = 0;
animFrame = 0;
currentHull = Hull.FindHull(position, hullGuess);
currentHull = prefab.CanEnterSubs ? Hull.FindHull(position, hullGuess) : null;
size = prefab.StartSizeMin + (prefab.StartSizeMax - prefab.StartSizeMin) * Rand.Range(0.0f, 1.0f);
@@ -178,6 +180,8 @@ namespace Barotrauma.Particles
HighQualityCollisionDetection = false;
VelocityChangeMultiplier = 1.0f;
OnChangeHull = null;
OnCollision = null;
@@ -247,8 +251,8 @@ namespace Barotrauma.Particles
bool inWater = (currentHull == null || (currentHull.Submarine != null && position.Y - currentHull.Submarine.DrawPosition.Y < currentHull.Surface));
if (inWater)
{
velocity.X += velocityChangeWater.X * deltaTime;
velocity.Y += velocityChangeWater.Y * deltaTime;
velocity.X += velocityChangeWater.X * VelocityChangeMultiplier * deltaTime;
velocity.Y += velocityChangeWater.Y * VelocityChangeMultiplier * deltaTime;
if (prefab.WaterDrag > 0.0f)
{
ApplyDrag(prefab.WaterDrag, deltaTime);
@@ -256,8 +260,8 @@ namespace Barotrauma.Particles
}
else
{
velocity.X += velocityChange.X * deltaTime;
velocity.Y += velocityChange.Y * deltaTime;
velocity.X += velocityChange.X * VelocityChangeMultiplier * deltaTime;
velocity.Y += velocityChange.Y * VelocityChangeMultiplier * deltaTime;
if (prefab.Drag > 0.0f)
{
ApplyDrag(prefab.Drag, deltaTime);