2f107db...5202af9

Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/BasicTutorial.cs

@@ -584,7 +584,7 @@ namespace Barotrauma.Tutorials
                     }
                 }
 
-                if (brokenBox != null && brokenBox.Condition > 50.0f && pump.Voltage < pump.MinVoltage)
+                if (brokenBox != null && brokenBox.Condition > brokenBox.Prefab.Health / 2.0f && pump.Voltage < pump.MinVoltage)
                 {
                     yield return new WaitForSeconds(1.0f);
 

Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ContextualTutorial.cs

@@ -152,7 +152,6 @@ namespace Barotrauma.Tutorials
             if (!Initialized) return;
 
             PreloadVideoContent();
-            Completed = true; // Trigger completed at start to prevent the contextual tutorial from automatically activating on starting new campaigns after this one
 
             base.Start();
 
@@ -194,6 +193,7 @@ namespace Barotrauma.Tutorials
             }
 
             crew = GameMain.GameSession.CrewManager.GetCharacters().ToList();
+            Completed = true; // Trigger completed at start to prevent the contextual tutorial from automatically activating on starting new campaigns after this one
             started = true;
         }
 
@@ -325,7 +325,7 @@ namespace Barotrauma.Tutorials
 
                     foreach (Item item in Item.ItemList)
                     {
-                        if (!item.Repairables.Any() || item.Condition > 50.0f) continue;
+                        if (!item.Repairables.Any() || item.Condition > item.Prefab.Health / 2.0f) continue;
                         degradedEquipmentFound = true;
                         break;
                     }
@@ -464,7 +464,7 @@ namespace Barotrauma.Tutorials
                     spriteSheetPlayer.LoadContent(playableContentPath, activeSegment.Content, activeSegment.Name, true, true, CurrentSegmentStopCallback);
                     break;
                 case ContentTypes.Text:
-                    infoBox = CreateInfoFrame(TextManager.Get(activeSegment.Name), TextManager.Get(activeSegment.Content.GetAttributeString("tag", ""), false, args),
+                    infoBox = CreateInfoFrame(TextManager.Get(activeSegment.Name), TextManager.GetFormatted(activeSegment.Content.GetAttributeString("tag", ""), false, args),
                                               activeSegment.Content.GetAttributeInt("width", 300),
                                               activeSegment.Content.GetAttributeInt("height", 80),
                                               activeSegment.Content.GetAttributeString("anchor", "Center"), true, CurrentSegmentStopCallback);

Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/ScenarioTutorial.cs

@@ -36,7 +36,7 @@ namespace Barotrauma.Tutorials
             }
 
             CharacterInfo charInfo = configElement.Element("Character") == null ?
-                new CharacterInfo(Character.HumanConfigFile, "", Gender.None, JobPrefab.List.Find(jp => jp.Identifier == "engineer")) :
+                new CharacterInfo(Character.HumanConfigFile, "", JobPrefab.List.Find(jp => jp.Identifier == "engineer")) :
                 new CharacterInfo(configElement.Element("Character"));
 
             character = Character.Create(charInfo, wayPoint.WorldPosition, "", false, false);
@@ -101,7 +101,7 @@ namespace Barotrauma.Tutorials
             messageBox.Buttons[0].OnClicked += messageBox.Close;
 
 
-            messageBox.Buttons[1].OnClicked = GameMain.MainMenuScreen.SelectTab;
+            messageBox.Buttons[1].OnClicked = GameMain.MainMenuScreen.ReturnToMainMenu;
             messageBox.Buttons[1].OnClicked += messageBox.Close;
 
             yield return CoroutineStatus.Success;

Barotrauma/BarotraumaClient/Source/GameSession/GameModes/Tutorials/Tutorial.cs

@@ -31,7 +31,7 @@ namespace Barotrauma.Tutorials
             {
                 if (completed == value) return;
                 completed = value;
-                GameMain.Config.Save();
+                GameMain.Config.SaveNewPlayerConfig();
             }
         }
 
@@ -105,7 +105,7 @@ namespace Barotrauma.Tutorials
         {
             configElement = element;
             Name = element.GetAttributeString("name", "Unnamed");
-            Completed = GameMain.Config.CompletedTutorialNames.Contains(Name);
+            completed = GameMain.Config.CompletedTutorialNames.Contains(Name);
             Enum.TryParse(element.GetAttributeString("tutorialtype", "Scenario"), true, out tutorialType);
         }
         
@@ -167,7 +167,7 @@ namespace Barotrauma.Tutorials
                 };
             }
             
-            GUI.PlayUISound(GUISoundType.Message);
+            GUI.PlayUISound(GUISoundType.UIMessage);
 
             return infoBlock;
         }
@@ -211,7 +211,7 @@ namespace Barotrauma.Tutorials
                 };
             }
 
-            GUI.PlayUISound(GUISoundType.Message);
+            GUI.PlayUISound(GUISoundType.UIMessage);
 
             return infoBlock;
         }