Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow other behavior nodes to run on failed interaction

Browse Source
This commit is contained in:
Maxicarlos08 2023-10-02 16:22:46 +02:00
parent 1b07c198ad
commit 8116e5be2c
No known key found for this signature in database
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
server/src/sys/agent/behavior_tree/interaction.rs
View File

@ -559,20 +559,20 @@ pub fn handle_inbox_cancel_interactions(bdata: &mut BehaviorData) -> bool {
if let Some(msg) = agent.inbox.front() { if let Some(msg) = agent.inbox.front() {
let used = match msg { let used = match msg {
AgentEvent::Talk(by, _) | AgentEvent::TradeAccepted(by) => { AgentEvent::Talk(by, _) | AgentEvent::TradeAccepted(by) => {
if let (Some(target), Some(speaker)) = if agent
(agent.target, get_entity_by_id(*by, bdata.read_data)) .target
{ .zip(get_entity_by_id(*by, bdata.read_data))
// in combat, speak to players that aren't the current target // in combat, speak to players that aren't the current target
if !target.hostile || target.target != speaker { .map_or(false, |(target, speaker)| !target.hostile || target.target != speaker)
agent_data.chat_npc_if_allowed_to_speak( {
Content::localized("npc-speech-villager_busy"), agent_data.chat_npc_if_allowed_to_speak(
agent, Content::localized("npc-speech-villager_busy"),
event_emitter, agent,
); event_emitter,
} );
} }
true false
}, },
AgentEvent::TradeInvite(by) => { AgentEvent::TradeInvite(by) => {
controller.push_invite_response(InviteResponse::Decline); controller.push_invite_response(InviteResponse::Decline);