409d4d9...aeafa16 (merge human-ai)

Barotrauma/BarotraumaClient/Source/Items/Components/ItemComponent.cs

@@ -184,6 +184,63 @@ namespace Barotrauma.Items.Components
                     }
                 }
             }
+
+            public void ApplyTo(RectTransform target)
+            {
+                if (RelativeOffset.HasValue)
+                {
+                    target.RelativeOffset = RelativeOffset.Value;
+                }
+                else if (AbsoluteOffset.HasValue)
+                {
+                    target.AbsoluteOffset = AbsoluteOffset.Value;
+                }
+                if (RelativeSize.HasValue)
+                {
+                    target.RelativeSize = RelativeSize.Value;
+                }
+                else if (AbsoluteSize.HasValue)
+                {
+                    target.NonScaledSize = AbsoluteSize.Value;
+                }
+                if (Anchor.HasValue)
+                {
+                    target.Anchor = Anchor.Value;
+                }
+                if (Pivot.HasValue)
+                {
+                    target.Pivot = Pivot.Value;
+                }
+                else
+                {
+                    target.Pivot = RectTransform.MatchPivotToAnchor(target.Anchor);
+                }
+                target.RecalculateChildren(true, true);
+            }
+        }
+
+        public GUIFrame GuiFrame { get; protected set; }
+
+        [Serialize(false, false)]
+        public bool AllowUIOverlap
+        {
+            get;
+            set;
+        }
+
+        private ItemComponent linkToUIComponent;
+        [Serialize("", false)]
+        public string LinkUIToComponent
+        {
+            get;
+            set;
+        }
+
+        [Serialize(0, false)]
+        public int HudPriority
+        {
+            get;
+            private set;
         }
 
         private bool shouldMuffleLooping;

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/MiniMap.cs

@@ -78,8 +78,8 @@ namespace Barotrauma.Items.Components
             {
                 CreateHUD();
             }
-
-            float distort = 1.0f - item.Condition / item.Prefab.Health;
+            
+            float distort = 1.0f - item.Condition / item.MaxCondition;
             foreach (HullData hullData in hullDatas.Values)
             {
                 hullData.DistortionTimer -= deltaTime;

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Sonar.cs

@@ -199,8 +199,8 @@ namespace Barotrauma.Items.Components
                     zoomSlider.OnMoved(zoomSlider, zoomSlider.BarScroll);
                 }
             }
-
-            float distort = 1.0f - item.Condition / item.Prefab.Health;
+            
+            float distort = 1.0f - item.Condition / item.MaxCondition;
             for (int i = sonarBlips.Count - 1; i >= 0; i--)
             {
                 sonarBlips[i].FadeTimer -= deltaTime * MathHelper.Lerp(0.5f, 2.0f, distort);
@@ -897,8 +897,8 @@ namespace Barotrauma.Items.Components
         private void DrawBlip(SpriteBatch spriteBatch, SonarBlip blip, Vector2 transducerPos, Vector2 center, float strength)
         {
             strength = MathHelper.Clamp(strength, 0.0f, 1.0f);
-
-            float distort = 1.0f - item.Condition / item.Prefab.Health;
+            
+            float distort = 1.0f - item.Condition / item.MaxCondition;
             
             Vector2 pos = (blip.Position - transducerPos) * displayScale * zoom;
             pos.Y = -pos.Y;

Barotrauma/BarotraumaClient/Source/Items/Components/RepairTool.cs

@@ -108,7 +108,7 @@ namespace Barotrauma.Items.Components
                 var progressBar = user.UpdateHUDProgressBar(
                     targetItem,
                     progressBarPos,
-                    targetItem.Prefab.Health <= 0.0f ? 0.0f : targetItem.Condition / targetItem.Prefab.Health,
+                    targetItem.Condition / item.MaxCondition,
                     Color.Red, Color.Green);
                 if (progressBar != null) { progressBar.Size = new Vector2(60.0f, 20.0f); }
             }

Barotrauma/BarotraumaClient/Source/Items/Components/Repairable.cs

@@ -27,7 +27,7 @@ namespace Barotrauma.Items.Components
         public override bool ShouldDrawHUD(Character character)
         {
             if (!HasRequiredItems(character, false) || character.SelectedConstruction != item) return false;
-            return (item.Condition < ShowRepairUIThreshold || (currentFixer == character && item.Condition < item.Prefab.Health));
+            return (item.Condition < ShowRepairUIThreshold || (currentFixer == character && !item.IsFullCondition));
         }
 
         partial void InitProjSpecific(XElement element)
@@ -90,7 +90,7 @@ namespace Barotrauma.Items.Components
         {
             for (int i = 0; i < particleEmitters.Count; i++)
             {
-                if (item.Condition >= particleEmitterConditionRanges[i].X && item.Condition <= particleEmitterConditionRanges[i].Y)
+                if (item.ConditionPercentage >= particleEmitterConditionRanges[i].X && item.ConditionPercentage <= particleEmitterConditionRanges[i].Y)
                 {
                     particleEmitters[i].Emit(deltaTime, item.WorldPosition, item.CurrentHull);
                 }
@@ -101,8 +101,8 @@ namespace Barotrauma.Items.Components
         {
             IsActive = true;
 
-            progressBar.BarSize = item.Condition / item.Prefab.Health;
-            progressBar.Color = ToolBox.GradientLerp(item.Condition / item.Prefab.Health, Color.Red, Color.Orange, Color.Green);
+            progressBar.BarSize = item.Condition / item.MaxCondition;
+            progressBar.Color = ToolBox.GradientLerp(progressBar.BarSize, Color.Red, Color.Orange, Color.Green);
 
             repairButton.Enabled = currentFixer == null;
             repairButton.Text = currentFixer == null ?