electricity bugfixes, destructable doors, ai improvements, removed rope, container changes

2015-05-27 01:02:30 +03:00
parent a1196d1876
commit 80648ffd46
51 changed files with 701 additions and 509 deletions
@@ -72,15 +72,16 @@ namespace Subsurface
            float damageAmount = 0.0f;
            DamageSoundType damageSoundType = DamageSoundType.None;

-            if (target as Structure == null)
-            {
-                damageAmount = damage;
-                damageSoundType = (damageType == DamageType.Blunt) ? DamageSoundType.LimbBlunt : DamageSoundType.LimbSlash;
-            }
-            else
+            if (target as Character == null)
            {
                damageAmount = structureDamage;
                damageSoundType = (damageType == DamageType.Blunt) ? DamageSoundType.StructureBlunt: DamageSoundType.StructureSlash;
+
+            }
+            else
+            {
+                damageAmount = damage;
+                damageSoundType = (damageType == DamageType.Blunt) ? DamageSoundType.LimbBlunt : DamageSoundType.LimbSlash;
            }

            if (playSound) AmbientSoundManager.PlayDamageSound(damageSoundType, damageAmount, position);