Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix stunbaton issues

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-07-07 23:12:12 +02:00
parent 75f92da8ac
commit a7565b7651
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs
View File

@@ -52,7 +52,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
private float _slowdownTime = 5f; private float _slowdownTime = 5f;
[ViewVariables(VVAccess.ReadWrite)] public float EnergyPerUse { get; set; } = 1000; [ViewVariables(VVAccess.ReadWrite)] public float EnergyPerUse { get; set; } = 50;
[ViewVariables] [ViewVariables]
public bool Activated => _activated; public bool Activated => _activated;
@@ -88,13 +88,12 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
protected override bool OnHitEntities(IReadOnlyList<IEntity> entities, AttackEventArgs eventArgs) protected override bool OnHitEntities(IReadOnlyList<IEntity> entities, AttackEventArgs eventArgs)
{ {
var cell = Cell; if (!Activated || entities.Count == 0 || Cell == null)
if (!Activated || entities.Count == 0 || cell == null) return true;
return false;
if (!cell.TryUseCharge(EnergyPerUse)) if (!Cell.TryUseCharge(EnergyPerUse))
{ return true;
return false;
}
EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/Weapons/egloves.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f)); EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/Weapons/egloves.ogg", Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
foreach (var entity in entities) foreach (var entity in entities)
@@ -112,11 +111,11 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee
else else
stunnable.Slowdown(_slowdownTime); stunnable.Slowdown(_slowdownTime);
} }
if(cell.CurrentCharge < EnergyPerUse)
{ if (!(Cell.CurrentCharge < EnergyPerUse)) return true;
EntitySystem.Get<AudioSystem>().PlayAtCoords(AudioHelpers.GetRandomFileFromSoundCollection("sparks"), Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
TurnOff(); EntitySystem.Get<AudioSystem>().PlayAtCoords(AudioHelpers.GetRandomFileFromSoundCollection("sparks"), Owner.Transform.GridPosition, AudioHelpers.WithVariation(0.25f));
} TurnOff();
return true; return true;
} }