Faction Test 100.4.0.0

Barotrauma/BarotraumaShared/SharedSource/Networking/ClientPermissions.cs

@@ -27,7 +27,8 @@ namespace Barotrauma.Networking
         SellSubItems = 0x4000,
         ManageMap = 0x8000,
         ManageHires = 0x10000,
-        All = 0x1FFFF
+        ManageBotTalents = 0x20000,
+        All = 0x3FFFF
     }
 
     class PermissionPreset

Barotrauma/BarotraumaShared/SharedSource/Networking/RespawnManager.cs

@@ -258,7 +258,7 @@ namespace Barotrauma.Networking
                 var powerContainer = item.GetComponent<PowerContainer>();
                 if (powerContainer != null)
                 {
-                    powerContainer.Charge = powerContainer.Capacity;
+                    powerContainer.Charge = powerContainer.GetCapacity();
                 }
 
                 var door = item.GetComponent<Door>();

Barotrauma/BarotraumaShared/SharedSource/Networking/ServerSettings.cs

@@ -382,12 +382,17 @@ namespace Barotrauma.Networking
 
         private bool autoRestart;
 
-        public bool IsPublic;
-
         private int maxPlayers;
 
         public List<SavedClientPermission> ClientPermissions { get; private set; } = new List<SavedClientPermission>();
 
+        [Serialize(true, IsPropertySaveable.Yes)]
+        public bool IsPublic
+        {
+            get;
+            set;
+        }
+
         private int tickRate = 20;
         [Serialize(20, IsPropertySaveable.Yes)]
         public int TickRate
@@ -518,13 +523,20 @@ namespace Barotrauma.Networking
             }
         }
 
-        [Serialize(Barotrauma.LosMode.Opaque, IsPropertySaveable.Yes)]
+        [Serialize(LosMode.Opaque, IsPropertySaveable.Yes)]
         public LosMode LosMode
         {
             get;
             set;
         }
 
+        [Serialize(EnemyHealthBarMode.ShowAll, IsPropertySaveable.Yes)]
+        public EnemyHealthBarMode ShowEnemyHealthBars
+        {
+            get;
+            set;
+        }
+
         [Serialize(800, IsPropertySaveable.Yes)]
         public int LinesPerLogFile
         {