(98ad00fa2) v0.9.1.0

2019-07-10 13:52:12 +03:00
parent 2a791887ed
commit afa2137bd2
104 changed files with 3041 additions and 3134 deletions
@@ -941,7 +941,7 @@ namespace Barotrauma
            else
            {
                orderTargetFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.2f + order.Options.Length * 0.1f, 0.18f), GUI.Canvas)
-                    { AbsoluteOffset = new Point(orderButton.Rect.Center.X, orderButton.Rect.Bottom) },
+                    { AbsoluteOffset = new Point((int)(200 * GUI.Scale), orderButton.Rect.Bottom) },
                    isHorizontal: true, childAnchor: Anchor.BottomLeft)
                {
                    UserData = character,
@@ -970,6 +970,12 @@ namespace Barotrauma
                            return true;
                        }
                    };
+                    new GUIFrame(new RectTransform(Vector2.One * 1.5f, optionButton.RectTransform, Anchor.Center), style: "OuterGlow")
+                    {
+                        Color = Color.Black,
+                        HoverColor = Color.CadetBlue,
+                        PressedColor = Color.Black
+                    }.RectTransform.SetAsFirstChild();

                    OrderOptionButtons.Add(optionButton);

@@ -1238,7 +1244,10 @@ namespace Barotrauma
                }
                hoverArea.Inflate(100, 100);

-                if (!hoverArea.Contains(PlayerInput.MousePosition)) orderTargetFrame = null;
+                if (!hoverArea.Contains(PlayerInput.MousePosition) || PlayerInput.RightButtonClicked())
+                {
+                    orderTargetFrame = null;
+                }
            }
        }

@@ -256,6 +256,18 @@ namespace Barotrauma
                {
                    if (c.Info == null || c.Inventory == null) { continue; }
                    var inventoryElement = new XElement("inventory");
+
+                    // Recharge headset batteries
+                    var headset = c.Inventory.FindItemByIdentifier("headset");
+                    if (headset != null)
+                    {
+                        var battery = headset.OwnInventory.FindItemByTag("loadable");
+                        if (battery != null)
+                        {
+                            battery.Condition = battery.MaxCondition;
+                        }
+                    }
+
                    c.SaveInventory(c.Inventory, inventoryElement);
                    c.Info.InventoryData = inventoryElement;
                    c.Inventory?.DeleteAllItems();
@@ -407,7 +419,8 @@ namespace Barotrauma
        public override void Save(XElement element)
        {
            XElement modeElement = new XElement("SinglePlayerCampaign",
-                new XAttribute("money", Money),
+                // Refunds the money when save & quitting from the map if there are items selected in the store
+                new XAttribute("money", Money + (CargoManager != null ? CargoManager.GetTotalItemCost() : 0)),
                new XAttribute("cheatsenabled", CheatsEnabled));
            CrewManager.Save(modeElement);
            Map.Save(modeElement);
@@ -42,8 +42,14 @@ namespace Barotrauma
                RelativeSpacing = 0.03f
            };

-            GUIListBox infoTextBox = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.7f), paddedFrame.RectTransform));
-            
+            GUIListBox infoTextBox = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.7f), paddedFrame.RectTransform))
+            {
+                Spacing = (int)(5 * GUI.Scale)
+            };
+
+            //spacing
+            new GUIFrame(new RectTransform(new Vector2(1.0f, 0.05f), infoTextBox.Content.RectTransform), style: null);
+
            string summaryText = TextManager.GetWithVariables(gameOver ? "RoundSummaryGameOver" :
                (progress ? "RoundSummaryProgress" : "RoundSummaryReturn"), new string[2] { "[sub]", "[location]" },
                new string[2] { Submarine.MainSub.Name, progress ? GameMain.GameSession.EndLocation.Name : GameMain.GameSession.StartLocation.Name });