Faction Test v1.0.1.0

2023-02-16 15:01:28 +02:00
parent caa5a2f762
commit 2c5a7923b0
309 changed files with 7502 additions and 4335 deletions
@@ -87,6 +87,8 @@ namespace Barotrauma
        /// Container for the icons above the health bar
        /// </summary>
        private GUIComponent afflictionIconContainer;
+        private float afflictionIconRefreshTimer;
+        const float AfflictionIconRefreshInterval = 1.0f;

        private GUIButton showHiddenAfflictionsButton;

@@ -861,7 +863,7 @@ namespace Barotrauma
                    {
                        treatmentButton.ToolTip =
                            RichString.Rich(
-                                $"‖color:gui.green‖[{TextManager.Get(PlayerInput.MouseButtonsSwapped() ? "input.rightmouse" : "input.leftmouse")}] "
+                                $"‖color:gui.green‖[{PlayerInput.PrimaryMouseLabel}] "
                                + $"{TextManager.Get("quickuseaction.usetreatment")}‖color:end‖" + '\n'
                                + treatmentButton.ToolTip.NestedStr);
                    }
@@ -1157,15 +1159,20 @@ namespace Barotrauma
                    }
                }

-                afflictionIconContainer.RectTransform.SortChildren((r1, r2) =>
+                afflictionIconRefreshTimer -= deltaTime;
+                if (afflictionIconRefreshTimer <= 0.0f)
                {
-                    if (r1.GUIComponent.UserData is not AfflictionPrefab prefab1) { return -1; }
-                    if (r2.GUIComponent.UserData is not AfflictionPrefab prefab2) { return 1; }
-                    var index1 = statusIcons.IndexOf(s => s.Prefab == prefab1);
-                    var index2 = statusIcons.IndexOf(s => s.Prefab == prefab2);
-                    return index1.CompareTo(index2);
-                });
-                (afflictionIconContainer as GUILayoutGroup).NeedsToRecalculate = true;
+                    afflictionIconContainer.RectTransform.SortChildren((r1, r2) =>
+                    {
+                        if (r1.GUIComponent.UserData is not AfflictionPrefab prefab1) { return -1; }
+                        if (r2.GUIComponent.UserData is not AfflictionPrefab prefab2) { return 1; }
+                        var index1 = statusIcons.IndexOf(s => s.Prefab == prefab1);
+                        var index2 = statusIcons.IndexOf(s => s.Prefab == prefab2);
+                        return index1.CompareTo(index2);
+                    });
+                    (afflictionIconContainer as GUILayoutGroup).NeedsToRecalculate = true;
+                    afflictionIconRefreshTimer = AfflictionIconRefreshInterval;
+                }

                Rectangle hiddenAfflictionHoverArea = showHiddenAfflictionsButton.Rect;
                foreach (GUIComponent child in hiddenAfflictionIconContainer.Children)
@@ -1983,6 +1990,7 @@ namespace Barotrauma
        {
            newAfflictions.Clear();
            newPeriodicEffects.Clear();
+            bool newAdded = false;
            byte afflictionCount = inc.ReadByte();
            for (int i = 0; i < afflictionCount; i++)
            {
@@ -2062,6 +2070,7 @@ namespace Barotrauma
                {
                    existingAffliction = afflictionPrefab.Instantiate(strength);
                    afflictions.Add(existingAffliction, limb);
+                    newAdded = true;
                }
                existingAffliction.SetStrength(strength);
                if (existingAffliction == stunAffliction)
@@ -2071,6 +2080,8 @@ namespace Barotrauma
                foreach (var periodicEffect in newPeriodicEffects)
                {
                    if (!existingAffliction.Prefab.PeriodicEffects.Contains(periodicEffect.effect)) { continue; }
+                    if (existingAffliction.Strength < periodicEffect.effect.MinStrength) { continue; }
+                    if (periodicEffect.effect.MaxStrength > 0 && existingAffliction.Strength > periodicEffect.effect.MaxStrength) { continue; }
                    //timer has wrapped around, apply the effect
                    if (periodicEffect.timer - existingAffliction.PeriodicEffectTimers[periodicEffect.effect] > periodicEffect.effect.MinInterval / 2)
                    {
@@ -2086,6 +2097,11 @@ namespace Barotrauma

            CalculateVitality();
            DisplayedVitality = Vitality;
+
+            if (newAdded)
+            {
+                MedicalClinic.OnAfflictionCountChanged(Character);
+            }
        }

        partial void UpdateSkinTint()
@@ -0,0 +1,22 @@
+#nullable enable
+
+using System;
+
+namespace Barotrauma
+{
+    internal static class HealingCooldown
+    {
+        public static float NormalizedCooldown => MathF.Min((float) (DateTimeOffset.UtcNow - OnCooldownUntil).TotalSeconds / CooldownDuration, 0f);
+        public static bool IsOnCooldown => DateTimeOffset.UtcNow < OnCooldownUntil;
+
+        private static DateTimeOffset OnCooldownUntil = DateTimeOffset.MinValue;
+        private const float CooldownDuration = 0.5f;
+
+        public static readonly Identifier MedicalItemTag = new Identifier("medical");
+
+        public static void PutOnCooldown()
+        {
+            OnCooldownUntil = DateTimeOffset.UtcNow.AddSeconds(CooldownDuration);
+        }
+    }
+}