Build 0.20.6.0

Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs

@@ -2182,8 +2182,6 @@ namespace Barotrauma
         private AttackTargetData currentAttackTarget;
         public void SetAttackTarget(Limb attackLimb, IDamageable damageTarget, Vector2 attackPos)
         {
-            DebugConsole.NewMessage($"SetAttackTarget {this.ToString()}: " + (damageTarget?.ToString() ?? null));
-
             currentAttackTarget = new AttackTargetData()
             {
                 AttackLimb = attackLimb,

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

@@ -71,6 +71,13 @@ namespace Barotrauma
         /// </summary>
         public Character Source;
 
+        private readonly static LocalizedString[] strengthTexts = new LocalizedString[]
+        {
+            TextManager.Get("AfflictionStrengthLow"),
+            TextManager.Get("AfflictionStrengthMedium"),
+            TextManager.Get("AfflictionStrengthHigh")
+        };
+
         public Affliction(AfflictionPrefab prefab, float strength)
         {
 #if CLIENT
@@ -89,6 +96,7 @@ namespace Barotrauma
             }
         }
 
+
         public void Serialize(XElement element)
         {
             SerializableProperty.SerializeProperties(this, element);
@@ -108,6 +116,17 @@ namespace Barotrauma
 
         public override string ToString() => Prefab == null ? "Affliction (Invalid)" : $"Affliction ({Prefab.Name})";
 
+        public LocalizedString GetStrengthText()
+        {
+            return GetStrengthText(Strength, Prefab.MaxStrength);
+        }
+
+        public static LocalizedString GetStrengthText(float strength, float maxStrength)
+        {
+            return strengthTexts[
+                MathHelper.Clamp((int)Math.Floor(strength / maxStrength * strengthTexts.Length), 0, strengthTexts.Length - 1)];
+        }
+
         public AfflictionPrefab.Effect GetActiveEffect() => Prefab.GetActiveEffect(Strength);
 
         public float GetVitalityDecrease(CharacterHealth characterHealth)

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

@@ -10,7 +10,8 @@
         public override void Update(CharacterHealth characterHealth, Limb targetLimb, float deltaTime)
         {
             base.Update(characterHealth, targetLimb, deltaTime);
-            characterHealth.BloodlossAmount += Strength * (1.0f / 60.0f) * deltaTime;
+            float bloodlossResistance = GetResistance(characterHealth.BloodlossAffliction.Identifier);
+            characterHealth.BloodlossAmount += Strength * (1.0f - bloodlossResistance) / 60.0f * deltaTime;
             if (Source != null)
             {
                 characterHealth.BloodlossAffliction.Source = Source;

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

@@ -880,17 +880,19 @@ namespace Barotrauma
         {
             if (!Character.NeedsOxygen) { return; }
 
+            float oxygenlowResistance = GetResistance(oxygenLowAffliction.Prefab);
             float prevOxygen = OxygenAmount;
             if (IsUnconscious)
             {
+                //clamp above 0.1 (no amount of oxygen low resistance should keep the character alive indefinitely)
+                float decreaseSpeed = Math.Max(0.1f, 1f - oxygenlowResistance);
                 //the character dies of oxygen deprivation in 100 seconds after losing consciousness
-                OxygenAmount = MathHelper.Clamp(OxygenAmount - 1.0f * deltaTime, -100.0f, 100.0f);                
+                OxygenAmount = MathHelper.Clamp(OxygenAmount - decreaseSpeed * deltaTime, -100.0f, 100.0f);                
             }
             else
             {
                 float decreaseSpeed = -5.0f;
                 float increaseSpeed = 10.0f;
-                float oxygenlowResistance = GetResistance(oxygenLowAffliction.Prefab);
                 decreaseSpeed *= (1f - oxygenlowResistance);
                 increaseSpeed *= (1f + oxygenlowResistance);
 

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/EventAction.cs

@@ -40,7 +40,8 @@ namespace Barotrauma
                         DebugConsole.ThrowError($"Error in event prefab \"{scriptedEvent.Prefab.Identifier}\". Status effect configured as a sub action (text: \"{Text}\"). Please configure status effects as child elements of a StatusEffectAction.");
                         continue;
                     }
-                    Actions.Add(Instantiate(scriptedEvent, e));
+                    var action = Instantiate(scriptedEvent, e);
+                    if (action != null) { Actions.Add(action); }
                 }
             }
 
@@ -149,6 +150,10 @@ namespace Barotrauma
             ConstructorInfo constructor = actionType.GetConstructor(new[] { typeof(ScriptedEvent), typeof(ContentXElement) });
             try
             {
+                if (constructor == null)
+                {
+                    throw new Exception($"Error in scripted event \"{scriptedEvent.Prefab.Identifier}\" - could not find a constructor for the EventAction \"{actionType}\".");
+                }
                 return constructor.Invoke(new object[] { scriptedEvent, element }) as EventAction;
             }
             catch (Exception ex)

Barotrauma/BarotraumaShared/SharedSource/GameSession/MedicalClinic.cs

@@ -57,42 +57,18 @@ namespace Barotrauma
             [NetworkSerialize]
             public ushort Strength;
 
+            [NetworkSerialize]
+            public int VitalityDecrease;
+
             [NetworkSerialize]
             public ushort Price;
 
-            public AfflictionSeverity AfflictionSeverity
+            public void SetAffliction(Affliction affliction, CharacterHealth characterHealth)
             {
-                get
-                {
-                    if (Prefab is null) { return AfflictionSeverity.Low; }
-
-                    float normalizedStrength = Strength / Prefab.MaxStrength;
-
-                    // lesser than 0.1
-                    if (normalizedStrength <= 0.1)
-                    {
-                        return AfflictionSeverity.Low;
-                    }
-
-                    // between 0.1 and 0.5
-                    if (normalizedStrength is > 0.1f and < 0.5f)
-                    {
-                        return AfflictionSeverity.Medium;
-                    }
-
-                    // greater than 0.5
-                    return AfflictionSeverity.High;
-                }
-            }
-
-            public Affliction Affliction
-            {
-                set
-                {
-                    Identifier = value.Identifier;
-                    Strength = (ushort)Math.Ceiling(value.Strength);
-                    Price = (ushort)(value.Prefab.BaseHealCost + Strength * value.Prefab.HealCostMultiplier);
-                }
+                Identifier = affliction.Identifier;
+                Strength = (ushort)Math.Ceiling(affliction.Strength);
+                Price = (ushort)(affliction.Prefab.BaseHealCost + Strength * affliction.Prefab.HealCostMultiplier);
+                VitalityDecrease = (int)affliction.GetVitalityDecrease(characterHealth);
             }
 
             private AfflictionPrefab? cachedPrefab;
@@ -306,7 +282,8 @@ namespace Barotrauma
                 }
                 else
                 {
-                    newAffliction = new NetAffliction { Affliction = affliction };
+                    newAffliction = new NetAffliction();
+                    newAffliction.SetAffliction(affliction, health);
                     newAffliction.Price = (ushort)GetAdjustedPrice(newAffliction.Price);
                 }
 

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Holdable.cs

@@ -681,11 +681,10 @@ namespace Barotrauma.Items.Components
                         return false; 
                     }
                     Vector2 attachPos = GetAttachPosition(character, useWorldCoordinates: true);
-                    Structure attachTarget = Structure.GetAttachTarget(attachPos);
-
+                    Submarine attachSubmarine = Structure.GetAttachTarget(attachPos)?.Submarine ?? item.Submarine;
                     int maxAttachableCount = (int)character.Info.GetSavedStatValue(StatTypes.MaxAttachableCount, item.Prefab.Identifier);
                     int currentlyAttachedCount = Item.ItemList.Count(
-                        i => i.Submarine == attachTarget?.Submarine && i.GetComponent<Holdable>() is Holdable holdable && holdable.Attached && i.Prefab.Identifier == item.Prefab.Identifier);
+                        i => i.Submarine == attachSubmarine && i.GetComponent<Holdable>() is Holdable holdable && holdable.Attached && i.Prefab.Identifier == item.Prefab.Identifier);
                     if (maxAttachableCount == 0)
                     {
 #if CLIENT

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Power/Powered.cs

@@ -206,7 +206,7 @@ namespace Barotrauma.Items.Components
             {
                 if (!powerOnSoundPlayed && powerOnSound != null)
                 {
-                    SoundPlayer.PlaySound(powerOnSound.Sound, item.WorldPosition, powerOnSound.Volume, powerOnSound.Range, hullGuess: item.CurrentHull, ignoreMuffling: powerOnSound.IgnoreMuffling);                    
+                    SoundPlayer.PlaySound(powerOnSound.Sound, item.WorldPosition, powerOnSound.Volume, powerOnSound.Range, hullGuess: item.CurrentHull, ignoreMuffling: powerOnSound.IgnoreMuffling, freqMult: powerOnSound.GetRandomFrequencyMultiplier());                    
                     powerOnSoundPlayed = true;
                 }
             }

Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs

@@ -3402,6 +3402,20 @@ namespace Barotrauma
                 item.PurchasedNewSwap = false;
             }
 
+            Version savedVersion = submarine?.Info.GameVersion;
+            if (element.Document?.Root != null && element.Document.Root.Name.ToString().Equals("gamesession", StringComparison.OrdinalIgnoreCase))
+            {
+                //character inventories are loaded from the game session file - use the version number of the saved game session instead of the sub
+                //(the sub may have already been saved and up-to-date, even though the character inventories aren't)
+                savedVersion = new Version(element.Document.Root.GetAttributeString("version", "0.0.0.0"));
+            }
+
+            float prevCondition = item.condition;
+            if (savedVersion != null)
+            {
+                SerializableProperty.UpgradeGameVersion(item, item.Prefab.ConfigElement, savedVersion);
+            }
+
             if (element.GetAttribute("conditionpercentage") != null)
             {
                 item.condition = element.GetAttributeFloat("conditionpercentage", 100.0f) / 100.0f * item.MaxCondition;
@@ -3413,7 +3427,7 @@ namespace Barotrauma
                 //if the item was in full condition considering the unmodified health
                 //(not taking possible HealthMultipliers added by mods into account),
                 //make sure it stays in full condition
-                bool wasFullCondition = item.condition >= item.Prefab.Health;
+                bool wasFullCondition = prevCondition >= item.Prefab.Health;
                 if (wasFullCondition)
                 {
                     item.condition = item.MaxCondition;
@@ -3424,19 +3438,6 @@ namespace Barotrauma
             item.RecalculateConditionValues();
             item.SetActiveSprite();
 
-            Version savedVersion = submarine?.Info.GameVersion;
-            if (element.Document?.Root != null && element.Document.Root.Name.ToString().Equals("gamesession", StringComparison.OrdinalIgnoreCase))
-            {
-                //character inventories are loaded from the game session file - use the version number of the saved game session instead of the sub
-                //(the sub may have already been saved and up-to-date, even though the character inventories aren't)
-                savedVersion = new Version(element.Document.Root.GetAttributeString("version", "0.0.0.0"));
-            }
-            
-            if (savedVersion != null)
-            {
-                SerializableProperty.UpgradeGameVersion(item, item.Prefab.ConfigElement, savedVersion);
-            }
-
             foreach (ItemComponent component in item.components)
             {
                 if (component.Parent != null) { component.IsActive = component.Parent.IsActive; }

Barotrauma/BarotraumaShared/SharedSource/Map/Explosion.cs

@@ -360,18 +360,21 @@ namespace Barotrauma
                         }
                     }
 
-                    AbilityAttackData attackData = new AbilityAttackData(Attack, c, attacker);
-                    if (attackData.Afflictions != null)
+                    if (attack.Afflictions.Any() || attack.Stun > 0.0f)
                     {
-                        modifiedAfflictions.AddRange(attackData.Afflictions);
-                    }
+                        AbilityAttackData attackData = new AbilityAttackData(Attack, c, attacker);
+                        if (attackData.Afflictions != null)
+                        {
+                            modifiedAfflictions.AddRange(attackData.Afflictions);
+                        }
 
-                    //use a position slightly from the limb's position towards the explosion
-                    //ensures that the attack hits the correct limb and that the direction of the hit can be determined correctly in the AddDamage methods
-                    Vector2 dir = worldPosition - limb.WorldPosition;
-                    Vector2 hitPos = limb.WorldPosition + (dir.LengthSquared() <= 0.001f ? Rand.Vector(1.0f) : Vector2.Normalize(dir)) * 0.01f;
-                    AttackResult attackResult = c.AddDamage(hitPos, modifiedAfflictions, attack.Stun * distFactor, false, attacker: attacker, damageMultiplier: attack.DamageMultiplier * attackData.DamageMultiplier);
-                    damages.Add(limb, attackResult.Damage);
+                        //use a position slightly from the limb's position towards the explosion
+                        //ensures that the attack hits the correct limb and that the direction of the hit can be determined correctly in the AddDamage methods
+                        Vector2 dir = worldPosition - limb.WorldPosition;
+                        Vector2 hitPos = limb.WorldPosition + (dir.LengthSquared() <= 0.001f ? Rand.Vector(1.0f) : Vector2.Normalize(dir)) * 0.01f;
+                        AttackResult attackResult = c.AddDamage(hitPos, modifiedAfflictions, attack.Stun * distFactor, false, attacker: attacker, damageMultiplier: attack.DamageMultiplier * attackData.DamageMultiplier);
+                        damages.Add(limb, attackResult.Damage);
+                    }
                     
                     if (attack.StatusEffects != null && attack.StatusEffects.Any())
                     {

Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs

@@ -2539,7 +2539,8 @@ namespace Barotrauma
                     levelResources.Add((itemPrefab, commonnessInfo));
                 }
                 else if (itemPrefab.LevelQuantity.TryGetValue(GenerationParams.Identifier, out var fixedQuantityResourceInfo) ||
-                         itemPrefab.LevelQuantity.TryGetValue(Identifier.Empty, out fixedQuantityResourceInfo))
+                        itemPrefab.LevelQuantity.TryGetValue(LevelData.Biome.Identifier, out fixedQuantityResourceInfo) ||
+                        itemPrefab.LevelQuantity.TryGetValue(Identifier.Empty, out fixedQuantityResourceInfo))
                 {
                     fixedResources.Add((itemPrefab, fixedQuantityResourceInfo));
                 }