3ea33fb...bbc4a31

commit bbc4a31aa83572258226f303ab767f8546de64fb
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Tue Mar 5 13:08:38 2019 +0200

    Fixed missing item names in the extra cargo menu. Closes #1218

commit dd18bd163e05e8ba4718c0e98083e50ef0a0157e
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Tue Mar 5 13:04:54 2019 +0200

    Fixed a compiler error in RespawnManager

commit 904700eda3e4da5468208bd7553a803e9f41234e
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Tue Mar 5 12:56:29 2019 +0200

    Autorestart/spectating fixes (closes #1219):
    - The server owner and spectators don't trigger autorestart.
    - The owner is allowed to spectate even if spectating is disallowed in server settings.
    - Fixed "play yourself" always toggling to true when a round ends.

commit 9710612256875d5a788fb34371ca8ea6dd61b749
Author: ezjamsen <ezjames.fi@gmail.com>
Date:   Tue Mar 5 10:10:25 2019 +0200

    dropped the point at which damage sprites appear slightly.

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

@@ -179,15 +179,6 @@ namespace Barotrauma
         {
             if (GameMain.Client != null) return;
 
-            Order newOrder = null;
-            if (Character.CurrentHull != null)
-            {
-                if (Character.CurrentHull.FireSources.Count > 0)
-                {
-                    var orderPrefab = Order.PrefabList.Find(o => o.AITag == "reportfire");
-                    newOrder = new Order(orderPrefab, Character.CurrentHull, null);
-                }
-
         partial void ReportProblems();
 
         private void UpdateSpeaking()

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

@@ -677,18 +677,6 @@ namespace Barotrauma
 
                 limb.body.ApplyForce(diff * (float)(Math.Sin(WalkPos) * Math.Sqrt(limb.Mass)) * 30.0f * animStrength);
             }
-
-            limb?.body.SmoothRotate(angle, torque, wrapAngle: false);
-        }
-
-        private void SmoothRotateWithoutWrapping(Limb limb, float angle, Limb referenceLimb, float torque)
-        {
-            //make sure the angle "has the same number of revolutions" as the reference limb
-            //(e.g. we don't want to rotate the legs to 0 if the torso is at 360, because that'd blow up the hip joints) 
-            while (referenceLimb.Rotation - angle > MathHelper.TwoPi)
-            {
-                angle += MathHelper.TwoPi;
-            }
             while (referenceLimb.Rotation - angle < -MathHelper.TwoPi)
             {
                 angle -= MathHelper.TwoPi;

Barotrauma/BarotraumaShared/Source/Characters/Character.cs

@@ -1035,6 +1035,61 @@ namespace Barotrauma
 
             ResetSpeedMultiplier(); // Reset, items will set the value before the next update
 
+            return targetMovement;
+        }
+
+        /// <summary>
+        /// Can be used to modify the character's speed via StatusEffects
+        /// </summary>
+        public float SpeedMultiplier
+        {
+            get
+            {
+                if (speedMultipliers.Count == 0) return 1f;
+
+                float greatestPositive = 1f;
+                float greatestNegative = 1f;
+
+                for (int i = 0; i < speedMultipliers.Count; i++)
+                {
+                    float val = speedMultipliers[i];
+                    if (val < 1f)
+                    {
+                        if (val < greatestNegative)
+                        {
+                            greatestNegative = val;
+                        }
+                    }
+                    else
+                    {
+                        if (val > greatestPositive)
+                        {
+                            greatestPositive = val;
+                        }
+                    }
+                }
+
+                return greatestPositive - (1f - greatestNegative);
+            }
+            set
+            {
+                if (value == 1f) return;
+                speedMultipliers.Add(value);
+            }
+        }
+
+        public void ResetSpeedMultiplier()
+        {
+            speedMultipliers.Clear();
+        }
+
+        /// <summary>
+        /// Applies temporary limits to the speed (damage).
+        /// </summary>
+        public float GetCurrentMaxSpeed(bool run)
+        {
+            float currMaxSpeed = AnimController.GetCurrentSpeed(run);
+
             //?
             //currMaxSpeed *= 1.5f;
 
@@ -1055,6 +1110,38 @@ namespace Barotrauma
             return currMaxSpeed;
         }
 
+        public void Control(float deltaTime, Camera cam)
+        {
+            ViewTarget = null;
+            if (!AllowInput) return;
+
+            Vector2 smoothedCursorDiff = cursorPosition - SmoothedCursorPosition;
+            if (Controlled == this)
+            {
+                SmoothedCursorPosition = cursorPosition;
+            }
+            else
+            {
+                smoothedCursorDiff = NetConfig.InterpolateCursorPositionError(smoothedCursorDiff);
+                SmoothedCursorPosition = cursorPosition - smoothedCursorDiff;
+            }
+            
+            if (!(this is AICharacter) || Controlled == this || IsRemotePlayer)
+            {
+                Vector2 targetMovement = GetTargetMovement();
+
+                AnimController.TargetMovement = targetMovement;
+                AnimController.IgnorePlatforms = AnimController.TargetMovement.Y < -0.1f;
+            }
+
+            if (AnimController is HumanoidAnimController)
+            {
+                ((HumanoidAnimController) AnimController).Crouching = IsKeyDown(InputType.Crouch);
+            }
+
+            return currMaxSpeed;
+        }
+
         /// <summary>
         /// Can be used to modify the character's speed via StatusEffects
         /// </summary>

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) =>

Barotrauma/BarotraumaShared/Source/GameSettings.cs

@@ -63,6 +63,24 @@ namespace Barotrauma
         public VoiceMode VoiceSetting { get; set; }
         public string VoiceCaptureDevice { get; set; }
 
+        public int ParticleLimit { get; set; }
+
+        public float LightMapScale { get; set; }
+        public bool SpecularityEnabled { get; set; }
+        public bool ChromaticAberrationEnabled { get; set; }
+
+        public bool MuteOnFocusLost { get; set; }
+
+        public enum VoiceMode
+        {
+            Disabled,
+            PushToTalk,
+            Activity
+        };
+
+        public VoiceMode VoiceSetting { get; set; }
+        public string VoiceCaptureDevice { get; set; }
+
         public float NoiseGateThreshold { get; set; } = -45;
 
         private KeyOrMouse[] keyMapping;
@@ -377,8 +395,6 @@ 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];
@@ -550,6 +566,34 @@ namespace Barotrauma
 
             TextManager.LoadTextPacks(SelectedContentPackages);
 
+            //display error messages after all content packages have been loaded
+            //to make sure the package that contains text files has been loaded before we attempt to use TextManager
+            foreach (string missingPackagePath in missingPackagePaths)
+            {
+                DebugConsole.ThrowError(TextManager.Get("ContentPackageNotFound").Replace("[packagepath]", missingPackagePath));
+            }
+            foreach (ContentPackage incompatiblePackage in incompatiblePackages)
+            {
+                DebugConsole.ThrowError(TextManager.Get(incompatiblePackage.GameVersion <= new Version(0, 0, 0, 0) ? "IncompatibleContentPackageUnknownVersion" : "IncompatibleContentPackage")
+                                .Replace("[packagename]", incompatiblePackage.Name)
+                                .Replace("[packageversion]", incompatiblePackage.GameVersion.ToString())
+                                .Replace("[gameversion]", GameMain.Version.ToString()));
+            }
+            foreach (ContentPackage contentPackage in SelectedContentPackages)
+            {
+                foreach (ContentFile file in contentPackage.Files)
+                {
+                    if (!System.IO.File.Exists(file.Path))
+                    {
+                        DebugConsole.ThrowError("Error in content package \"" + contentPackage.Name + "\" - file \"" + file.Path + "\" not found.");
+                        continue;
+                    }
+                    ToolBox.IsProperFilenameCase(file.Path);
+                }
+            }
+
+            TextManager.LoadTextPacks(SelectedContentPackages);
+
             //display error messages after all content packages have been loaded
             //to make sure the package that contains text files has been loaded before we attempt to use TextManager
             foreach (string missingPackagePath in missingPackagePaths)
@@ -1128,6 +1172,32 @@ 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)
             {

Barotrauma/BarotraumaShared/Source/Items/Components/ItemContainer.cs

@@ -205,6 +205,24 @@ namespace Barotrauma.Items.Components
             return base.Select(character);
         }
 
+        public override bool Select(Character character)
+        {
+            if (item.Container != null) { return false; }
+
+            if (AutoInteractWithContained)
+            {
+                foreach (Item contained in Inventory.Items)
+                {
+                    if (contained == null) continue;
+                    if (contained.TryInteract(character))
+                    {
+                        return false;
+                    }
+                }
+            }
+            return base.Select(character);
+        }
+
         public override bool Pick(Character picker)
         {
             if (AutoInteractWithContained)

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

@@ -430,13 +430,6 @@ 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/Submarine.cs

@@ -522,6 +522,10 @@ namespace Barotrauma
                 {
                     maxX = Math.Min(maxX, ruin.Area.X - 100.0f);
                 }
+                else
+                {
+                    maxX = Math.Min(maxX, ruin.Area.X - 100.0f);
+                }
 
                 if (entity.IsVisible(worldView)) { visibleEntities.Add(entity); }             
             }
@@ -546,6 +550,26 @@ namespace Barotrauma
                 spawnPos.X = (minX + maxX) / 2;
             }
             
+            if (minX < 0.0f && maxX > Level.Loaded.Size.X)
+            {
+                //no walls found at either side, just use the initial spawnpos and hope for the best
+            }
+            else if (minX < 0)
+            {
+                //no wall found at the left side, spawn to the left from the right-side wall
+                spawnPos.X = maxX - minWidth - 100.0f;
+            }
+            else if (maxX > Level.Loaded.Size.X)
+            {
+                //no wall found at right side, spawn to the right from the left-side wall
+                spawnPos.X = minX + minWidth + 100.0f;
+            }
+            else
+            {
+                //walls found at both sides, use their midpoint
+                spawnPos.X = (minX + maxX) / 2;
+            }
+            
             spawnPos.Y = Math.Min(spawnPos.Y, Level.Loaded.Size.Y - dockedBorders.Height / 2 - 10);
             return spawnPos - diffFromDockedBorders;
         }

Barotrauma/BarotraumaShared/Source/PlayerInput.cs

@@ -140,11 +140,6 @@ namespace Barotrauma
         }
 #endif
 
-        public KeyOrMouse State
-        {
-            get { return binding; }
-        }
-
         public void SetState()
         {
             hit = binding.IsHit();