Crates, some new chemicals, statuseffects that are triggered on impact, explosions can trigger "OnFire" statuseffects, applying impulses to items (and not just characters) when the submarine hits something

Subsurface/Source/Characters/BackgroundSprite/BackgroundSpriteManager.cs

@@ -179,9 +179,6 @@ namespace Barotrauma
 
         public void DrawSprites(SpriteBatch spriteBatch, Camera cam)
         {
-            Stopwatch sw = new Stopwatch();
-            sw.Start();
-
             Rectangle indices = Rectangle.Empty;
             indices.X = (int)Math.Floor(cam.WorldView.X / (float)GridSize) - 1;            
             if (indices.X >= sprites.GetLength(0)) return;
@@ -189,7 +186,6 @@ namespace Barotrauma
             indices.Y = (int)Math.Floor((cam.WorldView.Y - cam.WorldView.Height) / (float)GridSize) - 1;
             if (indices.Y >= sprites.GetLength(1)) return;
 
-
             indices.Width = (int)Math.Ceiling(cam.WorldView.Right / (float)GridSize) + 1;
             if (indices.Width < 0) return;
             indices.Height = (int)Math.Ceiling(cam.WorldView.Y / (float)GridSize) + 1;
@@ -212,9 +208,6 @@ namespace Barotrauma
                     }
                 }
             }
-
-            sw.Stop();
-            Debug.WriteLine(sw.ElapsedMilliseconds + "   -     "+sw.ElapsedTicks);
         }
 
         private BackgroundSpritePrefab GetRandomPrefab()

Subsurface/Source/Characters/StatusEffect.cs

@@ -219,17 +219,7 @@ namespace Barotrauma
         }
 
         protected void Apply(float deltaTime, Entity entity, List<IPropertyObject> targets)
-        {
-
-            if (explosion != null) explosion.Explode(entity.WorldPosition);
-            
-            if (FireSize > 0.0f)
-            {
-                var fire = new FireSource(entity.WorldPosition);
-                
-                fire.Size = new Vector2(FireSize, fire.Size.Y);
-            }            
-
+        {      
             if (sound != null) sound.Play(1.0f, 1000.0f, entity.WorldPosition);
 
             if (useItem)
@@ -259,8 +249,16 @@ namespace Barotrauma
                         ApplyToProperty(property, propertyEffects[i], deltaTime);                          
                     }
                 }
-
             }
+
+            if (explosion != null) explosion.Explode(entity.WorldPosition);
+
+            if (FireSize > 0.0f)
+            {
+                var fire = new FireSource(entity.WorldPosition);
+
+                fire.Size = new Vector2(FireSize, fire.Size.Y);
+            }   
         }
 
         private IEnumerable<object> ApplyToPropertyOverDuration(float duration, ObjectProperty property, object value)

Subsurface/Source/Items/Item.cs

@@ -12,13 +12,18 @@ using Barotrauma.Items.Components;
 using System.ComponentModel;
 using System.Collections.ObjectModel;
 using FarseerPhysics.Dynamics;
+using FarseerPhysics.Dynamics.Contacts;
 
 namespace Barotrauma
 {
 
     public enum ActionType
     {
-        Always, OnPicked, OnWearing, OnContaining, OnContained, OnActive, OnUse, OnFailure, OnBroken, OnFire, InWater
+        Always, OnPicked, OnUse, 
+        OnWearing, OnContaining, OnContained, 
+        OnActive, OnFailure, OnBroken, 
+        OnFire, InWater,
+        OnImpact
     }
 
     class Item : MapEntity, IDamageable, IPropertyObject
@@ -109,6 +114,11 @@ namespace Barotrauma
             get { return prefab.Description; }
         }
 
+        public float ImpactTolerance
+        {
+            get { return prefab.ImpactTolerance; }
+        }
+
         public override Sprite Sprite
         {
             get { return prefab.sprite; }
@@ -383,6 +393,12 @@ namespace Barotrauma
                 }
             }
 
+            //containers need to handle collision events to notify items inside them about the impact
+            if (ImpactTolerance > 0.0f || GetComponent<ItemContainer>() != null)
+            {
+                if (body != null) body.FarseerBody.OnCollision += OnCollision;
+            }
+
             InsertToList();
             ItemList.Add(this);
         }
@@ -729,6 +745,27 @@ namespace Barotrauma
             body.ApplyTorque(body.AngularVelocity * volume * -0.05f);                    
         }
 
+        private bool OnCollision(Fixture f1, Fixture f2, Contact contact)
+        {
+            Vector2 normal = contact.Manifold.LocalNormal;
+            
+            float impact = Vector2.Dot(f1.Body.LinearVelocity, -normal);
+
+            if (ImpactTolerance > 0.0f && impact > ImpactTolerance) ApplyStatusEffects(ActionType.OnImpact, 1.0f);
+
+            var containedItems = ContainedItems;
+            if (containedItems != null)
+            {
+                foreach (Item contained in containedItems)
+                {
+                    if (contained.body == null) continue;
+                    contained.OnCollision(f1, f2, contact);
+                }
+            }
+
+            return true;
+        }
+
         public override void Draw(SpriteBatch spriteBatch, bool editing, bool back = true)
         {
             Color color = (isSelected && editing) ? color = Color.Red : spriteColor;

Subsurface/Source/Items/ItemPrefab.cs

@@ -45,6 +45,8 @@ namespace Barotrauma
 
         public readonly bool FireProof;
 
+        private float impactTolerance;
+
         public string ConfigFile
         {
             get { return configFile; }
@@ -87,6 +89,13 @@ namespace Barotrauma
             get { return offsetOnSelected; }
         }
 
+
+        public float ImpactTolerance
+        {
+            get { return impactTolerance; }
+            set { impactTolerance = Math.Max(value, 0.0f); }
+        }
+
         public bool CanUseOnSelf
         {
             get;
@@ -213,7 +222,9 @@ namespace Barotrauma
 
             CanUseOnSelf        = ToolBox.GetAttributeBool(element, "canuseonself", false);
             
-            FireProof = ToolBox.GetAttributeBool(element, "fireproof", false);
+            FireProof           = ToolBox.GetAttributeBool(element, "fireproof", false);
+
+            ImpactTolerance     = ToolBox.GetAttributeFloat(element, "impacttolerance", 0.0f);
 
 
             string categoriesStr = ToolBox.GetAttributeString(element, "category", "Misc");

Subsurface/Source/Map/Explosion.cs

@@ -39,8 +39,6 @@ namespace Barotrauma
             {
                 GameMain.ParticleManager.CreateParticle("shockwave", worldPosition,
                     Vector2.Zero, 0.0f, hull);
-
-
             }
 
             for (int i = 0; i < attack.Range * 0.1f; i++)
@@ -79,6 +77,21 @@ namespace Barotrauma
 
             ApplyExplosionForces(worldPosition, attack.Range, force, attack.GetDamage(1.0f), attack.Stun);
 
+            if (flames)
+            {
+                foreach (Item item in Item.ItemList)
+                {
+                    if (item.CurrentHull != hull || item.FireProof || item.Condition <= 0.0f) continue;
+                    //if (item.ParentInventory != null) return;
+
+                    if (Vector2.Distance(item.WorldPosition, worldPosition) > attack.Range * 0.1f) continue;
+
+                    //item.Condition -= (float)Math.Sqrt(size.X) * deltaTime;
+
+                    item.ApplyStatusEffects(ActionType.OnFire, 1.0f);
+                }
+            }
+
         }
 
         private IEnumerable<object> DimLight()

Subsurface/Source/Map/FireSource.cs

@@ -250,7 +250,7 @@ namespace Barotrauma
             foreach (Item item in Item.ItemList)
             {
                 if (item.CurrentHull != hull || item.FireProof || item.Condition <= 0.0f) continue;
-                if (item.ParentInventory != null) return;
+                //if (item.ParentInventory != null) return;
 
                 float range = (float)Math.Sqrt(size.X) * 10.0f;
                 if (item.Position.X < position.X - range || item.Position.X > position.X + size.X + range) continue;

Subsurface/Source/Map/SubmarineBody.cs

@@ -492,10 +492,10 @@ namespace Barotrauma
             SoundPlayer.PlayDamageSound(DamageSoundType.StructureBlunt, impact * 10.0f, ConvertUnits.ToDisplayUnits(lastContactPoint));
             GameMain.GameScreen.Cam.Shake = impact * 2.0f;
 
-            Vector2 limbForce = direction * impact * 0.5f;
+            Vector2 impulse = direction * impact * 0.5f;
 
-            float length = limbForce.Length();
-            if (length > 5.0f) limbForce = (limbForce / length) * 5.0f;
+            float length = impulse.Length();
+            if (length > 5.0f) impulse = (impulse / length) * 5.0f;
 
             foreach (Character c in Character.CharacterList)
             {
@@ -506,10 +506,17 @@ namespace Barotrauma
                 foreach (Limb limb in c.AnimController.Limbs)
                 {
                     if (c.AnimController.LowestLimb == limb) continue;
-                    limb.body.ApplyLinearImpulse(limb.Mass * limbForce);
+                    limb.body.ApplyLinearImpulse(limb.Mass * impulse);
                 }
             }
 
+            foreach (Item item in Item.ItemList)
+            {
+                if (item.Submarine != submarine || item.CurrentHull == null || item.body == null) continue;
+
+                item.body.ApplyLinearImpulse(item.body.Mass * impulse);                
+            }
+
             Explosion.RangedStructureDamage(ConvertUnits.ToDisplayUnits(lastContactPoint), impact * 50.0f, impact * DamageMultiplier);
         }