v0.19.8.0

This commit is contained in:
Juan Pablo Arce
2022-09-28 21:30:52 -03:00
parent fec8131243
commit 3ca584f2fc
152 changed files with 1931 additions and 1071 deletions
@@ -422,6 +422,8 @@ namespace Barotrauma
}
}
public Color? HighlightColor;
[Serialize("", IsPropertySaveable.Yes)]
@@ -523,6 +525,7 @@ namespace Barotrauma
{
float prevConditionPercentage = ConditionPercentage;
healthMultiplier = MathHelper.Clamp(value, 0.0f, float.PositiveInfinity);
RecalculateConditionValues();
condition = MaxCondition * prevConditionPercentage / 100.0f;
RecalculateConditionValues();
}
@@ -751,6 +754,9 @@ namespace Barotrauma
get { return Prefab.Linkable; }
}
public float WorldPositionX => WorldPosition.X;
public float WorldPositionY => WorldPosition.Y;
/// <summary>
/// Can be used to move the item from XML (e.g. to correct the positions of items whose sprite origin has been changed)
/// </summary>
@@ -1913,8 +1919,11 @@ namespace Barotrauma
if (!wasInWater && CurrentHull != null && body != null && body.LinearVelocity.Y < -1.0f)
{
Splash();
//slow the item down (not physically accurate, but looks good enough)
body.LinearVelocity *= 0.2f;
if (GetComponent<Projectile>() is not { IsActive: true })
{
//slow the item down (not physically accurate, but looks good enough)
body.LinearVelocity *= 0.2f;
}
}
Item container = this.Container;
@@ -3340,10 +3349,8 @@ namespace Barotrauma
item.PurchasedNewSwap = false;
}
float condition = element.GetAttributeFloat("condition", item.MaxCondition);
item.condition = MathHelper.Clamp(condition, 0, item.MaxCondition);
item.condition = MathHelper.Clamp(item.condition, 0, item.MaxCondition);
item.lastSentCondition = item.condition;
item.RecalculateConditionValues();
item.SetActiveSprite();