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

Merge branch 'make-merchants-send-trade-on-iteraction' into 'master'

Browse Source 
Make merchants send the player a trade request when interacted with

Closes #1368

See merge request veloren/veloren!2914
This commit is contained in:
Joshua Barretto 2021-10-11 16:45:18 +00:00
commit 4bae3a4b62
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/sys/agent.rs
View File

@ -1081,10 +1081,21 @@ impl<'a> AgentData<'a> {
}; };
self.chat_general(msg, event_emitter); self.chat_general(msg, event_emitter);
} else if agent.behavior.can_trade() { } else if agent.behavior.can_trade() {
self.chat_general( if !agent.behavior.is(BehaviorState::TRADING) {
"npc.speech.merchant_advertisement", controller.events.push(ControlEvent::InitiateInvite(
event_emitter, by,
); InviteKind::Trade,
));
self.chat_general(
"npc.speech.merchant_advertisement",
event_emitter,
);
} else {
self.chat_general(
"npc.speech.merchant_busy",
event_emitter,
);
}
} else { } else {
self.chat_general("npc.speech.villager", event_emitter); self.chat_general("npc.speech.villager", event_emitter);
} }