(bcb06cc5c) Unstable v0.9.9.0

2020-03-27 15:22:59 -03:00
parent c81486a993
commit b143329701
326 changed files with 9692 additions and 4364 deletions
@@ -140,11 +140,11 @@ namespace Barotrauma.Items.Components
                var inputArea = new GUILayoutGroup(new RectTransform(new Vector2(0.95f, 1f), bottomFrame.RectTransform, Anchor.BottomCenter), isHorizontal: true, childAnchor: Anchor.BottomLeft);
                    
                    // === INPUT SLOTS === //
-                    inputInventoryHolder = new GUIFrame(new RectTransform(new Vector2(0.8f, 1f), inputArea.RectTransform), style: null);
+                    inputInventoryHolder = new GUIFrame(new RectTransform(new Vector2(0.7f, 1f), inputArea.RectTransform), style: null);
                        new GUICustomComponent(new RectTransform(Vector2.One, inputInventoryHolder.RectTransform), DrawInputOverLay) { CanBeFocused = false };

                    // === ACTIVATE BUTTON === //
-                    var buttonFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.2f, 0.8f), inputArea.RectTransform), childAnchor: Anchor.CenterRight);
+                    var buttonFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.3f, 0.8f), inputArea.RectTransform), childAnchor: Anchor.CenterRight);
                        activateButton = new GUIButton(new RectTransform(new Vector2(1f, 0.6f), buttonFrame.RectTransform),
                            TextManager.Get("FabricatorCreate"), style: "DeviceButton")
                        {
@@ -154,7 +154,7 @@ namespace Barotrauma.Items.Components
                        };
                            // === POWER WARNING === //
                            inSufficientPowerWarning = new GUITextBlock(new RectTransform(Vector2.One, activateButton.RectTransform),
-                                TextManager.Get("FabricatorNoPower"), textColor: GUI.Style.Orange, textAlignment: Alignment.Center, color: Color.Black, style: "OuterGlow")
+                                TextManager.Get("FabricatorNoPower"), textColor: GUI.Style.Orange, textAlignment: Alignment.Center, color: Color.Black, style: "OuterGlow", wrap: true)
                            {
                                HoverColor = Color.Black,
                                IgnoreLayoutGroups = true,
@@ -356,6 +356,8 @@ namespace Barotrauma.Items.Components
        private void DrawOutputOverLay(SpriteBatch spriteBatch, GUICustomComponent overlayComponent)
        {
            overlayComponent.RectTransform.SetAsLastChild();
+
+            if (outputContainer.Inventory.Items.First() != null) { return; }
            
            FabricationRecipe targetItem = fabricatedItem ?? selectedItem;
            if (targetItem != null)
@@ -584,15 +586,20 @@ namespace Barotrauma.Items.Components

        public void ClientRead(ServerNetObject type, IReadMessage msg, float sendingTime)
        {
+            FabricatorState newState = (FabricatorState)msg.ReadByte();
+            float newTimeUntilReady = msg.ReadSingle();
            int itemIndex = msg.ReadRangedInteger(-1, fabricationRecipes.Count - 1);
            UInt16 userID = msg.ReadUInt16();
            Character user = Entity.FindEntityByID(userID) as Character;

-            if (itemIndex == -1 || user == null)
+            State = newState;
+            timeUntilReady = newTimeUntilReady;
+
+            if (newState == FabricatorState.Stopped || itemIndex == -1 || user == null)
            {
                CancelFabricating();
            }
-            else
+            else if (newState == FabricatorState.Active || newState == FabricatorState.Paused)
            {
                //if already fabricating the selected item, return
                if (fabricatedItem != null && fabricationRecipes.IndexOf(fabricatedItem) == itemIndex) { return; }
@@ -129,8 +129,8 @@ namespace Barotrauma.Items.Components
            {
                if (child.UserData is Hull hull)
                {
-                    if (hull.Submarine == null || !hull.Submarine.IsOutpost) { continue; }
-                    string text = TextManager.GetWithVariable("MiniMapOutpostDockingInfo", "[outpost]", hull.Submarine.Name);
+                    if (hull.Submarine == null || !hull.Submarine.Info.IsOutpost) { continue; }
+                    string text = TextManager.GetWithVariable("MiniMapOutpostDockingInfo", "[outpost]", hull.Submarine.Info.Name);
                    Vector2 textSize = GUI.Font.MeasureString(text);
                    Vector2 textPos = child.Center;
                    if (textPos.X + textSize.X / 2 > submarineContainer.Rect.Right)
@@ -99,6 +99,10 @@ namespace Barotrauma.Items.Components
                Step = 0.05f,
                OnMoved = (GUIScrollBar scrollBar, float barScroll) =>
                {
+                    if (pumpSpeedLockTimer <= 0.0f)
+                    {
+                        targetLevel = null;
+                    }
                    float newValue = barScroll * 200.0f - 100.0f;
                    if (Math.Abs(newValue - FlowPercentage) < 0.1f) { return false; }

@@ -490,7 +490,7 @@ namespace Barotrauma.Items.Components
                disruptedDirections.Clear();
                foreach (AITarget t in AITarget.List)
                {
-                    if (t.SoundRange <= 0.0f || !t.Enabled || float.IsNaN(t.SoundRange) || float.IsInfinity(t.SoundRange)) { continue; }
+                    if (t.SoundRange <= 0.0f || float.IsNaN(t.SoundRange) || float.IsInfinity(t.SoundRange)) { continue; }
                    
                    float distSqr = Vector2.DistanceSquared(t.WorldPosition, transducerCenter);
                    if (distSqr > t.SoundRange * t.SoundRange * 2) { continue; }
@@ -647,6 +647,8 @@ namespace Barotrauma.Items.Components

            if (GameMain.GameSession == null) { return; }

+            if (Level.Loaded == null) { return; }
+
            DrawMarker(spriteBatch,
                GameMain.GameSession.StartLocation.Name,
                "outpost",
@@ -699,8 +701,8 @@ namespace Barotrauma.Items.Components
                if (sub.WorldPosition.Y > Level.Loaded.Size.Y) { continue; }
                             
                DrawMarker(spriteBatch, 
-                    sub.Name, 
-                    sub.HasTag(SubmarineTag.Shuttle) ? "shuttle" : "submarine",
+                    sub.Info.Name, 
+                    sub.Info.HasTag(SubmarineTag.Shuttle) ? "shuttle" : "submarine",
                    sub.WorldPosition - transducerCenter, 
                    displayScale, center, DisplayRadius * 0.95f);
            }
@@ -46,6 +46,8 @@ namespace Barotrauma.Items.Components
        private float checkConnectedPortsTimer;
        private const float CheckConnectedPortsInterval = 1.0f;

+        public DockingPort ActiveDockingSource, DockingTarget;
+
        private Vector2 keyboardInput = Vector2.Zero;
        private float inputCumulation;

@@ -665,7 +667,7 @@ namespace Barotrauma.Items.Components

            if (Vector2.DistanceSquared(PlayerInput.MousePosition, steerArea.Rect.Center.ToVector2()) < steerRadius * steerRadius)
            {
-                if (PlayerInput.PrimaryMouseButtonHeld() && !CrewManager.IsCommandInterfaceOpen)
+                if (PlayerInput.PrimaryMouseButtonHeld() && !CrewManager.IsCommandInterfaceOpen && !GameSession.IsInfoFrameOpen)
                {
                    Vector2 displaySubPos = (-sonar.DisplayOffset * sonar.Zoom) / sonar.Range * sonar.DisplayRadius * sonar.Zoom;
                    displaySubPos.Y = -displaySubPos.Y;