(d9829ac) v0.9.4.0

This commit is contained in:
Regalis
2019-10-24 18:05:42 +02:00
parent 9aa12bcac2
commit b39922a074
319 changed files with 12516 additions and 6815 deletions
@@ -623,6 +623,34 @@ namespace Barotrauma.Networking
set;
}
[Serialize(defaultValue: 90.0f, isSaveable: true)]
public float TraitorsMinStartDelay
{
get;
set;
}
[Serialize(defaultValue: 180.0f, isSaveable: true)]
public float TraitorsMaxStartDelay
{
get;
set;
}
[Serialize(defaultValue: 30.0f, isSaveable: true)]
public float TraitorsMinRestartDelay
{
get;
set;
}
[Serialize(defaultValue: 90.0f, isSaveable: true)]
public float TraitorsMaxRestartDelay
{
get;
set;
}
private SelectionMode subSelectionMode;
[Serialize(SelectionMode.Manual, true)]
public SelectionMode SubSelectionMode
@@ -693,12 +721,21 @@ namespace Barotrauma.Networking
}
}
private string karmaPreset = "default";
[Serialize("default", true)]
public string KarmaPreset
{
get;
set;
} = "default";
get { return karmaPreset; }
set
{
if (karmaPreset == value) { return; }
if (GameMain.NetworkMember == null || !GameMain.NetworkMember.IsClient)
{
GameMain.NetworkMember?.KarmaManager?.SelectPreset(value);
}
karmaPreset = value;
}
}
[Serialize("sandbox", true)]
public string GameModeIdentifier