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 '191_player_to_player_dm' into 'master'

Browse Source 
Player to player DM, closes #191

Closes #191

See merge request veloren/veloren!334
This commit is contained in:
Forest Anderson 2019-07-17 18:13:15 +00:00
commit b4b1a30ef8
1 changed files with 65 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
server/src/cmd.rs
View File

@ -119,10 +119,16 @@ lazy_static! {
handle_build,
),
ChatCommand::new(
"killnpcs",
"{}",
"/killnpcs : Kill the NPCs",
handle_killnpcs,
"msg",
"{}",
"/msg <alias> : Send a message to another player",
handle_msg,
),
ChatCommand::new(
"killnpcs",
"{}",
"/killnpcs : Kill the NPCs",
handle_killnpcs,
),
];
}
@ -430,3 +436,58 @@ fn handle_killnpcs(server: &mut Server, entity: EcsEntity, _args: String, _actio
};
server.clients.notify(entity, ServerMsg::Chat(text));
}
fn handle_msg(server: &mut Server, entity: EcsEntity, args: String, action: &ChatCommand) {
let opt_alias = scan_fmt!(&args, action.arg_fmt, String);
match opt_alias {
Some(alias) => {
let ecs = server.state.ecs();
let opt_player = (&ecs.entities(), &ecs.read_storage::<comp::Player>())
.join()
.find(|(_, player)| player.alias == alias)
.map(|(entity, _)| entity);
let msg = &args[alias.len()..args.len()];
match opt_player {
Some(player) => {
if msg.len() > 1 {
let opt_name = ecs
.read_storage::<comp::Player>()
.get(entity)
.map(|s| s.alias.clone());
match opt_name {
Some(name) => {
server.clients.notify(
player,
ServerMsg::Chat(format!("{} tells you:{}", name, msg)),
);
}
None => {
server.clients.notify(
entity,
ServerMsg::Chat(String::from("You do not exist!")),
);
}
}
} else {
server.clients.notify(
entity,
ServerMsg::Chat(format!(
"You really should say something to {}!",
alias
)),
);
}
}
None => {
server.clients.notify(
entity,
ServerMsg::Chat(format!("Player '{}' not found!", alias)),
);
}
}
}
None => server
.clients
.notify(entity, ServerMsg::Chat(String::from(action.help_string))),
}
}