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

Remove useless bools

Browse Source
This commit is contained in:
zumorica
2020-05-13 22:13:22 +02:00
parent 6428cdd596
commit 4e843358bd
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,8 +24,6 @@ namespace Content.Server.GameObjects.Components.Mobs
[Dependency] private IEntitySystemManager _entitySystemManager; [Dependency] private IEntitySystemManager _entitySystemManager;
[Dependency] private ITimerManager _timerManager; [Dependency] private ITimerManager _timerManager;
private bool _stunned = false;
private bool _knocked = false;
private bool _canHelp = true; private bool _canHelp = true;
private float _stunCap = 20f; private float _stunCap = 20f;
@@ -38,8 +36,8 @@ namespace Content.Server.GameObjects.Components.Mobs
public override string Name => "Stunnable"; public override string Name => "Stunnable";
[ViewVariables] public bool Stunned => _stunned; [ViewVariables] public bool Stunned => _stunnedTimer > 0f;
[ViewVariables] public bool KnockedDown => _knocked; [ViewVariables] public bool KnockedDown => _knockdownTimer > 0f;
public override void ExposeData(ObjectSerializer serializer) public override void ExposeData(ObjectSerializer serializer)
{ {
@@ -56,7 +54,6 @@ namespace Content.Server.GameObjects.Components.Mobs
StandingStateHelper.DropAllItemsInHands(Owner); StandingStateHelper.DropAllItemsInHands(Owner);
_stunned = true;
_stunnedTimer = seconds; _stunnedTimer = seconds;
} }
@@ -66,7 +63,6 @@ namespace Content.Server.GameObjects.Components.Mobs
StandingStateHelper.Down(Owner); StandingStateHelper.Down(Owner);
_knocked = true;
_knockdownTimer = seconds; _knockdownTimer = seconds;
} }
@@ -81,9 +77,6 @@ namespace Content.Server.GameObjects.Components.Mobs
/// </summary> /// </summary>
public void CancelAll() public void CancelAll()
{ {
_knocked = false;
_stunned = false;
_knockdownTimer = 0f; _knockdownTimer = 0f;
_stunnedTimer = 0f; _stunnedTimer = 0f;
} }
@@ -106,7 +99,7 @@ namespace Content.Server.GameObjects.Components.Mobs
public void Update(float delta) public void Update(float delta)
{ {
if (_knocked) if (KnockedDown)
{ {
_knockdownTimer -= delta; _knockdownTimer -= delta;
@@ -114,17 +107,17 @@ namespace Content.Server.GameObjects.Components.Mobs
{ {
StandingStateHelper.Standing(Owner); StandingStateHelper.Standing(Owner);
_knocked = false; _knockdownTimer = 0f;
} }
} }
if (_stunned) if (Stunned)
{ {
_stunnedTimer -= delta; _stunnedTimer -= delta;
if (_stunnedTimer <= 0) if (_stunnedTimer <= 0)
{ {
_stunned = false; _stunnedTimer = 0f;
} }
} }
} }