From 90b945e18b771551fdad6761320c92acf9f56ad0 Mon Sep 17 00:00:00 2001
From: "Tormod G. Hellen" <tormod.hellen@gmail.com>
Date: Wed, 16 Nov 2022 01:50:53 +0100
Subject: [PATCH] Make castles avoid trees.
---
world/src/civ/mod.rs | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/world/src/civ/mod.rs b/world/src/civ/mod.rs
index e00e407078..3c870d16bf 100644
--- a/world/src/civ/mod.rs
+++ b/world/src/civ/mod.rs
@@ -1180,10 +1180,12 @@ impl Civs {
fn castle_enemies(&self) -> Vec<Vec2<i32>> {
self.sites()
- .filter_map(|s| match s.kind {
- SiteKind::Tree | SiteKind::GiantTree => None,
- _ if s.is_settlement() => None,
- _ => Some(s.center),
+ .filter_map(|s| {
+ if s.is_settlement() {
+ None
+ } else {
+ Some(s.center)
+ }
})
.collect()
}