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

38f1ddb...178a853: v0.8.9.1, removed content folder

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-03-18 19:46:58 +02:00
parent 38f1ddb6fe
commit 6c0679c297
1054 changed files with 151673 additions and 144931 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaServer/Source/Screens/NetLobbyScreen.cs
+13 -17
View File
@@ -45,14 +45,14 @@ namespace Barotrauma
}
}
public string SelectedModeName
public string SelectedModeIdentifier
{
get { return gameModes[SelectedModeIndex].Name; }
get { return gameModes[SelectedModeIndex].Identifier; }
set
{
for (int i = 0; i < gameModes.Count(); i++)
for (int i = 0; i < gameModes.Length; i++)
{
if (gameModes[i].Name.ToLower() == value.ToLower())
if (gameModes[i].Identifier.ToLower() == value.ToLower())
{
SelectedModeIndex = i;
break;
@@ -75,26 +75,22 @@ namespace Barotrauma
set
{
lastUpdateID++;
missionTypeIndex = Math.Max(0, Math.Min(MissionPrefab.MissionTypes.Count() - 1, value));
missionTypeIndex = MathHelper.Clamp(value, 0, Enum.GetValues(typeof(MissionType)).Length - 1);
}
}
public string MissionTypeName
{
get { return MissionPrefab.MissionTypes[MissionTypeIndex]; }
get { return ((MissionType)missionTypeIndex).ToString(); }
set
{
for (int i = 0; i < MissionPrefab.MissionTypes.Count(); i++)
if (Enum.TryParse(value, out MissionType missionType))
{
if (MissionPrefab.MissionTypes[i].ToLower() == value.ToLower())
{
MissionTypeIndex = i;
break;
}
missionTypeIndex = (int)missionType;
}
}
}
public void ChangeServerName(string n)
{
ServerName = n; lastUpdateID++;
@@ -130,7 +126,7 @@ namespace Barotrauma
DebugConsole.NewMessage("Selected sub: " + SelectedSub.Name, Color.White);
DebugConsole.NewMessage("Selected shuttle: " + SelectedShuttle.Name, Color.White);
gameModes = GameModePreset.list.ToArray();
gameModes = GameModePreset.List.ToArray();
}
private List<Submarine> subs;
@@ -165,7 +161,7 @@ namespace Barotrauma
{
for (int i = 0; i < GameModes.Length; i++)
{
if ((GameModes[i].Name == "Campaign") == enabled)
if ((GameModes[i].Identifier == "multiplayercampaign") == enabled)
{
selectedModeIndex = i;
break;
@@ -192,8 +188,8 @@ namespace Barotrauma
}
if (GameMain.Server.ModeSelectionMode == SelectionMode.Random)
{
var allowedGameModes = Array.FindAll(gameModes, m => !m.IsSinglePlayer && m.Name != "Campaign");
SelectedModeName = allowedGameModes[Rand.Range(0, allowedGameModes.Length)].Name;
var allowedGameModes = Array.FindAll(gameModes, m => !m.IsSinglePlayer && m.Identifier != "multiplayercampaign");
SelectedModeIdentifier = allowedGameModes[Rand.Range(0, allowedGameModes.Length)].Identifier;
}
}
}