Unstable 1.1.14.0

Barotrauma/BarotraumaShared/SharedSource/Networking/ServerSettings.cs

@@ -15,11 +15,6 @@ namespace Barotrauma.Networking
         Manual = 0, Random = 1, Vote = 2
     }
 
-    public enum YesNoMaybe
-    {
-        No = 0, Maybe = 1, Yes = 2
-    }
-
     public enum BotSpawnMode
     {
         Normal, Fill
@@ -437,6 +432,16 @@ namespace Barotrauma.Networking
             private set;
         }
 
+        [Serialize(50f, IsPropertySaveable.Yes)]
+        /// <summary>
+        /// How much skills drop towards the job's default skill levels when dying
+        /// </summary>
+        public float SkillLossPercentageOnDeath
+        {
+            get;
+            private set;
+        }
+
         [Serialize(60.0f, IsPropertySaveable.Yes)]
         public float AutoRestartInterval
         {
@@ -485,13 +490,6 @@ namespace Barotrauma.Networking
             private set;
         } = true;
 
-        [Serialize(true, IsPropertySaveable.Yes)]
-        public bool AllowRagdollButton
-        {
-            get;
-            set;
-        }
-
         [Serialize(true, IsPropertySaveable.Yes)]
         public bool AllowFileTransfers
         {
@@ -722,19 +720,33 @@ namespace Barotrauma.Networking
             set;
         }
 
-        private YesNoMaybe traitorsEnabled;
-        [Serialize(YesNoMaybe.No, IsPropertySaveable.Yes)]
-        public YesNoMaybe TraitorsEnabled
+        private float traitorProbability;
+        [Serialize(0.0f, IsPropertySaveable.Yes)]
+        public float TraitorProbability
         {
-            get { return traitorsEnabled; }
+            get { return traitorProbability; }
             set
             {
-                if (traitorsEnabled == value) { return; }
-                traitorsEnabled = value;
+                if (MathUtils.NearlyEqual(traitorProbability, value)) { return; }
+                traitorProbability = MathHelper.Clamp(value, 0.0f, 1.0f);
                 ServerDetailsChanged = true;
             }
         }
 
+
+        private int traitorDangerLevel;
+        [Serialize(TraitorEventPrefab.MinDangerLevel, IsPropertySaveable.Yes)]
+        public int TraitorDangerLevel
+        {
+            get { return traitorDangerLevel; }
+            set
+            {
+                int clampedValue = MathHelper.Clamp(value, TraitorEventPrefab.MinDangerLevel, TraitorEventPrefab.MaxDangerLevel);
+                if (traitorDangerLevel == clampedValue) { return; }
+                traitorDangerLevel = clampedValue;
+                ServerDetailsChanged = true;
+            }
+        }
         [Serialize(defaultValue: 1, isSaveable: IsPropertySaveable.Yes)]
         public int TraitorsMinPlayerCount
         {
@@ -742,34 +754,13 @@ namespace Barotrauma.Networking
             set;
         }
 
-        [Serialize(defaultValue: 90.0f, isSaveable: IsPropertySaveable.Yes)]
-        public float TraitorsMinStartDelay
+        [Serialize(defaultValue: 50.0f, isSaveable: IsPropertySaveable.Yes)]
+        public float MinPercentageOfPlayersForTraitorAccusation
         {
             get;
             set;
         }
 
-        [Serialize(defaultValue: 180.0f, isSaveable: IsPropertySaveable.Yes)]
-        public float TraitorsMaxStartDelay
-        {
-            get;
-            set;
-        }
-
-        [Serialize(defaultValue: 30.0f, isSaveable: IsPropertySaveable.Yes)]
-        public float TraitorsMinRestartDelay
-        {
-            get;
-            set;
-        }
-
-        [Serialize(defaultValue: 90.0f, isSaveable: IsPropertySaveable.Yes)]
-        public float TraitorsMaxRestartDelay
-        {
-            get;
-            set;
-        }
-        
         [Serialize(defaultValue: "", IsPropertySaveable.Yes)]
         public LanguageIdentifier Language { get; set; }