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 'agent_worth_choosing_refactor' into 'master'

Browse Source 
worth_choosing refactor

See merge request veloren/veloren!3237
This commit is contained in:
Marcel
2022-02-27 19:21:22 +00:00
parent d5bde47a03 fc9c3c3be9
commit bc111abefd
1 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1440,34 +1440,18 @@ impl<'a> AgentData<'a> {
let mut aggro_on = false; let mut aggro_on = false;
let worth_choosing = |entity| { let worth_choosing = |entity| {
read_data read_data.positions.get(entity).and_then(|pos| {
.positions Some((
.get(entity) entity,
.and_then(|pos| read_data.healths.get(entity).map(|h| (pos, h))) pos,
.and_then(|(pos, health)| { read_data.healths.get(entity)?,
read_data read_data.stats.get(entity)?,
.stats read_data.inventories.get(entity)?,
.get(entity) read_data.alignments.get(entity),
.map(|stats| (pos, health, stats)) read_data.char_states.get(entity),
}) read_data.bodies.get(entity),
.and_then(|(pos, health, stats)| { ))
read_data })
.inventories
.get(entity)
.map(|inventory| (pos, health, stats, inventory))
})
.map(|(pos, health, stats, inventory)| {
(
entity,
pos,
health,
stats,
inventory,
read_data.alignments.get(entity),
read_data.char_states.get(entity),
read_data.bodies.get(entity),
)
})
}; };
let max_search_dist = agent.psyche.search_dist(); let max_search_dist = agent.psyche.search_dist();