Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git
This commit is contained in:
@@ -39,6 +39,12 @@ namespace Barotrauma.Networking
|
||||
SomethingDifferent = 4
|
||||
}
|
||||
|
||||
internal enum LootedMoneyDestination
|
||||
{
|
||||
Bank,
|
||||
Wallet
|
||||
}
|
||||
|
||||
partial class ServerSettings : ISerializableEntity
|
||||
{
|
||||
public const string SettingsFile = "serversettings.xml";
|
||||
@@ -897,21 +903,13 @@ namespace Barotrauma.Networking
|
||||
private set;
|
||||
}
|
||||
|
||||
[Serialize(true, IsPropertySaveable.Yes)]
|
||||
public bool RadiationEnabled
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
[Serialize(LootedMoneyDestination.Bank, IsPropertySaveable.Yes)]
|
||||
public LootedMoneyDestination LootedMoneyDestination { get; set; }
|
||||
|
||||
private int maxMissionCount = CampaignSettings.DefaultMaxMissionCount;
|
||||
[Serialize(999999, IsPropertySaveable.Yes)]
|
||||
public int MaximumMoneyTransferRequest { get; set; }
|
||||
|
||||
[Serialize(CampaignSettings.DefaultMaxMissionCount, IsPropertySaveable.Yes)]
|
||||
public int MaxMissionCount
|
||||
{
|
||||
get { return maxMissionCount; }
|
||||
set { maxMissionCount = MathHelper.Clamp(value, CampaignSettings.MinMissionCountLimit, CampaignSettings.MaxMissionCountLimit); }
|
||||
}
|
||||
public CampaignSettings CampaignSettings { get; set; } = CampaignSettings.Empty;
|
||||
|
||||
private bool allowSubVoting;
|
||||
//Don't serialize: the value is set based on SubSelectionMode
|
||||
|
||||
Reference in New Issue
Block a user