tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expose data on StunnableComponent

Browse Source
This commit is contained in:
zumorica
2020-05-13 19:10:29 +02:00
parent f968128af7
commit c3c5b87fd5
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs
View File

@@ -12,6 +12,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Timers;
using Robust.Shared.IoC;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
using Timer = Robust.Shared.Timers.Timer;
@@ -30,7 +31,7 @@ namespace Content.Server.GameObjects.Components.Mobs
private float _stunCap = 20f;
private float _knockdownCap = 20f;
private float _helpKnockdownRemove = 1f;
private float _helpInterval = 1f;
private float _helpInterval = 0.5f;
private float _stunnedTimer = 0f;
private float _knockdownTimer = 0f;
@@ -40,6 +41,15 @@ namespace Content.Server.GameObjects.Components.Mobs
[ViewVariables] public bool Stunned => _stunned;
[ViewVariables] public bool KnockedDown => _knocked;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _stunCap, "stunCap", 20f);
serializer.DataField(ref _knockdownCap, "knockdownCap", 20f);
serializer.DataField(ref _helpInterval, "helpInterval", 0.5f);
serializer.DataField(ref _helpKnockdownRemove, "helpKnockdownRemove", 1f);
}
public void Stun(float seconds)
{
seconds = Math.Min(seconds + _stunnedTimer, _stunCap);
@@ -50,12 +60,6 @@ namespace Content.Server.GameObjects.Components.Mobs
_stunnedTimer = seconds;
}
public override void Initialize()
{
base.Initialize();
Timer.Spawn(10000, () => Paralyze(15f));
}
public void Knockdown(float seconds)
{
seconds = MathF.Min(_knockdownTimer + seconds, _knockdownCap);
@@ -86,14 +90,14 @@ namespace Content.Server.GameObjects.Components.Mobs
public bool AttackHand(AttackHandEventArgs eventArgs)
{
if (!_canHelp || KnockedDown)
if (!_canHelp || !KnockedDown)
return false;
_canHelp = false;
Timer.Spawn(((int)_helpInterval*1000), () => _canHelp = true);
IoCManager.Resolve<IEntitySystemManager>().GetEntitySystem<AudioSystem>()
.Play("/Audio/effects/thudswoosh.ogg", Owner, AudioHelpers.WithVariation(0.5f));
.Play("/Audio/effects/thudswoosh.ogg", Owner, AudioHelpers.WithVariation(0.25f));
_knockdownTimer -= _helpKnockdownRemove;

2
Content.Server/Mobs/StandingStateHelper.cs
View File

@@ -34,7 +34,7 @@ namespace Content.Server.Mobs
appearance.SetData(SharedSpeciesComponent.MobVisuals.RotationState, newState);
if (playSound)
PlaySoundCollection("bodyfall", AudioHelpers.WithVariation(0.5f));
PlaySoundCollection("bodyfall", AudioHelpers.WithVariation(0.25f));
if(dropItems)
DropAllItemsInHands(entity);