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

Remove guard debug NPC chats (like "I'm a guard").

Browse Source
This commit is contained in:
Avi Weinstock 2021-07-06 17:16:20 -04:00
parent d2e600a930
commit c909a2cb43
1 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1372,18 +1372,6 @@ impl<'a> AgentData<'a> {
) { ) {
agent.action_state.timer = 0.0; agent.action_state.timer = 0.0;
// Search area
// TODO: REMOVE THIS BEFORE MERGE
//if let Some(agent_stats) = read_data.stats.get(*self.entity) {
// let is_village_guard = agent_stats.name == *"Guard".to_string();
// if is_village_guard {
// self.chat_general(
// "I am a guard, searching for target".to_string(),
// event_emitter,
// );
// }
//}
let target = self.cached_spatial_grid.0 let target = self.cached_spatial_grid.0
.in_circle_aabr(self.pos.0.xy(), SEARCH_DIST) .in_circle_aabr(self.pos.0.xy(), SEARCH_DIST)
.filter_map(|entity| { .filter_map(|entity| {
@ -1462,15 +1450,6 @@ impl<'a> AgentData<'a> {
}) })
// Can we even see them? // Can we even see them?
.filter(|(_e, e_pos)| { .filter(|(_e, e_pos)| {
// TODO: REMOVE THIS BEFORE MERGE
//if let Some(agent_stats) = read_data.stats.get(*self.entity) {
// let is_village_guard = agent_stats.name == *"Guard".to_string();
// if is_village_guard {
// println!("looking at: {:?} at {:?}", _e, e_pos);
// println!("can we see them: {:?}", read_data.terrain.ray(self.pos.0 + Vec3::unit_z(), e_pos.0 + Vec3::unit_z()).until(Block::is_opaque).cast().0 >= e_pos.0.distance(self.pos.0));
// }
//}
read_data.terrain read_data.terrain
.ray(self.pos.0 + Vec3::unit_z(), e_pos.0 + Vec3::unit_z()) .ray(self.pos.0 + Vec3::unit_z(), e_pos.0 + Vec3::unit_z())
.until(Block::is_opaque) .until(Block::is_opaque)
@ -1489,15 +1468,6 @@ impl<'a> AgentData<'a> {
hostile: true, hostile: true,
selected_at: read_data.time.0, selected_at: read_data.time.0,
}); });
// TODO: REMOVE THIS BEFORE MERGE
if let Some(agent_stats) = read_data.stats.get(*self.entity) {
let is_village_guard = agent_stats.name == *"Guard".to_string();
if is_village_guard {
let msg = "I'm a guard".to_string();
self.chat_general(msg, event_emitter);
}
}
} }
fn attack( fn attack(