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
@@ -16,6 +16,8 @@ namespace Subsurface.Items.Components
private float range;
private Character user;
[HasDefaultValue(0.0f, false)]
public float Range
{
@@ -45,6 +47,8 @@ namespace Subsurface.Items.Components
if (character == null) return false;
if (!character.GetInputState(InputType.SecondaryHeld) || hitting) return false;
user = character;
if (hitPos < MathHelper.Pi * 0.69f) return false;
item.body.FarseerBody.CollisionCategories = Physics.CollisionProjectile;
@@ -178,7 +182,7 @@ namespace Subsurface.Items.Components
if (target == null) return false;
attack.DoDamage(target, item.Position, 1.0f);
attack.DoDamage(user, target, item.Position, 1.0f);
RestoreCollision();
hitting = false;