Progress + prettier ice walls

Subsurface/Source/Characters/AI/EnemyAIController.cs

@@ -192,6 +192,7 @@ namespace Barotrauma
                 raycastTimer = RaycastInterval;
             }
 
+            steeringManager.SteeringAvoid(deltaTime, 1.0f);
             steeringManager.SteeringSeek(attackSimPosition);
             
             //check if any of the limbs is close enough to attack the target
@@ -322,7 +323,7 @@ namespace Barotrauma
                         attackTimer += deltaTime;
                         limb.body.ApplyTorque(limb.Mass * 50.0f * Character.AnimController.Dir * dir);
 
-                        limb.attack.DoDamage(Character, damageTarget, limb.SimPosition, deltaTime, (limb.soundTimer <= 0.0f));
+                        limb.attack.DoDamage(Character, damageTarget, limb.WorldPosition, deltaTime, (limb.soundTimer <= 0.0f));
 
                         limb.soundTimer = Limb.SoundInterval;
                     }

Subsurface/Source/Characters/AI/PathFinder.cs

@@ -218,7 +218,7 @@ namespace Barotrauma
                     //a node that hasn't been searched yet
                     if (nextNode.state==0)
                     {
-                        nextNode.H = Vector2.DistanceSquared(nextNode.Position,end.Position);
+                        nextNode.H = Vector2.Distance(nextNode.Position,end.Position);
 
                         if (GetNodePenalty != null)
                         {

Subsurface/Source/Characters/AI/SteeringManager.cs

@@ -144,11 +144,14 @@ namespace Barotrauma
 
                         avoidSteering = Vector2.Normalize(Submarine.LastPickedPosition - obstaclePosition);
                     }
-                    else
+                    else if (closestBody.UserData is Item)
                     {
                         Item item = closestBody.UserData as Item;
-                        if (item != null) avoidSteering = Vector2.Normalize(Submarine.LastPickedPosition - item.SimPosition);
-
+                        avoidSteering = Vector2.Normalize(Submarine.LastPickedPosition - item.SimPosition);
+                    }
+                    else
+                    {
+                        avoidSteering = Vector2.Normalize(host.SimPosition - Submarine.LastPickedPosition);
                     }
                 }
 

Subsurface/Source/Characters/Animation/Ragdoll.cs

@@ -388,14 +388,14 @@ namespace Barotrauma
             float volume = stairs == null ? impact/5.0f : impact;
                volume=  Math.Min(impact, 1.0f);
 
-            if (impact > 0.8f && l.HitSound != null && l.soundTimer <= 0.0f) l.HitSound.Play(volume, impact * 100.0f, l.body.FarseerBody);
+            if (impact > 0.8f && l.HitSound != null && l.soundTimer <= 0.0f) l.HitSound.Play(volume, impact * 100.0f, l.WorldPosition);
 
             if (impact > l.impactTolerance)
             {   
                 character.Health -= (impact - l.impactTolerance * 0.1f);
                 strongestImpact = Math.Max(strongestImpact, impact - l.impactTolerance);
 
-                SoundPlayer.PlayDamageSound(DamageSoundType.LimbBlunt, strongestImpact, l.body.FarseerBody);                
+                SoundPlayer.PlayDamageSound(DamageSoundType.LimbBlunt, strongestImpact, l.body);                
 
                 if (Character.Controlled == character) GameMain.GameScreen.Cam.Shake = strongestImpact;
             }

Subsurface/Source/Characters/Attack.cs

@@ -122,7 +122,7 @@ namespace Barotrauma
         }
 
 
-        public AttackResult DoDamage(IDamageable attacker, IDamageable target, Vector2 position, float deltaTime, bool playSound = true)
+        public AttackResult DoDamage(IDamageable attacker, IDamageable target, Vector2 worldPosition, float deltaTime, bool playSound = true)
         {
             float damageAmount = 0.0f;
             //DamageSoundType damageSoundType = DamageSoundType.None;
@@ -139,15 +139,15 @@ namespace Barotrauma
 
             if (particleEmitterPrefab != null)
             {
-                particleEmitterPrefab.Emit(position);
+                particleEmitterPrefab.Emit(worldPosition);
             }
 
             if (sound != null)
             {
-                sound.Play(1.0f, 500.0f, position);
+                sound.Play(1.0f, 500.0f, worldPosition);
             }
 
-            return target.AddDamage(attacker, position, this, deltaTime, playSound);
+            return target.AddDamage(attacker, worldPosition, this, deltaTime, playSound);
 
         }
     }

Subsurface/Source/Characters/Character.cs

@@ -448,7 +448,7 @@ namespace Barotrauma
                 }
             }
 
-            AnimController.FindHull(null, false);
+            AnimController.FindHull(null);
             if (AnimController.CurrentHull != null) Submarine = AnimController.CurrentHull.Submarine;
 
             CharacterList.Add(this);
@@ -741,7 +741,7 @@ namespace Barotrauma
         {
             Limb head = AnimController.GetLimb(LimbType.Head);
 
-            Lights.LightManager.ViewPos = WorldPosition;
+            Lights.LightManager.ViewPos = DrawPosition;
 
             if (!DisableControls)
             {
@@ -1010,7 +1010,7 @@ namespace Barotrauma
                 AnimController.DebugDraw(spriteBatch);
             }
 
-            Vector2 healthBarPos = new Vector2(WorldPosition.X - 50, -WorldPosition.Y - 100.0f);
+            Vector2 healthBarPos = new Vector2(DrawPosition.X - 50, -DrawPosition.Y - 100.0f);
             GUI.DrawRectangle(spriteBatch, new Rectangle((int)healthBarPos.X - 2, (int)healthBarPos.Y - 2, 100 + 4, 15 + 4), Color.Black, false);
             GUI.DrawRectangle(spriteBatch, new Rectangle((int)healthBarPos.X, (int)healthBarPos.Y, (int)(100.0f * (health / maxHealth)), 15), Color.Red, true);
         }
@@ -1028,17 +1028,16 @@ namespace Barotrauma
                 if (soundStates[i] != state) continue;
                 if (n == selectedSound && sounds[i]!=null)
                 {
-                    sounds[i].Play(1.0f, 2000.0f,
-                            AnimController.Limbs[0].body.FarseerBody);
+                    sounds[i].Play(1.0f, 2000.0f, AnimController.Limbs[0].WorldPosition);
                     return;
                 }
                 n++;
             }
         }
 
-        public virtual AttackResult AddDamage(IDamageable attacker, Vector2 simPosition, Attack attack, float deltaTime, bool playSound = false)
+        public virtual AttackResult AddDamage(IDamageable attacker, Vector2 worldPosition, Attack attack, float deltaTime, bool playSound = false)
         {
-            return AddDamage(simPosition, attack.DamageType, attack.GetDamage(deltaTime), attack.GetBleedingDamage(deltaTime), attack.Stun, playSound);
+            return AddDamage(worldPosition, attack.DamageType, attack.GetDamage(deltaTime), attack.GetBleedingDamage(deltaTime), attack.Stun, playSound);
         }
 
         public AttackResult AddDamage(Vector2 simPosition, DamageType damageType, float amount, float bleedingAmount, float stun, bool playSound)
@@ -1103,7 +1102,7 @@ namespace Barotrauma
                // limb.Damage = 100.0f;
             }
 
-            SoundPlayer.PlayDamageSound(DamageSoundType.Implode, 50.0f, AnimController.RefLimb.body.FarseerBody);
+            SoundPlayer.PlayDamageSound(DamageSoundType.Implode, 50.0f, AnimController.RefLimb.body);
             
             for (int i = 0; i < 10; i++)
             {

Subsurface/Source/Characters/StatusEffect.cs

@@ -215,7 +215,7 @@ namespace Barotrauma
             if (explosion != null) explosion.Explode(entity.WorldPosition);
             if (Fire) new FireSource(ConvertUnits.ToDisplayUnits(entity.SimPosition));            
 
-            if (sound != null) sound.Play(1.0f, 1000.0f, ConvertUnits.ToDisplayUnits(entity.SimPosition));
+            if (sound != null) sound.Play(1.0f, 1000.0f, entity.WorldPosition);
 
             for (int i = 0; i < propertyNames.Count(); i++)
             {