(325184804) Fix distance based attacks not registering if they hit a submarine.

2019-03-25 19:49:05 +02:00
parent 96003509b8
commit 5ec6a7fba9
36 changed files with 215 additions and 245 deletions
@@ -175,11 +175,12 @@ namespace Barotrauma
            LimitSize();

            UpdateProjSpecific(growModifier);
-            
-            if (size.X < 1.0f && (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer))
-            {
-                Remove();
-            }
+
+#if CLIENT
+            if (GameMain.Client != null) return;
+#endif
+
+            if (size.X < 1.0f) Remove();
        }

        partial void UpdateProjSpecific(float growModifier);
@@ -292,6 +293,10 @@ namespace Barotrauma
            //evaporate some of the water
            hull.WaterVolume -= extinguishAmount;

+#if CLIENT
+            if (GameMain.Client != null) return;
+#endif
+
            if (size.X < 1.0f && (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer))
            {
                Remove();
@@ -320,11 +325,12 @@ namespace Barotrauma
            size.X -= extinguishAmount;

            hull.WaterVolume -= extinguishAmount;
-            
-            if (size.X < 1.0f && (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer))
-            {
-                Remove();
-            }
+
+#if CLIENT
+            if (GameMain.Client != null) return;
+#endif
+
+            if (size.X < 1.0f) Remove();
        }

        public void Extinguish(float deltaTime, float amount, Vector2 worldPosition)
@@ -231,7 +231,7 @@ namespace Barotrauma

        public static Level CreateRandom(LocationConnection locationConnection)
        {
-            string seed = locationConnection.Locations[0].BaseName + locationConnection.Locations[1].BaseName;
+            string seed = locationConnection.Locations[0].Name + locationConnection.Locations[1].Name;

            float sizeFactor = MathUtils.InverseLerp(
                MapGenerationParams.Instance.SmallLevelConnectionLength, 
@@ -15,6 +15,7 @@ namespace Barotrauma
        public Vector3 Position;

        public float NetworkUpdateTimer;
+        public const float NetworkUpdateInterval = 0.2f;

        public float Scale;

@@ -343,7 +343,7 @@ namespace Barotrauma
                    {
                        GameMain.NetworkMember.CreateEntityEvent(this, new object[] { obj });
                        obj.NeedsNetworkSyncing = false;
-                        obj.NetworkUpdateTimer = NetConfig.LevelObjectUpdateInterval;
+                        obj.NetworkUpdateTimer = LevelObject.NetworkUpdateInterval;
                    }
                }

@@ -432,16 +432,12 @@ namespace Barotrauma
            {
                if (ForceFluctuationStrength > 0.0f)
                {
-                    //no need for force fluctuation (or network updates) if the trigger limits velocity and there are no triggerers
-                    if (forceMode != TriggerForceMode.LimitVelocity || triggerers.Any())
+                    forceFluctuationTimer += deltaTime;
+                    if (forceFluctuationTimer > ForceFluctuationInterval)
                    {
-                        forceFluctuationTimer += deltaTime;
-                        if (forceFluctuationTimer > ForceFluctuationInterval)
-                        {
-                            NeedsNetworkSyncing = true;
-                            currentForceFluctuation = Rand.Range(1.0f - ForceFluctuationStrength, 1.0f);
-                            forceFluctuationTimer = 0.0f;
-                        }
+                        NeedsNetworkSyncing = true;
+                        currentForceFluctuation = Rand.Range(1.0f - ForceFluctuationStrength, 1.0f);
+                        forceFluctuationTimer = 0.0f;
                    }
                }

@@ -15,8 +15,6 @@ namespace Barotrauma

        public int TypeChangeTimer;

-        public string BaseName { get => baseName; }
-
        public string Name { get; private set; }

        public Vector2 MapPosition { get; private set; }
@@ -36,7 +34,7 @@ namespace Barotrauma

                for (int i = availableMissions.Count; i < Connections.Count * 2; i++)
                {
-                    int seed = (ToolBox.StringToInt(BaseName) + MissionsCompleted * 10 + i) % int.MaxValue;
+                    int seed = (ToolBox.StringToInt(Name) + MissionsCompleted * 10 + i) % int.MaxValue;
                    MTRandom rand = new MTRandom(seed);

                    LocationConnection connection = Connections[(MissionsCompleted + i) % Connections.Count];
@@ -578,12 +578,10 @@ namespace Barotrauma
                        location.MissionsCompleted = missionsCompleted;
                        if (showNotifications && prevLocationType != location.Type)
                        {
-                            var change = prevLocationType.CanChangeTo.Find(c =>
-                                c.ChangeToType.ToLowerInvariant() == location.Type.Identifier.ToLowerInvariant());
-                            if (change != null)
-                            {
-                                ChangeLocationType(location, prevLocationName, change);
-                            }
+                            ChangeLocationType(
+                                location,
+                                prevLocationName,
+                                prevLocationType.CanChangeTo.Find(c => c.ChangeToType.ToLowerInvariant() == location.Type.Identifier.ToLowerInvariant()));
                        }
                        break;
                    case "connection":
@@ -10,7 +10,6 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using System.Xml.Linq;
 using Voronoi2;