Merge branch 'master' into moStuff

2018-01-09 10:38:06 +02:00
parent 31350698bf 093fb12d0b
commit 7187c277e7
179 changed files with 116633 additions and 3529 deletions
@@ -89,6 +89,11 @@ namespace Barotrauma
            get { return prefab.Body; }
        }

+        public List<Body> Bodies
+        {
+            get { return bodies; }
+        }
+
        public bool CastShadow
        {
            get { return prefab.CastShadow; }
@@ -272,7 +277,13 @@ namespace Barotrauma

        public override MapEntity Clone()
        {
-            return new Structure(rect, prefab, Submarine);
+            var clone = new Structure(rect, prefab, Submarine);
+            foreach (KeyValuePair<string, SerializableProperty> property in SerializableProperties)
+            {
+                if (!property.Value.Attributes.OfType<Editable>().Any()) continue;
+                clone.SerializableProperties[property.Key].TrySetValue(property.Value.GetValue());
+            }
+            return clone;
        }

        private void CreateStairBodies()
@@ -651,23 +662,28 @@ namespace Barotrauma
            Vector2 transformedPos = worldPosition;
            if (Submarine != null) transformedPos -= Submarine.Position;

-            int i = FindSectionIndex(transformedPos);
-            if (i == -1) return new AttackResult(0.0f, 0.0f);
-            
-            float damageAmount = attack.GetStructureDamage(deltaTime);
-
-            AddDamage(i, damageAmount, attacker);
+            float damageAmount = 0.0f;
+            for (int i = 0; i < SectionCount; i++)
+            {
+                if (Vector2.DistanceSquared(SectionPosition(i, true), worldPosition) <= attack.DamageRange * attack.DamageRange)
+                {
+                    damageAmount = attack.GetStructureDamage(deltaTime);
+                    AddDamage(i, damageAmount, attacker);

 #if CLIENT
            GameMain.ParticleManager.CreateParticle("dustcloud", SectionPosition(i), 0.0f, 0.0f);
+#endif
+                }
+            }

+#if CLIENT
            if (playSound)// && !SectionBodyDisabled(i))
            {
                string damageSoundType = (attack.DamageType == DamageType.Blunt) ? "StructureBlunt" : "StructureSlash";
                SoundPlayer.PlayDamageSound(damageSoundType, damageAmount, worldPosition, tags: Tags);
            }
 #endif
-            
+
            return new AttackResult(damageAmount, 0.0f);
        }

@@ -838,6 +854,7 @@ namespace Barotrauma
            {
                StairDirection = StairDirection == Direction.Left ? Direction.Right : Direction.Left;
                bodies.ForEach(b => GameMain.World.RemoveBody(b));
+                bodies.Clear();

                CreateStairBodies();
            }