Unstable 0.15.11.0 + the last 2 unstables I missed

2021-10-27 03:22:53 +09:00
parent fc2f7b76da
commit 6b84ff65e3
71 changed files with 479 additions and 479 deletions
@@ -4579,9 +4579,9 @@ namespace Barotrauma

        private readonly Dictionary<string, float> abilityResistances = new Dictionary<string, float>();

-        public float GetAbilityResistance(string resistanceId)
+        public float GetAbilityResistance(AfflictionPrefab affliction)
        {
-            return abilityResistances.TryGetValue(resistanceId, out float value) ? value : 1f;
+            return abilityResistances.TryGetValue(affliction.Identifier, out float value) ? value : abilityResistances.TryGetValue(affliction.AfflictionType, out float typeValue) ? typeValue : 1f;
        }

        public void ChangeAbilityResistance(string resistanceId, float value)