0.1500.3.0 (🗿 edition)

2021-09-17 22:47:21 +09:00
parent 1231170fce
commit 5a6bbcc79e
75 changed files with 1145 additions and 441 deletions
@@ -8,6 +8,7 @@ using Barotrauma.IO;
 using System.Text;
 using System.Xml.Linq;
 using Barotrauma.Sounds;
+using System.Linq;

 namespace Barotrauma.Items.Components
 {
@@ -145,7 +146,9 @@ namespace Barotrauma.Items.Components
            if (character == null || !character.IsKeyDown(InputType.Aim)) { return; }

            //camera focused on some other item/device, don't draw the crosshair
-            if (character.ViewTarget != null && (character.ViewTarget is Item item) && item.Prefab.FocusOnSelected) { return; }
+            if (character.ViewTarget != null && (character.ViewTarget is Item viewTargetItem) && viewTargetItem.Prefab.FocusOnSelected) { return; }
+            //don't draw the crosshair if the item is in some other type of equip slot than hands (e.g. assault rifle in the bag slot)
+            if (!character.HeldItems.Contains(item)) { return; }

            GUI.HideCursor = (crosshairSprite != null || crosshairPointerSprite != null) &&
                GUI.MouseOn == null && !Inventory.IsMouseOnInventory && !GameMain.Instance.Paused;
@@ -214,7 +214,7 @@ namespace Barotrauma.Items.Components
            if (UILabel == string.Empty) { return string.Empty; }
            if (UILabel != null)
            {
-                return TextManager.Get("UILabel." + UILabel);
+                return TextManager.Get("UILabel." + UILabel, returnNull: true) ?? TextManager.Get(UILabel);
            }
            else
            {
@@ -37,7 +37,7 @@ namespace Barotrauma.Items.Components

        private FabricationRecipe pendingFabricatedItem;

-        private Pair<Rectangle, string> tooltip;
+        private (Rectangle area, string text)? tooltip;

        private GUITextBlock requiredTimeBlock;

@@ -270,7 +270,7 @@ namespace Barotrauma.Items.Components
            });

            var sufficientSkillsText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.15f), itemList.Content.RectTransform),
-                TextManager.Get("fabricatorsufficientskills", returnNull: true) ?? "Sufficient skills to fabricate", textColor: GUI.Style.Green, font: GUI.SubHeadingFont)
+                TextManager.Get("fabricatorsufficientskills"), textColor: GUI.Style.Green, font: GUI.SubHeadingFont)
            {
                AutoScaleHorizontal = true,
                CanBeFocused = false
@@ -278,7 +278,7 @@ namespace Barotrauma.Items.Components
            sufficientSkillsText.RectTransform.SetAsFirstChild();

            var insufficientSkillsText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.15f), itemList.Content.RectTransform),
-                TextManager.Get("fabricatorinsufficientskills", returnNull: true) ?? "Insufficient skills to fabricate", textColor: Color.Orange, font: GUI.SubHeadingFont)
+                TextManager.Get("fabricatorinsufficientskills"), textColor: Color.Orange, font: GUI.SubHeadingFont)
            {
                AutoScaleHorizontal = true,
                CanBeFocused = false
@@ -290,7 +290,7 @@ namespace Barotrauma.Items.Components
            }

            var requiresRecipeText = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.15f), itemList.Content.RectTransform),
-                TextManager.Get("fabricatorrequiresrecipe", returnNull: true) ?? "Requires recipe to fabricate", textColor: Color.Red, font: GUI.SubHeadingFont)
+                TextManager.Get("fabricatorrequiresrecipe"), textColor: Color.Red, font: GUI.SubHeadingFont)
            {
                AutoScaleHorizontal = true,
                CanBeFocused = false
@@ -403,7 +403,7 @@ namespace Barotrauma.Items.Components
                        {
                            toolTipText += '\n' + requiredItem.ItemPrefabs.First().Description;
                        }
-                        tooltip = new Pair<Rectangle, string>(slotRect, toolTipText);
+                        tooltip = (slotRect, toolTipText);
                    }

                    slotIndex++;
@@ -443,7 +443,7 @@ namespace Barotrauma.Items.Components
            
            if (tooltip != null)
            {
-                GUIComponent.DrawToolTip(spriteBatch, tooltip.Second, tooltip.First);
+                GUIComponent.DrawToolTip(spriteBatch, tooltip.Value.text, tooltip.Value.area);
                tooltip = null;
            }
        }
@@ -463,6 +463,22 @@ namespace Barotrauma.Items.Components
                if (recipe?.DisplayName == null) { continue; }
                child.Visible = recipe.DisplayName.ToLower().Contains(filter);
            }
+
+            //go through the elements backwards, and disable the labels ("insufficient skills to fabricate", "recipe required...") if there's no items below them
+            bool recipeVisible = false;
+            foreach (GUIComponent child in itemList.Content.Children.Reverse())
+            {
+                if (!(child.UserData is FabricationRecipe recipe))
+                {
+                    child.Visible = recipeVisible;
+                    recipeVisible = false;
+                }
+                else
+                {
+                    recipeVisible = child.Visible;
+                }
+            }
+
            itemList.UpdateScrollBarSize();
            itemList.BarScroll = 0.0f;

@@ -498,9 +514,20 @@ namespace Barotrauma.Items.Components
                };
            }*/

+            string name = GetRecipeNameAndAmount(selectedItem);
+
+            float quality = 0;
+            foreach (string tag in selectedItem.TargetItem.Tags)
+            {
+                quality += user?.Info?.GetSavedStatValue(StatTypes.IncreaseFabricationQuality, tag) ?? 0;
+            }
+            if (quality > 0)
+            {
+                name = TextManager.GetWithVariable("itemname.quality" + (int)quality, "[itemname]", name+'\n', fallBackTag: "itemname.quality3");
+            }

            var nameBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedFrame.RectTransform),
-                GetRecipeNameAndAmount(selectedItem), textAlignment: Alignment.CenterLeft, textColor: Color.Aqua, font: GUI.SubHeadingFont)
+               name, textAlignment: Alignment.CenterLeft, textColor: Color.Aqua, font: GUI.SubHeadingFont, parseRichText: true)
            {
                AutoScaleHorizontal = true
            };
@@ -218,8 +218,8 @@ namespace Barotrauma.Items.Components
                                      DefaultNeutralColor = MiniMapBaseColor * 0.8f,
                                      HoverColor = Color.White,
                                      BlueprintBlue = new Color(23, 38, 33),
-                                      HullWaterColor = new Color(17, 173, 179),
-                                      HullWaterLineColor = Color.LightBlue,
+                                      HullWaterColor = new Color(17, 173, 179) * 0.5f,
+                                      HullWaterLineColor = Color.LightBlue * 0.5f,
                                      NoPowerColor = MiniMapBaseColor * 0.1f,
                                      ElectricalBaseColor = GUI.Style.Orange,
                                      NoPowerElectricalColor = ElectricalBaseColor * 0.1f;
@@ -307,10 +307,13 @@ namespace Barotrauma.Items.Components

            if (reports.Any())
            {
-                CrewManager.CreateReports(GameMain.GameSession?.CrewManager, reportFrame, reports, true);
+                CrewManager.CreateReportButtons(GameMain.GameSession?.CrewManager, reportFrame, reports, true);
            }

-            searchBarFrame = new GUILayoutGroup(new RectTransform(new Vector2(1), bottomFrame.RectTransform), isHorizontal: true, childAnchor: Anchor.Center);
+            searchBarFrame = new GUILayoutGroup(new RectTransform(new Vector2(1.5f, 1.0f), bottomFrame.RectTransform, Anchor.Center), isHorizontal: true, childAnchor: Anchor.Center)
+            {
+                Visible = false
+            };
            searchBar = new GUITextBox(new RectTransform(new Vector2(1), searchBarFrame.RectTransform), string.Empty, createClearButton: true, createPenIcon: true)
            {
                OnEnterPressed = (box, text) =>
@@ -345,6 +348,7 @@ namespace Barotrauma.Items.Components

            foreach (ItemPrefab prefab in ItemPrefab.Prefabs.OrderBy(prefab => prefab.Name))
            {
+                if (prefab.HideInMenus) { continue; }
                CreateItemFrame(prefab, listBox.Content.RectTransform);
            }

@@ -355,7 +359,10 @@ namespace Barotrauma.Items.Components

            searchBar.OnSelected += (sender, key) =>
            {
-                itemsFoundOnSub = Item.ItemList.Where(it => it.Submarine == item.Submarine && !it.NonInteractable && !it.HiddenInGame && it.Components.OfType<Holdable>().Any()).Select(it => it.Prefab).ToImmutableHashSet();
+                itemsFoundOnSub = Item.ItemList.Where(it => 
+                    it.Submarine == item.Submarine && 
+                    !it.NonInteractable && !it.HiddenInGame && 
+                    (it.GetComponent<Holdable>() != null || it.GetComponent<Wearable>() != null)).Select(it => it.Prefab).ToImmutableHashSet();
            };

            searchBar.OnKeyHit += ControlSearchTooltip;
@@ -487,21 +494,24 @@ namespace Barotrauma.Items.Components
                CreateHUD();
            }

-            if (PlayerInput.PrimaryMouseButtonDown() && currentMode != MiniMapMode.HullStatus)
+            if (scissorComponent != null)
            {
-                if (GUI.MouseOn == scissorComponent || scissorComponent.IsParentOf(GUI.MouseOn))
+                if (PlayerInput.PrimaryMouseButtonDown() && currentMode != MiniMapMode.HullStatus)
                {
-                    dragMapStart = PlayerInput.MousePosition;
+                    if (GUI.MouseOn == scissorComponent || scissorComponent.IsParentOf(GUI.MouseOn))
+                    {
+                        dragMapStart = PlayerInput.MousePosition;
+                    }
                }
-            }

-            if (currentMode != MiniMapMode.HullStatus && Math.Abs(PlayerInput.ScrollWheelSpeed) > 0 && (GUI.MouseOn == scissorComponent || scissorComponent.IsParentOf(GUI.MouseOn)))
-            {
-                float newZoom = Math.Clamp(Zoom + PlayerInput.ScrollWheelSpeed / 1000.0f * Zoom, minZoom, maxZoom);
-                float distanceScale = newZoom / Zoom;
-                mapOffset *= distanceScale;
-                recalculate |= !MathUtils.NearlyEqual(Zoom, newZoom);
-                Zoom = newZoom;
+                if (currentMode != MiniMapMode.HullStatus && Math.Abs(PlayerInput.ScrollWheelSpeed) > 0 && (GUI.MouseOn == scissorComponent || scissorComponent.IsParentOf(GUI.MouseOn)))
+                {
+                    float newZoom = Math.Clamp(Zoom + PlayerInput.ScrollWheelSpeed / 1000.0f * Zoom, minZoom, maxZoom);
+                    float distanceScale = newZoom / Zoom;
+                    mapOffset *= distanceScale;
+                    recalculate |= !MathUtils.NearlyEqual(Zoom, newZoom);
+                    Zoom = newZoom;
+                }
            }

            if (dragMapStart is { } dragStart)
@@ -524,15 +534,13 @@ namespace Barotrauma.Items.Components

            if (recalculate)
            {
-                miniMapContainer.RectTransform.LocalScale = new Vector2(Zoom);
-                miniMapContainer.RectTransform.RecalculateChildren(true, true);
-                miniMapContainer.RectTransform.AbsoluteOffset = mapOffset.ToPoint();
+                if (miniMapContainer != null)
+                {
+                    miniMapContainer.RectTransform.LocalScale = new Vector2(Zoom);
+                    miniMapContainer.RectTransform.RecalculateChildren(true, true);
+                    miniMapContainer.RectTransform.AbsoluteOffset = mapOffset.ToPoint();
+                }
                recalculate = false;
-
-                // var (maxWidth, maxHeight) = miniMapContainer.Rect.Size.ToVector2() / 2f;
-                //
-                // mapOffset.X = Math.Clamp(mapOffset.X, -maxWidth, maxWidth);
-                // mapOffset.Y = Math.Clamp(mapOffset.Y, -maxHeight, maxHeight);
            }

            // is there a better way to do this?
@@ -606,17 +614,6 @@ namespace Barotrauma.Items.Components

        private void DrawHUDFront(SpriteBatch spriteBatch, GUICustomComponent container)
        {
-            // TODO remove
-            #warning remove
-            if (currentMode == MiniMapMode.HullCondition)
-            {
-                const string wipText = "work in progress";
-                Vector2 textSize = GUI.LargeFont.MeasureString(wipText);
-                Vector2 textPos = GuiFrame.Rect.Center.ToVector2();
-
-                GUI.DrawString(spriteBatch, textPos - textSize / 2, wipText.ToUpper(), GUI.Style.Orange, Color.Black * 0.8f, backgroundPadding: 8, font: GUI.LargeFont);
-            }
-
            if (Voltage < MinVoltage)
            {
                Vector2 textSize = GUI.Font.MeasureString(noPowerTip);
@@ -627,18 +624,45 @@ namespace Barotrauma.Items.Components
                return;
            }

-            if (currentMode == MiniMapMode.HullStatus)
+            if (currentMode == MiniMapMode.HullStatus || currentMode == MiniMapMode.HullCondition)
            {
                Rectangle prevScissorRect = spriteBatch.GraphicsDevice.ScissorRectangle;
                spriteBatch.End();
                spriteBatch.Begin(SpriteSortMode.Deferred, samplerState: GUI.SamplerState, rasterizerState: GameMain.ScissorTestEnable);
                spriteBatch.GraphicsDevice.ScissorRectangle = submarineContainer.Rect;

-                foreach (var (entity, component) in hullStatusComponents)
+                if (currentMode == MiniMapMode.HullCondition && item.Submarine != null)
                {
-                    if (!(entity is Hull hull)) { continue; }
-                    if (!hullDatas.TryGetValue(hull, out HullData? hullData) || hullData is null) { continue; }
-                    DrawHullCards(spriteBatch, hull, hullData, component.RectComponent);
+                    var sprite = GUI.Style.UIGlowSolidCircular?.Sprite;
+                    float alpha = (MathF.Sin(blipState / maxBlipState * MathHelper.TwoPi) + 1.5f) * 0.5f;
+                    if (sprite != null)
+                    {
+                        Vector2 spriteSize = sprite.size;
+                        Rectangle worldBorders = item.Submarine.GetDockedBorders();
+                        worldBorders.Location += item.Submarine.WorldPosition.ToPoint();
+                        foreach (Gap gap in Gap.GapList)
+                        {
+                            if (gap.IsRoomToRoom || gap.Submarine != item.Submarine || gap.ConnectedDoor != null) { continue; }
+                            RectangleF entityRect = ScaleRectToUI(gap, miniMapFrame.Rect, worldBorders);
+
+                            Vector2 scale = new Vector2(entityRect.Size.X / spriteSize.X, entityRect.Size.Y / spriteSize.Y) * 2.0f;
+
+                            Color color = ToolBox.GradientLerp(gap.Open, GUI.Style.HealthBarColorMedium, GUI.Style.HealthBarColorLow) * alpha;
+                            sprite.Draw(spriteBatch,
+                                miniMapFrame.Rect.Location.ToVector2() + entityRect.Center,
+                                color, origin: sprite.Origin, rotate: 0.0f, scale: scale);
+                        }
+                    }
+                }
+
+                if (currentMode == MiniMapMode.HullStatus)
+                {
+                    foreach (var (entity, component) in hullStatusComponents)
+                    {
+                        if (!(entity is Hull hull)) { continue; }
+                        if (!hullDatas.TryGetValue(hull, out HullData? hullData) || hullData is null) { continue; }
+                        DrawHullCards(spriteBatch, hull, hullData, component.RectComponent);
+                    }
                }

                spriteBatch.End();
@@ -721,14 +745,21 @@ namespace Barotrauma.Items.Components
                UserData = prefab
            };

-            GUILayoutGroup layout = new GUILayoutGroup(new RectTransform(Vector2.One, frame.RectTransform), isHorizontal: true);
+            GUILayoutGroup layout = new GUILayoutGroup(new RectTransform(Vector2.One, frame.RectTransform), isHorizontal: true)
+            {
+                Stretch = true
+            };
            new GUIImage(new RectTransform(Vector2.One, layout.RectTransform, scaleBasis: ScaleBasis.BothHeight), sprite)
            {
-                Color = prefab.InventoryIconColor
+                Color = prefab.InventoryIconColor,
+                UserData = prefab
            };

-            new GUITextBlock(new RectTransform(Vector2.One, layout.RectTransform), prefab.Name, font: GUI.SubHeadingFont);
-            layout.UserData = prefab;
+            var nameText = new GUITextBlock(new RectTransform(Vector2.One, layout.RectTransform), prefab.Name);
+            nameText.RectTransform.SizeChanged += () =>
+            {
+                nameText.Text = ToolBox.LimitString(prefab.Name, nameText.Font, nameText.Rect.Width);
+            };
        }

        private void SearchItems(string text)
@@ -792,15 +823,18 @@ namespace Barotrauma.Items.Components

        private void UpdateHUDBack()
        {
+            if (item.Submarine == null) { return; }
+
            hullInfoFrame.Visible = false;
-            electricalFrame.Visible = false;
-            miniMapFrame.Visible = false;
            reportFrame.Visible = false;
            searchBarFrame.Visible = false;
+            electricalFrame.Visible = false;
+            miniMapFrame.Visible = false;

            switch (currentMode)
            {
                case MiniMapMode.HullStatus:
+                case MiniMapMode.HullCondition:
                    UpdateHullStatus();
                    miniMapFrame.Visible = true;
                    reportFrame.Visible = true;
@@ -937,16 +971,19 @@ namespace Barotrauma.Items.Components
                    SetTooltip(borderComponent.Rect.Center, header, line1, line2, line3, line1Color, line2Color, line3Color);
                }

+                bool draggingReport = GameMain.GameSession?.CrewManager?.DraggedOrder != null;
                // When setting the colors we want to know the linked hulls too or else the linked hull will not realize its being hovered over and reset the border color
                foreach (Hull linkedHull in hullData.LinkedHulls)
                {
                    if (!hullStatusComponents.ContainsKey(linkedHull)) { continue; }

-                    isHoveringOver |= canHoverOverHull && hullStatusComponents[linkedHull].RectComponent == GUI.MouseOn;
+                    isHoveringOver |= 
+                        canHoverOverHull && 
+                        (hullStatusComponents[linkedHull].RectComponent == GUI.MouseOn || (draggingReport && hullStatusComponents[linkedHull].RectComponent.MouseRect.Contains(PlayerInput.MousePosition)));
                    if (isHoveringOver) { break; }
                }

-                if (isHoveringOver)
+                if (isHoveringOver || (draggingReport && component.MouseRect.Contains(PlayerInput.MousePosition)))
                {
                    borderColor = Color.Lerp(borderColor, Color.White, 0.5f);
                    componentColor = HoverColor;
@@ -1037,7 +1074,7 @@ namespace Barotrauma.Items.Components
            }
            else
            {
-                bool hullsVisible = currentMode == MiniMapMode.HullStatus;
+                bool hullsVisible = currentMode == MiniMapMode.HullStatus || currentMode == MiniMapMode.HullCondition;

                foreach (var (entity, component) in hullStatusComponents)
                {
@@ -1150,7 +1187,7 @@ namespace Barotrauma.Items.Components
                GameMain.GameScreen.BlueprintEffect.Parameters["width"].SetValue((float)texture.Width);
                GameMain.GameScreen.BlueprintEffect.Parameters["height"].SetValue((float)texture.Height);

-                Color blueprintBlue = BlueprintBlue * currentMode switch { MiniMapMode.HullStatus => 0.1f, MiniMapMode.ElectricalView => 0.1f, _ => 0.5f };
+                Color blueprintBlue = BlueprintBlue * currentMode switch { MiniMapMode.HullStatus => 0.1f, MiniMapMode.HullCondition => 0.1f, MiniMapMode.ElectricalView => 0.1f, _ => 0.5f };

                Vector2 origin = new Vector2(texture.Width / 2f, texture.Height / 2f);
                float scale = currentMode == MiniMapMode.HullStatus ? 1.0f : Zoom;
@@ -19,9 +19,11 @@ namespace Barotrauma.Items.Components

        private GUIProgressBar progressBar;

-        private List<ParticleEmitter> particleEmitters = new List<ParticleEmitter>();
+        private GUITextBlock progressBarOverlayText;
+
+        private readonly List<ParticleEmitter> particleEmitters = new List<ParticleEmitter>();
        //the corresponding particle emitter is active when the condition is within this range
-        private List<Vector2> particleEmitterConditionRanges = new List<Vector2>();
+        private readonly List<Vector2> particleEmitterConditionRanges = new List<Vector2>();

        private SoundChannel repairSoundChannel;

@@ -88,7 +90,7 @@ namespace Barotrauma.Items.Components
            }
        }

-        private void CreateGUI()
+        protected override void CreateGUI()
        {
            var paddedFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.8f, 0.75f), GuiFrame.RectTransform, Anchor.Center), childAnchor: Anchor.TopCenter)
            {
@@ -123,6 +125,11 @@ namespace Barotrauma.Items.Components

            progressBar = new GUIProgressBar(new RectTransform(new Vector2(0.6f, 1.0f), progressBarHolder.RectTransform),
                color: GUI.Style.Green, barSize: 0.0f, style: "DeviceProgressBar");
+            progressBarOverlayText = new GUITextBlock(new RectTransform(Vector2.One, progressBar.RectTransform), string.Empty, font: GUI.SubHeadingFont, textAlignment: Alignment.Center)
+            {
+                IgnoreLayoutGroups = true
+            };
+
            repairButtonText = TextManager.Get("RepairButton");
            repairingText = TextManager.Get("Repairing");
            RepairButton = new GUIButton(new RectTransform(new Vector2(0.4f, 1.0f), progressBarHolder.RectTransform, Anchor.TopCenter), repairButtonText)
@@ -138,6 +145,7 @@ namespace Barotrauma.Items.Components
            progressBarHolder.RectTransform.MinSize = RepairButton.RectTransform.MinSize;
            RepairButton.RectTransform.MinSize = new Point((int)(RepairButton.TextBlock.TextSize.X * 1.2f), RepairButton.RectTransform.MinSize.Y);

+
            sabotageButtonText = TextManager.Get("SabotageButton");
            sabotagingText = TextManager.Get("Sabotaging");
            SabotageButton = new GUIButton(new RectTransform(new Vector2(0.8f, 0.15f), paddedFrame.RectTransform, Anchor.BottomCenter), sabotageButtonText, style: "GUIButtonSmall")
@@ -229,9 +237,23 @@ namespace Barotrauma.Items.Components
        {
            IsActive = true;

-            progressBar.BarSize = item.Condition / item.MaxCondition;
+            float defaultMaxCondition = (item.MaxCondition / item.MaxRepairConditionMultiplier);
+
+            progressBar.BarSize = item.Condition / defaultMaxCondition;
            progressBar.Color = ToolBox.GradientLerp(progressBar.BarSize, GUI.Style.Red, GUI.Style.Orange, GUI.Style.Green);

+            if (item.Condition > defaultMaxCondition)
+            {
+                float extraCondition = item.MaxCondition * (item.MaxRepairConditionMultiplier - 1.0f);
+                progressBar.Color = ToolBox.GradientLerp((item.Condition - defaultMaxCondition) / extraCondition, GUI.Style.ColorReputationHigh, GUI.Style.ColorReputationVeryHigh);
+                progressBarOverlayText.Visible = true;
+                progressBarOverlayText.Text = $"{(int)Math.Round((item.Condition / defaultMaxCondition) * 100)}%";
+            }
+            else
+            {
+                progressBarOverlayText.Visible = false;
+            }
+
            RepairButton.Enabled = (currentFixerAction == FixActions.None || (CurrentFixer == character && currentFixerAction != FixActions.Repair)) && !item.IsFullCondition;
            RepairButton.Text = (currentFixerAction == FixActions.None || CurrentFixer != character || currentFixerAction != FixActions.Repair) ? 
                repairButtonText :