Unstable v0.1300.0.1

2021-03-05 17:00:56 +02:00
parent 64cdb32078
commit cb969c959f
199 changed files with 6043 additions and 3911 deletions
@@ -260,10 +260,13 @@ namespace Barotrauma

        /// <summary>
        /// Use this method to skip clamping and additional logic of the setters.
-        /// Intended only to be used when the value is already clamped! (networking code)
        /// Ideally we would keep this private, but doing so would require too much refactoring.
        /// </summary>
-        public void SetStrength(float strength) => _strength = strength;
+        public void SetStrength(float strength)
+        {
+            _nonClampedStrength = strength;
+            _strength = _nonClampedStrength;
+        }

        public bool ShouldShowIcon(Character afflictedCharacter)
        {
@@ -290,6 +290,9 @@ namespace Barotrauma
        //how high the strength has to be for the affliction icon to be shown with a health scanner
        public readonly float ShowInHealthScannerThreshold = 0.05f;

+        //how strong the affliction needs to be before bots attempt to treat it
+        public readonly float TreatmentThreshold = 5.0f;
+
        //how much karma changes when a player applies this affliction to someone (per strength of the affliction)
        public float KarmaChangeOnApplied;

@@ -376,6 +379,9 @@ namespace Barotrauma
            {
                DebugConsole.ThrowError("Cannot override all afflictions, because many of them are required by the main game! Please try overriding them one by one.");
            }
+
+            List<(AfflictionPrefab prefab, XElement element)> loadedAfflictions = new List<(AfflictionPrefab prefab, XElement element)>();
+
            foreach (XElement element in mainElement.Elements())
            {
                bool isOverride = element.IsOverride();
@@ -510,10 +516,18 @@ namespace Barotrauma

                if (prefab != null)
                {
+                    loadedAfflictions.Add((prefab, element));
                    Prefabs.Add(prefab, isOverride);
                    prefab.CalculatePrefabUIntIdentifier(Prefabs);
                }
            }
+
+            //load the effects after all the afflictions in the file have been instantiated
+            //otherwise afflictions can't inflict other afflictions that are defined at a later point in the file
+            foreach ((AfflictionPrefab prefab, XElement element) in loadedAfflictions)
+            {
+                prefab.LoadEffects(element);
+            }
        }

        public static void RemoveByFile(string filePath)
@@ -565,6 +579,7 @@ namespace Barotrauma
            MaxStrength         = element.GetAttributeFloat("maxstrength", 100.0f);

            ShowInHealthScannerThreshold = element.GetAttributeFloat("showinhealthscannerthreshold", Math.Max(ActivationThreshold, 0.05f));
+            TreatmentThreshold = element.GetAttributeFloat("treatmentthreshold", Math.Max(ActivationThreshold, 5.0f));

            DamageOverlayAlpha  = element.GetAttributeFloat("damageoverlayalpha", 0.0f);
            BurnOverlayAlpha    = element.GetAttributeFloat("burnoverlayalpha", 0.0f);
@@ -584,9 +599,6 @@ namespace Barotrauma
                    case "icon":
                        Icon = new Sprite(subElement);
                        break;
-                    case "effect":
-                        effects.Add(new Effect(subElement, Name));
-                        break;
                    case "periodiceffect":
                        periodicEffects.Add(new PeriodicEffect(subElement, Name));
                        break;
@@ -614,6 +626,19 @@ namespace Barotrauma
            constructor = type.GetConstructor(new[] { typeof(AfflictionPrefab), typeof(float) });
        }

+        private void LoadEffects(XElement element)
+        {
+            foreach (XElement subElement in element.Elements())
+            {
+                switch (subElement.Name.ToString().ToLowerInvariant())
+                {
+                    case "effect":
+                        effects.Add(new Effect(subElement, Name));
+                        break;
+                }
+            }
+        }
+
        public override string ToString()
        {
            return "AfflictionPrefab (" + Name + ")";
@@ -36,7 +36,11 @@ namespace Barotrauma

            public LimbHealth(XElement element, CharacterHealth characterHealth)
            {
-                Name = TextManager.Get("HealthLimbName." + element.GetAttributeString("name", ""));
+                string limbName = element.GetAttributeString("name", null) ?? "generic";
+                if (limbName != "generic")
+                {
+                    Name = TextManager.Get("HealthLimbName." + limbName);
+                }
                this.characterHealth = characterHealth;
                foreach (XElement subElement in element.Elements())
                {
@@ -664,7 +668,6 @@ namespace Barotrauma
            }
        }

-
        partial void UpdateProjSpecific(float deltaTime);

        partial void UpdateLimbAfflictionOverlays();
@@ -687,6 +690,10 @@ namespace Barotrauma
                {
                    var affliction = limbHealths[i].Afflictions[j];
                    Limb targetLimb = Character.AnimController.Limbs.LastOrDefault(l => !l.IsSevered && !l.Hidden && l.HealthIndex == i);
+                    if (targetLimb == null)
+                    {
+                        targetLimb = Character.AnimController.MainLimb;
+                    }
                    affliction.Update(this, targetLimb, deltaTime);
                    affliction.DamagePerSecondTimer += deltaTime;
                    if (affliction is AfflictionBleeding bleeding)
@@ -877,6 +884,7 @@ namespace Barotrauma
            float minSuitability = -10, maxSuitability = 10;
            foreach (Affliction affliction in GetAllAfflictions())
            {
+                if (affliction.Strength < affliction.Prefab.TreatmentThreshold) { continue; }
                foreach (KeyValuePair<string, float> treatment in affliction.Prefab.TreatmentSuitability)
                {
                    if (!treatmentSuitability.ContainsKey(treatment.Key))