ad0bbaf...7245c72

commit 7245c721339885d062567befc052a592391b3b4a
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Sun Mar 10 15:22:31 2019 +0200

    Fixed StatusEffects only applying afflictions to one limb even if the target is "Character" instead of "Limb", added a subtle screen distortion effect to heavy radiation sickness. Closes #1256

commit e0db27e62ec9546fd4b182a0cc97f7e5830645ae
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Sat Mar 9 21:53:51 2019 +0200

    Fixed WrapText adding unnecessary spaces after every line break. Closes #1215

commit 988bc58d51c195ad9265b84a1e97e0101cd3f808
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Sat Mar 9 21:12:50 2019 +0200

    Fixed crashing when attempting to create a body for a wall section that's less than 1 unit long (e.g. if a wall that's just slightly longer than the wall section size receives damage).

commit 8c31157425a9e2ec02312618d1bfa359ab3ee87d
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Sat Mar 9 20:30:44 2019 +0200

    Fixed clients being unable to toggle the respawn shuttle on/off

commit a4ccb039219830efe9cd305c26942dda1bd04e9c
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Sat Mar 9 19:33:22 2019 +0200

    Fixed inability to select the respawn shuttle as a client host

commit b89b2d2c282d8c74d7ccd37b3f29dcab51eff680
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Sat Mar 9 19:32:41 2019 +0200

    Made it possible to edit the style of the ListBox under GUIDropDowns, increased the opacity of the listbox to make the contents more readable when there's text behind it

commit 8f6d9aef3d637fe37a18c78f4b15ef8fd266374e
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Sat Mar 9 18:11:23 2019 +0200

    Fixed NetLobbyScreen not showing the names of the submarines the client doesn't have

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveCombat.cs

@@ -136,11 +136,16 @@ namespace Barotrauma
 
         public override bool IsCompleted()
         {
-            return enemy.IsDead || coolDownTimer <= 0.0f;
+            return enemy == null || enemy.Removed || enemy.IsDead || coolDownTimer <= 0.0f;
         }
 
         public override float GetPriority(AIObjectiveManager objectiveManager)
         {
+            if (enemy == null || enemy.Removed)
+            {
+                return 0.0f;
+            }
+
             if (objectiveManager.CurrentOrder == this)
             {
                 return AIObjectiveManager.OrderPriority;
@@ -151,8 +156,7 @@ namespace Barotrauma
 
             float enemyDanger = Math.Min(Math.Max(CalculateEnemyStrength(), MaxEnemyDamage), character.Health) + enemy.Health / 10.0f;
 
-            EnemyAIController enemyAI = enemy.AIController as EnemyAIController;
-            if (enemyAI != null)
+            if (enemy.AIController is EnemyAIController enemyAI)
             {
                 if (enemyAI.SelectedAiTarget == character.AiTarget) enemyDanger *= 2.0f;
             }

Barotrauma/BarotraumaShared/Source/Characters/AI/PathFinder.cs

@@ -176,7 +176,7 @@ namespace Barotrauma
                 //prefer nodes that are closer to the end position
                 dist += (Math.Abs(end.X - nodePos.X) + Math.Abs(end.Y - nodePos.Y)) / 2.0f;
                 //much higher cost to waypoints that are outside
-                if (node.Waypoint.CurrentHull == null) dist *= 10.0f;
+                if (node.Waypoint.CurrentHull == null && insideSubmarine) dist *= 10.0f;
                 if (dist < closestDist || startNode == null)
                 {
                     //if searching for a path inside the sub, make sure the waypoint is visible
@@ -213,10 +213,13 @@ namespace Barotrauma
                 Vector2 nodePos = node.Position;
 
                 float dist = Vector2.Distance(end, nodePos);
-                //much higher cost to waypoints that are outside
-                if (node.Waypoint.CurrentHull == null) dist *= 10.0f;
-                //avoid stopping at a doorway
-                if (node.Waypoint.ConnectedDoor != null) dist *= 10.0f;
+                if (insideSubmarine)
+                {
+                    //much higher cost to waypoints that are outside
+                    if (node.Waypoint.CurrentHull == null) dist *= 10.0f;
+                    //avoid stopping at a doorway
+                    if (node.Waypoint.ConnectedDoor != null) dist *= 10.0f;
+                }
                 if (dist < closestDist || endNode == null)
                 {
                     //if searching for a path inside the sub, make sure the waypoint is visible
@@ -233,13 +236,13 @@ namespace Barotrauma
 
             if (endNode == null)
             {
-                DebugConsole.NewMessage("Pathfinding error, couldn't find an end node. "+ errorMsgStr, Color.DarkRed);
+                DebugConsole.NewMessage("Pathfinding error, couldn't find an end node. " + errorMsgStr, Color.DarkRed);
                 return new SteeringPath();
             }
 
 
-            var path =  FindPath(startNode,endNode);
-            
+            var path = FindPath(startNode, endNode);
+
             return path;
         }
 

Barotrauma/BarotraumaShared/Source/Characters/Animation/FishAnimController.cs

@@ -123,7 +123,7 @@ namespace Barotrauma
             set { FishSwimFastParams = value as FishSwimFastParams; }
         }
 
-        private float flipTimer;
+        private float flipTimer, flipCooldown;
 
         public FishAnimController(Character character, string seed, FishRagdollParams ragdollParams = null) : base(character, seed, ragdollParams) { }
 
@@ -250,11 +250,12 @@ namespace Barotrauma
             if (!CurrentFishAnimation.Flip || IsStuck) return;
             if (character.AIController != null && !character.AIController.CanFlip) return;
 
-            flipTimer += deltaTime;
+            flipCooldown -= deltaTime;
 
             if (TargetDir != Direction.None && TargetDir != dir) 
             {
-                if (flipTimer > 1.0f || character.IsRemotePlayer)
+                flipTimer += deltaTime;
+                if ((flipTimer > 0.5f && flipCooldown <= 0.0f) || character.IsRemotePlayer)
                 {
                     Flip();
                     if (!inWater || (CurrentSwimParams != null && CurrentSwimParams.Mirror))
@@ -262,8 +263,13 @@ namespace Barotrauma
                         Mirror();
                     }
                     flipTimer = 0.0f;
+                    flipCooldown = 1.0f;
                 }
             }
+            else
+            {
+                flipTimer = 0.0f;
+            }
         }
 
         private bool CanDrag(Character target)

Barotrauma/BarotraumaShared/Source/Characters/Health/DamageModifier.cs

@@ -69,7 +69,8 @@ namespace Barotrauma
 
         public bool MatchesAffliction(Affliction affliction)
         {
-            if (AfflictionIdentifiers.Length == 0) { return true; }
+            //if no identifiers or types have been defined, the damage modifier affects all afflictions
+            if (AfflictionIdentifiers.Length == 0 && AfflictionTypes.Length == 0) { return true; }
 
             foreach (string afflictionName in AfflictionIdentifiers)
             {

Barotrauma/BarotraumaShared/Source/DebugConsole.cs

@@ -149,7 +149,7 @@ namespace Barotrauma
                     commands.SelectMany(c => c.names).ToArray(),
                     new string[0]
                 };
-            }, isCheat: true));
+            }));
 
 
             commands.Add(new Command("items|itemlist", "itemlist: List all the item prefabs available for spawning.", (string[] args) =>
@@ -382,9 +382,8 @@ namespace Barotrauma
                             banDuration = parsedBanDuration;
                         }
 
-                ShowQuestionPrompt("Reason for kicking \"" + client.Name + "\"?", (reason) =>
-                {
-                    GameMain.NetworkMember.KickPlayer(client.Name, reason);
+                        GameMain.NetworkMember.BanPlayer(client.Name, reason, false, banDuration);
+                    });
                 });
             }));
             

Barotrauma/BarotraumaShared/Source/GameSettings.cs

@@ -69,6 +69,8 @@ namespace Barotrauma
 
         public int ParticleLimit { get; set; }
 
+        public int ParticleLimit { get; set; }
+
         public float LightMapScale { get; set; }
         public bool SpecularityEnabled { get; set; }
         public bool ChromaticAberrationEnabled { get; set; }
@@ -401,6 +403,8 @@ namespace Barotrauma
 
             AimAssistAmount = doc.Root.GetAttributeFloat("aimassistamount", 0.5f);
 
+            AimAssistAmount = doc.Root.GetAttributeFloat("aimassistamount", 0.5f);
+
             AimAssistAmount = doc.Root.GetAttributeFloat("aimassistamount", 0.5f);
             
             keyMapping = new KeyOrMouse[Enum.GetNames(typeof(InputType)).Length];
@@ -1252,6 +1256,84 @@ namespace Barotrauma
                 NewLineOnAttributes = true
             };
 
+#if CLIENT
+            if (Tutorial.Tutorials != null)
+            {
+                foreach (Tutorial tutorial in Tutorial.Tutorials)
+                {
+                    if (tutorial.Completed && !CompletedTutorialNames.Contains(tutorial.Name))
+                    {
+                        CompletedTutorialNames.Add(tutorial.Name);
+                    }
+                }
+            }
+#endif
+            var tutorialElement = new XElement("tutorials");
+            foreach (string tutorialName in CompletedTutorialNames)
+            {
+                tutorialElement.Add(new XElement("Tutorial", new XAttribute("name", tutorialName)));
+            }
+            doc.Root.Add(tutorialElement);
+
+            XmlWriterSettings settings = new XmlWriterSettings
+            {
+                Indent = true,
+                OmitXmlDeclaration = true,
+                NewLineOnAttributes = true
+            };
+
+#if CLIENT
+            if (Tutorial.Tutorials != null)
+            {
+                foreach (Tutorial tutorial in Tutorial.Tutorials)
+                {
+                    if (tutorial.Completed && !CompletedTutorialNames.Contains(tutorial.Name))
+                    {
+                        CompletedTutorialNames.Add(tutorial.Name);
+                    }
+                }
+            }
+#endif
+            var tutorialElement = new XElement("tutorials");
+            foreach (string tutorialName in CompletedTutorialNames)
+            {
+                tutorialElement.Add(new XElement("Tutorial", new XAttribute("name", tutorialName)));
+            }
+            doc.Root.Add(tutorialElement);
+
+            XmlWriterSettings settings = new XmlWriterSettings
+            {
+                Indent = true,
+                OmitXmlDeclaration = true,
+                NewLineOnAttributes = true
+            };
+
+#if CLIENT
+            if (Tutorial.Tutorials != null)
+            {
+                foreach (Tutorial tutorial in Tutorial.Tutorials)
+                {
+                    if (tutorial.Completed && !CompletedTutorialNames.Contains(tutorial.Name))
+                    {
+                        CompletedTutorialNames.Add(tutorial.Name);
+                    }
+                }
+            }
+#endif
+            var tutorialElement = new XElement("tutorials");
+            foreach (string tutorialName in CompletedTutorialNames)
+            {
+                tutorialElement.Add(new XElement("Tutorial", new XAttribute("name", tutorialName)));
+            }
+            doc.Root.Add(tutorialElement);
+
+            XmlWriterSettings settings = new XmlWriterSettings
+            {
+                Indent = true,
+                OmitXmlDeclaration = true,
+                NewLineOnAttributes = true
+            };
+
 #if CLIENT
             if (Tutorial.Tutorials != null)
             {

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs

@@ -13,7 +13,7 @@ namespace Barotrauma.Items.Components
     partial class Steering : Powered, IServerSerializable, IClientSerializable
     {
         private const float AutopilotRayCastInterval = 0.5f;
-        private const float RecalculatePathInterval = 10.0f;
+        private const float RecalculatePathInterval = 5.0f;
 
         private Vector2 currVelocity;
         private Vector2 targetVelocity;

Barotrauma/BarotraumaShared/Source/Map/Map/Map.cs

@@ -430,6 +430,13 @@ namespace Barotrauma
             }
             CurrentLocation.SelectedMissionIndex = missionIndex;
 
+            //the destination must be the same as the destination of the mission
+            if (CurrentLocation.SelectedMission != null && 
+                CurrentLocation.SelectedMission.Locations[1] != SelectedLocation)
+            {
+                SelectLocation(CurrentLocation.SelectedMission.Locations[1]);
+            }
+
             SelectedLocation = location;
             SelectedConnection = connections.Find(c => c.Locations.Contains(CurrentLocation) && c.Locations.Contains(SelectedLocation));
             OnLocationSelected?.Invoke(SelectedLocation, SelectedConnection);

Barotrauma/BarotraumaShared/Source/Map/Structure.cs

@@ -992,14 +992,14 @@ namespace Barotrauma
             if (IsHorizontal)
             {
                 diffFromCenter = (rect.Center.X - this.rect.Center.X) / (float)this.rect.Width * BodyWidth;
-                if (BodyWidth > 0.0f) rect.Width = (int)(BodyWidth * (rect.Width / (float)this.rect.Width));
+                if (BodyWidth > 0.0f) rect.Width = Math.Max((int)Math.Round(BodyWidth * (rect.Width / (float)this.rect.Width)), 1);
                 if (BodyHeight > 0.0f) rect.Height = (int)BodyHeight;
             }
             else
             {
                 diffFromCenter = ((rect.Y - rect.Height / 2) - (this.rect.Y - this.rect.Height / 2)) / (float)this.rect.Height * BodyHeight;
                 if (BodyWidth > 0.0f) rect.Width = (int)BodyWidth;
-                if (BodyHeight > 0.0f) rect.Height = (int)(BodyHeight * (rect.Height / (float)this.rect.Height));
+                if (BodyHeight > 0.0f) rect.Height = Math.Max((int)Math.Round(BodyHeight * (rect.Height / (float)this.rect.Height)), 1);
             }
             if (FlippedX) diffFromCenter = -diffFromCenter;
             

Barotrauma/BarotraumaShared/Source/Map/Submarine.cs

@@ -304,7 +304,7 @@ namespace Barotrauma
             this.filePath = filePath;
             try
             {
-                name = System.IO.Path.GetFileNameWithoutExtension(filePath);
+                name = displayName = Path.GetFileNameWithoutExtension(filePath);
             }
             catch (Exception e)
             {

Barotrauma/BarotraumaShared/Source/Networking/ServerSettings.cs

@@ -321,6 +321,13 @@ namespace Barotrauma.Networking
             set;
         }
 
+        [Serialize(true, true)]
+        public bool UseRespawnShuttle
+        {
+            get;
+            private set;
+        }
+
         [Serialize(300.0f, true)]
         public float RespawnInterval
         {
@@ -342,7 +349,6 @@ namespace Barotrauma.Networking
             private set;
         }
 
-
         [Serialize(60.0f, true)]
         public float AutoRestartInterval
         {

Barotrauma/BarotraumaShared/Source/Networking/Voting.cs

@@ -1,8 +1,5 @@
 using Barotrauma.Networking;
-using Lidgren.Network;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace Barotrauma
 {
@@ -41,7 +38,7 @@ namespace Barotrauma
             if (voteType == VoteType.Sub && !AllowSubVoting) return default(T);
             if (voteType == VoteType.Mode && !AllowModeVoting) return default(T);
 
-            List<Pair<object, int>> voteList = GetVoteList(voteType,voters);
+            List<Pair<object, int>> voteList = GetVoteList(voteType, voters);
 
             T selected = default(T);
             int highestVotes = 0;

Barotrauma/BarotraumaShared/Source/PlayerInput.cs

@@ -160,6 +160,16 @@ namespace Barotrauma
         }
 #endif
 
+        public void SetState()
+        {
+            hit = binding.IsHit();
+            if (hit) hitQueue = true;
+
+            held = binding.IsDown();
+            if (held) heldQueue = true;
+        }
+#endif
+
         public bool Hit
         {
             get

Barotrauma/BarotraumaShared/Source/StatusEffects/StatusEffect.cs

@@ -693,7 +693,10 @@ namespace Barotrauma
                     if (target is Character character)
                     {
                         character.LastDamageSource = entity;
-                        character.AddDamage(entity.WorldPosition, new List<Affliction>() { multipliedAffliction }, stun: 0.0f, playSound: false);
+                        foreach (Limb limb in character.AnimController.Limbs)
+                        {
+                            limb.character.DamageLimb(entity.WorldPosition, limb, new List<Affliction>() { multipliedAffliction }, stun: 0.0f, playSound: false, attackImpulse: 0.0f);
+                        }
                     }
                     else if (target is Limb limb)
                     {
@@ -704,9 +707,9 @@ namespace Barotrauma
                 foreach (Pair<string, float> reduceAffliction in ReduceAffliction)
                 {
                     float reduceAmount = disableDeltaTime ? reduceAffliction.Second : reduceAffliction.Second * deltaTime;
-                    if (target is Character)
+                    if (target is Character character)
                     {
-                        ((Character)target).CharacterHealth.ReduceAffliction(null, reduceAffliction.First, reduceAmount);
+                        character.CharacterHealth.ReduceAffliction(null, reduceAffliction.First, reduceAmount);
                     }
                     else if (target is Limb limb)
                     {