Unstable v0.1300.0.1

2021-03-05 17:00:56 +02:00
parent 64cdb32078
commit cb969c959f
199 changed files with 6043 additions and 3911 deletions
@@ -20,6 +20,9 @@ namespace Barotrauma
        [Serialize(1f, false)]
        public float HealthMultiplier { get; protected set; }

+        [Serialize(1f, false)]
+        public float HealthMultiplierInMultiplayer { get; protected set; }
+
        [Serialize(1f, false)]
        public float AimSpeed { get; protected set; }

@@ -117,6 +120,10 @@ namespace Barotrauma
        public void InitializeCharacter(Character npc, ISpatialEntity positionToStayIn = null)
        {
            npc.CharacterHealth.MaxVitality *= HealthMultiplier;
+            if (GameMain.NetworkMember != null)
+            {
+                npc.CharacterHealth.MaxVitality *= HealthMultiplierInMultiplayer;
+            }
            var humanAI = npc.AIController as HumanAIController;
            if (humanAI != null)
            {