diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/CaptainTutorial.cs b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/CaptainTutorial.cs index a7e82cfff..00ae9403c 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/CaptainTutorial.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/CaptainTutorial.cs @@ -148,7 +148,7 @@ namespace Barotrauma.Tutorials TriggerTutorialSegment(0); do { - yield return new WaitForSeconds(1.5f); + yield return null; GameMain.GameSession.CrewManager.HighlightOrderButton(captain_medic, "follow", highlightColor, new Vector2(5, 5)); } while (!HasOrder(captain_medic, "follow")); @@ -163,7 +163,7 @@ namespace Barotrauma.Tutorials GameMain.GameSession.CrewManager.AddCharacter(captain_mechanic); do { - yield return new WaitForSeconds(1.5f); + yield return null; GameMain.GameSession.CrewManager.HighlightOrderButton(captain_mechanic, "repairsystems", highlightColor, new Vector2(5, 5)); HighlightOrderOption("jobspecific"); } @@ -174,7 +174,7 @@ namespace Barotrauma.Tutorials GameMain.GameSession.CrewManager.AddCharacter(captain_security); do { - yield return new WaitForSeconds(1.5f); + yield return null; GameMain.GameSession.CrewManager.HighlightOrderButton(captain_security, "operateweapons", highlightColor, new Vector2(5, 5)); HighlightOrderOption("fireatwill"); } @@ -185,7 +185,7 @@ namespace Barotrauma.Tutorials GameMain.GameSession.CrewManager.AddCharacter(captain_engineer); do { - yield return new WaitForSeconds(1.5f); + yield return null; GameMain.GameSession.CrewManager.HighlightOrderButton(captain_engineer, "operatereactor", highlightColor, new Vector2(5, 5)); HighlightOrderOption("powerup"); } diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/MechanicTutorial.cs b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/MechanicTutorial.cs index 72dca0c66..ec272ba98 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/MechanicTutorial.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/MechanicTutorial.cs @@ -317,11 +317,14 @@ namespace Barotrauma.Tutorials SetHighlight(mechanic_workingPump.Item, true); do { - if (mechanic_workingPump.IsActiveSlider.FlashTimer <= 0) - { - mechanic_workingPump.IsActiveSlider.Flash(uiHighlightColor, 1.5f, true); - } yield return null; + if (IsSelectedItem(mechanic_brokenPump.Item)) + { + if (mechanic_workingPump.IsActiveSlider.FlashTimer <= 0) + { + mechanic_workingPump.IsActiveSlider.Flash(uiHighlightColor, 1.5f, true); + } + } } while (mechanic_workingPump.FlowPercentage >= 0 || !mechanic_workingPump.IsActive); // Highlight until draining SetHighlight(mechanic_workingPump.Item, false); do { yield return null; } while (mechanic_brokenhull_1.WaterPercentage > waterVolumeBeforeOpening); // Unlock door once drained @@ -510,6 +513,7 @@ namespace Barotrauma.Tutorials Repairable repairablePumpComponent = mechanic_brokenPump.Item.GetComponent(); do { + yield return null; if (!mechanic_brokenPump.Item.IsFullCondition) { if (!mechanic.HasEquippedItem("wrench")) @@ -524,7 +528,6 @@ namespace Barotrauma.Tutorials } } } - yield return null; } while (!mechanic_brokenPump.Item.IsFullCondition || mechanic_brokenPump.FlowPercentage >= 0 || !mechanic_brokenPump.IsActive); RemoveCompletedObjective(segments[9]); SetHighlight(mechanic_brokenPump.Item, false); diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/Tutorial.cs b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/Tutorial.cs index 045253fc1..a3af8e75c 100644 --- a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/Tutorial.cs +++ b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/Tutorial.cs @@ -505,29 +505,33 @@ namespace Barotrauma.Tutorials Enum.TryParse(anchorStr, out anchor); } - var infoBlock = new GUIFrame(new RectTransform(new Point((int)(width * GUI.Scale), (int)(height * GUI.Scale)), GUI.Canvas, anchor) { AbsoluteOffset = new Point(20) }); + var background = new GUIFrame(new RectTransform(new Point(GameMain.GraphicsWidth, GameMain.GraphicsHeight), GUI.Canvas, Anchor.Center), "InnerFrame", new Color(0, 0, 0, 1f)); + + var infoBlock = new GUIFrame(new RectTransform(new Point((int)(width * GUI.Scale), (int)(height * GUI.Scale)), background.RectTransform, anchor) { AbsoluteOffset = new Point(20) }); infoBlock.Flash(Color.Green); var infoContent = new GUILayoutGroup(new RectTransform(new Vector2(0.9f, 0.8f), infoBlock.RectTransform, Anchor.Center)) { Stretch = true, - RelativeSpacing = 0.02f + RelativeSpacing = 0.05f }; if (title.Length > 0) { - var titleBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.3f), infoContent.RectTransform), + var titleBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoContent.RectTransform), title, font: GUI.VideoTitleFont, textAlignment: Alignment.Center, textColor: new Color(253, 174, 0)); titleBlock.TextScale = textScale; } - var textBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 1.0f), infoContent.RectTransform), text, wrap: true); + var textBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), infoContent.RectTransform), + text, wrap: true); + textBlock.TextScale = textScale; infoBoxClosedCallback = callback; if (hasButton) { - var buttonContainer = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.3f), infoContent.RectTransform) { MinSize = new Point(0, 30), MaxSize = new Point((int) infoContent.Rect.X, 60) }, isHorizontal: true) + var buttonContainer = new GUILayoutGroup(new RectTransform(new Vector2(1.0f, 0.2f), infoContent.RectTransform) { MinSize = new Point(0, 30) }, isHorizontal: true) { Stretch = true, RelativeSpacing = 0.1f @@ -555,7 +559,7 @@ namespace Barotrauma.Tutorials GUI.PlayUISound(GUISoundType.UIMessage); - return infoBlock; + return background; } #endregion diff --git a/Barotrauma/BarotraumaShared/SharedContent.projitems b/Barotrauma/BarotraumaShared/SharedContent.projitems index 4a521611f..989c0f30e 100644 --- a/Barotrauma/BarotraumaShared/SharedContent.projitems +++ b/Barotrauma/BarotraumaShared/SharedContent.projitems @@ -2172,19 +2172,15 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - PreserveNewest - Never + PreserveNewest + + + PreserveNewest -