(a7d754a40) Fixed: ContextualTutorial not resetting properly when quitting a single player campaign session and starting a new game after. Added: Forced on for contextual tutorial when the selected sub is 'PAX'

This commit is contained in:
Joonas Rikkonen
2019-03-27 20:52:16 +02:00
parent 018fcb0fa0
commit b66bdb6da4
10 changed files with 256 additions and 17 deletions
@@ -58,11 +58,14 @@ namespace Barotrauma
// New game left side
new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.1f), leftColumn.RectTransform), TextManager.Get("SelectedSub") + ":", textAlignment: Alignment.BottomLeft);
subList = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.65f), leftColumn.RectTransform));
subList = new GUIListBox(new RectTransform(new Vector2(1.0f, 0.65f), leftColumn.RectTransform))
{
OnSelected = CheckForPax
};
UpdateSubList();
// New game right side
// New game right sideon
new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.1f), rightColumn.RectTransform), TextManager.Get("SaveName") + ":", textAlignment: Alignment.BottomLeft);
saveNameBox = new GUITextBox(new RectTransform(new Vector2(1.0f, 0.1f), rightColumn.RectTransform), string.Empty);
@@ -350,7 +353,25 @@ namespace Barotrauma
{
if (isMultiplayer) return;
Tutorial contextualTutorial = Tutorial.Tutorials.Find(t => t is ContextualTutorial);
contextualTutorialBox.Selected = (contextualTutorial != null) ? !GameMain.Config.CompletedTutorialNames.Contains(contextualTutorial.Name) : true;
Submarine selectedSub = subList.SelectedData as Submarine;
if (selectedSub == null || selectedSub.Name != "PAX")
{
contextualTutorialBox.Selected = (contextualTutorial != null) ? !GameMain.Config.CompletedTutorialNames.Contains(contextualTutorial.Name) : true;
}
else
{
contextualTutorialBox.Selected = true;
}
}
private bool CheckForPax(GUIComponent component, object obj)
{
if (!(obj is Submarine) || contextualTutorialBox == null) return false;
Submarine sub = obj as Submarine;
contextualTutorialBox.Selected = sub.Name == "PAX";
return true;
}
private bool SelectSaveFile(GUIComponent component, object obj)