v0.11.0.9

2020-12-09 16:34:16 +02:00
parent bbf06f0984
commit f433a7ba10
325 changed files with 13947 additions and 3652 deletions
@@ -20,6 +20,7 @@ namespace Barotrauma

        protected GUIButton endRoundButton;

+        public GUIButton ReadyCheckButton;
        public GUIButton EndRoundButton => endRoundButton;

        protected GUIFrame campaignUIContainer;
@@ -142,7 +143,8 @@ namespace Barotrauma

            if (GUI.DisableHUD || GUI.DisableUpperHUD || ForceMapUI || CoroutineManager.IsCoroutineRunning("LevelTransition"))
            {
-                endRoundButton.Visible = false; 
+                endRoundButton.Visible = false;
+                if (ReadyCheckButton != null) { ReadyCheckButton.Visible = false; }
                return; 
            }
            if (Submarine.MainSub == null) { return; }
@@ -188,6 +190,8 @@ namespace Barotrauma
                    break;
            }

+            if (ReadyCheckButton != null) { ReadyCheckButton.Visible = endRoundButton.Visible; }
+
            if (endRoundButton.Visible)
            {
                if (!AllowedToEndRound()) { buttonText = TextManager.Get("map"); }
@@ -211,6 +215,10 @@ namespace Barotrauma
                }
            }
            endRoundButton.DrawManually(spriteBatch);
+            if (this is MultiPlayerCampaign)
+            {
+                ReadyCheckButton?.DrawManually(spriteBatch);
+            }
        }

        public Task SelectSummaryScreen(RoundSummary roundSummary, LevelData newLevel, bool mirror, Action action)
@@ -279,6 +287,7 @@ namespace Barotrauma
            base.AddToGUIUpdateList();
            CrewManager.AddToGUIUpdateList();
            endRoundButton.AddToGUIUpdateList();
+            ReadyCheckButton?.AddToGUIUpdateList();
        }

        public override void Update(float deltaTime)
@@ -34,7 +34,6 @@ namespace Barotrauma
            }
        }

-
        public static void StartCampaignSetup(IEnumerable<string> saveFiles)
        {
            var parent = GameMain.NetLobbyScreen.CampaignSetupFrame;
@@ -103,11 +102,13 @@ namespace Barotrauma
            {
                CanBeFocused = false
            };
-            
-            int buttonHeight = (int)(GUI.Scale * 40);
-            int buttonWidth = GUI.IntScale(450);

-            endRoundButton = new GUIButton(HUDLayoutSettings.ToRectTransform(new Rectangle((GameMain.GraphicsWidth / 2) - (buttonWidth / 2), HUDLayoutSettings.ButtonAreaTop.Center.Y - (buttonHeight / 2), buttonWidth, buttonHeight), GUICanvas.Instance),
+            int buttonHeight = (int) (GUI.Scale * 40),
+                buttonWidth = GUI.IntScale(450),
+                buttonCenter = buttonHeight / 2,
+                screenMiddle = GameMain.GraphicsWidth / 2;
+
+            endRoundButton = new GUIButton(HUDLayoutSettings.ToRectTransform(new Rectangle(screenMiddle - buttonWidth / 2, HUDLayoutSettings.ButtonAreaTop.Center.Y - buttonCenter, buttonWidth, buttonHeight), GUICanvas.Instance),
                TextManager.Get("EndRound"), textAlignment: Alignment.Center, style: "EndRoundButton")
            {
                Pulse = true,
@@ -140,6 +141,25 @@ namespace Barotrauma
                    return true;
                }
            };
+
+            int readyButtonHeight = buttonHeight;
+            int readyButtonWidth = (int) (GUI.Scale * 50);
+
+            ReadyCheckButton = new GUIButton(HUDLayoutSettings.ToRectTransform(new Rectangle(screenMiddle + (buttonWidth / 2) + GUI.IntScale(16), HUDLayoutSettings.ButtonAreaTop.Center.Y - buttonCenter, readyButtonWidth, readyButtonHeight), GUICanvas.Instance), 
+                style: "RepairBuyButton")
+            {
+                ToolTip = TextManager.Get("ReadyCheck.Tooltip"),
+                OnClicked = delegate
+                {
+                    if (CrewManager != null && CrewManager.ActiveReadyCheck == null)
+                    {
+                        ReadyCheck.CreateReadyCheck();
+                    }
+                    return true;
+                },
+                UserData = "ReadyCheckButton"
+            };
+            
            buttonContainer.Recalculate();
        }

@@ -378,6 +398,7 @@ namespace Barotrauma
            if (!GUI.DisableHUD && !GUI.DisableUpperHUD)
            {
                endRoundButton.UpdateManually(deltaTime);
+                ReadyCheckButton?.UpdateManually(deltaTime);
                if (CoroutineManager.IsCoroutineRunning("LevelTransition") || ForceMapUI) { return; }
            }

@@ -368,6 +368,9 @@ namespace Barotrauma
            SoundPlayer.OverrideMusicDuration = 18.0f;
            crewDead = false;

+            LevelData lvlData = GameMain.GameSession.LevelData;
+            bool beaconActive = GameMain.GameSession.Level.CheckBeaconActive();
+
            GameMain.GameSession.EndRound("", traitorResults, transitionType);
            var continueButton = GameMain.GameSession.RoundSummary?.ContinueButton;
            RoundSummary roundSummary = null;
@@ -452,6 +455,8 @@ namespace Barotrauma
                    }
                }

+                lvlData.IsBeaconActive = beaconActive;
+
                SaveUtil.SaveGame(GameMain.GameSession.SavePath);
            }
            else
@@ -39,6 +39,10 @@ namespace Barotrauma
            base.Start();
            
            CrewManager.InitSinglePlayerRound();
+            foreach (Submarine submarine in Submarine.Loaded)
+            {
+                submarine.NeutralizeBallast();
+            }

            if (SpawnOutpost)
            {
@@ -121,7 +121,7 @@ namespace Barotrauma.Tutorials
                return;
            }

-            character = Character.Create(charInfo, wayPoint.WorldPosition, "", false, false);
+            character = Character.Create(charInfo, wayPoint.WorldPosition, "", isRemotePlayer: false, hasAi: false);
            character.TeamID = Character.TeamType.Team1;
            Character.Controlled = character;
            character.GiveJobItems(null);