v0.19.0.0 (unstable)

2022-07-20 18:47:07 +03:00
parent 2e2663a175
commit 6b55adcdd9
170 changed files with 2769 additions and 1634 deletions
@@ -1,4 +1,5 @@
-using Barotrauma.Extensions;
+using System.Collections.Generic;
+using System.Collections.Immutable;
 using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
@@ -15,6 +16,7 @@ namespace Barotrauma.Items.Components
        }
        private GUIButton activateButton;
        private GUIComponent inputInventoryHolder, outputInventoryHolder;
+        private GUIListBox outputDisplayListBox;

        private GUIComponent inSufficientPowerWarning;

@@ -44,32 +46,43 @@ namespace Barotrauma.Items.Components

        protected override void CreateGUI()
        {
-            var paddedFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.90f, 0.80f), GuiFrame.RectTransform, Anchor.Center), childAnchor: Anchor.TopCenter)
+            var paddedFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.9f, 0.88f), GuiFrame.RectTransform, Anchor.Center), childAnchor: Anchor.TopCenter)
            {
-                Stretch = true, 
+                Stretch = true,
                RelativeSpacing = 0.08f
            };

-            new GUITextBlock(new RectTransform(new Vector2(1f, 0.07f), paddedFrame.RectTransform), item.Name, font: GUIStyle.SubHeadingFont)
+            new GUITextBlock(new RectTransform(new Vector2(1f, 0.07f), paddedFrame.RectTransform) { MinSize = new Point(0, GUI.IntScale(25)) }, item.Name, font: GUIStyle.SubHeadingFont)
            {
                TextAlignment = Alignment.Center,
                AutoScaleHorizontal = true
            };

-            var topFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.5f), paddedFrame.RectTransform), style: null);
-                
+            var topFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.375f), paddedFrame.RectTransform), style: null);
+
                // === INPUT LABEL === //
-                var inputLabelArea = new GUILayoutGroup(new RectTransform(new Vector2(0.95f, 0.15f), topFrame.RectTransform, Anchor.TopCenter), childAnchor: Anchor.CenterLeft, isHorizontal: true)
-                {
-                    Stretch = true, 
-                    RelativeSpacing = 0.05f
-                };
-                    var inputLabel = new GUITextBlock(new RectTransform(Vector2.One, inputLabelArea.RectTransform), TextManager.Get("deconstructor.input", "uilabel.input"), font: GUIStyle.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");
+                var inputLabelArea = new GUILayoutGroup(new RectTransform(new Vector2(0.95f, 0.15f), topFrame.RectTransform, Anchor.TopCenter), childAnchor: Anchor.CenterLeft, isHorizontal: true);
+
+                    var queueLabelLayout = new GUILayoutGroup(new RectTransform(new Vector2(0.43f, 1f), inputLabelArea.RectTransform), childAnchor: Anchor.CenterLeft, isHorizontal: true)
+                    {
+                        Stretch = true,
+                        RelativeSpacing = 0.05f
+                    };
+                        var queueLabel = new GUITextBlock(new RectTransform(Vector2.One, queueLabelLayout.RectTransform), TextManager.Get("deconstructor.inputqueue"), font: GUIStyle.SubHeadingFont) { Padding = Vector4.Zero };
+                        queueLabel.RectTransform.Resize(new Point((int) queueLabel.Font.MeasureString(queueLabel.Text).X, queueLabel.RectTransform.Rect.Height));
+                        new GUIFrame(new RectTransform(Vector2.One, queueLabelLayout.RectTransform), style: "HorizontalLine");
+
+                    var inputLabelLayout = new GUILayoutGroup(new RectTransform(new Vector2(0.57f, 1f), inputLabelArea.RectTransform), childAnchor: Anchor.CenterLeft, isHorizontal: true)
+                    {
+                        Stretch = true,
+                        RelativeSpacing = 0.05f
+                    };
+                        var inputLabel = new GUITextBlock(new RectTransform(Vector2.One, inputLabelLayout.RectTransform), TextManager.Get("deconstructor.input", "uilabel.input"), font: GUIStyle.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, inputLabelLayout.RectTransform), style: "HorizontalLine");

                var inputArea = new GUILayoutGroup(new RectTransform(new Vector2(1f, 1f), topFrame.RectTransform, Anchor.CenterLeft), childAnchor: Anchor.BottomLeft, isHorizontal: true) { Stretch = true, RelativeSpacing = 0.05f };
-                    
+
                    // === INPUT SLOTS === //
                    inputInventoryHolder = new GUIFrame(new RectTransform(new Vector2(0.7f, 1f), inputArea.RectTransform), style: null);
                        new GUICustomComponent(new RectTransform(Vector2.One, inputInventoryHolder.RectTransform), DrawOverLay, null) { CanBeFocused = false };
@@ -92,8 +105,8 @@ namespace Barotrauma.Items.Components
                            };

            // === OUTPUT AREA === //
-            var bottomFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.5f), paddedFrame.RectTransform), style: null);
-                
+            var bottomFrame = new GUIFrame(new RectTransform(new Vector2(1f, 0.375f), paddedFrame.RectTransform), style: null);
+
                // === OUTPUT LABEL === //
                var outputLabelArea = new GUILayoutGroup(new RectTransform(new Vector2(0.95f, 0.15f), bottomFrame.RectTransform, Anchor.TopCenter), childAnchor: Anchor.CenterLeft, isHorizontal: true)
                {
@@ -104,10 +117,16 @@ namespace Barotrauma.Items.Components
                    outputLabel.RectTransform.Resize(new Point((int) outputLabel.Font.MeasureString(outputLabel.Text).X, outputLabel.RectTransform.Rect.Height));
                    new GUIFrame(new RectTransform(Vector2.One, outputLabelArea.RectTransform), style: "HorizontalLine");

-            var outputArea = new GUILayoutGroup(new RectTransform(new Vector2(1f, 1f), bottomFrame.RectTransform, Anchor.CenterLeft), childAnchor: Anchor.BottomLeft, isHorizontal: true) { Stretch = true, RelativeSpacing = 0.05f };
+                var outputArea = new GUILayoutGroup(new RectTransform(new Vector2(1f, 1f), bottomFrame.RectTransform, Anchor.CenterLeft), childAnchor: Anchor.BottomLeft, isHorizontal: true) { Stretch = true, RelativeSpacing = 0.05f };

-            // === OUTPUT SLOTS === //
-            outputInventoryHolder = new GUIFrame(new RectTransform(new Vector2(1f - InfoAreaWidth, 1f), outputArea.RectTransform, Anchor.CenterLeft), style: null);
+                // === OUTPUT SLOTS === //
+                outputInventoryHolder = new GUIFrame(new RectTransform(new Vector2(1f - InfoAreaWidth, 1f), outputArea.RectTransform, Anchor.CenterLeft), style: null);
+
+            GUILayoutGroup outputDisplayLayout = new GUILayoutGroup(new RectTransform(new Vector2(1f, 0.25f), paddedFrame.RectTransform), childAnchor: Anchor.TopCenter);
+                    GUILayoutGroup outDisplayTopGroup = new GUILayoutGroup(new RectTransform(new Vector2(0.95f, 0.2f), outputDisplayLayout.RectTransform), isHorizontal: true);
+                        GUITextBlock outDisplayBlock = new GUITextBlock(new RectTransform(Vector2.One, outDisplayTopGroup.RectTransform), TextManager.Get("deconstructor.output"), font: GUIStyle.SubHeadingFont) { Padding = Vector4.Zero };
+                    GUILayoutGroup outDisplayBottomGroup = new GUILayoutGroup(new RectTransform(new Vector2(0.975f, 0.8f), outputDisplayLayout.RectTransform), isHorizontal: true);
+                        outputDisplayListBox = new GUIListBox(new RectTransform(new Vector2(1f, 1f), outDisplayBottomGroup.RectTransform), isHorizontal: true, style: null);

            if (InfoAreaWidth >= 0.0f)
            {
@@ -181,7 +200,7 @@ namespace Barotrauma.Items.Components
                {
                    if (!(linkedTo is Item { DisplaySideBySideWhenLinked: true } linkedItem)) { continue; }
                    if (!linkedItem.Components.Any()) { continue; }
-                
+
                    var itemContainer = linkedItem.GetComponent<ItemContainer>();
                    if (itemContainer?.GuiFrame == null || itemContainer.AllowUIOverlap) { continue; }

@@ -195,6 +214,170 @@ namespace Barotrauma.Items.Components
            return base.Select(character);
        }

+        partial void OnItemSlotsChanged(ItemContainer container)
+        {
+            if (container.Inventory is null) { return; }
+            RefreshOutputDisplay(container.Inventory.AllItems.ToImmutableArray());
+        }
+
+        private void RefreshOutputDisplay(ImmutableArray<Item> items)
+        {
+            const string outputItemCountUserData = "OutputItemCount";
+            const string questionMarkUserData = "UnknownItemOutput";
+
+            if (outputDisplayListBox is null || inputContainer.Inventory is null) { return; }
+
+            Dictionary<Identifier, int> itemCounts = new Dictionary<Identifier, int>();
+            Dictionary<Identifier, GUIComponent> children = new Dictionary<Identifier, GUIComponent>();
+
+            bool addQuestionMark = false;
+
+            foreach (GUIComponent child in outputDisplayListBox.Content.Children)
+            {
+                if (child.UserData is Identifier it)
+                {
+                    children.Add(it, child);
+                }
+            }
+
+            if (outputDisplayListBox.Content.FindChild(questionMarkUserData) is { } foundChild)
+            {
+                outputDisplayListBox.RemoveChild(foundChild);
+            }
+
+            foreach (Item it in items)
+            {
+                if (it.Prefab.RandomDeconstructionOutput)
+                {
+                    addQuestionMark = true;
+                    continue;
+                }
+
+                foreach (DeconstructItem deconstructItem in it.Prefab.DeconstructItems)
+                {
+                    RegisterItem(deconstructItem.ItemIdentifier);
+                }
+
+                if (it.OwnInventory is { } inventory)
+                {
+                    foreach (Item inventoryItems in inventory.AllItems)
+                    {
+                        RegisterItem(inventoryItems.Prefab.Identifier);
+                    }
+                }
+
+                void RegisterItem(Identifier identifier)
+                {
+                    if (itemCounts.ContainsKey(identifier))
+                    {
+                        itemCounts[identifier]++;
+                        return;
+                    }
+
+                    itemCounts.Add(identifier, 1);
+                }
+            }
+
+            foreach (var (it, child) in children)
+            {
+                if (!itemCounts.ContainsKey(it))
+                {
+                    outputDisplayListBox.RemoveChild(child);
+                }
+            }
+
+            foreach (var (it, amount) in itemCounts)
+            {
+                if (!children.TryGetValue(it, out GUIComponent child))
+                {
+                    child = CreateOutputDisplayItem(it, outputDisplayListBox.Content);
+                }
+
+                if (child is null) { continue; }
+                UpdateOutputDisplayItemCount(child, amount);
+            }
+
+            if (addQuestionMark)
+            {
+                CreateQuestionMark(outputDisplayListBox.Content);
+            }
+
+            static void CreateQuestionMark(GUIComponent parent)
+            {
+                GUIFrame itemFrame = new GUIFrame(new RectTransform(new Vector2(0.1f, 1f), parent.RectTransform), style: null)
+                {
+                    UserData = questionMarkUserData,
+                    ToolTip = TextManager.Get("deconstructor.unknownitemsoutput")
+                };
+
+                GUIFrame questionMarkFrame = new GUIFrame(new RectTransform(Vector2.One, itemFrame.RectTransform, scaleBasis: ScaleBasis.Smallest, anchor: Anchor.Center), style: "GUIFrameListBox")
+                {
+                    CanBeFocused = false,
+                };
+
+                // question mark text
+                new GUITextBlock(new RectTransform(Vector2.One, questionMarkFrame.RectTransform, anchor: Anchor.Center), text: "?", textAlignment: Alignment.Center, font: GUIStyle.LargeFont)
+                {
+                    CanBeFocused = false
+                };
+            }
+
+            static GUIComponent CreateOutputDisplayItem(Identifier identifier, GUIComponent parent)
+            {
+                ItemPrefab prefab = ItemPrefab.Find(null, identifier);
+                if (prefab is null) { return null; }
+
+                GUIFrame itemFrame = new GUIFrame(new RectTransform(new Vector2(0.1f, 1f), parent.RectTransform), style: null)
+                {
+                    UserData = identifier,
+                    ToolTip = GetTooltip(prefab)
+                };
+
+                Sprite icon = prefab.InventoryIcon ?? prefab.Sprite;
+                Color iconColor = prefab.InventoryIcon is null ? prefab.SpriteColor : prefab.InventoryIconColor;
+
+                GUIImage itemIcon = new GUIImage(new RectTransform(Vector2.One, itemFrame.RectTransform, scaleBasis: ScaleBasis.Smallest, anchor: Anchor.Center), sprite: icon, scaleToFit: true)
+                {
+                    Color = iconColor,
+                    CanBeFocused = false
+                };
+
+                // item count text
+                new GUITextBlock(new RectTransform(new Vector2(0.5f, 0.5f), itemIcon.RectTransform, anchor: Anchor.BottomRight), "", font: GUIStyle.Font, textAlignment: Alignment.BottomRight)
+                {
+                    UserData = outputItemCountUserData,
+                    Shadow = true,
+                    CanBeFocused = false,
+                    Padding = Vector4.Zero,
+                    TextColor = Color.White,
+                };
+
+                return itemFrame;
+            }
+
+            static void UpdateOutputDisplayItemCount(GUIComponent component, int count)
+            {
+                if (!(component.FindChild(outputItemCountUserData, recursive: true) is GUITextBlock textBlock)) { return; }
+
+                textBlock.Text = TextManager.GetWithVariable("campaignstore.quantity", "[amount]", count.ToString());
+            }
+
+            static RichString GetTooltip(ItemPrefab prefab)
+            {
+                LocalizedString toolTip = $"‖color:{Color.White.ToStringHex()}‖{prefab.Name}‖color:end‖";
+
+                LocalizedString description = prefab.Description;
+                if (!description.IsNullOrEmpty()) { toolTip += '\n' + description; }
+
+                if (prefab.ContentPackage != GameMain.VanillaContent && prefab.ContentPackage != null)
+                {
+                    toolTip += $"\n‖color:{Color.MediumPurple.ToStringHex()}‖{prefab.ContentPackage.Name}‖color:end‖";
+                }
+
+                return RichString.Rich(toolTip);
+            }
+        }
+
        partial void OnItemLoadedProjSpecific()
        {
            inputContainer.AllowUIOverlap = true;
@@ -208,7 +391,7 @@ namespace Barotrauma.Items.Components
            overlayComponent.RectTransform.SetAsLastChild();

            if (!(inputContainer?.Inventory?.visualSlots is { } visualSlots)) { return; }
-            
+
            if (DeconstructItemsSimultaneously)
            {
                for (int i = 0; i < InputContainer.Inventory.Capacity; i++)