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

Rename Faction to NpcFaction (#18079)

Browse Source
This commit is contained in:
Leon Friedrich
2023-07-17 15:51:52 +12:00
committed by GitHub
parent f8c94bd76c
commit 541eb417e3
37 changed files with 108 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Entry/EntryPoint.cs
View File

@@ -109,7 +109,7 @@ namespace Content.Client.Entry
_prototypeManager.RegisterIgnore("htnPrimitive"); _prototypeManager.RegisterIgnore("htnPrimitive");
_prototypeManager.RegisterIgnore("gameMap"); _prototypeManager.RegisterIgnore("gameMap");
_prototypeManager.RegisterIgnore("gameMapPool"); _prototypeManager.RegisterIgnore("gameMapPool");
_prototypeManager.RegisterIgnore("faction"); _prototypeManager.RegisterIgnore("npcFaction");
_prototypeManager.RegisterIgnore("lobbyBackground"); _prototypeManager.RegisterIgnore("lobbyBackground");
_prototypeManager.RegisterIgnore("advertisementsPack"); _prototypeManager.RegisterIgnore("advertisementsPack");
_prototypeManager.RegisterIgnore("metabolizerType"); _prototypeManager.RegisterIgnore("metabolizerType");

2
Content.Server/GameTicking/Rules/Components/NukeopsRuleComponent.cs
View File

@@ -119,7 +119,7 @@ public sealed class NukeopsRuleComponent : Component
[DataField("operativePlayers")] [DataField("operativePlayers")]
public readonly Dictionary<string, IPlayerSession> OperativePlayers = new(); public readonly Dictionary<string, IPlayerSession> OperativePlayers = new();
[DataField("faction", customTypeSerializer: typeof(PrototypeIdSerializer<FactionPrototype>), required: true)] [DataField("faction", customTypeSerializer: typeof(PrototypeIdSerializer<NpcFactionPrototype>), required: true)]
public string Faction = default!; public string Faction = default!;
} }

10
Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
View File

@@ -49,7 +49,7 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
[Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IPlayerManager _playerSystem = default!; [Dependency] private readonly IPlayerManager _playerSystem = default!;
[Dependency] private readonly EmergencyShuttleSystem _emergency = default!; [Dependency] private readonly EmergencyShuttleSystem _emergency = default!;
[Dependency] private readonly FactionSystem _faction = default!; [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
[Dependency] private readonly HumanoidAppearanceSystem _humanoidSystem = default!; [Dependency] private readonly HumanoidAppearanceSystem _humanoidSystem = default!;
[Dependency] private readonly StationSpawningSystem _stationSpawningSystem = default!; [Dependency] private readonly StationSpawningSystem _stationSpawningSystem = default!;
[Dependency] private readonly StationSystem _stationSystem = default!; [Dependency] private readonly StationSystem _stationSystem = default!;
@@ -181,9 +181,9 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
// we can only currently guarantee that NT stations are the only station to // we can only currently guarantee that NT stations are the only station to
// exist in the base game. // exist in the base game.
var eligible = EntityQuery<StationEventEligibleComponent, FactionComponent>() var eligible = EntityQuery<StationEventEligibleComponent, NpcFactionMemberComponent>()
.Where(x => .Where(x =>
_faction.IsFactionHostile(component.Faction, x.Item2.Owner, x.Item2)) _npcFaction.IsFactionHostile(component.Faction, x.Item2.Owner, x.Item2))
.Select(x => x.Item1.Owner) .Select(x => x.Item1.Owner)
.ToList(); .ToList();
@@ -712,8 +712,8 @@ public sealed class NukeopsRuleSystem : GameRuleSystem<NukeopsRuleComponent>
if (component.StartingGearPrototypes.TryGetValue(gear, out var gearPrototype)) if (component.StartingGearPrototypes.TryGetValue(gear, out var gearPrototype))
_stationSpawningSystem.EquipStartingGear(mob, gearPrototype, profile); _stationSpawningSystem.EquipStartingGear(mob, gearPrototype, profile);
_faction.RemoveFaction(mob, "NanoTrasen", false); _npcFaction.RemoveFaction(mob, "NanoTrasen", false);
_faction.AddFaction(mob, "Syndicate"); _npcFaction.AddFaction(mob, "Syndicate");
} }
private void SpawnOperatives(int spawnCount, List<IPlayerSession> sessions, bool addSpawnPoints, NukeopsRuleComponent component) private void SpawnOperatives(int spawnCount, List<IPlayerSession> sessions, bool addSpawnPoints, NukeopsRuleComponent component)

6
Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
View File

@@ -31,7 +31,7 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
[Dependency] private readonly IObjectivesManager _objectivesManager = default!; [Dependency] private readonly IObjectivesManager _objectivesManager = default!;
[Dependency] private readonly IChatManager _chatManager = default!; [Dependency] private readonly IChatManager _chatManager = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly FactionSystem _faction = default!; [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
[Dependency] private readonly MobStateSystem _mobStateSystem = default!; [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
[Dependency] private readonly UplinkSystem _uplink = default!; [Dependency] private readonly UplinkSystem _uplink = default!;
[Dependency] private readonly SharedAudioSystem _audioSystem = default!; [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
@@ -263,8 +263,8 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
} }
// Change the faction // Change the faction
_faction.RemoveFaction(entity, "NanoTrasen", false); _npcFaction.RemoveFaction(entity, "NanoTrasen", false);
_faction.AddFaction(entity, "Syndicate"); _npcFaction.AddFaction(entity, "Syndicate");
// Give traitors their objectives // Give traitors their objectives
var maxDifficulty = _cfg.GetCVar(CCVars.TraitorMaxDifficulty); var maxDifficulty = _cfg.GetCVar(CCVars.TraitorMaxDifficulty);

6
Content.Server/NPC/Components/FactionComponent.cs → Content.Server/NPC/Components/NpcFactionMemberComponent.cs
View File

@@ -4,14 +4,14 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
namespace Content.Server.NPC.Components namespace Content.Server.NPC.Components
{ {
[RegisterComponent] [RegisterComponent]
[Access(typeof(FactionSystem))] [Access(typeof(NpcFactionSystem))]
public sealed class FactionComponent : Component public sealed class NpcFactionMemberComponent : Component
{ {
/// <summary> /// <summary>
/// Factions this entity is a part of. /// Factions this entity is a part of.
/// </summary> /// </summary>
[ViewVariables(VVAccess.ReadWrite), [ViewVariables(VVAccess.ReadWrite),
DataField("factions", customTypeSerializer:typeof(PrototypeIdHashSetSerializer<FactionPrototype>))] DataField("factions", customTypeSerializer:typeof(PrototypeIdHashSetSerializer<NpcFactionPrototype>))]
public HashSet<string> Factions = new(); public HashSet<string> Factions = new();
/// <summary> /// <summary>

9
Content.Server/NPC/Components/FactionPrototype.cs → Content.Server/NPC/Components/NpcFactionPrototype.cs
View File

@@ -1,23 +1,22 @@
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
namespace Content.Server.NPC.Components namespace Content.Server.NPC.Components
{ {
/// <summary> /// <summary>
/// Contains data about this faction's relations with other factions. /// Contains data about this faction's relations with other factions.
/// </summary> /// </summary>
[Prototype("faction")] [Prototype("npcFaction")]
public sealed class FactionPrototype : IPrototype public sealed class NpcFactionPrototype : IPrototype
{ {
[ViewVariables] [ViewVariables]
[IdDataField] [IdDataField]
public string ID { get; } = default!; public string ID { get; } = default!;
[ViewVariables(VVAccess.ReadWrite), DataField("friendly", customTypeSerializer:typeof(PrototypeIdListSerializer<FactionPrototype>))] [ViewVariables(VVAccess.ReadWrite), DataField("friendly", customTypeSerializer:typeof(PrototypeIdListSerializer<NpcFactionPrototype>))]
public List<string> Friendly = new(); public List<string> Friendly = new();
[ViewVariables(VVAccess.ReadWrite), DataField("hostile", customTypeSerializer:typeof(PrototypeIdListSerializer<FactionPrototype>))] [ViewVariables(VVAccess.ReadWrite), DataField("hostile", customTypeSerializer:typeof(PrototypeIdListSerializer<NpcFactionPrototype>))]
public List<string> Hostile = new(); public List<string> Hostile = new();
} }
} }

4
Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
View File

@@ -483,7 +483,7 @@ public sealed partial class NPCSteeringSystem
var objectRadius = 0.25f; var objectRadius = 0.25f;
var detectionRadius = MathF.Max(0.35f, agentRadius + objectRadius); var detectionRadius = MathF.Max(0.35f, agentRadius + objectRadius);
var ourVelocity = body.LinearVelocity; var ourVelocity = body.LinearVelocity;
var factionQuery = GetEntityQuery<FactionComponent>(); var factionQuery = GetEntityQuery<NpcFactionMemberComponent>();
factionQuery.TryGetComponent(uid, out var ourFaction); factionQuery.TryGetComponent(uid, out var ourFaction);
foreach (var ent in _lookup.GetEntitiesInRange(uid, detectionRadius, LookupFlags.Dynamic)) foreach (var ent in _lookup.GetEntitiesInRange(uid, detectionRadius, LookupFlags.Dynamic))
@@ -496,7 +496,7 @@ public sealed partial class NPCSteeringSystem
(mask & otherBody.CollisionLayer) == 0x0 && (mask & otherBody.CollisionLayer) == 0x0 &&
(layer & otherBody.CollisionMask) == 0x0 || (layer & otherBody.CollisionMask) == 0x0 ||
!factionQuery.TryGetComponent(ent, out var otherFaction) || !factionQuery.TryGetComponent(ent, out var otherFaction) ||
!_faction.IsEntityFriendly(uid, ent, ourFaction, otherFaction) || !_npcFaction.IsEntityFriendly(uid, ent, ourFaction, otherFaction) ||
// Use <= 0 so we ignore stationary friends in case. // Use <= 0 so we ignore stationary friends in case.
Vector2.Dot(otherBody.LinearVelocity, ourVelocity) <= 0f) Vector2.Dot(otherBody.LinearVelocity, ourVelocity) <= 0f)
{ {

2
Content.Server/NPC/Systems/NPCSteeringSystem.cs
View File

@@ -53,7 +53,7 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem
[Dependency] private readonly DoAfterSystem _doAfter = default!; [Dependency] private readonly DoAfterSystem _doAfter = default!;
[Dependency] private readonly DoorSystem _doors = default!; [Dependency] private readonly DoorSystem _doors = default!;
[Dependency] private readonly EntityLookupSystem _lookup = default!; [Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly FactionSystem _faction = default!; [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
[Dependency] private readonly PathfindingSystem _pathfindingSystem = default!; [Dependency] private readonly PathfindingSystem _pathfindingSystem = default!;
[Dependency] private readonly SharedInteractionSystem _interaction = default!; [Dependency] private readonly SharedInteractionSystem _interaction = default!;
[Dependency] private readonly SharedMeleeWeaponSystem _melee = default!; [Dependency] private readonly SharedMeleeWeaponSystem _melee = default!;

4
Content.Server/NPC/Systems/NPCUtilitySystem.cs
View File

@@ -26,7 +26,7 @@ public sealed class NPCUtilitySystem : EntitySystem
[Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly ContainerSystem _container = default!; [Dependency] private readonly ContainerSystem _container = default!;
[Dependency] private readonly EntityLookupSystem _lookup = default!; [Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly FactionSystem _faction = default!; [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
[Dependency] private readonly FoodSystem _food = default!; [Dependency] private readonly FoodSystem _food = default!;
[Dependency] private readonly MobStateSystem _mobState = default!; [Dependency] private readonly MobStateSystem _mobState = default!;
[Dependency] private readonly PuddleSystem _puddle = default!; [Dependency] private readonly PuddleSystem _puddle = default!;
@@ -264,7 +264,7 @@ public sealed class NPCUtilitySystem : EntitySystem
break; break;
case NearbyHostilesQuery: case NearbyHostilesQuery:
foreach (var ent in _faction.GetNearbyHostiles(owner, vision)) foreach (var ent in _npcFaction.GetNearbyHostiles(owner, vision))
{ {
entities.Add(ent); entities.Add(ent);
} }

46
Content.Server/NPC/Systems/FactionSystem.cs → Content.Server/NPC/Systems/NpcFactionSystem.cs
View File

@@ -7,7 +7,7 @@ namespace Content.Server.NPC.Systems;
/// <summary> /// <summary>
/// Outlines faction relationships with each other. /// Outlines faction relationships with each other.
/// </summary> /// </summary>
public sealed class FactionSystem : EntitySystem public sealed class NpcFactionSystem : EntitySystem
{ {
[Dependency] private readonly FactionExceptionSystem _factionException = default!; [Dependency] private readonly FactionExceptionSystem _factionException = default!;
[Dependency] private readonly EntityLookupSystem _lookup = default!; [Dependency] private readonly EntityLookupSystem _lookup = default!;
@@ -24,7 +24,7 @@ public sealed class FactionSystem : EntitySystem
{ {
base.Initialize(); base.Initialize();
_sawmill = Logger.GetSawmill("faction"); _sawmill = Logger.GetSawmill("faction");
SubscribeLocalEvent<FactionComponent, ComponentStartup>(OnFactionStartup); SubscribeLocalEvent<NpcFactionMemberComponent, ComponentStartup>(OnFactionStartup);
_protoManager.PrototypesReloaded += OnProtoReload; _protoManager.PrototypesReloaded += OnProtoReload;
RefreshFactions(); RefreshFactions();
} }
@@ -37,33 +37,33 @@ public sealed class FactionSystem : EntitySystem
private void OnProtoReload(PrototypesReloadedEventArgs obj) private void OnProtoReload(PrototypesReloadedEventArgs obj)
{ {
if (!obj.ByType.ContainsKey(typeof(FactionPrototype))) if (!obj.ByType.ContainsKey(typeof(NpcFactionPrototype)))
return; return;
RefreshFactions(); RefreshFactions();
} }
private void OnFactionStartup(EntityUid uid, FactionComponent component, ComponentStartup args) private void OnFactionStartup(EntityUid uid, NpcFactionMemberComponent memberComponent, ComponentStartup args)
{ {
RefreshFactions(component); RefreshFactions(memberComponent);
} }
/// <summary> /// <summary>
/// Refreshes the cached factions for this component. /// Refreshes the cached factions for this component.
/// </summary> /// </summary>
private void RefreshFactions(FactionComponent component) private void RefreshFactions(NpcFactionMemberComponent memberComponent)
{ {
component.FriendlyFactions.Clear(); memberComponent.FriendlyFactions.Clear();
component.HostileFactions.Clear(); memberComponent.HostileFactions.Clear();
foreach (var faction in component.Factions) foreach (var faction in memberComponent.Factions)
{ {
// YAML Linter already yells about this // YAML Linter already yells about this
if (!_factions.TryGetValue(faction, out var factionData)) if (!_factions.TryGetValue(faction, out var factionData))
continue; continue;
component.FriendlyFactions.UnionWith(factionData.Friendly); memberComponent.FriendlyFactions.UnionWith(factionData.Friendly);
component.HostileFactions.UnionWith(factionData.Hostile); memberComponent.HostileFactions.UnionWith(factionData.Hostile);
} }
} }
@@ -72,13 +72,13 @@ public sealed class FactionSystem : EntitySystem
/// </summary> /// </summary>
public void AddFaction(EntityUid uid, string faction, bool dirty = true) public void AddFaction(EntityUid uid, string faction, bool dirty = true)
{ {
if (!_protoManager.HasIndex<FactionPrototype>(faction)) if (!_protoManager.HasIndex<NpcFactionPrototype>(faction))
{ {
_sawmill.Error($"Unable to find faction {faction}"); _sawmill.Error($"Unable to find faction {faction}");
return; return;
} }
var comp = EnsureComp<FactionComponent>(uid); var comp = EnsureComp<NpcFactionMemberComponent>(uid);
if (!comp.Factions.Add(faction)) if (!comp.Factions.Add(faction))
return; return;
@@ -93,13 +93,13 @@ public sealed class FactionSystem : EntitySystem
/// </summary> /// </summary>
public void RemoveFaction(EntityUid uid, string faction, bool dirty = true) public void RemoveFaction(EntityUid uid, string faction, bool dirty = true)
{ {
if (!_protoManager.HasIndex<FactionPrototype>(faction)) if (!_protoManager.HasIndex<NpcFactionPrototype>(faction))
{ {
_sawmill.Error($"Unable to find faction {faction}"); _sawmill.Error($"Unable to find faction {faction}");
return; return;
} }
if (!TryComp<FactionComponent>(uid, out var component)) if (!TryComp<NpcFactionMemberComponent>(uid, out var component))
return; return;
if (!component.Factions.Remove(faction)) if (!component.Factions.Remove(faction))
@@ -111,7 +111,7 @@ public sealed class FactionSystem : EntitySystem
} }
} }
public IEnumerable<EntityUid> GetNearbyHostiles(EntityUid entity, float range, FactionComponent? component = null) public IEnumerable<EntityUid> GetNearbyHostiles(EntityUid entity, float range, NpcFactionMemberComponent? component = null)
{ {
if (!Resolve(entity, ref component, false)) if (!Resolve(entity, ref component, false))
return Array.Empty<EntityUid>(); return Array.Empty<EntityUid>();
@@ -126,7 +126,7 @@ public sealed class FactionSystem : EntitySystem
return hostiles; return hostiles;
} }
public IEnumerable<EntityUid> GetNearbyFriendlies(EntityUid entity, float range, FactionComponent? component = null) public IEnumerable<EntityUid> GetNearbyFriendlies(EntityUid entity, float range, NpcFactionMemberComponent? component = null)
{ {
if (!Resolve(entity, ref component, false)) if (!Resolve(entity, ref component, false))
return Array.Empty<EntityUid>(); return Array.Empty<EntityUid>();
@@ -141,7 +141,7 @@ public sealed class FactionSystem : EntitySystem
if (!xformQuery.TryGetComponent(entity, out var entityXform)) if (!xformQuery.TryGetComponent(entity, out var entityXform))
yield break; yield break;
foreach (var comp in _lookup.GetComponentsInRange<FactionComponent>(entityXform.MapPosition, range)) foreach (var comp in _lookup.GetComponentsInRange<NpcFactionMemberComponent>(entityXform.MapPosition, range))
{ {
if (comp.Owner == entity) if (comp.Owner == entity)
continue; continue;
@@ -153,7 +153,7 @@ public sealed class FactionSystem : EntitySystem
} }
} }
public bool IsEntityFriendly(EntityUid uidA, EntityUid uidB, FactionComponent? factionA = null, FactionComponent? factionB = null) public bool IsEntityFriendly(EntityUid uidA, EntityUid uidB, NpcFactionMemberComponent? factionA = null, NpcFactionMemberComponent? factionB = null)
{ {
if (!Resolve(uidA, ref factionA, false) || !Resolve(uidB, ref factionB, false)) if (!Resolve(uidA, ref factionA, false) || !Resolve(uidB, ref factionB, false))
return false; return false;
@@ -166,7 +166,7 @@ public sealed class FactionSystem : EntitySystem
return _factions[target].Friendly.Contains(with) && _factions[with].Friendly.Contains(target); return _factions[target].Friendly.Contains(with) && _factions[with].Friendly.Contains(target);
} }
public bool IsFactionFriendly(string target, EntityUid with, FactionComponent? factionWith = null) public bool IsFactionFriendly(string target, EntityUid with, NpcFactionMemberComponent? factionWith = null)
{ {
if (!Resolve(with, ref factionWith, false)) if (!Resolve(with, ref factionWith, false))
return false; return false;
@@ -180,7 +180,7 @@ public sealed class FactionSystem : EntitySystem
return _factions[target].Hostile.Contains(with) && _factions[with].Hostile.Contains(target); return _factions[target].Hostile.Contains(with) && _factions[with].Hostile.Contains(target);
} }
public bool IsFactionHostile(string target, EntityUid with, FactionComponent? factionWith = null) public bool IsFactionHostile(string target, EntityUid with, NpcFactionMemberComponent? factionWith = null)
{ {
if (!Resolve(with, ref factionWith, false)) if (!Resolve(with, ref factionWith, false))
return false; return false;
@@ -220,7 +220,7 @@ public sealed class FactionSystem : EntitySystem
{ {
_factions.Clear(); _factions.Clear();
foreach (var faction in _protoManager.EnumeratePrototypes<FactionPrototype>()) foreach (var faction in _protoManager.EnumeratePrototypes<NpcFactionPrototype>())
{ {
_factions[faction.ID] = new FactionData() _factions[faction.ID] = new FactionData()
{ {
@@ -229,7 +229,7 @@ public sealed class FactionSystem : EntitySystem
}; };
} }
foreach (var comp in EntityQuery<FactionComponent>(true)) foreach (var comp in EntityQuery<NpcFactionMemberComponent>(true))
{ {
comp.FriendlyFactions.Clear(); comp.FriendlyFactions.Clear();
comp.HostileFactions.Clear(); comp.HostileFactions.Clear();

28
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
View File

@@ -134,7 +134,7 @@
- type: MobMover - type: MobMover
- type: HTN - type: HTN
rootTask: SimpleHostileCompound rootTask: SimpleHostileCompound
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleHostile - SimpleHostile
- type: Bloodstream - type: Bloodstream
@@ -207,7 +207,7 @@
flavorKind: station-event-random-sentience-flavor-organic flavorKind: station-event-random-sentience-flavor-organic
- type: Puller - type: Puller
needsHands: true needsHands: true
- type: Faction - type: NpcFactionMember
factions: factions:
- Passive - Passive
@@ -290,7 +290,7 @@
accent: duck accent: duck
- type: SentienceTarget - type: SentienceTarget
flavorKind: station-event-random-sentience-flavor-organic flavorKind: station-event-random-sentience-flavor-organic
- type: Faction - type: NpcFactionMember
factions: factions:
- Passive - Passive
@@ -464,7 +464,7 @@
path: /Audio/Animals/cow_moo.ogg path: /Audio/Animals/cow_moo.ogg
- type: Perishable - type: Perishable
molsPerSecondPerUnitMass: 0.0015 molsPerSecondPerUnitMass: 0.0015
- type: Faction - type: NpcFactionMember
factions: factions:
- Passive - Passive
- type: Body - type: Body
@@ -582,7 +582,7 @@
interactFailureString: petting-failure-goat interactFailureString: petting-failure-goat
interactSuccessSound: interactSuccessSound:
path: /Audio/Animals/goat_bah.ogg path: /Audio/Animals/goat_bah.ogg
- type: Faction - type: NpcFactionMember
factions: factions:
- Passive - Passive
- type: Body - type: Body
@@ -633,7 +633,7 @@
- type: Bloodstream - type: Bloodstream
bloodMaxVolume: 100 bloodMaxVolume: 100
- type: Puller - type: Puller
- type: Faction - type: NpcFactionMember
factions: factions:
- Passive - Passive
@@ -764,7 +764,7 @@
prototypes: [ BoxingKangarooGear ] prototypes: [ BoxingKangarooGear ]
- type: HTN - type: HTN
rootTask: SimpleHostileCompound rootTask: SimpleHostileCompound
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleHostile - SimpleHostile
@@ -844,7 +844,7 @@
- type: MonkeyAccent - type: MonkeyAccent
- type: Puller - type: Puller
- type: CanHostGuardian - type: CanHostGuardian
- type: Faction - type: NpcFactionMember
factions: factions:
- Passive - Passive
- type: GhostRole - type: GhostRole
@@ -902,7 +902,7 @@
equippedPrefix: 0 equippedPrefix: 0
slots: slots:
- HEAD - HEAD
- type: Faction - type: NpcFactionMember
factions: factions:
- Mouse - Mouse
- type: HTN - type: HTN
@@ -1270,7 +1270,7 @@
interactFailureString: petting-failure-generic interactFailureString: petting-failure-generic
interactSuccessSound: interactSuccessSound:
path: /Audio/Animals/penguin_squawk.ogg path: /Audio/Animals/penguin_squawk.ogg
- type: Faction - type: NpcFactionMember
factions: factions:
- Passive - Passive
@@ -1287,7 +1287,7 @@
- type: MobMover - type: MobMover
- type: HTN - type: HTN
rootTask: SimpleHostileCompound rootTask: SimpleHostileCompound
- type: Faction - type: NpcFactionMember
factions: factions:
- Syndicate - Syndicate
- type: Sprite - type: Sprite
@@ -1465,7 +1465,7 @@
id: MobGiantSpiderAngry id: MobGiantSpiderAngry
suffix: Angry suffix: Angry
components: components:
- type: Faction - type: NpcFactionMember
factions: factions:
- Xeno - Xeno
- type: InputMover - type: InputMover
@@ -1776,7 +1776,7 @@
- type: MobMover - type: MobMover
- type: HTN - type: HTN
rootTask: SimpleHostileCompound rootTask: SimpleHostileCompound
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleHostile - SimpleHostile
- type: InteractionPopup - type: InteractionPopup
@@ -2241,6 +2241,6 @@
accent: pig accent: pig
- type: SentienceTarget - type: SentienceTarget
flavorKind: station-event-random-sentience-flavor-organic flavorKind: station-event-random-sentience-flavor-organic
- type: Faction - type: NpcFactionMember
factions: factions:
- Passive - Passive

2
Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml
View File

@@ -13,7 +13,7 @@
- type: GhostTakeoverAvailable - type: GhostTakeoverAvailable
- type: HTN - type: HTN
rootTask: SimpleHostileCompound rootTask: SimpleHostileCompound
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleHostile - SimpleHostile
- type: Speech - type: Speech

2
Resources/Prototypes/Entities/Mobs/NPCs/carp.yml
View File

@@ -12,7 +12,7 @@
blackboard: blackboard:
NavSmash: !type:Bool NavSmash: !type:Bool
true true
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleHostile - SimpleHostile
- type: Sprite - type: Sprite

2
Resources/Prototypes/Entities/Mobs/NPCs/flesh.yml
View File

@@ -10,7 +10,7 @@
blackboard: blackboard:
NavSmash: !type:Bool NavSmash: !type:Bool
true true
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleHostile - SimpleHostile
- type: Tag - type: Tag

4
Resources/Prototypes/Entities/Mobs/NPCs/human.yml
View File

@@ -8,7 +8,7 @@
- type: MobMover - type: MobMover
- type: Loadout - type: Loadout
prototypes: [PassengerGear] prototypes: [PassengerGear]
- type: Faction - type: NpcFactionMember
factions: factions:
- NanoTrasen - NanoTrasen
@@ -18,7 +18,7 @@
id: MobSpirate id: MobSpirate
description: Yarr! description: Yarr!
components: components:
- type: Faction - type: NpcFactionMember
factions: factions:
- Syndicate - Syndicate
- type: InputMover - type: InputMover

2
Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
View File

@@ -9,7 +9,7 @@
- FootstepSound - FootstepSound
- type: InputMover - type: InputMover
- type: MobMover - type: MobMover
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleHostile - SimpleHostile
- type: Hands - type: Hands

6
Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
View File

@@ -86,7 +86,7 @@
id: MobCatRuntime id: MobCatRuntime
description: Professional mouse hunter. Escape artist. description: Professional mouse hunter. Escape artist.
components: components:
- type: Faction - type: NpcFactionMember
factions: factions:
- PetsNT - PetsNT
- type: HTN - type: HTN
@@ -104,7 +104,7 @@
parent: MobCatCalico parent: MobCatCalico
description: Ask nicely, and maybe they'll give you one of their spare lives. description: Ask nicely, and maybe they'll give you one of their spare lives.
components: components:
- type: Faction - type: NpcFactionMember
factions: factions:
- PetsNT - PetsNT
- type: Grammar - type: Grammar
@@ -477,7 +477,7 @@
id: MobSpiderShiva id: MobSpiderShiva
description: The first defender of the station. description: The first defender of the station.
components: components:
- type: Faction - type: NpcFactionMember
factions: factions:
- PetsNT - PetsNT
- type: Sprite - type: Sprite

4
Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
View File

@@ -16,7 +16,7 @@
groups: groups:
Flammable: [Touch] Flammable: [Touch]
Extinguish: [Touch] Extinguish: [Touch]
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleHostile - SimpleHostile
- type: Sprite - type: Sprite
@@ -181,7 +181,7 @@
groups: groups:
Flammable: [Touch] Flammable: [Touch]
Extinguish: [Touch] Extinguish: [Touch]
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleHostile - SimpleHostile
- type: Sprite - type: Sprite

2
Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
View File

@@ -38,7 +38,7 @@
- type: Sprite - type: Sprite
noRot: true noRot: true
drawdepth: Mobs drawdepth: Mobs
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleNeutral - SimpleNeutral
- type: HealthExaminable - type: HealthExaminable

2
Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
View File

@@ -19,7 +19,7 @@
rootTask: IdleCompound rootTask: IdleCompound
- type: Input - type: Input
context: "human" context: "human"
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleNeutral - SimpleNeutral
- type: MovementSpeedModifier - type: MovementSpeedModifier

8
Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
View File

@@ -5,7 +5,7 @@
abstract: true abstract: true
description: It looks so much like jelly. I wonder what it tastes like? description: It looks so much like jelly. I wonder what it tastes like?
components: components:
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleNeutral - SimpleNeutral
- type: HTN - type: HTN
@@ -135,7 +135,7 @@
id: MobAdultSlimesBlueAngry id: MobAdultSlimesBlueAngry
suffix: Angry suffix: Angry
components: components:
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleHostile - SimpleHostile
- type: GhostRole - type: GhostRole
@@ -170,7 +170,7 @@
id: MobAdultSlimesGreenAngry id: MobAdultSlimesGreenAngry
suffix: Angry suffix: Angry
components: components:
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleHostile - SimpleHostile
- type: GhostRole - type: GhostRole
@@ -205,7 +205,7 @@
id: MobAdultSlimesYellowAngry id: MobAdultSlimesYellowAngry
suffix: Angry suffix: Angry
components: components:
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleHostile - SimpleHostile
- type: GhostRole - type: GhostRole

2
Resources/Prototypes/Entities/Mobs/NPCs/space.yml
View File

@@ -7,7 +7,7 @@
components: components:
- type: HTN - type: HTN
rootTask: SimpleHostileCompound rootTask: SimpleHostileCompound
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleHostile - SimpleHostile
- type: Sprite - type: Sprite

2
Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml
View File

@@ -8,7 +8,7 @@
- type: MobMover - type: MobMover
- type: HTN - type: HTN
rootTask: SimpleHostileCompound rootTask: SimpleHostileCompound
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleHostile - SimpleHostile
- type: Sprite - type: Sprite

4
Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
View File

@@ -28,7 +28,7 @@
groups: groups:
Flammable: [Touch] Flammable: [Touch]
Extinguish: [Touch] Extinguish: [Touch]
- type: Faction - type: NpcFactionMember
factions: factions:
- Xeno - Xeno
- type: Hands - type: Hands
@@ -375,7 +375,7 @@
- type: MobMover - type: MobMover
- type: HTN - type: HTN
rootTask: SimpleHostileCompound rootTask: SimpleHostileCompound
- type: Faction - type: NpcFactionMember
factions: factions:
- Xeno - Xeno
- type: MeleeWeapon - type: MeleeWeapon

2
Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
View File

@@ -30,6 +30,6 @@
- type: CameraRecoil - type: CameraRecoil
- type: Examiner - type: Examiner
- type: CanHostGuardian - type: CanHostGuardian
- type: Faction - type: NpcFactionMember
factions: factions:
- NanoTrasen - NanoTrasen

2
Resources/Prototypes/Entities/Mobs/Player/diona.yml
View File

@@ -29,6 +29,6 @@
- type: CameraRecoil - type: CameraRecoil
- type: Examiner - type: Examiner
- type: CanHostGuardian - type: CanHostGuardian
- type: Faction - type: NpcFactionMember
factions: factions:
- NanoTrasen - NanoTrasen

2
Resources/Prototypes/Entities/Mobs/Player/dragon.yml
View File

@@ -22,7 +22,7 @@
true true
NavSmash: !type:Bool NavSmash: !type:Bool
true true
- type: Faction - type: NpcFactionMember
factions: factions:
- Dragon - Dragon
- type: Speech - type: Speech

2
Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
View File

@@ -22,6 +22,6 @@
- type: CameraRecoil - type: CameraRecoil
- type: Examiner - type: Examiner
- type: CanHostGuardian - type: CanHostGuardian
- type: Faction - type: NpcFactionMember
factions: factions:
- NanoTrasen - NanoTrasen

4
Resources/Prototypes/Entities/Mobs/Player/familiars.yml
View File

@@ -24,7 +24,7 @@
- Chapel - Chapel
- type: MindContainer - type: MindContainer
showExamineInfo: true showExamineInfo: true
- type: Faction - type: NpcFactionMember
factions: factions:
- PetsNT - PetsNT
- type: Alerts - type: Alerts
@@ -54,7 +54,7 @@
Slash: 7 Slash: 7
- type: InputMover - type: InputMover
- type: MobMover - type: MobMover
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleNeutral - SimpleNeutral
- type: InteractionPopup - type: InteractionPopup

6
Resources/Prototypes/Entities/Mobs/Player/human.yml
View File

@@ -29,7 +29,7 @@
- type: CameraRecoil - type: CameraRecoil
- type: Examiner - type: Examiner
- type: CanHostGuardian - type: CanHostGuardian
- type: Faction - type: NpcFactionMember
factions: factions:
- NanoTrasen - NanoTrasen
@@ -44,7 +44,7 @@
prototypes: [SyndicateOperativeGearExtremelyBasic] prototypes: [SyndicateOperativeGearExtremelyBasic]
- type: RandomMetadata - type: RandomMetadata
nameSegments: [names_death_commando] nameSegments: [names_death_commando]
- type: Faction - type: NpcFactionMember
factions: factions:
- Syndicate - Syndicate
@@ -74,6 +74,6 @@
nameSegments: nameSegments:
- SyndicateNamesPrefix - SyndicateNamesPrefix
- SyndicateNamesNormal - SyndicateNamesNormal
- type: Faction - type: NpcFactionMember
factions: factions:
- Syndicate - Syndicate

2
Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
View File

@@ -21,7 +21,7 @@
- type: CameraRecoil - type: CameraRecoil
- type: Examiner - type: Examiner
- type: CanHostGuardian - type: CanHostGuardian
- type: Faction - type: NpcFactionMember
factions: factions:
- NanoTrasen - NanoTrasen
- type: Respirator - type: Respirator

2
Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
View File

@@ -20,7 +20,7 @@
- type: CameraRecoil - type: CameraRecoil
- type: Examiner - type: Examiner
- type: CanHostGuardian - type: CanHostGuardian
- type: Faction - type: NpcFactionMember
factions: factions:
- NanoTrasen - NanoTrasen

2
Resources/Prototypes/Entities/Mobs/Player/slime.yml
View File

@@ -21,6 +21,6 @@
- type: CameraRecoil - type: CameraRecoil
- type: Examiner - type: Examiner
- type: CanHostGuardian - type: CanHostGuardian
- type: Faction - type: NpcFactionMember
factions: factions:
- NanoTrasen - NanoTrasen

2
Resources/Prototypes/Entities/Mobs/Player/vox.yml
View File

@@ -21,7 +21,7 @@
- type: CameraRecoil - type: CameraRecoil
- type: Examiner - type: Examiner
- type: CanHostGuardian - type: CanHostGuardian
- type: Faction - type: NpcFactionMember
factions: factions:
- NanoTrasen - NanoTrasen
- type: Respirator - type: Respirator

10
Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml
View File

@@ -116,7 +116,7 @@
id: WeaponTurretSyndicate id: WeaponTurretSyndicate
suffix: Syndicate suffix: Syndicate
components: components:
- type: Faction - type: NpcFactionMember
factions: factions:
- Syndicate - Syndicate
@@ -126,7 +126,7 @@
id: WeaponTurretSyndicateDisposable id: WeaponTurretSyndicateDisposable
suffix: Syndicate, Disposable suffix: Syndicate, Disposable
components: components:
- type: Faction - type: NpcFactionMember
factions: factions:
- Syndicate - Syndicate
- type: Destructible - type: Destructible
@@ -166,7 +166,7 @@
id: WeaponTurretNanoTrasen id: WeaponTurretNanoTrasen
suffix: NanoTrasen suffix: NanoTrasen
components: components:
- type: Faction - type: NpcFactionMember
factions: factions:
- NanoTrasen - NanoTrasen
@@ -175,7 +175,7 @@
id: WeaponTurretHostile id: WeaponTurretHostile
suffix: Hostile suffix: Hostile
components: components:
- type: Faction - type: NpcFactionMember
factions: factions:
- SimpleHostile - SimpleHostile
@@ -186,7 +186,7 @@
id: WeaponTurretXeno id: WeaponTurretXeno
suffix: Xeno suffix: Xeno
components: components:
- type: Faction - type: NpcFactionMember
factions: factions:
- Xeno - Xeno
- type: Sprite - type: Sprite

2
Resources/Prototypes/Entities/Stations/nanotrasen.yml
View File

@@ -2,7 +2,7 @@
abstract: true abstract: true
id: BaseStationNanotrasen id: BaseStationNanotrasen
components: components:
- type: Faction - type: NpcFactionMember
factions: factions:
- NanoTrasen - NanoTrasen

18
Resources/Prototypes/ai_factions.yml
View File

@@ -1,4 +1,4 @@
- type: faction - type: npcFaction
id: Dragon id: Dragon
hostile: hostile:
- NanoTrasen - NanoTrasen
@@ -6,29 +6,29 @@
- Xeno - Xeno
- PetsNT - PetsNT
- type: faction - type: npcFaction
id: NanoTrasen id: NanoTrasen
hostile: hostile:
- SimpleHostile - SimpleHostile
- Syndicate - Syndicate
- Xeno - Xeno
- type: faction - type: npcFaction
id: Mouse id: Mouse
hostile: hostile:
- PetsNT - PetsNT
- type: faction - type: npcFaction
id: Passive id: Passive
- type: faction - type: npcFaction
id: PetsNT id: PetsNT
hostile: hostile:
- Mouse - Mouse
- SimpleHostile - SimpleHostile
- Xeno - Xeno
- type: faction - type: npcFaction
id: SimpleHostile id: SimpleHostile
hostile: hostile:
- NanoTrasen - NanoTrasen
@@ -36,10 +36,10 @@
- Passive - Passive
- PetsNT - PetsNT
- type: faction - type: npcFaction
id: SimpleNeutral id: SimpleNeutral
- type: faction - type: npcFaction
id: Syndicate id: Syndicate
hostile: hostile:
- NanoTrasen - NanoTrasen
@@ -47,7 +47,7 @@
- Xeno - Xeno
- PetsNT - PetsNT
- type: faction - type: npcFaction
id: Xeno id: Xeno
hostile: hostile:
- NanoTrasen - NanoTrasen