(326dbd217) Don't take the diving suit off while trying to get a diving suit as a part of the goto objective. Fixes bots occasionally standing next to the diving suit cabinet apparently holding the suit in hands but not putting it on or moving anywhere.

2019-05-16 05:37:14 +03:00
parent 01743eb7e1
commit 6f9690eeaf
13 changed files with 387 additions and 74 deletions
@@ -152,6 +152,32 @@ namespace Barotrauma

                }

+                if (character.MemLocalState.Count > 120) character.MemLocalState.RemoveRange(0, character.MemLocalState.Count - 120);
+                character.MemState.Clear();
+            }
+        }
+        
+        partial void ImpactProjSpecific(float impact, Body body)
+        {
+            float volume = MathHelper.Clamp(impact - 3.0f, 0.5f, 1.0f);
+
+            if (body.UserData is Limb limb && character.Stun <= 0f)
+            {
+                if (impact > 3.0f) { PlayImpactSound(limb); }
+            }
+            else if (body.UserData is Limb || body == Collider.FarseerBody)
+            {
+                if (!character.IsRemotePlayer && impact > ImpactTolerance)
+                {
+                    SoundPlayer.PlayDamageSound("LimbBlunt", strongestImpact, Collider);
+                }
+            }
+            if (Character.Controlled == character)
+            {
+                GameMain.GameScreen.Cam.Shake = Math.Min(Math.Max(strongestImpact, GameMain.GameScreen.Cam.Shake), 3.0f);
+            }
+        }
+
                if (character.MemState.Count < 1) return;

                overrideTargetMovement = Vector2.Zero;