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

Mobs auto state handlers (#26957)

Browse Source 
* Autogenerate MobStateComponentState

* changed CurrentState to DataField, updated DataField attribute for AllowedStates

* Update Content.Shared/Mobs/Components/MobStateComponent.cs

* Update Content.Shared/Mobs/Components/MobStateComponent.cs

---------

Co-authored-by: BuildTools <unconfigured@null.spigotmc.org>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Alfred Baumann
2024-04-17 12:00:05 +02:00
committed by GitHub
parent e2341c0089
commit 5b8468c9d8
2 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Content.Shared/Mobs/Components/MobStateComponent.cs
View File

@@ -13,30 +13,21 @@ namespace Content.Shared.Mobs.Components
/// </summary> /// </summary>
[RegisterComponent] [RegisterComponent]
[NetworkedComponent] [NetworkedComponent]
[AutoGenerateComponentState]
[Access(typeof(MobStateSystem), typeof(MobThresholdSystem))] [Access(typeof(MobStateSystem), typeof(MobThresholdSystem))]
public sealed partial class MobStateComponent : Component public sealed partial class MobStateComponent : Component
{ {
//default mobstate is always the lowest state level //default mobstate is always the lowest state level
[ViewVariables] public MobState CurrentState { get; set; } = MobState.Alive; [AutoNetworkedField, ViewVariables]
public MobState CurrentState { get; set; } = MobState.Alive;
[DataField("allowedStates")] public HashSet<MobState> AllowedStates = new() [DataField]
[AutoNetworkedField]
public HashSet<MobState> AllowedStates = new()
{ {
MobState.Alive, MobState.Alive,
MobState.Critical, MobState.Critical,
MobState.Dead MobState.Dead
}; };
} }
[Serializable, NetSerializable]
public sealed class MobStateComponentState : ComponentState
{
public readonly MobState CurrentState;
public readonly HashSet<MobState> AllowedStates;
public MobStateComponentState(MobState currentState, HashSet<MobState> allowedStates)
{
CurrentState = currentState;
AllowedStates = allowedStates;
}
}
} }

21
Content.Shared/Mobs/Systems/MobStateSystem.cs
View File

@@ -25,8 +25,6 @@ public partial class MobStateSystem : EntitySystem
_sawmill = _logManager.GetSawmill("MobState"); _sawmill = _logManager.GetSawmill("MobState");
base.Initialize(); base.Initialize();
SubscribeEvents(); SubscribeEvents();
SubscribeLocalEvent<MobStateComponent, ComponentGetState>(OnGetComponentState);
SubscribeLocalEvent<MobStateComponent, ComponentHandleState>(OnHandleComponentState);
} }
#region Public API #region Public API
@@ -100,24 +98,5 @@ public partial class MobStateSystem : EntitySystem
#region Private Implementation #region Private Implementation
private void OnHandleComponentState(EntityUid uid, MobStateComponent component, ref ComponentHandleState args)
{
if (args.Current is not MobStateComponentState state)
return;
component.CurrentState = state.CurrentState;
if (!component.AllowedStates.SetEquals(state.AllowedStates))
{
component.AllowedStates.Clear();
component.AllowedStates.UnionWith(state.AllowedStates);
}
}
private void OnGetComponentState(EntityUid uid, MobStateComponent component, ref ComponentGetState args)
{
args.State = new MobStateComponentState(component.CurrentState, component.AllowedStates);
}
#endregion #endregion
} }