Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ECS NPCs (#9941)

Browse Source 
* ECS

* A

* parity

* Remove dummy update

* abs

* thanks rider
This commit is contained in:
metalgearsloth
2022-07-25 14:57:33 +10:00
committed by GitHub
parent 3fb9b4a480
commit aad6a22a6a
40 changed files with 482 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Server.AI.WorldState.States.Clothing
var result = new List<EntityUid>();
var entMan = IoCManager.Resolve<IEntityManager>();
if (!entMan.TryGetComponent(Owner, out AiControllerComponent? controller))
if (!entMan.TryGetComponent(Owner, out NPCComponent? controller))
{
return result;
}

2
Content.Server/AI/WorldState/States/Combat/Nearby/NearbyMeleeWeapons.cs
View File

@@ -15,7 +15,7 @@ namespace Content.Server.AI.WorldState.States.Combat.Nearby
var result = new List<EntityUid>();
var entMan = IoCManager.Resolve<IEntityManager>();
if (!entMan.TryGetComponent(Owner, out AiControllerComponent? controller))
if (!entMan.TryGetComponent(Owner, out NPCComponent? controller))
{
return result;
}

2
Content.Server/AI/WorldState/States/Mobs/NearbyBodiesState.cs
View File

@@ -15,7 +15,7 @@ namespace Content.Server.AI.WorldState.States.Mobs
var result = new List<EntityUid>();
var entMan = IoCManager.Resolve<IEntityManager>();
if (!entMan.TryGetComponent(Owner, out AiControllerComponent? controller))
if (!entMan.TryGetComponent(Owner, out NPCComponent? controller))
{
return result;
}

2
Content.Server/AI/WorldState/States/Mobs/NearbyPlayersState.cs
View File

@@ -15,7 +15,7 @@ namespace Content.Server.AI.WorldState.States.Mobs
var result = new List<EntityUid>();
var entMan = IoCManager.Resolve<IEntityManager>();
if (!entMan.TryGetComponent(Owner, out AiControllerComponent? controller))
if (!entMan.TryGetComponent(Owner, out NPCComponent? controller))
{
return result;
}

2
Content.Server/AI/WorldState/States/Nutrition/NearbyDrinkState.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Server.AI.WorldState.States.Nutrition
var result = new List<EntityUid>();
var entMan = IoCManager.Resolve<IEntityManager>();
if (!entMan.TryGetComponent(Owner, out AiControllerComponent? controller))
if (!entMan.TryGetComponent(Owner, out NPCComponent? controller))
{
return result;
}

2
Content.Server/AI/WorldState/States/Nutrition/NearbyFoodState.cs
View File

@@ -17,7 +17,7 @@ namespace Content.Server.AI.WorldState.States.Nutrition
var result = new List<EntityUid>();
var entMan = IoCManager.Resolve<IEntityManager>();
if (!entMan.TryGetComponent(Owner, out AiControllerComponent? controller))
if (!entMan.TryGetComponent(Owner, out NPCComponent? controller))
{
return result;
}