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 'james/fix-npc-chat-spam' into 'master'

Browse Source 
Correct npc chat spam

See merge request veloren/veloren!1921
This commit is contained in:
Marcel 2021-03-16 23:22:48 +00:00
commit afa11d03e5
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -842,12 +842,12 @@ impl<'a> AgentData<'a> {
destination_name
)
};
event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc_say(
event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc(
*self.uid, msg,
)));
} else if agent.trade_for_site.is_some() {
let msg = "Can I interest you in a trade?".to_string();
event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc_say(
event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc(
*self.uid, msg,
)));
} else {
@ -860,10 +860,18 @@ impl<'a> AgentData<'a> {
}
}
},
Some(AgentEvent::TradeInvite(_with)) => {
Some(AgentEvent::TradeInvite(with)) => {
if agent.trade_for_site.is_some() && !agent.trading {
// stand still and looking towards the trading player
controller.actions.push(ControlAction::Talk);
if let Some(target) =
read_data.uid_allocator.retrieve_entity_internal(with.id())
{
agent.target = Some(Target {
target,
hostile: false,
});
}
controller
.events
.push(ControlEvent::InviteResponse(InviteResponse::Accept));
@ -879,12 +887,12 @@ impl<'a> AgentData<'a> {
if agent.trading {
match result {
TradeResult::Completed => {
event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc_say(
event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc(
*self.uid,
"Thank you for trading with me!".to_string(),
)))
},
_ => event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc_say(
_ => event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc(
*self.uid,
"Maybe another time, have a good day!".to_string(),
))),
@ -1082,7 +1090,7 @@ impl<'a> AgentData<'a> {
})
);
let msg = format!("{}! How dare you cross me again!", e_stats.name.clone());
event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc_say(*self.uid, msg)));
event_emitter.emit(ServerEvent::Chat(UnresolvedChatMsg::npc(*self.uid, msg)));
true
} else {
false