Guardians (Holo and holoclown) have syndicate faction ai (#19816)
This commit is contained in:
@@ -300,11 +300,6 @@ namespace Content.Server.Guardian
|
|||||||
RetractGuardian(hostUid, hostComponent, guardianUid, guardianComponent);
|
RetractGuardian(hostUid, hostComponent, guardianUid, guardianComponent);
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool CanRelease(EntityUid guardian)
|
|
||||||
{
|
|
||||||
return HasComp<ActorComponent>(guardian);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ReleaseGuardian(EntityUid host, GuardianHostComponent hostComponent, EntityUid guardian, GuardianComponent guardianComponent)
|
private void ReleaseGuardian(EntityUid host, GuardianHostComponent hostComponent, EntityUid guardian, GuardianComponent guardianComponent)
|
||||||
{
|
{
|
||||||
if (guardianComponent.GuardianLoose)
|
if (guardianComponent.GuardianLoose)
|
||||||
@@ -313,12 +308,6 @@ namespace Content.Server.Guardian
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!CanRelease(guardian))
|
|
||||||
{
|
|
||||||
_popupSystem.PopupEntity(Loc.GetString("guardian-no-soul"), host, host);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
DebugTools.Assert(hostComponent.GuardianContainer.Contains(guardian));
|
DebugTools.Assert(hostComponent.GuardianContainer.Contains(guardian));
|
||||||
hostComponent.GuardianContainer.Remove(guardian);
|
hostComponent.GuardianContainer.Remove(guardian);
|
||||||
DebugTools.Assert(!hostComponent.GuardianContainer.Contains(guardian));
|
DebugTools.Assert(!hostComponent.GuardianContainer.Contains(guardian));
|
||||||
|
|||||||
@@ -130,6 +130,12 @@
|
|||||||
map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
|
map: [ "enum.DamageStateVisualLayers.BaseUnshaded" ]
|
||||||
color: "#40a7d7"
|
color: "#40a7d7"
|
||||||
shader: unshaded
|
shader: unshaded
|
||||||
|
- type: NpcFactionMember
|
||||||
|
factions:
|
||||||
|
- Syndicate
|
||||||
|
- type: HTN
|
||||||
|
rootTask:
|
||||||
|
task: SimpleHumanoidHostileCompound
|
||||||
|
|
||||||
# From Wizard deck of cards
|
# From Wizard deck of cards
|
||||||
- type: entity
|
- type: entity
|
||||||
@@ -232,6 +238,12 @@
|
|||||||
- type: RandomMetadata
|
- type: RandomMetadata
|
||||||
nameSegments:
|
nameSegments:
|
||||||
- names_clown
|
- names_clown
|
||||||
|
- type: NpcFactionMember
|
||||||
|
factions:
|
||||||
|
- Syndicate
|
||||||
|
- type: HTN
|
||||||
|
rootTask:
|
||||||
|
task: SimpleHumanoidHostileCompound
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
id: ActionToggleGuardian
|
id: ActionToggleGuardian
|
||||||
|
|||||||
Reference in New Issue
Block a user