vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unstable 1.1.14.0

Browse Source
This commit is contained in:
Markus Isberg
2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/Screens/CampaignSetupUI/SinglePlayerCampaignSetupUI.cs
+14 -17
View File
@@ -20,11 +20,10 @@ namespace Barotrauma
private GUIButton nextButton;
private GUIListBox characterInfoColumns;
public SinglePlayerCampaignSetupUI(GUIComponent newGameContainer, GUIComponent loadGameContainer, IEnumerable<SubmarineInfo> submarines, IEnumerable<CampaignMode.SaveInfo> saveFiles = null)
public SinglePlayerCampaignSetupUI(GUIComponent newGameContainer, GUIComponent loadGameContainer)
: base(newGameContainer, loadGameContainer)
{
UpdateNewGameMenu(submarines);
UpdateLoadMenu(saveFiles);
CreateNewGameMenu();
}
private int currentPage = 0;
@@ -73,7 +72,7 @@ namespace Barotrauma
});
}
private void UpdateNewGameMenu(IEnumerable<SubmarineInfo> submarines)
private void CreateNewGameMenu()
{
pageContainer =
new GUIListBox(new RectTransform(Vector2.One, newGameContainer.RectTransform), style: null, isHorizontal: true)
@@ -92,7 +91,7 @@ namespace Barotrauma
Anchor.Center));
}
CreateFirstPage(createPageLayout(), submarines);
CreateFirstPage(createPageLayout());
CreateSecondPage(createPageLayout());
pageContainer.RecalculateChildren();
@@ -108,7 +107,7 @@ namespace Barotrauma
SetPage(0);
}
private void CreateFirstPage(GUILayoutGroup firstPageLayout, IEnumerable<SubmarineInfo> submarines)
private void CreateFirstPage(GUILayoutGroup firstPageLayout)
{
firstPageLayout.RelativeSpacing = 0.02f;
@@ -238,8 +237,6 @@ namespace Barotrauma
columnContainer.Recalculate();
leftColumn.Recalculate();
rightColumn.Recalculate();
if (submarines != null) { UpdateSubList(submarines); }
}
private void CreateSecondPage(GUILayoutGroup secondPageLayout)
@@ -578,7 +575,7 @@ namespace Barotrauma
}
}
public override void UpdateLoadMenu(IEnumerable<CampaignMode.SaveInfo> saveFiles = null)
public override void CreateLoadMenu(IEnumerable<CampaignMode.SaveInfo> saveFiles = null)
{
prevSaveFiles?.Clear();
prevSaveFiles = null;
@@ -625,21 +622,21 @@ namespace Barotrauma
var saveFrame = CreateSaveElement(saveInfo);
if (saveFrame == null) { continue; }
XDocument doc = SaveUtil.LoadGameSessionDoc(saveInfo.FilePath);
XElement docRoot = SaveUtil.ExtractGameSessionRootElementFromSaveFile(saveInfo.FilePath);
if (doc?.Root == null)
if (docRoot == null)
{
DebugConsole.ThrowError("Error loading save file \"" + saveInfo.FilePath + "\". The file may be corrupted.");
saveFrame.GetChild<GUITextBlock>().TextColor = GUIStyle.Red;
continue;
}
if (doc.Root.GetChildElement("multiplayercampaign") != null)
if (docRoot.GetChildElement("multiplayercampaign") != null)
{
//multiplayer campaign save in the wrong folder -> don't show the save
saveList.Content.RemoveChild(saveFrame);
continue;
}
if (!SaveUtil.IsSaveFileCompatible(doc))
if (!SaveUtil.IsSaveFileCompatible(docRoot))
{
saveFrame.GetChild<GUITextBlock>().TextColor = GUIStyle.Red;
saveFrame.ToolTip = TextManager.Get("campaignmode.incompatiblesave");
@@ -668,14 +665,14 @@ namespace Barotrauma
string fileName = saveInfo.FilePath;
XDocument doc = SaveUtil.LoadGameSessionDoc(fileName);
if (doc?.Root == null)
XElement docRoot = SaveUtil.ExtractGameSessionRootElementFromSaveFile(fileName);
if (docRoot == null)
{
DebugConsole.ThrowError("Error loading save file \"" + fileName + "\". The file may be corrupted.");
return false;
}
loadGameButton.Enabled = SaveUtil.IsSaveFileCompatible(doc);
loadGameButton.Enabled = SaveUtil.IsSaveFileCompatible(docRoot);
RemoveSaveFrame();
@@ -684,7 +681,7 @@ namespace Barotrauma
.Select(t => (LocalizedString)t.ToLocalUserString())
.Fallback(TextManager.Get("Unknown"));
string mapseed = doc.Root.GetAttributeString("mapseed", "unknown");
string mapseed = docRoot.GetAttributeString("mapseed", "unknown");
var saveFileFrame = new GUIFrame(
new RectTransform(new Vector2(0.45f, 0.6f), loadGameContainer.RectTransform, Anchor.TopRight)