water ambience sounds change according to speed, oxygengenerator fills oxygen tanks even if their condition is 0, submarine refactoring & bugfixes, wire node editing bugfixes

This commit is contained in:
Regalis
2015-09-24 15:21:10 +03:00
parent f6966f06c3
commit bf7619bcc4
33 changed files with 635 additions and 490 deletions
+4 -4
View File
@@ -459,11 +459,11 @@ namespace Subsurface
}
public AttackResult AddDamage(Vector2 position, DamageType damageType, float amount, float bleedingAmount, float stun, bool playSound = true)
public AttackResult AddDamage(IDamageable attacker, Vector2 position, Attack attack, bool playSound = true)
{
Condition -= amount;
Condition -= attack.Damage;
return new AttackResult(amount, 0.0f, false);
return new AttackResult(attack.Damage, 0.0f, false);
}
@@ -601,7 +601,7 @@ namespace Subsurface
GUI.DrawLine(spriteBatch,
new Vector2(rect.X + rect.Width / 2, -rect.Y + rect.Height / 2),
new Vector2(e.Rect.X + e.Rect.Width / 2, -e.Rect.Y + e.Rect.Height / 2),
Color.Red);
Color.Red*0.3f);
}
}