Move faction exception and everything it needs to shared (#25154)
* move faction prototype to shared * move faction exception and member stuff to shared * fix breaking changes for random stuff * move pettable friend stuff to shared * mostly fix * final fixy * dragonops * final fixy II * use querys and fix warpspeed fish (probably) * fixer * Rrrr! --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
24
Content.Shared/NPC/Components/FactionExceptionComponent.cs
Normal file
24
Content.Shared/NPC/Components/FactionExceptionComponent.cs
Normal file
@@ -0,0 +1,24 @@
|
||||
using Content.Shared.NPC.Systems;
|
||||
using Robust.Shared.GameStates;
|
||||
|
||||
namespace Content.Shared.NPC.Components;
|
||||
|
||||
/// <summary>
|
||||
/// Prevents an NPC from attacking ignored entities from enemy factions.
|
||||
/// Can be added to if pettable, see PettableFriendComponent.
|
||||
/// </summary>
|
||||
[RegisterComponent, NetworkedComponent, Access(typeof(NpcFactionSystem))]
|
||||
public sealed partial class FactionExceptionComponent : Component
|
||||
{
|
||||
/// <summary>
|
||||
/// Collection of entities that this NPC will refuse to attack
|
||||
/// </summary>
|
||||
[DataField]
|
||||
public HashSet<EntityUid> Ignored = new();
|
||||
|
||||
/// <summary>
|
||||
/// Collection of entities that this NPC will attack, regardless of faction.
|
||||
/// </summary>
|
||||
[DataField]
|
||||
public HashSet<EntityUid> Hostiles = new();
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
using Content.Shared.NPC.Systems;
|
||||
using Robust.Shared.GameStates;
|
||||
|
||||
namespace Content.Shared.NPC.Components;
|
||||
|
||||
/// <summary>
|
||||
/// This is used for tracking entities stored in <see cref="FactionExceptionComponent"/>.
|
||||
/// </summary>
|
||||
[RegisterComponent, NetworkedComponent, Access(typeof(NpcFactionSystem))]
|
||||
public sealed partial class FactionExceptionTrackerComponent : Component
|
||||
{
|
||||
/// <summary>
|
||||
/// Entities with <see cref="FactionExceptionComponent"/> that are tracking this entity.
|
||||
/// </summary>
|
||||
[DataField]
|
||||
public HashSet<EntityUid> Entities = new();
|
||||
}
|
||||
28
Content.Shared/NPC/Components/NpcFactionMemberComponent.cs
Normal file
28
Content.Shared/NPC/Components/NpcFactionMemberComponent.cs
Normal file
@@ -0,0 +1,28 @@
|
||||
using Content.Shared.NPC.Prototypes;
|
||||
using Content.Shared.NPC.Systems;
|
||||
using Robust.Shared.GameStates;
|
||||
using Robust.Shared.Prototypes;
|
||||
|
||||
namespace Content.Shared.NPC.Components;
|
||||
|
||||
[RegisterComponent, NetworkedComponent, Access(typeof(NpcFactionSystem))]
|
||||
public sealed partial class NpcFactionMemberComponent : Component
|
||||
{
|
||||
/// <summary>
|
||||
/// Factions this entity is a part of.
|
||||
/// </summary>
|
||||
[DataField]
|
||||
public HashSet<ProtoId<NpcFactionPrototype>> Factions = new();
|
||||
|
||||
/// <summary>
|
||||
/// Cached friendly factions.
|
||||
/// </summary>
|
||||
[ViewVariables]
|
||||
public readonly HashSet<ProtoId<NpcFactionPrototype>> FriendlyFactions = new();
|
||||
|
||||
/// <summary>
|
||||
/// Cached hostile factions.
|
||||
/// </summary>
|
||||
[ViewVariables]
|
||||
public readonly HashSet<ProtoId<NpcFactionPrototype>> HostileFactions = new();
|
||||
}
|
||||
Reference in New Issue
Block a user