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

Kill unarmed combat comp (#8420)

Browse Source
This commit is contained in:
Kara
2022-05-25 14:48:41 -07:00
committed by GitHub
parent efedb3d7ba
commit 4811124786
18 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/AI/Utility/Actions/Combat/Melee/UnarmedAttackEntity.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Server.AI.Utility.Actions.Combat.Melee
public override void SetupOperators(Blackboard context)
{
MoveToEntityOperator moveOperator;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out UnarmedCombatComponent? unarmedCombatComponent))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out MeleeWeaponComponent? unarmedCombatComponent))
{
moveOperator = new MoveToEntityOperator(Owner, Target, unarmedCombatComponent.Range - 0.01f);
}

2
Content.Server/AI/Utility/Considerations/Combat/Melee/CanUnarmedCombatCon.cs
View File

@@ -10,7 +10,7 @@ namespace Content.Server.AI.Utility.Considerations.Combat.Melee
{
var entityManager = IoCManager.Resolve<IEntityManager>();
var entity = context.GetState<SelfState>().GetValue();
return entityManager.HasComponent<UnarmedCombatComponent>(entity) ? 1.0f : 0.0f;
return entityManager.HasComponent<MeleeWeaponComponent>(entity) ? 1.0f : 0.0f;
}
}
}