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

2f107db...5202af9

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-03-18 21:42:26 +02:00
parent 58c92888b7
commit 044fd3344b
395 changed files with 27417 additions and 19754 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaServer/Source/Screens/NetLobbyScreen.cs
+7 -15
View File
@@ -66,8 +66,6 @@ namespace Barotrauma
get { return gameModes[SelectedModeIndex]; }
}
public string ServerMessageText;
private int missionTypeIndex;
public int MissionTypeIndex
{
@@ -93,12 +91,12 @@ namespace Barotrauma
public void ChangeServerName(string n)
{
ServerName = n; lastUpdateID++;
GameMain.Server.ServerSettings.ServerName = n; lastUpdateID++;
}
public void ChangeServerMessage(string m)
{
ServerMessageText = m; lastUpdateID++;
GameMain.Server.ServerSettings.ServerMessageText = m; lastUpdateID++;
}
public List<JobPrefab> JobPreferences
@@ -150,13 +148,7 @@ namespace Barotrauma
LocationType.Random(levelSeed); //call to sync up with clients
}
}
public bool StartButtonEnabled
{
get { return true; }
set { /* do nothing */ }
}
public void ToggleCampaignMode(bool enabled)
{
for (int i = 0; i < GameModes.Length; i++)
@@ -174,19 +166,19 @@ namespace Barotrauma
public override void Select()
{
base.Select();
GameMain.Server.Voting.ResetVotes(GameMain.Server.ConnectedClients);
GameMain.Server.ServerSettings.Voting.ResetVotes(GameMain.Server.ConnectedClients);
}
public void RandomizeSettings()
{
if (GameMain.Server.RandomizeSeed) LevelSeed = ToolBox.RandomSeed(8);
if (GameMain.Server.ServerSettings.RandomizeSeed) LevelSeed = ToolBox.RandomSeed(8);
if (GameMain.Server.SubSelectionMode == SelectionMode.Random)
if (GameMain.Server.ServerSettings.SubSelectionMode == SelectionMode.Random)
{
var nonShuttles = Submarine.SavedSubmarines.Where(c => !c.HasTag(SubmarineTag.Shuttle) && !c.HasTag(SubmarineTag.HideInMenus)).ToList();
SelectedSub = nonShuttles[Rand.Range(0, nonShuttles.Count)];
}
if (GameMain.Server.ModeSelectionMode == SelectionMode.Random)
if (GameMain.Server.ServerSettings.ModeSelectionMode == SelectionMode.Random)
{
var allowedGameModes = Array.FindAll(gameModes, m => !m.IsSinglePlayer && m.Identifier != "multiplayercampaign");
SelectedModeIdentifier = allowedGameModes[Rand.Range(0, allowedGameModes.Length)].Identifier;