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

address review comments

Browse Source
This commit is contained in:
Vincent Foulon 2021-04-01 19:13:08 +02:00
parent c2a8feada5
commit dcde8df365
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen/i18n/en/_manifest.ron
View File

@ -96,7 +96,7 @@
],
"npc.speech.villager_decline_trade": [
"Sorry, I don't have anything to trade.",
"Trade ? Like I got anything that may interest you.",
"Trade? Like I got anything that may interest you.",
"My house is mine, I won't trade it for anything.",
],
"npc.speech.merchant_advertisement": [

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

@ -889,6 +889,7 @@ impl<'a> AgentData<'a> {
});
if self.look_toward(controller, read_data, &target) {
controller.actions.push(ControlAction::Stand);
controller.actions.push(ControlAction::Talk);
match subject {
Subject::Regular => {
@ -1096,6 +1097,7 @@ impl<'a> AgentData<'a> {
if agent.trade_for_site.is_some() {
if !agent.trading {
// stand still and looking towards the trading player
controller.actions.push(ControlAction::Stand);
controller.actions.push(ControlAction::Talk);
if let Some(target) =
read_data.uid_allocator.retrieve_entity_internal(with.id())