Unstable v0.10.600.0

Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/Affliction.cs

@@ -37,7 +37,7 @@ namespace Barotrauma
         public string Identifier { get; private set; }
 
         [Serialize(1.0f, true, description: "The probability for the affliction to be applied."), Editable(minValue: 0f, maxValue: 1f)]
-        public float Probability { get; private set; } = 1.0f;
+        public float Probability { get; set; } = 1.0f;
 
         public float DamagePerSecond;
         public float DamagePerSecondTimer;
@@ -264,5 +264,10 @@ namespace Barotrauma
         /// Ideally we would keep this private, but doing so would require too much refactoring.
         /// </summary>
         public void SetStrength(float strength) => _strength = strength;
+
+        public bool ShouldShowIcon(Character afflictedCharacter)
+        {
+            return Strength >= (afflictedCharacter == Character.Controlled ? Prefab.ShowIconThreshold : Prefab.ShowIconToOthersThreshold);
+        }
     }
 }

Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/AfflictionPrefab.cs

@@ -273,6 +273,8 @@ namespace Barotrauma
         public readonly float ActivationThreshold = 0.0f;
         //how high the strength has to be for the affliction icon to be shown in the UI
         public readonly float ShowIconThreshold = 0.05f;
+        //how high the strength has to be for the affliction icon to be shown to others with a health scanner or via the health interface
+        public readonly float ShowIconToOthersThreshold = 0.05f;
         public readonly float MaxStrength = 100.0f;
 
         //how high the strength has to be for the affliction icon to be shown with a health scanner
@@ -555,6 +557,7 @@ namespace Barotrauma
 
             ActivationThreshold = element.GetAttributeFloat("activationthreshold", 0.0f);
             ShowIconThreshold   = element.GetAttributeFloat("showiconthreshold", Math.Max(ActivationThreshold, 0.05f));
+            ShowIconToOthersThreshold   = element.GetAttributeFloat("showicontoothersthreshold", ShowIconThreshold);
             MaxStrength         = element.GetAttributeFloat("maxstrength", 100.0f);
 
             ShowInHealthScannerThreshold = element.GetAttributeFloat("showinhealthscannerthreshold", Math.Max(ActivationThreshold, 0.05f));

Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/AfflictionPsychosis.cs

@@ -1,12 +1,4 @@
-using Microsoft.Xna.Framework;
-using System.Collections.Generic;
-using Barotrauma.IO;
-using System.Linq;
-using Barotrauma.Extensions;
-using System.Xml.Linq;
-using System;
-
-namespace Barotrauma
+namespace Barotrauma
 {
     partial class AfflictionPsychosis : Affliction
     {

Barotrauma/BarotraumaShared/SharedSource/Characters/Health/CharacterHealth.cs

@@ -725,10 +725,10 @@ namespace Barotrauma
                 OxygenAmount = MathHelper.Clamp(OxygenAmount + deltaTime * (Character.OxygenAvailable < InsufficientOxygenThreshold ? -5.0f : 10.0f), -100.0f, 100.0f);
             }
 
-            UpdateOxygenProjSpecific(prevOxygen);
+            UpdateOxygenProjSpecific(prevOxygen, deltaTime);
         }
         
-        partial void UpdateOxygenProjSpecific(float prevOxygen);
+        partial void UpdateOxygenProjSpecific(float prevOxygen, float deltaTime);
 
         partial void UpdateBleedingProjSpecific(AfflictionBleeding affliction, Limb targetLimb, float deltaTime);