Need to merge this

This commit is contained in:
Pieter-Jan Briers
2020-03-25 11:16:57 +01:00
parent 42814fcfe7
commit 705aeceba6
7 changed files with 104 additions and 121 deletions

View File

@@ -1,6 +1,5 @@
using Content.Shared.GameObjects.Components.Mobs;
using Robust.Shared.GameObjects;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.Mobs
{
@@ -12,34 +11,5 @@ namespace Content.Server.GameObjects.Components.Mobs
[RegisterComponent]
public sealed class CombatModeComponent : SharedCombatModeComponent
{
private bool _isInCombatMode;
private TargetingZone _activeZone;
[ViewVariables(VVAccess.ReadWrite)]
public bool IsInCombatMode
{
get => _isInCombatMode;
set
{
_isInCombatMode = value;
Dirty();
}
}
[ViewVariables(VVAccess.ReadWrite)]
public TargetingZone ActiveZone
{
get => _activeZone;
set
{
_activeZone = value;
Dirty();
}
}
public override ComponentState GetComponentState()
{
return new CombatModeComponentState(IsInCombatMode, ActiveZone);
}
}
}