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

Medibot fixes (#18744)

Browse Source
This commit is contained in:
metalgearsloth
2023-08-06 16:38:14 +10:00
committed by GitHub
parent 4262c62306
commit 83a43b83b3
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs
View File

@@ -25,9 +25,12 @@ public sealed class InteractWithOperator : HTNOperator
return HTNOperatorStatus.Continuing; return HTNOperatorStatus.Continuing;
} }
_entManager.System<SharedCombatModeSystem>().SetInCombatMode(owner, false); if (_entManager.TryGetComponent<CombatModeComponent>(owner, out var combatMode))
_entManager.System<InteractionSystem>().UserInteraction(owner, targetXform.Coordinates, moveTarget); {
_entManager.System<SharedCombatModeSystem>().SetInCombatMode(owner, false, combatMode);
}
_entManager.System<InteractionSystem>().UserInteraction(owner, targetXform.Coordinates, moveTarget);
return HTNOperatorStatus.Finished; return HTNOperatorStatus.Finished;
} }
} }

3
Resources/Prototypes/NPCs/medibot.yml
View File

@@ -16,7 +16,8 @@
- !type:HTNPrimitiveTask - !type:HTNPrimitiveTask
operator: !type:PickNearbyInjectableOperator operator: !type:PickNearbyInjectableOperator
targetKey: InjectTarget targetKey: InjectTarget
targetMoveKey: MovementTarget targetMoveKey: TargetCoordinates
- !type:HTNPrimitiveTask - !type:HTNPrimitiveTask
operator: !type:SpeakOperator operator: !type:SpeakOperator
speech: medibot-start-inject speech: medibot-start-inject