Unstable 0.1400.2.0 (a mimir edition)

2021-05-28 19:04:09 +03:00
parent 5bc850cddb
commit 0b3fb5e440
126 changed files with 1623 additions and 787 deletions
@@ -239,6 +239,9 @@ namespace Barotrauma
        private static SavingIndicatorState savingIndicatorState = SavingIndicatorState.None;
        private static float? timeUntilSavingIndicatorDisabled;

+        private static string loadedSpritesText;
+        private static DateTime loadedSpritesUpdateTime;
+
        private enum SavingIndicatorState
        {
            None,
@@ -454,9 +457,12 @@ namespace Barotrauma
                        "Particle count: " + GameMain.ParticleManager.ParticleCount + "/" + GameMain.ParticleManager.MaxParticles,
                        Color.Lerp(GUI.Style.Green, GUI.Style.Red, (GameMain.ParticleManager.ParticleCount / (float)GameMain.ParticleManager.MaxParticles)), Color.Black * 0.5f, 0, SmallFont);

-                    DrawString(spriteBatch, new Vector2(10, 115),
-                        "Loaded sprites: " + Sprite.LoadedSprites.Count() + "\n(" + Sprite.LoadedSprites.Select(s => s.FilePath).Distinct().Count() + " unique textures)",
-                        Color.White, Color.Black * 0.5f, 0, SmallFont);
+                    if (loadedSpritesText == null || DateTime.Now > loadedSpritesUpdateTime)
+                    {
+                        loadedSpritesText = "Loaded sprites: " + Sprite.LoadedSprites.Count() + "\n(" + Sprite.LoadedSprites.Select(s => s.FilePath).Distinct().Count() + " unique textures)";
+                        loadedSpritesUpdateTime = DateTime.Now + new TimeSpan(0, 0, seconds: 5);
+                    }
+                    DrawString(spriteBatch, new Vector2(10, 115), loadedSpritesText, Color.White, Color.Black * 0.5f, 0, SmallFont);

                    if (debugDrawSounds)
                    {
@@ -1365,8 +1371,9 @@ namespace Barotrauma

                float screenDist = Vector2.Distance(cam.WorldToScreen(cam.WorldViewCenter), targetScreenPos);
                float angle = MathUtils.VectorToAngle(diff);
+                float originalAngle = angle;

-                float minAngleDiff = 0.05f;
+                const float minAngleDiff = 0.05f;
                bool overlapFound = true;
                int iterations = 0;
                while (overlapFound && iterations < 10)
@@ -1388,18 +1395,24 @@ namespace Barotrauma

                usedIndicatorAngles.Add(angle);

-                Vector2 unclampedDiff = new Vector2(
-                    (float)Math.Cos(angle) * screenDist,
-                    (float)-Math.Sin(angle) * screenDist);
-
                Vector2 iconDiff = new Vector2(
+                    (float)Math.Cos(angle) * Math.Min(GameMain.GraphicsWidth * 0.4f, screenDist + 10),
+                    (float)-Math.Sin(angle) * Math.Min(GameMain.GraphicsHeight * 0.4f, screenDist + 10));
+
+                angle = MathHelper.Lerp(originalAngle, angle, MathHelper.Clamp(((screenDist + 10f) - iconDiff.Length()) / 10f, 0f, 1f));
+
+                /*Vector2 unclampedDiff = new Vector2(
+                    (float)Math.Cos(angle) * screenDist,
+                    (float)-Math.Sin(angle) * screenDist);*/
+
+                iconDiff = new Vector2(
                    (float)Math.Cos(angle) * Math.Min(GameMain.GraphicsWidth * 0.4f, screenDist),
                    (float)-Math.Sin(angle) * Math.Min(GameMain.GraphicsHeight * 0.4f, screenDist));

                Vector2 iconPos = cam.WorldToScreen(cam.WorldViewCenter) + iconDiff;
                sprite.Draw(spriteBatch, iconPos, color * alpha, rotate: 0.0f, scale: symbolScale);

-                if (unclampedDiff.Length() - 10 > iconDiff.Length())
+                if (/*unclampedDiff.Length()*/ screenDist - 10 > iconDiff.Length())
                {
                    Vector2 normalizedDiff = Vector2.Normalize(targetScreenPos - iconPos);
                    Vector2 arrowOffset = normalizedDiff * sprite.size.X * symbolScale * 0.7f;
@@ -838,6 +838,7 @@ namespace Barotrauma
        {
            bool hasPermissions = HasPermissions;
            HashSet<GUIComponent> existingItemFrames = new HashSet<GUIComponent>();
+            bool refreshingBuyList = listBox == shoppingCrateBuyList;
            int totalPrice = 0;
            foreach (PurchasedItem item in items)
            {
@@ -859,6 +860,7 @@ namespace Barotrauma
                    {
                        numInput.UserData = item;
                        numInput.Enabled = hasPermissions;
+                        numInput.MaxValueInt = GetMaxAvailable(item.ItemPrefab, refreshingBuyList ? StoreTab.Buy : StoreTab.Sell);
                    }
                    SetOwnedLabelText(itemFrame);
                    SetItemFrameStatus(itemFrame, hasPermissions);
@@ -873,7 +875,7 @@ namespace Barotrauma
                }
                suppressBuySell = false;

-                var price = listBox == shoppingCrateBuyList ?
+                var price = refreshingBuyList ?
                    CurrentLocation.GetAdjustedItemBuyPrice(item.ItemPrefab, priceInfo: priceInfo) :
                    CurrentLocation.GetAdjustedItemSellPrice(item.ItemPrefab, priceInfo: priceInfo);
                totalPrice += item.Quantity * price;
@@ -884,7 +886,7 @@ namespace Barotrauma

            SortItems(listBox, SortingMethod.CategoryAsc);
            listBox.UpdateScrollBarSize();       
-            if (listBox == shoppingCrateBuyList)
+            if (refreshingBuyList)
            {
                buyTotal = totalPrice;
                if (IsBuying) { SetShoppingCrateTotalText(); }
@@ -12,7 +12,8 @@ namespace Barotrauma
        private const int submarinesPerPage = 4;
        private int currentPage = 1;
        private int pageCount;
-        private bool transferService, purchaseService, initialized;
+        private readonly bool transferService, purchaseService;
+        private bool initialized;
        private int deliveryFee;
        private string deliveryLocationName;

@@ -27,12 +28,12 @@ namespace Barotrauma
        private int selectionIndicatorThickness;
        private GUIImage listBackground;

-        private List<SubmarineInfo> subsToShow;
-        private SubmarineDisplayContent[] submarineDisplays = new SubmarineDisplayContent[submarinesPerPage];
+        private readonly List<SubmarineInfo> subsToShow;
+        private readonly SubmarineDisplayContent[] submarineDisplays = new SubmarineDisplayContent[submarinesPerPage];
        private SubmarineInfo selectedSubmarine = null;
        private string purchaseAndSwitchText, purchaseOnlyText, deliveryText, currentSubText, deliveryFeeText, priceText, switchText, missingPreviewText, currencyShorthandText, currencyLongText;
-        private RectTransform parent;
-        private Action closeAction;
+        private readonly RectTransform parent;
+        private readonly Action closeAction;
        private Sprite pageIndicator;

        public static readonly string[] DeliveryTextVariables = new string[] { "[submarinename1]", "[location1]", "[location2]", "[submarinename2]", "[amount]", "[currencyname]" };
@@ -42,7 +43,7 @@ namespace Barotrauma

        private static readonly string[] notEnoughCreditsDeliveryTextVariables = new string[] { "[currencyname]", "[submarinename]", "[location1]", "[location2]" };
        private static readonly string[] notEnoughCreditsPurchaseTextVariables = new string[] { "[currencyname]", "[submarinename]" };
-        private string[] messageBoxOptions;
+        private readonly string[] messageBoxOptions;

        public const int DeliveryFeePerDistanceTravelled = 1000;
        public static bool ContentRefreshRequired = false;
@@ -65,7 +66,7 @@ namespace Barotrauma

        public SubmarineSelection(bool transfer, Action closeAction, RectTransform parent)
        {
-            if (GameMain.GameSession.Campaign == null) return;
+            if (GameMain.GameSession.Campaign == null) { return; }

            transferService = transfer;
            purchaseService = !transfer;
@@ -83,7 +84,7 @@ namespace Barotrauma
                messageBoxOptions = new string[2] { TextManager.Get("Yes") + " " + TextManager.Get("initiatevoting"), TextManager.Get("Cancel") };
            }

-            if (Submarine.MainSub?.Info == null) return;
+            if (Submarine.MainSub?.Info == null) { return; }
            Initialize();
        }

@@ -184,8 +185,10 @@ namespace Barotrauma

            for (int i = 0; i < submarineDisplays.Length; i++)
            {
-                SubmarineDisplayContent submarineDisplayElement = new SubmarineDisplayContent();
-                submarineDisplayElement.background = new GUIFrame(new RectTransform(new Vector2(1f / submarinesPerPage, 1f), submarineHorizontalGroup.RectTransform), style: null, new Color(8, 13, 19));
+                SubmarineDisplayContent submarineDisplayElement = new SubmarineDisplayContent
+                {
+                    background = new GUIFrame(new RectTransform(new Vector2(1f / submarinesPerPage, 1f), submarineHorizontalGroup.RectTransform), style: null, new Color(8, 13, 19))
+                };
                submarineDisplayElement.submarineImage = new GUIImage(new RectTransform(new Vector2(0.8f, 1f), submarineDisplayElement.background.RectTransform, Anchor.Center), null, true);
                submarineDisplayElement.middleTextBlock = new GUITextBlock(new RectTransform(new Vector2(0.8f, 1f), submarineDisplayElement.background.RectTransform, Anchor.Center), string.Empty, textAlignment: Alignment.Center);
                submarineDisplayElement.submarineName = new GUITextBlock(new RectTransform(new Vector2(1f, 0.1f), submarineDisplayElement.background.RectTransform, Anchor.TopCenter, Pivot.TopCenter) { AbsoluteOffset = new Point(0, HUDLayoutSettings.Padding) }, string.Empty, textAlignment: Alignment.Center, font: GUI.SubHeadingFont);
@@ -433,7 +436,7 @@ namespace Barotrauma

        private SubmarineInfo GetSubToDisplay(int index)
        {
-            if (subsToShow.Count <= index || index < 0) return null;
+            if (subsToShow.Count <= index || index < 0) { return null; }
            return subsToShow[index];
        }

@@ -112,10 +112,10 @@ namespace Barotrauma
        {
            switch (selectedUpgradeTab)
            {
-                case UpgradeTab.Repairs:                    
+                case UpgradeTab.Repairs:
                    SelectTab(UpgradeTab.Repairs);
-                    break;                    
-                case UpgradeTab.Upgrade:                    
+                    break;
+                case UpgradeTab.Upgrade:
                    RefreshUpgradeList();
                    foreach (var itemPreview in itemPreviews)
                    {
@@ -123,7 +123,7 @@ namespace Barotrauma
                        if (!(itemPreview.Value is GUIImage image)) { continue; }
                        image.Sprite = itemPreview.Key.PendingItemSwap.UpgradePreviewSprite;
                    }
-                    break;                    
+                    break;
            }
        }

@@ -170,6 +170,11 @@ namespace Barotrauma
                    // ReSharper disable once PossibleMultipleEnumeration
                    UpdateCategoryIndicators(indicators, component, data.Prefabs, data.Category, campaign, drawnSubmarine, applicableCategories);
                }
+                var customizeButton = component.FindChild("customizebutton", true);
+                if (customizeButton != null)
+                {
+                    customizeButton.Visible = HasSwappableItems(data.Category);
+                }
            }

            // reset the order first
@@ -625,6 +630,20 @@ namespace Barotrauma
                frameChild.DefaultColor = frameChild.Color;
                frameChild.Color = Color.Transparent;

+                var weaponSwitchBg = new GUIButton(new RectTransform(new Vector2(0.65f), frameChild.RectTransform, Anchor.TopRight, scaleBasis: ScaleBasis.Smallest)
+                { RelativeOffset = new Vector2(0.04f, 0.0f) }, style: "WeaponSwitchTab")
+                {
+                    Visible = false,
+                    CanBeSelected = false,
+                    UserData = "customizebutton"
+                };
+                weaponSwitchBg.DefaultColor = weaponSwitchBg.Frame.DefaultColor = weaponSwitchBg.Color;
+                var weaponSwitchImg = new GUIImage(new RectTransform(new Vector2(0.7f), weaponSwitchBg.RectTransform, Anchor.Center), "WeaponSwitchIcon", scaleToFit: true)
+                {
+                    CanBeFocused = false
+                };
+                weaponSwitchImg.DefaultColor = weaponSwitchImg.Color;
+
                /*                     UPGRADE CATEGORY
                 * |--------------------------------------------------------|
                 * |                                                        |
@@ -670,6 +689,7 @@ namespace Barotrauma
                    foreach (GUIComponent itemFrame in itemPreviews.Values)
                    {
                        itemFrame.OutlineColor = itemFrame.Color = previewWhite;
+                        itemFrame.Children.ForEach(c => c.Color = itemFrame.Color);
                    }
                    return true;
                }
@@ -679,6 +699,9 @@ namespace Barotrauma
                    TrySelectCategory(prefabs, categoryData.Category, sub);
                }

+                var customizeCategoryButton = selectedUpgradeCategoryLayout?.FindChild("customizebutton", recursive: true) as GUIButton;
+                customizeCategoryButton?.OnClicked(customizeCategoryButton, customizeCategoryButton.UserData);
+                
                return true;
            };
        }
@@ -688,6 +711,16 @@ namespace Barotrauma

        private bool customizeTabOpen;

+        private static bool HasSwappableItems(UpgradeCategory category)
+        {
+            if (Submarine.MainSub == null) { return false; }
+            return Submarine.MainSub.GetItems(true).Any(i =>
+                i.Prefab.SwappableItem != null &&
+                !i.HiddenInGame && i.AllowSwapping &&
+                (i.Prefab.SwappableItem.CanBeBought || ItemPrefab.Prefabs.Any(ip => ip.SwappableItem?.ReplacementOnUninstall == i.Prefab.Identifier)) &&
+                Submarine.MainSub.IsEntityFoundOnThisSub(i, true) && category.ItemTags.Any(t => i.HasTag(t)));
+        }
+
        private void SelectUpgradeCategory(List<UpgradePrefab> prefabs, UpgradeCategory category, Submarine submarine)
        {
            if (selectedUpgradeCategoryLayout == null) { return; }
@@ -698,6 +731,7 @@ namespace Barotrauma
            foreach (GUIComponent itemFrame in itemPreviews.Values)
            {
                itemFrame.OutlineColor = itemFrame.Color = categoryFrames.Contains(itemFrame) ? GUI.Style.Orange : previewWhite;
+                itemFrame.Children.ForEach(c => c.Color = itemFrame.Color);
            }

            highlightWalls = category.IsWallUpgrade;
@@ -706,11 +740,7 @@ namespace Barotrauma
            GUIFrame frame = new GUIFrame(rectT(1.0f, 0.4f, selectedUpgradeCategoryLayout));
            GUIFrame paddedFrame = new GUIFrame(rectT(0.93f, 0.9f, frame, Anchor.Center), style: null);

-            bool hasSwappableItems = Submarine.MainSub.GetItems(true).Any(i => 
-                i.Prefab.SwappableItem != null && 
-                !i.HiddenInGame && i.AllowSwapping &&
-                (i.Prefab.SwappableItem.CanBeBought || ItemPrefab.Prefabs.Any(ip => ip.SwappableItem?.ReplacementOnUninstall == i.Prefab.Identifier)) && 
-                Submarine.MainSub.IsEntityFoundOnThisSub(i, true) && category.ItemTags.Any(t => i.HasTag(t)));
+            bool hasSwappableItems = HasSwappableItems(category);

            float listHeight = hasSwappableItems ? 0.9f : 1.0f;

@@ -725,12 +755,19 @@ namespace Barotrauma
            {
                GUILayoutGroup buttonLayout = new GUILayoutGroup(rectT(1.0f, 0.1f, paddedFrame, anchor: Anchor.TopLeft), isHorizontal: true);

+                GUIButton customizeButton = new GUIButton(rectT(0.5f, 1f, buttonLayout), text: TextManager.Get("uicategory.customize"), style: "GUITabButton")
+                {
+                    UserData = "customizebutton"
+                };
+                new GUIImage(new RectTransform(new Vector2(1.0f, 0.75f), customizeButton.RectTransform, Anchor.CenterLeft, scaleBasis: ScaleBasis.Smallest) { RelativeOffset = new Vector2(0.015f, 0.0f) }, "WeaponSwitchIcon", scaleToFit: true);
+                customizeButton.TextBlock.RectTransform.RelativeSize = new Vector2(0.7f, 1.0f);
+
                GUIButton upgradeButton = new GUIButton(rectT(0.5f, 1f, buttonLayout), text: TextManager.Get("uicategory.upgrades"), style: "GUITabButton")
                {
                    Selected = true
                };

-                GUIButton customizeButton = new GUIButton(rectT(0.5f, 1f, buttonLayout), text: TextManager.Get("uicategory.customize"), style: "GUITabButton");
+                GUITextBlock.AutoScaleAndNormalize(upgradeButton.TextBlock, customizeButton.TextBlock);

                upgradeButton.OnClicked = delegate
                {
@@ -742,6 +779,7 @@ namespace Barotrauma
                    foreach (GUIComponent itemFrame in itemPreviews.Values)
                    {
                        itemFrame.OutlineColor = itemFrame.Color = categoryFrames.Contains(itemFrame) ? GUI.Style.Orange : previewWhite;
+                        itemFrame.Children.ForEach(c => c.Color = itemFrame.Color);
                    }
                    return true;
                };
@@ -754,7 +792,6 @@ namespace Barotrauma
                    CreateSwappableItemList(prefabList, category, submarine);
                    return true;
                };
-
            }

            CreateUpgradePrefabList(prefabList, category, prefabs, submarine);
@@ -779,23 +816,25 @@ namespace Barotrauma
        {
            parent.Content.ClearChildren();
            currentUpgradeCategory = category;
-            IEnumerable<ItemPrefab> availableReplacements = MapEntityPrefab.List.Where(p => 
-                p is ItemPrefab itemPrefab && 
-                category.ItemTags.Any(t => itemPrefab.Tags.Contains(t)) &&
-                (itemPrefab.SwappableItem?.CanBeBought ?? false)).Cast<ItemPrefab>();
            var entitiesOnSub = submarine.GetItems(true).Where(i => submarine.IsEntityFoundOnThisSub(i, true) && !i.HiddenInGame && i.AllowSwapping && category.ItemTags.Any(t => i.HasTag(t))).ToList();

            int slotIndex = 0;
            foreach (Item item in entitiesOnSub)
            {
                slotIndex++;
-                CreateSwappableItemSlideDown(parent, slotIndex, item, availableReplacements);
+                CreateSwappableItemSlideDown(parent, slotIndex, item, submarine);
            }
        }

-        private void CreateSwappableItemSlideDown(GUIListBox parent, int slotIndex, Item item, IEnumerable<ItemPrefab> availableReplacements)
+        private void CreateSwappableItemSlideDown(GUIListBox parent, int slotIndex, Item item, Submarine submarine)
        {
-            if (Campaign == null) { return; }
+            if (Campaign == null || submarine == null) { return; }
+
+            IEnumerable<ItemPrefab> availableReplacements = MapEntityPrefab.List.Where(p =>
+                p is ItemPrefab itemPrefab &&
+                itemPrefab.SwappableItem != null &&
+                itemPrefab.SwappableItem.CanBeBought && 
+                itemPrefab.SwappableItem.SwapIdentifier.Equals(item.Prefab.SwappableItem.SwapIdentifier, StringComparison.OrdinalIgnoreCase)).Cast<ItemPrefab>();

            var currentOrPending = item.PendingItemSwap ?? item.Prefab;

@@ -833,7 +872,7 @@ namespace Barotrauma
                frames.Add(CreateUpgradeEntry(rectT(1f, 0.25f, parent.Content), currentOrPending.UpgradePreviewSprite,
                                TextManager.GetWithVariable(item.PendingItemSwap != null ? "upgrades.pendingitem" : "upgrades.installeditem", "[itemname]", currentOrPending.Name),
                                currentOrPending.Description,
-                                0, null, addBuyButton: canUninstall, addProgressBar: false, buttonStyle: "StoreRemoveFromCrateButton"));
+                                0, null, addBuyButton: canUninstall, addProgressBar: false, buttonStyle: "WeaponUninstallButton"));

                if (canUninstall && frames.Last().FindChild(c => c is GUIButton, recursive: true) is GUIButton refundButton)
                {
@@ -876,7 +915,7 @@ namespace Barotrauma
                    price, replacement, 
                    addBuyButton: true, 
                    addProgressBar: false,
-                    buttonStyle: isPurchased ? "UpgradeBuyButton" : "StoreAddToCrateButton"));
+                    buttonStyle: isPurchased ? "WeaponInstallButton" : "StoreAddToCrateButton"));

                if (!(frames.Last().FindChild(c => c is GUIButton, recursive: true) is GUIButton buyButton)) { continue; }
                if (Campaign.Money >= price)
@@ -1234,9 +1273,11 @@ namespace Barotrauma
                        {
                            if (selectedUpgradeCategoryLayout != null)
                            {
-                                if (selectedUpgradeCategoryLayout.FindChild(c => c.UserData as Item == HoveredItem, recursive: true) is GUIButton itemElement && !itemElement.Selected)
+                                if (selectedUpgradeCategoryLayout.FindChild(c => c.UserData as Item == HoveredItem, recursive: true) is GUIButton itemElement)
                                {
-                                    itemElement.OnClicked(itemElement, itemElement.UserData);
+                                    if (!itemElement.Selected) { itemElement.OnClicked(itemElement, itemElement.UserData); }
+                                    //TODO: enable this if/when we make ScrollToElement work with child elements of different sizes
+                                    //(itemElement.Parent?.Parent?.Parent as GUIListBox)?.ScrollToElement(itemElement);
                                }
                            }
                        }
@@ -1343,6 +1384,15 @@ namespace Barotrauma
                            HoverCursor = CursorState.Hand,
                            SpriteEffects = item.Rotation > 90.0f && item.Rotation < 270.0f ? SpriteEffects.FlipVertically : SpriteEffects.None
                        };
+                        if (item.Prefab.SwappableItem != null)
+                        {
+                            new GUIImage(new RectTransform(new Vector2(0.8f), itemFrame.RectTransform, Anchor.TopLeft) { RelativeOffset = new Vector2(-0.2f) }, "WeaponSwitchIcon.DropShadow", scaleToFit: true)
+                            {
+                                SelectedColor = GUI.Style.Orange,
+                                Color = previewWhite,
+                                CanBeFocused = false
+                            };
+                        }
                    }
                    else
                    {