Unstable 0.16.1.0

2022-01-27 00:30:32 +09:00
parent 7d6421a548
commit b259af5911
161 changed files with 1913 additions and 638 deletions
@@ -63,7 +63,7 @@ namespace Barotrauma.Items.Components
                    Stretch = true, 
                    RelativeSpacing = 0.05f
                };
-                    var inputLabel = new GUITextBlock(new RectTransform(Vector2.One, inputLabelArea.RectTransform), TextManager.Get("uilabel.input"), font: GUI.SubHeadingFont) { Padding = Vector4.Zero };
+                    var inputLabel = new GUITextBlock(new RectTransform(Vector2.One, inputLabelArea.RectTransform), TextManager.Get("deconstructor.input", fallBackTag: "uilabel.input"), font: GUI.SubHeadingFont) { Padding = Vector4.Zero };
                    inputLabel.RectTransform.Resize(new Point((int) inputLabel.Font.MeasureString(inputLabel.Text).X, inputLabel.RectTransform.Rect.Height));
                    new GUIFrame(new RectTransform(Vector2.One, inputLabelArea.RectTransform), style: "HorizontalLine");

@@ -132,7 +132,7 @@ namespace Barotrauma.Items.Components
                    Stretch = true, 
                    RelativeSpacing = 0.03f
                };
-                    var inputLabel = new GUITextBlock(new RectTransform(Vector2.One, separatorArea.RectTransform), TextManager.Get("uilabel.input"), font: GUI.SubHeadingFont) { Padding = Vector4.Zero };
+                    var inputLabel = new GUITextBlock(new RectTransform(Vector2.One, separatorArea.RectTransform), TextManager.Get("fabricator.input", fallBackTag: "uilabel.input"), font: GUI.SubHeadingFont) { Padding = Vector4.Zero };
                    inputLabel.RectTransform.Resize(new Point((int) inputLabel.Font.MeasureString(inputLabel.Text).X, inputLabel.RectTransform.Rect.Height));
                    new GUIFrame(new RectTransform(Vector2.One, separatorArea.RectTransform), style: "HorizontalLine");

@@ -507,7 +507,7 @@ namespace Barotrauma.Items.Components
                        {
                            Vector2 origin = weaponSprite.Origin;
                            float scale = parentWidth / Math.Max(weaponSprite.size.X, weaponSprite.size.Y);
-                            Color color = !hasPower ? NoPowerColor : turret.ActiveUser is null ? GUI.Style.Red : GUI.Style.Green;
+                            Color color = !hasPower ? NoPowerColor : turret.ActiveUser is null ? Color.DimGray : GUI.Style.Green;
                            weaponSprite.Draw(batch, center, color, origin, rotation, scale, it.SpriteEffects);
                        }
                    });
@@ -1335,7 +1335,7 @@ namespace Barotrauma.Items.Components

            RectangleF entityRect = ScaleRectToUI(structure, parent, border);
            Vector2 spriteScale = new Vector2(entityRect.Size.X / sprite.size.X, entityRect.Size.Y / sprite.size.Y);
-            sprite.Draw(spriteBatch, new Vector2(entityRect.Location.X + inflate, entityRect.Location.Y + inflate), structure.SpriteColor, Vector2.Zero, 0f, spriteScale, structure.SpriteEffects);
+            sprite.Draw(spriteBatch, new Vector2(entityRect.Location.X + inflate, entityRect.Location.Y + inflate), structure.SpriteColor, Vector2.Zero, 0f, spriteScale, sprite.effects ^ structure.SpriteEffects);
        }

        private static RectangleF ScaleRectToUI(MapEntity entity, RectangleF parentRect, RectangleF worldBorders)
@@ -1718,5 +1718,20 @@ namespace Barotrauma.Items.Components

            return new MiniMapHullData(scaledPolygon, worldRect, parentRect.Size, snappedRectangles, hullRefs.ToImmutableArray());
        }
+
+        protected override void RemoveComponentSpecific()
+        {
+            base.RemoveComponentSpecific();
+            if (searchAutoComplete != null)
+            {
+                searchAutoComplete.RectTransform.Parent = null;
+                searchAutoComplete = null;
+            }
+            if (hullInfoFrame != null)
+            {
+                hullInfoFrame.RectTransform.Parent = null;
+                hullInfoFrame = null;
+            }
+        }
    }
 }
@@ -14,7 +14,7 @@ namespace Barotrauma.Items.Components

            if (selectionUI == null)
            {
-                selectionUI = new SubmarineSelection(true, null, GUICanvas.Instance.ItemComponentHolder);
+                selectionUI = new SubmarineSelection(true, null, GUI.Canvas);
            }

            GuiFrame = selectionUI.GuiFrame;
@@ -35,5 +35,15 @@ namespace Barotrauma.Items.Components

            selectionUI?.Update();
        }
+
+        protected override void RemoveComponentSpecific()
+        {
+            base.RemoveComponentSpecific();
+            if (selectionUI != null)
+            {
+                selectionUI.GuiFrame.RectTransform.Parent = null;
+                selectionUI = null;
+            }
+        }
    }
 }
@@ -348,6 +348,27 @@ namespace Barotrauma.Items.Components
            }
        }

+        private Vector2 GetTransducerPos()
+        {
+            if (!UseTransducers || connectedTransducers.Count == 0)
+            {
+                //use the position of the sub if the item is static (no body) and inside a sub
+                return item.Submarine != null && item.body == null ? item.Submarine.WorldPosition : item.WorldPosition;
+            }
+
+            Vector2 transducerPosSum = Vector2.Zero;
+            foreach (ConnectedTransducer transducer in connectedTransducers)
+            {
+                if (transducer.Transducer.Item.Submarine != null && !CenterOnTransducers)
+                {
+                    return transducer.Transducer.Item.Submarine.WorldPosition;
+                }
+                transducerPosSum += transducer.Transducer.Item.WorldPosition;
+            }
+            return transducerPosSum / connectedTransducers.Count;
+        }
+
+
        public override void OnItemLoaded()
        {
            base.OnItemLoaded();