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

21
src/map.rs
View File

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