projects/blackout
1
0
Fork 0
Code Pull Requests Projects Releases Wiki Activity

More robust area descriptions.

Browse Source
This commit is contained in:
Nolan Darilek 2021-07-19 12:16:47 -05:00
parent 9a2495d9de
commit a591326734
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/map.rs
View File

@ -445,25 +445,30 @@ fn area_description(
mut log: Query<&mut Log>,
) {
for event in events.iter() {
if event.intersecting {
if let Some((area, other)) =
target_and_other(event.collider1.entity(), event.collider2.entity(), &|v| {
areas.get(v).is_ok()
})
{
if players.get(other).is_ok() {
if let Ok(mut log) = log.single_mut() {
if let Ok(name) = names.get(area) {
log.push(name.to_string());
} else if config.describe_undescribed_areas {
if let Ok(shape) = shapes.get(area) {
let aabb = shape.compute_local_aabb();
log.push(format!(
"{}-by-{} area",
aabb.extents().x,
aabb.extents().y
));
}
if let Some((area, other)) =
target_and_other(event.collider1.entity(), event.collider2.entity(), &|v| {
areas.get(v).is_ok()
})
{
if players.get(other).is_ok() {
if let Ok(mut log) = log.single_mut() {
let name = if let Ok(name) = names.get(area) {
Some(name.to_string())
} else if config.describe_undescribed_areas {
if let Ok(shape) = shapes.get(area) {
let aabb = shape.compute_local_aabb();
Some(format!("{}-by-{} area", aabb.extents().x, aabb.extents().y))
} else {
None
}
} else {
None
};
if let Some(name) = name {
if event.intersecting {
log.push(format!("Entering {}.", name));
} else {
log.push(format!("Leaving {}.", name));
}
}
}