Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

This commit is contained in:
EvilFactory
2025-06-17 15:45:16 -03:00
298 changed files with 7347 additions and 2422 deletions
@@ -882,6 +882,16 @@ namespace Barotrauma
/// Its opacity is controlled by the active effect's MinAfflictionOverlayAlphaMultiplier and MaxAfflictionOverlayAlphaMultiplier
/// </summary>
public readonly Sprite AfflictionOverlay;
/// <summary>
/// The speed of the affliction overlay animation.
/// Only applicable with AfflictionOverlayAnimated, and the overlay has to be a spritesheet so there's something to animate.
/// </summary>
public float AfflictionOverlayAnimSpeed
{
get;
set;
}
public ImmutableDictionary<Identifier, float> TreatmentSuitabilities
{
@@ -1005,6 +1015,10 @@ namespace Barotrauma
case "afflictionoverlay":
AfflictionOverlay = new Sprite(subElement);
break;
case "afflictionoverlayanimated":
AfflictionOverlay = new SpriteSheet(subElement);
AfflictionOverlayAnimSpeed = subElement.GetAttributeFloat("animspeed", 1.0f);
break;
case "statvalue":
DebugConsole.ThrowError($"Error in affliction \"{Identifier}\" - stat values should be configured inside the affliction's effects.",
contentPackage: element.ContentPackage);