diff --git a/.gitignore b/.gitignore
index 2aa3a5c82..51221c526 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,8 @@ proj/vs*/*/ipch/
 proj/vs*/.vs
 proj/vs*/.vs
 proj/vs*/packages/
+proj/vs*/vcpkg_installed/
+proj/vs*/*.nupkg
 
 # SCons junk files
 .sconsign.dblite
diff --git a/rsrc/graphics/ter1.png b/rsrc/graphics/ter1.png
index c59f85f15..8d825866e 100644
Binary files a/rsrc/graphics/ter1.png and b/rsrc/graphics/ter1.png differ
diff --git a/rsrc/scenarios/valleydy/out/out0~2.map b/rsrc/scenarios/valleydy/out/out0~2.map
index de0fed0c0..c8a64995e 100644
--- a/rsrc/scenarios/valleydy/out/out0~2.map
+++ b/rsrc/scenarios/valleydy/out/out0~2.map
@@ -1,48 +1,48 @@
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,71,71,71,15,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,71,71,71,15,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,77,77,77,19,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,21,245@9,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,71,71,71,15,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,9,0&25,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,71,71,71,71,15,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,9,0&25,0&25,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,77,77,77,12,19,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,20,11,0&25,15,5,5,21,6,6,6,6,6,6,18,5,5,5,5,5,5,5,5,5,21,8,71,71,71,17,18,5,5,5,5,5,5,5
-5,5,5,5,5,5,21,6,18,21,6,18,9,0&25,15,5,5,9,0,0,0,0,0,98,17,18,5,5,5,5,5,21,6,6,8,0,71,71,71,0,15,5,5,5,5,5,5,5
-5,5,5,5,5,5,9,71,17,8,96,15,9,0&25:0,17,6,18,9,0,0,0,0,0,0,93,17,6,6,6,6,6,8,0,0,0,74,71,71,71,1,17,18,5,5,5,5,5,5
-5,5,5,5,5,5,9,71,96,96,96,15,9,0&25,0,1,17,8,0,98,93,92,98,94,0,0,93,0,92,93,0,93,0,0,71,71,71,71,71,0,0,15,5,5,5,5,5,5
-5,5,5,5,5,5,20,11,96,96,0,17,8,0&25,0,0,0,1,0,0,97,97,94,98,93,0,92,0,93,0,93,0,71,71,71,71,71,71,92,91,0,15,5,5,5,5,5,5
-5,5,5,5,5,5,5,9,96,0,0,0,0,0&25,0&25,0,0,0,0,94,97,0,93,92,93,0,71,71,71,71,74,71,71,71,71,71,71,71,91,1,91,17,18,5,5,5,5,5
-5,5,5,5,5,5,5,20,11,0,97,0,98,0,0&25,1,0,0,93,0,0,0,0,91,91,71,71,71,71,71,71,71,71,74,71,71,1,93,0,0,0,92,15,5,5,5,5,5
-5,5,5,5,5,5,5,5,9,0,0,0,0,97,0&25,0&25,0,0,0,98,98,93,92,0,71,71,71,71,71,71,71,71,71,71,71,92,1,92,0,98,0,91,15,5,5,5,5,5
-5,5,5,5,5,5,5,5,9,0,1,0,0,0*3,0,0&25,0,0,98,0,0,0,0,0,71,71,71,71,1,1,91,92,1,0,0,91,91,91,91,91,91,98,15,5,5,5,5,5
-5,5,5,5,5,5,5,21,8,0,0,0,97,0,0,0&25,0,0,0,0,1,93,92,0,71,71,71,93,0,93,91,91,1,0,91,91,94:5,98,98,0:4,92,93,15,5,5,5,5,5
-5,5,5,5,5,5,5,9,0,0,0,0,0,0,0,0&25,106!0,0,0,0,98,0,92,93,74,71,71,0,94,91,91,92,91,0,91,91,91,93,91,97,93*0,0,15,5,5,5,5,5
-5,5,5,5,5,5,21,8,0,0,0,85,86,0,0&25,0&25,0&25,0&25,0&25,0&25,0,0,93,92,71,71,71,71,94,91,94,93,0,92,1,93,91,91,91,0,94,94,15,5,5,5,5,5
-5,5,5,5,5,5,9,0,98,1,0,0,0,0,0,0,0,0,0,0&25,0,0,1,0,71,71,71,71,94,0,91,91,91,92,93,91,92,0,98,0,91,91,15,5,5,5,5,5
-5,5,5,5,5,5,9,0,0,97,0,0,85,86,0,96,0,1,0,0&25,0&25,1,0,0,0,71,74,71,71,71,71,71,93,92,93,98,0,91,92,91,91,0,15,5,5,5,5,5
-5,5,5,5,5,5,9,0,0,0,0,0&25,0,0,0,0,96,96,96,0,0&25,0,0*2,0,0,71,71,71,71,71,71,71,71,71,92,1,91,92,92,92,0,0,15,5,5,5,5,5
-5,5,5,5,5,5,9,0,0,0,0,0&25,0&25,0,1,93,0,96,96,0,0&25,0&25,0,0,0,0,71,71,71,71,71,71,71,71,0,0,91,0,0,0,97,0,15,5,5,5,5,5
-5,5,5,5,5,5,20,11,0,0,0,0,0&25,0,0,0,96,0,96,0,0,0&25,0&25,0,0,0,91,0,0,93,71,71,71,71,0,0,0,0:9,91,91,0:9,14,19,5,5,5,5,5
-5,5,5,5,5,5,5,20,11,0,0,0,0&25,96,96,96,96,96,96,84,96,0,0&25,0&25,0,0,93,0,0,0,1,71,71,71,0,92,91,91,0,0,1,15,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,20,11,96,93,0&25,84,96,96,84,0,0,96,0,1,91,0&25,96,0,93,1,92,0,0,71,71,71,71,0:9,91,0,0,14,12,19,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,227@19,0&25,0&25,0&25,96,0,71,71,71,71,71,0,96,1,0&25,0,0,93,0,93,93,93,71,71,71,71,0,0,0,0,15,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,21,6,8,0,0,0,71,71,71,74,71,71,71,96,0,1,0&25,1,0,96,0,96,0,0,0,71,71,71,0,0,0,0,17,18,5,5,5,5,5,5,5
-5,5,5,5,5,5,21,8,93,98,0,96,71,71,71,71,71,71,71,71,0,0,1,0&25,96,0,93,0,0,0,0,74,71,71,71,0,0,1,0,0,15,5,5,5,5,5,5,5
-5,5,5,5,5,5,9,93,0,96,71,71,71,71,71,71,71,71,71,71,71,96,96,0&25,91,0,93,91,0,0,71,71,71,71,0,0,0,0,0,14,19,5,5,5,5,5,5,5
-5,5,5,5,5,5,9,93,96,71,71,71,71,71,71,71,96,84,71,71,71,71,0,0&25,1,0,93,0,93,71,71,71,71,71,0,0,0,0,14,19,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,20,11,96,71,71,71,71,71,84,1,96,84,71,71,71,71,0,0&25,0,0,0,0,0,71,71,71,71,0,0,0,14,12,19,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,21,6,8,0,71,71,71,1,96,96,0,93,0,96,71,71,71,71,72:2,71,71,96,0,71,71,71,71,71,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,9,96,96,96,71,74,71,0,96,96,0,96,98,96,0,71,71,71,72:3,71,71,71,71,71,71,71,71,244,0,0,17,18,21,6,245@10,6,18,5,5,5,5,5,5
-5,5,5,5,5,9,0,0,0,71,71,71,71,96,84,0,96,96,0,93,0,0,0,0&25,71,71,71,71,74,71,0,93,244,244,0,0,17,8,244,244,0,15,5,5,5,5,5,5
-5,5,5,5,5,20,11,0,97,71,71,71,71,0,0,0,96,93,0,0,0,98,0,0&25,244,0,93,1,0,1,93,0,1,244,244,244,244,244:1,244:1,0&25:1,1:1,15,5,5,5,5,5,5
-5,5,5,5,5,5,20,12,11,71,71,74,71,96,96,0,0,0,0,0,0,0,0,0&25,244,244,93,93,0,0,0,0,0,0,98,244,0,244,106!2,0&25,0,15,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,9,71,71,71,71,96,0,96,0,96,96,0,0,0&25,0&25,0&25,96,244,244,0,0,0,0,0,244,244,244,244,1,244,0&25,0&25,1,15,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,9,71,71,71,1,0,98,98,0,98,0,0&25,0&25,0&25,106!1,0&25,0&25,0&25,244,244,244,244,244,244,244,244,0,0,0&25,244,0&25,0,0,15,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,9,71,71,71,71,96,0,98,0,0,0&25,0&25,97,0,0,0,0,0&25,0&25,0&25*1,0&25,0&25,0&25,0&25,0&25,0&25,0&25,0&25,0&25,244,0,0,14,19,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,9,71,71,71,14,12,11,0,0,98,0&25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,244,244,244,244,0,14,19,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,20,77,77,77,19,5,20,12,12,12,243@11,12,12,12,12,12,11,0,0,0,0,0,0,0,0,244,244,244,244,244,14,19,5,5,5,5,5,5,5,5
-5,5,5,5,5,21,6,6,8,71,71,71,15,5,5,5,5,5,5,5,5,5,5,5,20,12,12,12,12,12,12,12,12,11,244,244,244,14,19,5,5,5,5,5,5,5,5,5
-5,5,5,5,21,8,71,71,71,71,71,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,12,13,19,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,9,71,71,71,71,71,71,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,7,18,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,9,71,71,71,71,14,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0&9:10,15,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,9,71,71,71,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,19,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,9,71,71,71,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,9,71,71,71,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,77,77,77,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,245@9,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,0&25,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,71,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,0&25,0&25,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,77,77,77,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,0&25,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,0&25,5,5,5,5,0,0,0,0,0,98,5,5,5,5,5,5,5,5,5,5,5,0,71,71,71,0,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,71,5,5,96,5,5,0&25:0,5,5,5,5,0,0,0,0,0,0,93,5,5,5,5,5,5,5,0,0,0,74,71,71,71,1,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,71,96,96,96,5,5,0&25,0,1,5,5,0,98,93,92,98,94,0,0,93,0,92,93,0,93,0,0,71,71,71,71,71,0,0,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,96,96,0,5,5,0&25,0,0,0,1,0,0,97,97,94,98,93,0,92,0,93,0,93,0,71,71,71,71,71,71,92,91,0,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,96,0,0,0,0,0&25,0&25,0,0,0,0,94,97,0,93,92,93,0,71,71,71,71,74,71,71,71,71,71,71,71,91,1,91,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,0,97,0,98,0,0&25,1,0,0,93,0,0,0,0,91,91,71,71,71,71,71,71,71,71,74,71,71,1,93,0,0,0,92,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,0,0,0,0,97,0&25,0&25,0,0,0,98,98,93,92,0,71,71,71,71,71,71,71,71,71,71,71,92,1,92,0,98,0,91,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,0,1,0,0,0*3,0,0&25,0,0,98,0,0,0,0,0,71,71,71,71,1,1,91,92,1,0,0,91,91,91,91,91,91,98,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,0,0,0,97,0,0,0&25,0,0,0,0,1,93,92,0,71,71,71,93,0,93,91,91,1,0,91,91,94:5,98,98,0:4,92,93,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,0,0,0,0,0,0,0,0&25,106!0,0,0,0,98,0,92,93,74,71,71,0,94,91,91,92,91,0,91,91,91,93,91,97,93*0,0,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,0,0,0,85,86,0,0&25,0&25,0&25,0&25,0&25,0&25,0,0,93,92,71,71,71,71,94,91,94,93,0,92,1,93,91,91,91,0,94,94,5,5,5,5,5,5
+5,5,5,5,5,5,5,0,98,1,0,0,0,0,0,0,0,0,0,0&25,0,0,1,0,71,71,71,71,94,0,91,91,91,92,93,91,92,0,98,0,91,91,5,5,5,5,5,5
+5,5,5,5,5,5,5,0,0,97,0,0,85,86,0,96,0,1,0,0&25,0&25,1,0,0,0,71,74,71,71,71,71,71,93,92,93,98,0,91,92,91,91,0,5,5,5,5,5,5
+5,5,5,5,5,5,5,0,0,0,0,0&25,0,0,0,0,96,96,96,0,0&25,0,0*2,0,0,71,71,71,71,71,71,71,71,71,92,1,91,92,92,92,0,0,5,5,5,5,5,5
+5,5,5,5,5,5,5,0,0,0,0,0&25,0&25,0,1,93,0,96,96,0,0&25,0&25,0,0,0,0,71,71,71,71,71,71,71,71,0,0,91,0,0,0,97,0,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,0,0,0,0,0&25,0,0,0,96,0,96,0,0,0&25,0&25,0,0,0,91,0,0,93,71,71,71,71,0,0,0,0:9,91,91,0:9,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,0,0,0,0&25,96,96,96,96,96,96,84,96,0,0&25,0&25,0,0,93,0,0,0,1,71,71,71,0,92,91,91,0,0,1,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,96,93,0&25,84,96,96,84,0,0,96,0,1,91,0&25,96,0,93,1,92,0,0,71,71,71,71,0:9,91,0,0,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,227@19,0&25,0&25,0&25,96,0,71,71,71,71,71,0,96,1,0&25,0,0,93,0,93,93,93,71,71,71,71,0,0,0,0,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,0,0,0,71,71,71,74,71,71,71,96,0,1,0&25,1,0,96,0,96,0,0,0,71,71,71,0,0,0,0,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,93,98,0,96,71,71,71,71,71,71,71,71,0,0,1,0&25,96,0,93,0,0,0,0,74,71,71,71,0,0,1,0,0,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,93,0,96,71,71,71,71,71,71,71,71,71,71,71,96,96,0&25,91,0,93,91,0,0,71,71,71,71,0,0,0,0,0,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,93,96,71,71,71,71,71,71,71,96,84,71,71,71,71,0,0&25,1,0,93,0,93,71,71,71,71,71,0,0,0,0,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,96,71,71,71,71,71,84,1,96,84,71,71,71,71,0,0&25,0,0,0,0,0,71,71,71,71,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,0,71,71,71,1,96,96,0,93,0,96,71,71,71,71,72:2,71,71,96,0,71,71,71,71,71,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,96,96,96,71,74,71,0,96,96,0,96,98,96,0,71,71,71,72:3,71,71,71,71,71,71,71,71,244,0,0,5,5,5,5,245@10,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,0,0,0,71,71,71,71,96,84,0,96,96,0,93,0,0,0,0&25,71,71,71,71,74,71,0,93,244,244,0,0,5,5,244,244,0,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,0,97,71,71,71,71,0,0,0,96,93,0,0,0,98,0,0&25,244,0,93,1,0,1,93,0,1,244,244,244,244,244:1,244:1,0&25:1,1:1,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,71,71,74,71,96,96,0,0,0,0,0,0,0,0,0&25,244,244,93,93,0,0,0,0,0,0,98,244,0,244,106!2,0&25,0,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,71,71,71,71,96,0,96,0,96,96,0,0,0&25,0&25,0&25,96,244,244,0,0,0,0,0,244,244,244,244,1,244,0&25,0&25,1,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,71,71,71,1,0,98,98,0,98,0,0&25,0&25,0&25,106!1,0&25,0&25,0&25,244,244,244,244,244,244,244,244,0,0,0&25,244,0&25,0,0,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,71,71,71,71,96,0,98,0,0,0&25,0&25,97,0,0,0,0,0&25,0&25,0&25*1,0&25,0&25,0&25,0&25,0&25,0&25,0&25,0&25,0&25,244,0,0,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,0,0,98,0&25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,244,244,244,244,0,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,77,77,77,5,5,5,5,5,5,243@11,5,5,5,5,5,5,0,0,0,0,0,0,0,0,244,244,244,244,244,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,244,244,244,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,71,71,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,71,71,71,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,71,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0&9:10,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
diff --git a/rsrc/scenarios/valleydy/out/out1~2.map b/rsrc/scenarios/valleydy/out/out1~2.map
index a36117c6e..9aa4035a0 100644
--- a/rsrc/scenarios/valleydy/out/out1~2.map
+++ b/rsrc/scenarios/valleydy/out/out1~2.map
@@ -1,48 +1,48 @@
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,245@14,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0&25,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,6,18,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,0&25:1,17,6,18,5,5,5,5,5,5,5,5,21,6,6,6,6,6,6,6,18,5,5,21,8,94,0,71,15,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0&25,0&25,1,15,5,5,5,5,5,5,5,21,8,0,0,0,98,0,0,0,17,18,5,9,0,94,71,71,15,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0&25,0,15,5,5,5,5,5,5,21,8,0,0,0&25,0&25,0&25,0&25,0&25,0,0,17,6,8,0,14,11,71,15,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,11,106!0,0&25,0,15,5,5,5,5,5,21,8,84,0&25,0&25,0&25,0,0,1,0&25,0&25,1,0,94,0,0,15,20,12,19,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,8,0,0&25,0,17,18,5,5,5,5,9,0,0&25,0&25,0,0,14,11,0,0,0&25*1,0,14,12,12,12,19,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,21,6,8,0,0,0,0&25*3,0,0,15,5,5,5,5,9,93,0&25,93,0,0,15,9,0,0,0&25,0,17,18,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,21,6,8,0,0,94,93,0,0&25,0&25,97,15,5,5,5,5,9,97,0&25,0,14,12,19,20,11,0,0&25,0,0,15,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,9,0,0,1,94,93,93,94,0,0&25,0,17,6,18,5,5,9,0,0&25,0,15,5,5,5,9,0,0&25,0&25,0,17,18,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,21,8,0,93,93,71,71,14,11,0,0&25,0,84,97,15,5,21,8,0,0&25,0,15,5,5,5,20,11,0,0&25,0,0,15,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,9,94,93,93,71,71,14,19,9,0,0&25,0&25,0,0,17,18,9,0,0,0&25,0,15,5,5,5,5,20,11,0&25,0&25,94,15,5,21,6,18,5,5,5,5
-5,5,5,5,5,5,5,21,8,0,94,71,71,71,15,5,20,11,0,0&25,0,0,0,15,9,0,0,0&25,0,15,5,5,5,5,5,9,0,0&25,0,15,5,9,90,15,5,5,5,5
-5,5,5,5,5,5,21,8,0:10,94:10,71,71,14,12,19,5,5,9,0,0&25,98,0,98,15,9,0,94,0&25,0,15,5,5,5,5,21,8,0,0&25,0,17,6,8,90,15,5,5,5,5
-5,5,5,5,5,5,9,0,93,71,71,71,15,5,5,5,5,9,97,0&25:3,0:3,97,97,15,20,11,0,0&25,93,15,5,5,5,5,9,0,0,0&25,0,90,90,90,90,15,5,5,5,5
-5,5,5,5,5,5,9,0,93,93,71,14,19,5,5,5,5,9,98,0&25,0,0,97,15,5,9,0,0&25,0&25,17,18,5,5,5,9,0,0&25,0&25,0,90,90,90,90,15,5,5,5,5
-5,5,5,5,5,5,9,0,1,93,14,19,5,5,5,5,5,9,0,0&25,0,98,14,19,5,9,0,93,0&25,0,15,5,5,21,8,0,0&25,0,90,90,90,90,0,15,5,5,5,5
-5,5,5,5,5,5,9,98,0,0,15,5,5,5,5,21,6,8,0,0&25,0,14,19,5,5,9,0,0,0&25,0,17,6,18,9,90,90,0&25,90,90,90,90,0,14,19,5,5,5,5
-5,5,5,5,5,21,8,0,0,0,15,21,6,6,6,8,97,0,0&25,0&25,1,15,5,5,5,20,11,0,0&25,0,84,90,17,8,90,90,0&25:9,90,90,90,0,0,15,5,5,5,5,5
-5,21,6,6,6,8,90,90,90,0,17,8,0,1,0,0&25,0&25,0&25,0&25,0,1,15,5,5,5,5,9,0&25,0&25,0,0,90,90,90,90,90,0&25,90,90,90,0,14,19,5,5,5,5,5
-5,8,90,90,90,90,90,0,0,0,0,0,0&25,0&25,0&25,0&25,0,0,0,94,14,19,5,5,5,21,8,0&25,0,0,90,90,90,90,90,90,0&25,0,0,0,0,15,5,5,5,5,5,5
-6,90,90,14,12,11,1,0,0,0&25,0&25,0&25,0&25,0,1,0,14,12,12,12,19,5,5,5,21,8,0,0&25,94,0,90,90,90,90,90,0,0&25,0,14,12,12,19,5,5,5,5,5,5
-90,90,14,19,21,8,0,0&25,0&25,0&25,0,0,0,94,14,12,19,5,5,5,5,5,5,21,8,0,0&25,0&25,0,93,90,90,90,14,11,0&25,0&25,0,15,21,6,18,5,21,6,18,5,5
-12,12,19,5,9,0,0,0&25,0,1,14,12,12,12,19,5,5,5,5,5,5,5,5,9,0,0,0&25,0,0,90,90,90,90,17,8,0&25,0,0,16,10,0,17,6,8,0&9:8,15,5,5
-5,5,5,5,9,0,0&25,0&25,1,14,19,5,5,5,5,5,5,5,5,5,5,21,6,8,0&25,0&25,0&25,90,90,90,90,90,0,0,0&25,0&25,0,14,19,9,0,1,0,0,0,15,5,5
-5,5,5,5,9,97,0&25:4,97,0:4,17,18,5,5,5,5,5,5,5,5,5,21,8,0,0&25,0&25,0,90,90,90,90,90,90,0,0&25,0&25,0,14,19,5,20,12,12,12,12,12,19,5,5
-5,5,5,5,9,93,0&25,0,0,84,15,5,5,5,5,5,5,5,21,6,8,0,0&25,0&25,0,90,90,90,90,90,0,0,0,0&25,1,0,15,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,9,0,0&25,0&25,0,14,19,5,5,5,5,5,5,5,9,97,0,0&25,0&25,90,90,90,90,14,12,11,0,0,0&25,0&25,0,0,15,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,9,0,0,0&25,0,17,6,6,6,6,18,5,21,6,8,84,0,0&25,90,90,0,0,14,19,21,8,1,0&25,0&25,0,94,14,19,5,21,6,6,6,6,6,6,18,5,5
-5,5,5,5,20,11,93,0&25,0&25,1,0,97,0,0,17,6,8,93,0,0&25,0&25,0&25,0,93,97,14,19,5,9,0,0&25,0&25,0,14,12,19,5,21,8,0,93,0,90,90,90,15,5,5
-5,5,5,5,5,9,0,0,0&25,0&25,0&25,0&25,0&25,0&25,0,0,0,0,0&25,0&25,94,0,0,0,0,15,5,21,8,94,0&25,0,0,15,5,5,21,8,0,84,0,0&25,0&25,0&25,0&25,228@16,5,5
-5,5,5,5,5,20,11,0,97,84,0,93,93,0&25,0&25,0&25*2,0&25,0&25,0&25,0,84,0,14,12,12,19,21,8,0,0&25,0&25,0,14,19,5,5,9,0,84,0&25,0&25,0&25,90,90,90,15,5,5
-5,5,5,5,5,5,20,12,11,0,14,12,11,0,0,0,0,84,0,14,12,12,19,5,5,5,9,98,0,0&25,0,94,15,5,21,6,8,0,0&25,0&25,1,0,14,12,12,19,5,5
-5,5,5,5,5,5,5,5,9,98,17,18,20,12,12,12,13,12,12,19,5,5,5,5,5,5,9,93,98,0&25,0,14,19,5,9,0,0,0&25,0&25,0,0,14,19,5,5,5,5,5
-5,5,5,5,5,5,5,5,9,0,0,15,5,5,5,21,7,18,5,5,5,5,5,5,5,5,9,94,94,0&25,93,15,5,5,9,0,0&25,0&25,0,84,14,19,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,20,11,0,15,5,5,5,9,0,17,18,5,5,5,5,5,5,5,9,1,0,0&25,1,15,5,21,8,0,0&25,0,1,14,19,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,21,6,8,98,15,5,5,5,9,0,0,17,6,6,6,18,5,5,5,9,0,94,0&25,0,15,5,9,94,0&25,0&25,84,14,19,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,21,8,0,0,0,15,5,5,5,20,11,0,0,0,0,0&9:6,15,5,5,5,20,11,98,0&25,84,15,5,9,0,0&25,94,14,19,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,9,0,0,71,71,15,5,5,5,5,20,12,12,12,12,12,19,5,5,5,5,9,0,0&25,0,17,6,8,0,0&25,94,15,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,9,98,71,71,71,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0&25,0&25,0,0,0,0&25,0&25,0,15,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,20,12,12,12,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0&25,0&25,0&25*0,0&25,0&25,1,0,15,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,11,0,0,0,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,12,12,12,12,12,19,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,245@14,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0&25,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0&25:1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,94,0,71,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0&25,0&25,1,5,5,5,5,5,5,5,5,5,5,0,0,0,98,0,0,0,5,5,5,5,0,94,71,71,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0&25,0,5,5,5,5,5,5,5,5,5,0,0,0&25,0&25,0&25,0&25,0&25,0,0,5,5,5,0,5,5,71,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,106!0,0&25,0,5,5,5,5,5,5,5,5,84,0&25,0&25,0&25,0,0,1,0&25,0&25,1,0,94,0,0,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0&25,0,5,5,5,5,5,5,5,0,0&25,0&25,0,0,5,5,0,0,0&25*1,0,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,0&25*3,0,0,5,5,5,5,5,5,93,0&25,93,0,0,5,5,0,0,0&25,0,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,0,0,94,93,0,0&25,0&25,97,5,5,5,5,5,5,97,0&25,0,5,5,5,5,5,0,0&25,0,0,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,0,0,1,94,93,93,94,0,0&25,0,5,5,5,5,5,5,0,0&25,0,5,5,5,5,5,0,0&25,0&25,0,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,0,93,93,71,71,5,5,0,0&25,0,84,97,5,5,5,5,0,0&25,0,5,5,5,5,5,5,0,0&25,0,0,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,94,93,93,71,71,5,5,5,0,0&25,0&25,0,0,5,5,5,0,0,0&25,0,5,5,5,5,5,5,5,0&25,0&25,94,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,0,94,71,71,71,5,5,5,5,0,0&25,0,0,0,5,5,0,0,0&25,0,5,5,5,5,5,5,5,0,0&25,0,5,5,5,90,5,5,5,5,5
+5,5,5,5,5,5,5,5,0:10,94:10,71,71,5,5,5,5,5,5,0,0&25,98,0,98,5,5,0,94,0&25,0,5,5,5,5,5,5,5,0,0&25,0,5,5,5,90,5,5,5,5,5
+5,5,5,5,5,5,5,0,93,71,71,71,5,5,5,5,5,5,97,0&25:3,0:3,97,97,5,5,5,0,0&25,93,5,5,5,5,5,5,0,0,0&25,0,90,90,90,90,5,5,5,5,5
+5,5,5,5,5,5,5,0,93,93,71,5,5,5,5,5,5,5,98,0&25,0,0,97,5,5,5,0,0&25,0&25,5,5,5,5,5,5,0,0&25,0&25,0,90,90,90,90,5,5,5,5,5
+5,5,5,5,5,5,5,0,1,93,5,5,5,5,5,5,5,5,0,0&25,0,98,5,5,5,5,0,93,0&25,0,5,5,5,5,5,0,0&25,0,90,90,90,90,0,5,5,5,5,5
+5,5,5,5,5,5,5,98,0,0,5,5,5,5,5,5,5,5,0,0&25,0,5,5,5,5,5,0,0,0&25,0,5,5,5,5,90,90,0&25,90,90,90,90,0,5,5,5,5,5,5
+5,5,5,5,5,5,5,0,0,0,5,5,5,5,5,5,97,0,0&25,0&25,1,5,5,5,5,5,5,0,0&25,0,84,90,5,5,90,90,0&25:9,90,90,90,0,0,5,5,5,5,5,5
+5,5,5,5,5,5,90,90,90,0,5,5,0,1,0,0&25,0&25,0&25,0&25,0,1,5,5,5,5,5,5,0&25,0&25,0,0,90,90,90,90,90,0&25,90,90,90,0,5,5,5,5,5,5,5
+5,5,90,90,90,90,90,0,0,0,0,0,0&25,0&25,0&25,0&25,0,0,0,94,5,5,5,5,5,5,5,0&25,0,0,90,90,90,90,90,90,0&25,0,0,0,0,5,5,5,5,5,5,5
+5,90,90,5,5,5,1,0,0,0&25,0&25,0&25,0&25,0,1,0,5,5,5,5,5,5,5,5,5,5,0,0&25,94,0,90,90,90,90,90,0,0&25,0,5,5,5,5,5,5,5,5,5,5
+90,90,5,5,5,5,0,0&25,0&25,0&25,0,0,0,94,5,5,5,5,5,5,5,5,5,5,5,0,0&25,0&25,0,93,90,90,90,5,5,0&25,0&25,0,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,0,0,0&25,0,1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0&25,0,0,90,90,90,90,5,5,0&25,0,0,5,5,0,5,5,5,0&9:8,5,5,5
+5,5,5,5,5,0,0&25,0&25,1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0&25,0&25,0&25,90,90,90,90,90,0,0,0&25,0&25,0,5,5,5,0,1,0,0,0,5,5,5
+5,5,5,5,5,97,0&25:4,97,0:4,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0&25,0&25,0,90,90,90,90,90,90,0,0&25,0&25,0,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,93,0&25,0,0,84,5,5,5,5,5,5,5,5,5,5,5,0,0&25,0&25,0,90,90,90,90,90,0,0,0,0&25,1,0,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,0,0&25,0&25,0,5,5,5,5,5,5,5,5,5,5,97,0,0&25,0&25,90,90,90,90,5,5,5,0,0,0&25,0&25,0,0,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,0,0,0&25,0,5,5,5,5,5,5,5,5,5,5,84,0,0&25,90,90,0,0,5,5,5,5,1,0&25,0&25,0,94,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,93,0&25,0&25,1,0,97,0,0,5,5,5,93,0,0&25,0&25,0&25,0,93,97,5,5,5,5,0,0&25,0&25,0,5,5,5,5,5,5,0,93,0,90,90,90,5,5,5
+5,5,5,5,5,5,0,0,0&25,0&25,0&25,0&25,0&25,0&25,0,0,0,0,0&25,0&25,94,0,0,0,0,5,5,5,5,94,0&25,0,0,5,5,5,5,5,0,84,0,0&25,0&25,0&25,0&25,228@16,5,5
+5,5,5,5,5,5,5,0,97,84,0,93,93,0&25,0&25,0&25*2,0&25,0&25,0&25,0,84,0,5,5,5,5,5,5,0,0&25,0&25,0,5,5,5,5,5,0,84,0&25,0&25,0&25,90,90,90,5,5,5
+5,5,5,5,5,5,5,5,5,0,5,5,5,0,0,0,0,84,0,5,5,5,5,5,5,5,5,98,0,0&25,0,94,5,5,5,5,5,0,0&25,0&25,1,0,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,98,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,93,98,0&25,0,5,5,5,5,0,0,0&25,0&25,0,0,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,94,94,0&25,93,5,5,5,5,0,0&25,0&25,0,84,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,1,0,0&25,1,5,5,5,5,0,0&25,0,1,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,98,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,0,94,0&25,0,5,5,5,94,0&25,0&25,84,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,0,0,0,5,5,5,5,5,5,0,0,0,0,0&9:6,5,5,5,5,5,5,98,0&25,84,5,5,5,0,0&25,94,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,0,0,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0&25,0,5,5,5,0,0&25,94,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,98,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0&25,0&25,0,0,0,0&25,0&25,0,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0&25,0&25,0&25*0,0&25,0&25,1,0,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
diff --git a/rsrc/scenarios/valleydy/scenario.xml b/rsrc/scenarios/valleydy/scenario.xml
index beca22e1d..4b8ff0511 100644
--- a/rsrc/scenarios/valleydy/scenario.xml
+++ b/rsrc/scenarios/valleydy/scenario.xml
@@ -40,7 +40,7 @@
     <creator>
         <type>oboe</type>
         <version>2.0.0</version>
-        <os>Apple Mac OS X Version 10.7.5 (Build 11G63)</os>
+        <os>Apple Mac OS X Version 14.5 (Build 23F79)</os>
     </creator>
     <game>
         <num-towns>21</num-towns>
diff --git a/rsrc/scenarios/valleydy/terrain.xml b/rsrc/scenarios/valleydy/terrain.xml
index 5b5d4029f..ce6351a7e 100644
--- a/rsrc/scenarios/valleydy/terrain.xml
+++ b/rsrc/scenarios/valleydy/terrain.xml
@@ -145,7 +145,7 @@
         <archetype>true</archetype>
         <light>0</light>
         <step-sound>step</step-sound>
-        <trim>none</trim>
+        <trim>smart-border</trim>
         <ground>2</ground>
         <trim-for>0</trim-for>
         <arena>1</arena>
diff --git a/rsrc/scenarios/valleydy/towns/town10.map b/rsrc/scenarios/valleydy/towns/town10.map
index 2d77870f0..0c2ea99b2 100644
--- a/rsrc/scenarios/valleydy/towns/town10.map
+++ b/rsrc/scenarios/valleydy/towns/town10.map
@@ -30,19 +30,19 @@
 5,5,5,5,5,139,139,139,139,139,139,226,226,226,226,150,139,148,139,170,170,139,170,170,170,170,139,170&15,170,139,148,139,139,139,139,139,139,139,139,139,139,139,139,5,5,5,5,5
 5,5,5,5,5,139,170,170,170,170,170,226,226,226,226,226,170,170,141,170&15,170,139,170,170,170,170,139,170,170,141,170,170,170,170,170,170,230,170,170,170,230,170,139,5,5,5,5,5
 5,5,5,5,5,139,230,230,229,170,229,226,226,226,226,170,170,170,149!3,141,139,139,226,170,170,170,139,139,141,149!5,170,170,170,170,229,170,230,170,230,170,230,170,139,5,5,5,5,5
-5,5,5,5,5,139,170,170,170,170,170,170,226,226,226,226,226,226,226,226,226,139,226,226,226,226,226,226,226,226,226,226,170,170,230,170,170,170,230,170,170,170,150,18,5,5,5,5
-5,5,5,5,5,139,139,230,230,229,170,229,229,229,226,226,226,229,170,244,226,226,226,170,170,170,139,170,226,226,226,226,226,170,170,170,170,170,170,170,170,85,86,15,5,5,5,5
-5,5,5,5,5,5,139,139,170,170,170,170,170,226,226,226,226,226,229,244,170,139,170,170,170,170,139,170,170,226,226,226,226,170,170,230,170,170,229,170,150,150,12,19,5,5,5,5
-5,5,5,5,5,5,5,139,139,230,229,170,229,226,226,170,226,226,226,244,244,244,244,244,170,170,139,170,170,170,226,226,170,170,170,230,170,170,170,85,86,0,15,5,5,5,5,5
-5,5,5,5,5,5,5,5,139,139,170,170,170,229,229,170,226,170,226,170,170,139,170,244,244,170,139,230,170,170,170,170,170,230,170,229,170,170,150,150,11,0:1,15,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,139,139,170,230,229,170,226,226,170,170,170,170,139,170,170,170,170,139,230,170,230,170,230,170,230,170,230,170,139,139,5,9,0,15,5,5,5,5,5
-5,5,5,5,5,5,5,21,6,6,139,139,139,139,139,150,226,226,226,150,150,149!1,148,148,148,148,149!2,139,139,139,139,139,139,139,139,139,150,139,18,21,8,0,15,5,5,5,5,5
-5,5,5,5,5,5,5,9,0,0,0,0,1,0,0,0,226,226,226,226,0,1,226,82,82,82,0,0,0,0,0,0,0,0,0,1,0,0,16,10,0,0,15,5,5,5,5,5
-5,5,5,5,5,5,5,20,11,0,0,0,0,1,0,226,226,226,226,226,226,0,226,82,82,82,0,0,0,0,0,0,0,0,0,0,1,14,19,20,12,12,19,5,5,5,5,5
-5,5,5,5,5,5,5,5,20,12,11,0,0,0,226,226,0,226,226,0,226,226,226,82,82,82,0,0,0,0,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,20,11,0,0,226,226,0,0,226,0,226,226,82,82,82,82,0,0,0,0,0,0,0,0,0,14,12,19,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,9,0,226,226,0,0,0,226,0,226,0,82,82,82v<^>,82,0,0,0,0,0,0,1,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,9,0,226,1,0,0,0,226,0,226,226,226,82,82,82,0,0,0,0,0,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,9,0,226,226,0,0,226,226,0,226,0,226,82,82,82,0,0,0,0,0,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,9,0,0,226,0,0,226,0,0,226,0,226,226,82,82,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,9,0,0,226,0,0,226,0,0,226,0,226,82,82,82,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,139,170,170,170,170,170,170,226,226,226,226,226,226,226,226,226,139,226,226,226,226,226,226,226,226,226,226,170,170,230,170,170,170,230,170,170,170,150,5,5,5,5,5
+5,5,5,5,5,139,139,230,230,229,170,229,229,229,226,226,226,229,170,244,226,226,226,170,170,170,139,170,226,226,226,226,226,170,170,170,170,170,170,170,170,85,86,5,5,5,5,5
+5,5,5,5,5,5,139,139,170,170,170,170,170,226,226,226,226,226,229,244,170,139,170,170,170,170,139,170,170,226,226,226,226,170,170,230,170,170,229,170,150,150,5,5,5,5,5,5
+5,5,5,5,5,5,5,139,139,230,229,170,229,226,226,170,226,226,226,244,244,244,244,244,170,170,139,170,170,170,226,226,170,170,170,230,170,170,170,85,86,0,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,139,139,170,170,170,229,229,170,226,170,226,170,170,139,170,244,244,170,139,230,170,170,170,170,170,230,170,229,170,170,150,150,5,0:1,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,139,139,170,230,229,170,226,226,170,170,170,170,139,170,170,170,170,139,230,170,230,170,230,170,230,170,230,170,139,139,5,5,0,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,139,139,139,139,139,150,226,226,226,150,150,149!1,148,148,148,148,149!2,139,139,139,139,139,139,139,139,139,150,139,5,5,5,0,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,0,0,0,0,1,0,0,0,226,226,226,226,0,1,226,82,82,82,0,0,0,0,0,0,0,0,0,1,0,0,5,5,0,0,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,0,0,0,0,1,0,226,226,226,226,226,226,0,226,82,82,82,0,0,0,0,0,0,0,0,0,0,1,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,0,0,0,226,226,0,226,226,0,226,226,226,82,82,82,0,0,0,0,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,0,0,226,226,0,0,226,0,226,226,82,82,82,82,0,0,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,0,226,226,0,0,0,226,0,226,0,82,82,82v<^>,82,0,0,0,0,0,0,1,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,0,226,1,0,0,0,226,0,226,226,226,82,82,82,0,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,0,226,226,0,0,226,226,0,226,0,226,82,82,82,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,0,0,226,0,0,226,0,0,226,0,226,226,82,82,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,0,0,226,0,0,226,0,0,226,0,226,82,82,82,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
diff --git a/rsrc/scenarios/valleydy/towns/town11.map b/rsrc/scenarios/valleydy/towns/town11.map
index cde865f40..21efe77e4 100644
--- a/rsrc/scenarios/valleydy/towns/town11.map
+++ b/rsrc/scenarios/valleydy/towns/town11.map
@@ -1,10 +1,10 @@
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,82,82,82,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,82,82,82,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,82,82,82,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,5,5,5,5,9,0,82,82,82,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-122,177@0,177,176@2,170,127,170,170,170,170,170$39,123,170,172,172,172,170,170,122,5,5,5,5,9,0,82,82v<>,82,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-122,170,170,170,170,122,170,170,170,170,170,122,122,122,122,122,122,170,122,5,5,5,21,8,0,82,82,82,0,0,17,18,5,122,122,122,5,5,5,5,5,5,5,5,5,5,5,5
-122,170,178@1,177,177,122,177@3,177@4,177@6,177@5,177@7,122,170:5&9,172,172,172,170,170,122,5,5,5,9,0,0,82,82,82,0,0,0,15,5,122,194@27,122,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,82,82,82,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,82,82,82,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,82,82,82,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,5,5,5,5,5,0,82,82,82,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+122,177@0,177,176@2,170,127,170,170,170,170,170$39,123,170,172,172,172,170,170,122,5,5,5,5,5,0,82,82v<>,82,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+122,170,170,170,170,122,170,170,170,170,170,122,122,122,122,122,122,170,122,5,5,5,5,5,0,82,82,82,0,0,5,5,5,122,122,122,5,5,5,5,5,5,5,5,5,5,5,5
+122,170,178@1,177,177,122,177@3,177@4,177@6,177@5,177@7,122,170:5&9,172,172,172,170,170,122,5,5,5,5,0,0,82,82,82,0,0,0,5,5,122,194@27,122,5,5,5,5,5,5,5,5,5,5,5,5
 122,123,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,5,122,122,122,122,122,131:0,132!1,131:0,122,122,122,122,122,122,123,122,122,122,122,122,122,122,122,122,122,122,122,122
 122,170,170,170,170,126,170,170,170,170,170,126,170,170$8,170:7,186,122,5,5,122,122,170,170,170,170,170,170,170,170,170,170,170,122,122,170,170&22,170,170,170$7,122,177,122,177,122,177@32,122,194@30,122
 122,199,199,170,184,122,199&16,199,199,170,185,122,170,170,170,170:7,122,122,122,122,170&10,170,187,170,170,170,170,170,170&22,170,187,170,170,122,196,170,170,170,170,122,170,170,170,170,170,170&13,170,122
diff --git a/rsrc/scenarios/valleydy/towns/town13.map b/rsrc/scenarios/valleydy/towns/town13.map
index 076c79909..2139abcfc 100644
--- a/rsrc/scenarios/valleydy/towns/town13.map
+++ b/rsrc/scenarios/valleydy/towns/town13.map
@@ -30,8 +30,8 @@
 139,170,195,195,195,170,170,170,139,170,139,170,170,170,170,170,170,170,170,170,139,170,170,170,170,170,170,139,170,170,170,170,170,170,170,170,170,139,170,170,170,170,170,170,170,170,170,139
 139,170,170,170,170,170,170,170,170:8,170,139,191,191,191,191,191,191,191,191,191,139,170,170,170,170,170,170,139,191,191,191,191,191,191,191,191,191,139,191,191,191:11,191,191,191,191,191,191,139
 139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,170:19,170:19,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139
-122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,252,252,122,122,122,122,122,122,122,122,122,122,122,122,122,133,122,134,133,122,18,5,5,5,5
-122,170:6&9,170:6&9,122,170@3@4@5&11,170&12,170&22,170,170&10,170@6@7@8&11&10,122,170:5@2&22,170&14,170,170,175,122,71,71,71,71,71,71,170$10,170,71,71,71,71,71,71,122,170,170,170,122,170,170,170,133,170,170,170,17,6,6,6,6
+122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,252,252,122,122,122,122,122,122,122,122,122,122,122,122,122,133,122,134,133,122,5,5,5,5,5
+122,170:6&9,170:6&9,122,170@3@4@5&11,170&12,170&22,170,170&10,170@6@7@8&11&10,122,170:5@2&22,170&14,170,170,175,122,71,71,71,71,71,71,170$10,170,71,71,71,71,71,71,122,170,170,170,122,170,170,170,133,170,170,170,5,5,5,5,5
 122,170,170,122,170,170&22,170,170$4,170,170&10,122,170&14,170&14,170,170,195,122,71,71,71,71,170,170$8,170,170,170,170,71,71,71,71,122,170,170,170,122,170,170,85,86,170,170,170,0:45&9,85,86,85,86
 122,170,170,122,170&12,170,170$3,170,170,170&22,122,170,170,170,170,170,122,71,71,170,170$6,170,189,170$9,170,189,170,170,170,71,71,122,170,170,170,122,170,170,170,85,86,170,170,0:45&9,0,85,86,0
 122,170,170,122,170&10,170,170&22,170$2,170,170,122,170,192,170,170,170,122,71,71,170,189,170$7,170,170,170,170,170,189,170,71,71,122,122,122,125,122,122,134,129,134,133,133,129,122,122,122,122,122
diff --git a/rsrc/scenarios/valleydy/towns/town14.map b/rsrc/scenarios/valleydy/towns/town14.map
index 9eef8c711..ab8067874 100644
--- a/rsrc/scenarios/valleydy/towns/town14.map
+++ b/rsrc/scenarios/valleydy/towns/town14.map
@@ -10,9 +10,9 @@
 122,122,122,127,122,125,122,122,125,122,122,122,170,170,122,122,122,122,122,122,122,122,170,170,170,122,122,122,122,122,122,122,122,170,170,122,125,132!1,122,122,122,122,170,170,132!6,122,122,122
 122,180,170,170,122,170,170,122,170,170,170,122,170,170,122,170,170,170,170,170,170,170$23,170,170,170,170,170,170,170,170,170,170,122,170,170,122,172,172,172,172,172,122,170,170,122,0,0,1
 122,180@1,170,170,122,170&13,170&13,122,170,170,170,122,170,170,122,170,187,170,170$21,170$19,187,170,170,170,187,170,170,170,187,170,170,170,122,170,170,122,122,126,122,122,126,122,170,170,122,1,0,0
-122,180@3,170,170,122,170,170,122,170,170,170,122,170,170,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,71,122,170,170,122,170,170,122,170,170,122,170:24,170:24,122,0,1,14
-122,180@2,170,170,122,170&13,170&13,122,170,170,170&10,122,170,170,122,170,170,170$20,170,170,170$18,170,170*3,170,170,170,170,170,170,170,71,71,122,170,170,122,170,170,122,170,170,122,0,0<,0:25&9,0,1,15
-122,180@0,170,170,122,170@51,170&23,122,170,170&10,170&10,122,170,170,122,170,170,170,170$17,170,170,170,170,170,170,170,170,170,170,170,170,71,122,170,170,122,170&16,170,122,170@41@42&18&22$4,170,122,0,1,0:25&9,0,1,15
+122,180@3,170,170,122,170,170,122,170,170,170,122,170,170,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,71,122,170,170,122,170,170,122,170,170,122,170:24,170:24,122,0,1,5
+122,180@2,170,170,122,170&13,170&13,122,170,170,170&10,122,170,170,122,170,170,170$20,170,170,170$18,170,170*3,170,170,170,170,170,170,170,71,71,122,170,170,122,170,170,122,170,170,122,0,0<,0:25&9,0,1,5
+122,180@0,170,170,122,170@51,170&23,122,170,170&10,170&10,122,170,170,122,170,170,170,170$17,170,170,170,170,170,170,170,170,170,170,170,170,71,122,170,170,122,170&16,170,122,170@41@42&18&22$4,170,122,0,1,0:25&9,0,1,5
 122,122,122,122,122,122,122,122,122,122,122,122,130,130,122,170,187,170,170,170$22,187,170,170,170,187,170,170,170,187,170,170,170,122,130,131,122,122,122,122,122,122,122,122,122,122,122,122,122
 122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,122
 122,170,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,122
@@ -42,7 +42,7 @@
 122,170,122,122,122,122,122,122,122,122,122,122,133,85:15,86,133,170,122,122,122,122,122,170,122,170,170,122,170,149!3,170,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,170,139
 122,170,170,170,170,170,170,170,170,170,170,170,170:15,170,170,170,170,170:15,170,170,170,170,170,122,170:17,170:17,122,170,170:23,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,139
 122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,132!8,122,122,122,122,122,122,0^,0,122,122,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
diff --git a/rsrc/scenarios/valleydy/towns/town15.map b/rsrc/scenarios/valleydy/towns/town15.map
index 68489e5fc..bdd721214 100644
--- a/rsrc/scenarios/valleydy/towns/town15.map
+++ b/rsrc/scenarios/valleydy/towns/town15.map
@@ -1,45 +1,45 @@
-5,5,5,5,5,5,5,5,5,9,71,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,6,6,6,6,6,18,5,5,5
-5,5,5,5,5,5,5,5,5,20,77,19,5,21,6,6,18,5,5,5,5,5,5,5,21,6,6,6,18,5,5,5,5,5,21,6,8,0@10,84,0,0,0,0,0,15,5,5,5
-5,5,5,5,5,21,6,6,6,8,71,15,5,9,0,102@11@12@13@14@15,15,5,5,5,5,5,5,5,9,90,90,1,17,18,5,5,5,5,9,85@9,86,0,0,0,97,14,12,13,19,5,5,5
-5,5,5,5,5,9,71,71,71,71,71,15,5,9,0,14,19,5,5,5,5,5,5,5,9,90,90,93,0@5,15,5,5,5,5,9,0,84,0,0,14,12,19,21,7,6,18,5,5
-5,5,5,5,5,9,71,71,71,71,71,17,6,8,0,15,5,5,5,5,5,21,6,6,8v,1,98,0,94,17,6,18,5,5,20,11,85@8,86@7,14,19,5,21,8,93,0,15,5,5
-5,5,5,5,5,9,71,71,71,93$2,93$3,93,98,0,0,15,5,5,5,5,21,8,93,93,0,0,0,0,0,94,0,17,18,5,5,20,12,12,19,5,5,9,0,93,0,15,5,5
-5,5,5,21,6,8,71,71,93,93,91,93,0$1,98,14,19,5,5,5,5,9,0,0,14,11,98,0,1,98,0,0,0,17,18,5,5,5,5,5,5,21,8,0,0,0,15,5,5
-5,5,21,8,71,71,71,14,12,11,93,0$0,0,0,15,5,5,5,21,6,8,93,14,19,20,11,0@6,0,0,0,0,0,0,15,5,5,5,5,5,21,8,93,0,0,0,15,5,5
-5,21,8,71,71,14,12,19,5,9,93,0,0,1,15,5,5,21,8,94,0,0,15,5,5,9,0,93,0,0,0,98,0,17,18,21,6,18,21,8,98,0,0,0,0,15,5,5
-6,8,71,71,14,19,5,5,5,20,12,11,0,94,15,5,21,8,0,0,0,0,17,18,5,20,12,12,11,98,98,0,98,0,17,8,0,17,8,94,94,0,0,0,14,19,5,5
-71,71,71,14,19,5,5,5,21,6,6,8,1,14,19,21,8,94,0,94,0,0,0,15,5,5,5,5,20,12,12,12,11,0,0,0,0,0,1,0,98,0,0,14,19,5,5,5
-12,12,12,19,5,5,5,21,8,0,0,0,0,15,5,9,98,0,1,94,98,0,0,15,21,6,6,6,6,6,6,18,20,12,11,0,0,14,11,0,0,0,0,15,5,5,5,5
-5,5,5,5,5,21,6,8,0,14,12,12,12,19,5,20,11,0,14,11,0,93,0,17,8,0,0,0,0,0,0,17,6,18,20,12,12,19,9,0,1,98,14,19,5,5,5,5
-5,5,5,5,5,9,0,98,0,15,21,6,6,6,6,18,9,0,17,8,0,1,0,0,0,0,14,12,12,11,1,1,94,15,5,5,5,21,8,0,98,14,19,5,5,5,5,5
-5,5,5,5,5,9,0,98,0,15,9,0,0,98,0,15,9,0,0,0,0,0,0,14,12,12,19,5,5,20,12,11,0,17,6,18,5,9,0,0,14,19,5,5,5,5,5,5
-5,5,5,5,21,8,0,0$8,0,15,9,0,14,11,0,15,20,11,0,0,14,12,12,19,5,5,5,5,5,5,5,9,0,0,0,15,5,9,0,14,19,5,5,5,5,5,5,5
-5,5,5,5,9,0,98$6,0$7,0,15,9,94,15,9,0,15,5,20,11,0,17,18,21,6,6,18,5,5,5,5,5,9,0,14,12,19,5,9,0,15,5,5,5,5,5,5,5,5
-5,5,5,5,9,1$5,1,1,14,19,20,12,19,9,0,17,6,6,8,0,0,15,9,90,90,15,5,5,21,6,6,8,0,15,21,6,6,8,0,17,6,6,6,6,6,18,5,5
-5,5,5,5,9,94,0$4,0,15,5,5,21,6,8,0,93,0,0,0,0,93,15,9,90,90,15,5,21,8,0,0,0,0,15,9,93,0,0,0,93,0,0,0,98,0,15,5,5
-5,5,5,5,9,0,0,98,15,5,5,9,0,0,0,14,12,12,12,11,0,15,20,11,93,15,5,9,1,93,14,12,12,19,9,0,14,12,12,12,11,0,0,0,98,15,5,5
-5,5,5,5,20,11,0,14,19,5,5,9,0,14,12,19,5,5,21,8,0,17,18,9,0,15,5,9,0,14,19,21,6,6,8,98,15,5,5,21,8,94,0,0,14,19,5,5
-5,5,5,5,5,9,1,15,5,5,21,8,0,15,21,6,6,6,8,0,0,98$12,15,9,0,17,6,8,0,15,21,8,0,0,0,0,15,5,5,9,101@0@1@2@3@4,0,93,0,17,6,18,5
-5,5,5,5,5,9,0,15,5,21,8,0,0,15,9,92,0,0,92,0,0,92$13,15,9,0,93:3,0,0,0,15,9,0,0,14,12,12,19,5,5,9,1,0,94,93,0,0,15,5
-5,5,5,5,5,9,0,15,5,9,0,0,14,19,20,12,12,11,0$11,0,0$10,92,15,20,12,12,12,12,12,19,9,0,14,19,5,5,5,5,5,9,98,0,105$16,0,105$15,0,15,5
-5,5,5,5,5>,9,0,17,6,8,0,14,19,21,6,18,5,9,0$9,92,0,0,15,5,5,5,5,5,5,21,8,0,15,5,5,5,5,5,5,20,11,0,0,104<,0,0,15,5
-5,5,5,5,5,9,0,0,0,1,0,15,21,8,0,15,5,9,92,0,0,14,19,21,6,6,6,6,18,9,0,1,15,5,21,6,6,6,18,21,8,0,105$17,0,0,14,19,5
-5,5,5,5,5,20,12,11,0,14,12,19,9,94,14,19,5,20,11,0,0,17,6,8,0,0,98,1,15,9,0,14,19,5,9,90,90,90,17,8,0,0,0,1,14,19,5,5
-5,5,5,21,6,6,6,8,0,17,6,6,8,0,15,21,6,18,20,11,0,0,1,98,0,0,0,1,17,8,0,15,5,5,9,90,90,90,90,1,0,98,0,93,15,5,5,5
-5,5,5,9,90,94,0,0,98,1,0,93,0,98,15,9,0,17,6,8,0,14,12,11,0,0,0,0,0,0,0,15,5,5,20,11,90,90,90,93,90,90,90,90,15,5,5,5
-5,5,5,9,90,90,90,90,14,12,12,12,12,12,19,9,0,98,0,0,1,15,5,9,93,0,0,0,0,0,1,15,5,5,5,9,90,90,90,0,90,90,0,90,15,5,5,5
-5,5,5,20,12,12,12,12,19,5,5,5,5,5,5,20,12,12,12,12,12,19,5,9,0,0,94,0,0,0,14,19,5,5,5,20,11,90,90,0,90,90,90,90,15,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,11,93,94,0,0,14,19,5,5,5,5,5,9,0,0,0,90,90,14,12,19,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,12,12,12,19,5,5,5,5,5,5,9,0,14,12,12,12,19,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,21,6,6,6,6,6,6,6,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,8,0,17,6,18,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,21,8,94,97,97,93,95,1,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,8,0,0,1,93,0,15,5,5,5,5,5,5,5
-5,5,5,5,5,5,21,6,8,98,0,0,0,98,0,98,0,17,6,18,5,5,5,5,21,6,6,6,6,6,6,8,93,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5
-5,5,5,5,5,21,8,0,0,98,97,0,93,97,98,98,97,97,0,15,5,5,5,21,8,0,1,93,0,93,0:5,93,0,0,0,0,93,0,105$14,94,17,18,5,5,5,5,5,5
-5,5,5,5,21,8,0,97,97,93,97,93,95,97,0,0,0,98,0,17,6,18,21,8,0,93,0,0,0,14,11,0,0,93,0,0,0,104,0,71,71,15,5,5,5,5,5,5
-6,6,6,6,8,0,0,84,93,0,0,0,0,93,0,97,95,0,97,0,0,17,8,1,0,94,14,12,12,19,20,11,0,0,0,93,0,0,0,71,71,15,5,5,5,5,5,5
-84,85,86,84,0:4&9,0,98,0,0,0,97,97,98,98,98,97,93,94,97,97,94,0:0&9,0,0,98,93,15,5,5,5,5,9,0,0,98,0,0,14,12,12,12,19,5,5,5,5,5,5
-85,86,85,86,0:4&9,84,94,1,14,12,12,12,12,12,11,0,0,98,1,94,0,14,12,12,12,12,19,5,5,5,5,20,12,12,12,12,12,19,5,5,5,5,5,5,5,5,5,5
-12,12,12,12,12,12,12,12,19,5,5,5,5,5,20,12,12,12,12,12,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,77,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0@10,84,0,0,0,0,0,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,71,5,5,5,0,102@11@12@13@14@15,5,5,5,5,5,5,5,5,5,90,90,1,5,5,5,5,5,5,5,85@9,86,0,0,0,97,5,5,5,5,5,5,5
+5,5,5,5,5,5,71,71,71,71,71,5,5,5,0,5,5,5,5,5,5,5,5,5,5,90,90,93,0@5,5,5,5,5,5,5,0,84,0,0,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,71,71,71,71,71,5,5,5,0,5,5,5,5,5,5,5,5,5,5v,1,98,0,94,5,5,5,5,5,5,5,85@8,86@7,5,5,5,5,5,93,0,5,5,5
+5,5,5,5,5,5,71,71,71,93$2,93$3,93,98,0,0,5,5,5,5,5,5,5,93,93,0,0,0,0,0,94,0,5,5,5,5,5,5,5,5,5,5,5,0,93,0,5,5,5
+5,5,5,5,5,5,71,71,93,93,91,93,0$1,98,5,5,5,5,5,5,5,0,0,5,5,98,0,1,98,0,0,0,5,5,5,5,5,5,5,5,5,5,0,0,0,5,5,5
+5,5,5,5,71,71,71,5,5,5,93,0$0,0,0,5,5,5,5,5,5,5,93,5,5,5,5,0@6,0,0,0,0,0,0,5,5,5,5,5,5,5,5,93,0,0,0,5,5,5
+5,5,5,71,71,5,5,5,5,5,93,0,0,1,5,5,5,5,5,94,0,0,5,5,5,5,0,93,0,0,0,98,0,5,5,5,5,5,5,5,98,0,0,0,0,5,5,5
+5,5,71,71,5,5,5,5,5,5,5,5,0,94,5,5,5,5,0,0,0,0,5,5,5,5,5,5,5,98,98,0,98,0,5,5,0,5,5,94,94,0,0,0,5,5,5,5
+71,71,71,5,5,5,5,5,5,5,5,5,1,5,5,5,5,94,0,94,0,0,0,5,5,5,5,5,5,5,5,5,5,0,0,0,0,0,1,0,98,0,0,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,0,0,0,0,5,5,5,98,0,1,94,98,0,0,5,5,5,5,5,5,5,5,5,5,5,5,0,0,5,5,0,0,0,0,5,5,5,5,5
+5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,0,5,5,0,93,0,5,5,0,0,0,0,0,0,5,5,5,5,5,5,5,5,0,1,98,5,5,5,5,5,5
+5,5,5,5,5,5,0,98,0,5,5,5,5,5,5,5,5,0,5,5,0,1,0,0,0,0,5,5,5,5,1,1,94,5,5,5,5,5,5,0,98,5,5,5,5,5,5,5
+5,5,5,5,5,5,0,98,0,5,5,0,0,98,0,5,5,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,0,0$8,0,5,5,0,5,5,0,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,5,5,5,0,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,0,98$6,0$7,0,5,5,94,5,5,0,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,1$5,1,1,5,5,5,5,5,5,0,5,5,5,5,0,0,5,5,90,90,5,5,5,5,5,5,5,0,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,94,0$4,0,5,5,5,5,5,5,0,93,0,0,0,0,93,5,5,90,90,5,5,5,5,0,0,0,0,5,5,93,0,0,0,93,0,0,0,98,0,5,5,5
+5,5,5,5,5,0,0,98,5,5,5,5,0,0,0,5,5,5,5,5,0,5,5,5,93,5,5,5,1,93,5,5,5,5,5,0,5,5,5,5,5,0,0,0,98,5,5,5
+5,5,5,5,5,5,0,5,5,5,5,5,0,5,5,5,5,5,5,5,0,5,5,5,0,5,5,5,0,5,5,5,5,5,5,98,5,5,5,5,5,94,0,0,5,5,5,5
+5,5,5,5,5,5,1,5,5,5,5,5,0,5,5,5,5,5,5,0,0,98$12,5,5,0,5,5,5,0,5,5,5,0,0,0,0,5,5,5,5,101@0@1@2@3@4,0,93,0,5,5,5,5
+5,5,5,5,5,5,0,5,5,5,5,0,0,5,5,92,0,0,92,0,0,92$13,5,5,0,93:3,0,0,0,5,5,0,0,5,5,5,5,5,5,5,1,0,94,93,0,0,5,5
+5,5,5,5,5,5,0,5,5,5,0,0,5,5,5,5,5,5,0$11,0,0$10,92,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,98,0,105$16,0,105$15,0,5,5
+5,5,5,5,5>,5,0,5,5,5,0,5,5,5,5,5,5,5,0$9,92,0,0,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,0,0,104<,0,0,5,5
+5,5,5,5,5,5,0,0,0,1,0,5,5,5,0,5,5,5,92,0,0,5,5,5,5,5,5,5,5,5,0,1,5,5,5,5,5,5,5,5,5,0,105$17,0,0,5,5,5
+5,5,5,5,5,5,5,5,0,5,5,5,5,94,5,5,5,5,5,0,0,5,5,5,0,0,98,1,5,5,0,5,5,5,5,90,90,90,5,5,0,0,0,1,5,5,5,5
+5,5,5,5,5,5,5,5,0,5,5,5,5,0,5,5,5,5,5,5,0,0,1,98,0,0,0,1,5,5,0,5,5,5,5,90,90,90,90,1,0,98,0,93,5,5,5,5
+5,5,5,5,90,94,0,0,98,1,0,93,0,98,5,5,0,5,5,5,0,5,5,5,0,0,0,0,0,0,0,5,5,5,5,5,90,90,90,93,90,90,90,90,5,5,5,5
+5,5,5,5,90,90,90,90,5,5,5,5,5,5,5,5,0,98,0,0,1,5,5,5,93,0,0,0,0,0,1,5,5,5,5,5,90,90,90,0,90,90,0,90,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,94,0,0,0,5,5,5,5,5,5,5,90,90,0,90,90,90,90,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,93,94,0,0,5,5,5,5,5,5,5,5,0,0,0,90,90,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,94,97,97,93,95,1,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,1,93,0,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,98,0,0,0,98,0,98,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,93,0,0,0,0,0,0,0,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,0,0,98,97,0,93,97,98,98,97,97,0,5,5,5,5,5,5,0,1,93,0,93,0:5,93,0,0,0,0,93,0,105$14,94,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,0,97,97,93,97,93,95,97,0,0,0,98,0,5,5,5,5,5,0,93,0,0,0,5,5,0,0,93,0,0,0,104,0,71,71,5,5,5,5,5,5,5
+5,5,5,5,5,0,0,84,93,0,0,0,0,93,0,97,95,0,97,0,0,5,5,1,0,94,5,5,5,5,5,5,0,0,0,93,0,0,0,71,71,5,5,5,5,5,5,5
+84,85,86,84,0:4&9,0,98,0,0,0,97,97,98,98,98,97,93,94,97,97,94,0:0&9,0,0,98,93,5,5,5,5,5,5,0,0,98,0,0,5,5,5,5,5,5,5,5,5,5,5
+85,86,85,86,0:4&9,84,94,1,5,5,5,5,5,5,5,0,0,98,1,94,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5^,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
diff --git a/rsrc/scenarios/valleydy/towns/town16.map b/rsrc/scenarios/valleydy/towns/town16.map
index a27736d55..89fff3415 100644
--- a/rsrc/scenarios/valleydy/towns/town16.map
+++ b/rsrc/scenarios/valleydy/towns/town16.map
@@ -1,18 +1,18 @@
-90,90,90,90,90,90,90,90,15,5,5,5,21,6,6,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-90,90,90,90,90,90,90,90,17,18,5,5,9,0&16,102@3&17,17,18,5,5,5,5,5,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,5,5,5,5,5
-90,90,90,90,90,90,90,90,90,15,5,5,9,102@1,0,102@2,15,5,5,5,5,139,139,210,210,210,254,210,210,210,139,139,139,210,210,210,210,210,210,210,210,210,139,139,5,5,5,5
-90,90,90,90,90,90,90,90,90,15,5,5,9,102@0&16,0&18,0,15,5,5,5,139,139,210,210,210,210,254,210,210,210,210,210,210,210,254,254,254,254,210,254,210,210,210,139,139,5,5,5
-90,90,90,90,90,90,90,90,90,17,18,5,20,12,11,0:22,15,5,5,139,139,210,210,254,254v,254,254,254,210,254,210,139,254,254,254,210,210,210,210,254,210,254,210,210,139,139,5,5
-90,90,90,90,90,90,90,90,90,90,15,5,5,5,9,0,17,18,139,139,210,210,210,210,210,210,210:7&9,254,210,254,210,139,210,210,210,210,210,254,254,254,210,254,210,210,210,139,139,5
-90,90,90,90,90,90,90,90,90,90,15,5,5,5,9,0,0,15:0,150,210,210,254,254,254,254,254,254,254,210,254,210,139,210,254,254,254,210,254,210,210,210,254,210,254,210,210,139,5
-90,90,90,90,90,90,90,90,90,90,15,5,5,5,20,12,12,19,139,210,210,210,210,254,254,210,210,210,210,210,210,139,210,210,210,210,210,254,254,254,254,254,254,254,254,210,139,5
-90,90,90,90,90,90,90,90,90,90,15,5,5,5,5,5,5,5,139,210,254,254,254,254,254,254,210,254,254,254,254,139,210,254,210,254,210,210,210,210,210,210,210,210,210,210,139,5
-90,90,90,90,90,90,90,90,90,90,17,6,6,6,18,5,5,5,139,210,254,210,210,254,254,254,210,210,210,210,210,139,210,254,210,254,210,254,254,254,210,254,254,254,254,210,139,5
-90,90,90,90,90,90,90,90,90,90,90,90,90,90,17,18,5,5,139,210,254,210,254,254,254,254,210,254,210,254,210,139,210,254,210,254,210,254,210:10&9,254:2,210,210,210,210,254,210,139,5
-90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,15,5,5,139,210,254,210,210,210,254,254,210,254,254,254,210,139,210,254,254,254,210,254,254,254,254,254,254,254,254,210,139,5
-90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,15,21,6,139,210,210,210,210,210,210,254,210,254,210,210,210,139,210,210,210,210,210,254,210,254,210,210,210,210,210,210,139,5
-90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,15,9,0,139,210,254,254,254,254,210,254,210,254,254,254,210,139,210,254,254,254,254,254,210,254,254,254,254,254,210,210,139,5
-90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,17,8,0,139,210,210,210,210,254,210,210,210,254,210,210,210,139,210,210,210,210,210,210,210,254,210,210,210,254,254,210,139,5
+90,90,90,90,90,90,90,90,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+90,90,90,90,90,90,90,90,5,5,5,5,5,0&16,102@3&17,5,5,5,5,5,5,5,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,5,5,5,5,5
+90,90,90,90,90,90,90,90,90,5,5,5,5,102@1,0,102@2,5,5,5,5,5,139,139,210,210,210,254,210,210,210,139,139,139,210,210,210,210,210,210,210,210,210,139,139,5,5,5,5
+90,90,90,90,90,90,90,90,90,5,5,5,5,102@0&16,0&18,0,5,5,5,5,139,139,210,210,210,210,254,210,210,210,210,210,210,210,254,254,254,254,210,254,210,210,210,139,139,5,5,5
+90,90,90,90,90,90,90,90,90,5,5,5,5,5,5,0:22,5,5,5,139,139,210,210,254,254v,254,254,254,210,254,210,139,254,254,254,210,210,210,210,254,210,254,210,210,139,139,5,5
+90,90,90,90,90,90,90,90,90,90,5,5,5,5,5,0,5,5,139,139,210,210,210,210,210,210,210:7&9,254,210,254,210,139,210,210,210,210,210,254,254,254,210,254,210,210,210,139,139,5
+90,90,90,90,90,90,90,90,90,90,5,5,5,5,5,0,0,5:0,150,210,210,254,254,254,254,254,254,254,210,254,210,139,210,254,254,254,210,254,210,210,210,254,210,254,210,210,139,5
+90,90,90,90,90,90,90,90,90,90,5,5,5,5,5,5,5,5,139,210,210,210,210,254,254,210,210,210,210,210,210,139,210,210,210,210,210,254,254,254,254,254,254,254,254,210,139,5
+90,90,90,90,90,90,90,90,90,90,5,5,5,5,5,5,5,5,139,210,254,254,254,254,254,254,210,254,254,254,254,139,210,254,210,254,210,210,210,210,210,210,210,210,210,210,139,5
+90,90,90,90,90,90,90,90,90,90,5,5,5,5,5,5,5,5,139,210,254,210,210,254,254,254,210,210,210,210,210,139,210,254,210,254,210,254,254,254,210,254,254,254,254,210,139,5
+90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,5,139,210,254,210,254,254,254,254,210,254,210,254,210,139,210,254,210,254,210,254,210:10&9,254:2,210,210,210,210,254,210,139,5
+90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,139,210,254,210,210,210,254,254,210,254,254,254,210,139,210,254,254,254,210,254,254,254,254,254,254,254,254,210,139,5
+90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,139,210,210,210,210,210,210,254,210,254,210,210,210,139,210,210,210,210,210,254,210,254,210,210,210,210,210,210,139,5
+90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,0,139,210,254,254,254,254,210,254,210,254,254,254,210,139,210,254,254,254,254,254,210,254,254,254,254,254,210,210,139,5
+90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,0,139,210,210,210,210,254,210,210,210,254,210,210,210,139,210,210,210,210,210,210,210,254,210,210,210,254,254,210,139,5
 90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,0,97,0,139,210,210,254,210,254,210,254,254,254,254,254,210,139,210,254,254,210,254,210,254,254,254,254,210,210,210,210,139,5
 90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,0,0,139,210,254,254,254,254,210,254,210,210,210,210,210,139,210,210,254,254,254,254,254,254,210,210$4,210$5,139,210,210,139,5
 90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,0,0,0,139,210,210,210,210,210,210,210,210,210,210,210,139,139,139,210,210,210,210,210$1,210,210$2,210$3,210,139,139,210,210,139,5
@@ -31,18 +31,18 @@
 90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,0,0,0,139,210,210,210,210,210,210,139,139,139,254,210,139,210,210,210,210,139,210,210,254,139,210,254,139,139,210,210,139,5
 90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,0,0,0,139,210:4,210:4,139,139,139,139,139,139,139,139,210,139,139,139,139,139,139,139,139,139,139,139,139,139,139,210,210,139,5
 90,90,90,90,90,90,90,90,90,90,90,90,90,90,90,0,1,0,139,210,210,210,210,210,210,210,210,210,210,210,139,139,139,210,210,210,210$6,210,210,210,210$7,210,139,139,210,210,139,5
-90,90,90,90,90,90,90,90,90,90,90,90,90,90,14,11,98,0,139,210,254,254,254,254,254,254,254,210,254,210,210,139,210,210,254,254,254,254,254,254,254,210,210,139,210,210,139,5
-90,90,90,90,90,90,90,90,90,90,90,90,90,90,15,20,11,0,139,210,210,210,210,254,210,210,210,210,254,210,210,139,210,254,254,210,210,210,210,210,210,210,210,210,210,210,139,5
-90,90,90,90,90,90,90,90,90,90,90,90,90,90,15,5,9,97,139,210,254,254,254,254,210,254,254,254,254,254,210,139,210,254,210,210,254,254,254,254,210,254,254,254,254,210,139,5
-90,90,90,90,90,90,90,90,90,90,90,90,90,90,15,5,20,12,139,210,210,210,254,210,210,254,254,210,210,210,210,139,210,254,210,254,254,210,210,210,210,210,210,210,210,210,139,5
-90,90,90,90,90,90,90,90,90,90,90,90,90,14,19,5,5,5,139,210,254,254,254,210,210,254,210,210,254,210,210,139,210,254,210,254,210:9&9,210,254,210,254,254,254,210,254,210,139,5
-90,90,90,90,90,90,90,90,90,90,90,90,90,15,5,5,5,5,139,210,210,254,210,210,254,254,254,254,254,254,254,139,210,254,210,254,254,254,254,210,254,210,210,210,254,210,139,5
-90,90,90,90,90,90,90,90,90,90,90,90,14,19,5,5,5,5,139,210,254,254,210,254,254,210:5&9,254,210,254:1,210,210,139,210,254,210,254,210,210,210,210,210,210,254,254,254,210,139,5
-90,90,90,90,90,90,90,90,90,90,90,14,19,139,139,139,139,139,139,210,210,210,210,210,254,210,254,210,254,210,210,139,210,254,210,210,210,254,254,254,254,210,254,210,210,210,139,5
-90,90,90,90,90,90,90,90,90,90,14,139,139,139,170,170&10,170&10,170,140,210,210,210,254,210,254,210,210,210,254,210,210,139,210,254,210,254,254,254,210,254,210,210,254,254,210,210,139,5
-90,90,90,90,90,90,90,90,90,90,15,139,199&17,139,170,139,139,139,139,139,210,210,254,254,254,254,254,254,254,254,210$0,139,210,254,210,210,254,210,210,210,210,254,254,210,210,139,139,5
-90,90,90,90,90,90,90,90,90,14,19,139,170,142,170,142,170,199@4,139,139,139,210,210,210,210^,254,210,210,210,210,210,139,210,254,254,210,210,210,254,210,254,254,210,210,139,139,5,5
-90,90,90,90,90,90,90,90,90,15,139,139,139,139,170,139,139,139,139,5,139,139,210,210,254,254,254,254,254,210,210,210,210,210,254,254,254,254,254,254,254,210,210,139,139,5,5,5
-90,90,90,90,90,90,90,90,90,15,139,199&16,170,142,170,142,170,199&16,139,5,5,139,139,210,210,210,210,210,210,210,139,139,139,210,210,210,210,210,210,210,210,210,139,139,5,5,5,5
-90,90,90,90,90,90,90,90,90,15,139,139,139,139,139,139,139,139,139,5,5,5,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,5,5,5,5,5
-90,90,90,90,90,90,90,90,90,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,98,0,139,210,254,254,254,254,254,254,254,210,254,210,210,139,210,210,254,254,254,254,254,254,254,210,210,139,210,210,139,5
+90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,0,139,210,210,210,210,254,210,210,210,210,254,210,210,139,210,254,254,210,210,210,210,210,210,210,210,210,210,210,139,5
+90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,97,139,210,254,254,254,254,210,254,254,254,254,254,210,139,210,254,210,210,254,254,254,254,210,254,254,254,254,210,139,5
+90,90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,5,139,210,210,210,254,210,210,254,254,210,210,210,210,139,210,254,210,254,254,210,210,210,210,210,210,210,210,210,139,5
+90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,5,5,139,210,254,254,254,210,210,254,210,210,254,210,210,139,210,254,210,254,210:9&9,210,254,210,254,254,254,210,254,210,139,5
+90,90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,5,5,139,210,210,254,210,210,254,254,254,254,254,254,254,139,210,254,210,254,254,254,254,210,254,210,210,210,254,210,139,5
+90,90,90,90,90,90,90,90,90,90,90,90,5,5,5,5,5,5,139,210,254,254,210,254,254,210:5&9,254,210,254:1,210,210,139,210,254,210,254,210,210,210,210,210,210,254,254,254,210,139,5
+90,90,90,90,90,90,90,90,90,90,90,5,5,139,139,139,139,139,139,210,210,210,210,210,254,210,254,210,254,210,210,139,210,254,210,210,210,254,254,254,254,210,254,210,210,210,139,5
+90,90,90,90,90,90,90,90,90,90,5,139,139,139,170,170&10,170&10,170,140,210,210,210,254,210,254,210,210,210,254,210,210,139,210,254,210,254,254,254,210,254,210,210,254,254,210,210,139,5
+90,90,90,90,90,90,90,90,90,90,5,139,199&17,139,170,139,139,139,139,139,210,210,254,254,254,254,254,254,254,254,210$0,139,210,254,210,210,254,210,210,210,210,254,254,210,210,139,139,5
+90,90,90,90,90,90,90,90,90,5,5,139,170,142,170,142,170,199@4,139,139,139,210,210,210,210^,254,210,210,210,210,210,139,210,254,254,210,210,210,254,210,254,254,210,210,139,139,5,5
+90,90,90,90,90,90,90,90,90,5,139,139,139,139,170,139,139,139,139,5,139,139,210,210,254,254,254,254,254,210,210,210,210,210,254,254,254,254,254,254,254,210,210,139,139,5,5,5
+90,90,90,90,90,90,90,90,90,5,139,199&16,170,142,170,142,170,199&16,139,5,5,139,139,210,210,210,210,210,210,210,139,139,139,210,210,210,210,210,210,210,210,210,139,139,5,5,5,5
+90,90,90,90,90,90,90,90,90,5,139,139,139,139,139,139,139,139,139,5,5,5,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,5,5,5,5,5
+90,90,90,90,90,90,90,90,90,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
diff --git a/rsrc/scenarios/valleydy/towns/town17.map b/rsrc/scenarios/valleydy/towns/town17.map
index a4f7e4526..59b44df17 100644
--- a/rsrc/scenarios/valleydy/towns/town17.map
+++ b/rsrc/scenarios/valleydy/towns/town17.map
@@ -1,48 +1,48 @@
-5,5,5,5,5,5,5,5,5,5,9,0,15,5,5,5,5,5,9,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,30,22,22,26,36,36,36,36,37,37
-5,5,5,5,5,5,5,5,5,5,9,0,15,5,5,5,5,5,9,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,30,35,24,25,37,37,37,36,36,36
-5,5,5,5,5,5,5,5,5,21,8,0,15,5,5,5,5,21,8,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,29,33,25,36,36,36,36,36,36,36,36
-5,5,5,5,5,5,5,5,5,9,0,0,15,5,5,5,5,9,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,29,33,25,36,36,36,36,36,36,36,36,37
-5,21,6,6,6,6,6,6,18,9,0,14,19,5,5,5,5,9,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,30,26,36,36,36,36,37,36v<^>,37,36,29,28
-21,8,71,71,71,71,93,94,15,9,0,15,5,21,6,6,18,9,0,15,5,21,6,18,5,5,5,5,5,5,5,5,5,5,21,8,30,26,36,36,36,36,37,36,36,36,30,22
-9,71,71,71,71,93,0@27,98,15,9,0,17,6,8,0,0,16,10,0,17,6,8,0,17,6,6,6,18,5,5,5,5,5,5,9,29,33,26,37,36,36,37,36,36,36,37,30,22
-9,71,71,94,93,93,94,14,19,9,98,98,0,0,0,14,19,9,0,0,0,0,0,0,0,0,97,15,5,5,5,5,5,21,8,30,35,25,36,36,36,36,36,36,36,36,30,22
-9,71,93,94,93,0,0,17,18,20,12,12,12,122,123,122,122,122,122,122,122,122,122,122,0,1,0,17,18,5,5,5,5,9,29,33,26,36,37,36,36,36,36,37,37,36,30,22
-9,93,0@28,98,98,0,0,98,17,6,6,6,18,122,170,170,170,170,170,170,170,170,198$8,138,0,93,0,98,15,5,5,5,21,8,30,35,25,36,36,37,36,36,37,36,29,28,33,24
-9,93,0,94,14,12,11,1,0,0,0,0,15,122,122,122,122,122,170,170,170,170,170,122,1,0,0,0,17,18,5,21,8,29,33,26,37,36,36,37,36,37,36,29,33,35,25,14
-9,97,94,0,15,5,20,12,12,12,11,0,17,122,191:4,191:4,191:4,170,197$16,197$15,170,170,207,122,0,0,0,0,97,15,21,8,29,33,24,25,37,36,36,36,37,36,29,33,35,25,14,19
-9,0@29,98,14,19,5,21,6,6,6,8,0,0,122,170,170,170,170,185,185,170,170,198$7,138,0,0,93,0,14,19,9,29,33,26,36,36,37,37,37,36,36,29,33,35,25,14,19,5
-20,12,12,19,5,21,8,0,0,98,0,0,0,122,170,170,170,170,195$14,195,170,170,170,122,0,0,93,0,15,5,9,30,35,25,36,36,37,36,36,37,36,30,35,25,14,19,5,5
-5,5,5,5,21,8,97,0,0,0$18,93,0,0,125,170,170,170,170,170,170,170,170,170,122,12,11,0,0,15,5,9,30,26,37,36,37,36,36,29,28,28:0,33,26,14,19,5,5,5
-5,5,5,21,8,98,0,1$19,0,0,0,0,0,122,122,122,122,126,122,126,122,122,122,122,5,9,0,0,15,5,9,30,34,27,36,36,36,29,33,35,24:0,24,25,15,5,5,5,5
-5,5,5,9,0,0,0,0,104,0,0,0,0,122,170,170,170,170,122,170,170,170,170@23&12,122,5,9,0,1,17,18,9,31,32,34,28,28,28,33,35,25,0,0,0,15,5,5,5,5
-5,5,5,9,97,0,98,0$17,93,1$20,98,0,14,122,170,170,170,170,122,170,170,170,170,122,5,20,11,0,0,17,18,11,31,32,22,22,22,35,25,14,12,11,0:2,15,5,5,5,5
-5,5,5,20,11,0,0,0,0,0,14,12,19,122,177@24,177,177@25,177@26,122,170@19&11,170@20&11,170@21&11,170@22&12,122,21,6,8,0,0,0,17,18,11,31,24,24,24,25,14,19,21,8,0,17,18,5,5,5
-5,21,6,18,20,11,0,0,0,14,19,5,5,122,122,122,122,122,122,122,122,122,122,122,9,0,0,0,94,0,0,17,18,12,12,12,12,12,19,21,8,0,0,0,15,5,5,5
-21,8,101@30,17,18,9,0,0,0,15,5,5,21,6,18,5,5,21,6,6,6,18,5,21,8,98,0,0,0,0,0,0,15,5,5,5,5,5,21,8,0,0,0,0,15,5,5,5
-9,0,0,101@31@32,15,9,0,0,97,17,18,5,9,98,15,5,5,9,93,71,71,17,6,8,0,0,0,0,104,0,0,0,15,5,5,5,21,6,8,0,1,0,0,14,19,5,5,5
-9,0,0,0,15,9,0,0,1,0,17,6,8,0,17,6,6,8,93,71,71,93,0,0,0,0,0,0,0,0,0,97,15,5,5,21,8,0,0,0,0,0,0,15,5,5,5,5
-9,0,0,101@33@34@35,15,9,0,1,0,0,1,0,0,0,0,0,0,93,0,71,71,14,12,12,11,1,0,94,0,0,0,14,19,21,6,8,1,0,0,104,0,0,14,19,5,5,5,5
-9,0:5,14,12,19,20,11,0,0,0,0,0,14,12,12,12,12,12,12,12,12,19,5,5,20,12,12,11,0,0,0,15,21,8,0,0,0,0,0,0,0,0,15,5,5,5,5,5
-9,0:5,17,18,5,5,9,0,98,0,0,0,17,6,18,5,5,5,122,122,136,122,122,122,136,122,122,8,0,0,0,15,9,0,1,0,0,0,0,0,0,0,15,5,5,5,5,5
-9,0,1,15,5,5,20,11,97,0,0,0,0,98,17,18,5,5,122,170,170,198,184,196,170,170,122,0,0,0,14,19,9,1,0,122,122,138,122,122,122,138,122,122,5,5,5,5
-20,11,0,15,5,5,5,20,12,12,11,0,0,0,0,17,6,18,122,170,170,198,184@16,196$13,170,198$4,138,0,0,0,15,21,8,0,14,122,170,195$6,170,170,170,195$0,170,122,5,5,5,5
-5,9,0,15,122,122,122,122,122,122,9,1,0,0,0,98,0,17,122,170,170,198$12,184,196,170,207,122,0,0,0,15,9,0,0,15,122,170,197,197,197$11,197,170,170,122,5,5,5,5
-5,9,0,15,122,170,199,199,170,122,8,1,0,0,0,0,0,98,122,170,170,170,170,170,170,170,122,0,0,0,15,9,0,0,17,122,170,185@12,185@13,185@14,185@15,170,207,122,5,5,5,5
-5,9,0,17,122,170,170,170,170,122,1,0,0,0,0,1$24,0,0,138,196$5,170,170,170,170,170,198$3,138,1,0,1,15,9,0,0,0,138,196$1,195,195$10,195,195,170,170,122,5,5,5,5
-5,9,0,0,123,170,170,170,204,127,0,14,11,98,0$23,0,0,0,122,170,170,170,170,170,170,170,122,0,0,0,15,9,104,0,0,122,170,170,170,170,170,170,202,122,5,5,5,5
-21,8,0,14,122,201@18,170,170,188,122,12,19,9,104,0,0,0$22,0,122,170,170,199,199,199,199,201@0@17,122,12,11,0,15,20,11,0,0,122,170,170,170,122,122,122,122,122,5,5,5,5
-9,0,0,15,122,122,122,122,122,122,5,5,20,12,11,93,0,0,122,170,170,170,170,170,170,170,122,5,9,0,17,18,9,0,0,138,196$2,170,170,125,170,170,199,122,5,5,5,5
-9,0,14,19,21,6,6,6,6,6,18,21,6,18,20,11,0,0,125,170,170,199,199,199,199,201@1@2@3@4,122,5,9,0,0,15,20,11,0,122,170,170,170,122,170,170,170,122,5,5,5,5
-9,0,15,5,9,0,0,0,0,0,17,8,0,17,6,8,0,14,122,122,122,122,122,122,122,122,122,5,20,11,0,17,6,8,0,122,170,170,170,122,201@9@10@11,170,199,122,5,5,5,5
-9,0,17,18,9,0,14,12,11,0,1,0,0,0,0,0,0,15,5,5,5,5,21,6,6,6,6,6,18,9,1,1,0:3,1,0,122,170,122,125,122,122,122,122,122,5,5,5,5
-9,0,0,15,9,0,15,21,8,1,14,12,11,0,14,12,12,19,5,5,5,5,9,0,0,0,0,0,15,20,12,12,12,12,12,122,170,122,170$9,170,175@8,170,201@5@6@7,122,5,5,5,5
-20,11,0,15,9,0,15,9,0,0,17,18,9,0,17,6,6,6,6,6,6,18,9,0,14,12,12,12,19,5,5,21,6,18,5,122,170,122,170,170,195,170,170,122,5,5,5,5
-5,9,0,15,9,0,15,9,0,0,0,15,9,0,0,0,0,0,0,0,98,17,8,0,17,6,6,6,6,6,18,9,0,15,5,122,170,122,170,170,170,170,199,122,5,5,5,5
-5,9,1,15,9,0,15,9,0,14,12,19,20,12,12,12,12,12,12,11,0,0,0,0,0,0,0,0,0,0,17,8,0,17,6,122,126,122,122,122,122,123,122,122,5,5,5,5
-5,9,0:6,15,9,0:8,15,9,0,17,6,6,6,6,6,6,6,6,18,20,12,11,0,14,12,12,12,12,11,0,0,0,0,0,0,0$21,0,15,5,5,122,170,170,122,5,5,5,5
-21,8,0,15,9,0,15,9,0,0,0,98,0,0,0,0,0,0,15,5,5,9,0,15,5,5,5,5,20,12,12,12,12,12,12,12,12,19,5,5,122,122,170:10,122,5,5,5,5
-9,0,0,15,9,0,15,20,12,12,12,12,12,12,12,12,11,0,15,5,5,20,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,194@36@37@38@39,170,122,5,5,5,5
-9,0,14,19,9,0,15,5,5,5,5,5,5,5,5,5,9,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,122,122,122,5,5,5,5
-9,0,15,5,9,0,15,5,5,5,5,5,5,5,5,5,9,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-9,0,15,5,9,1,15,5,5,5,5,5,5,5,5,5,20,11,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-9,0,15,5,9,0,15,5,5,5,5,5,5,5,5,5,5,9,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,30,22,22,26,36,36,36,36,37,37
+5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,30,35,24,25,37,37,37,36,36,36
+5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,29,33,25,36,36,36,36,36,36,36,36
+5,5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,29,33,25,36,36,36,36,36,36,36,36,37
+5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,30,26,36,36,36,36,37,36v<^>,37,36,29,28
+5,5,71,71,71,71,93,94,5,5,0,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,30,26,36,36,36,36,37,36,36,36,30,22
+5,71,71,71,71,93,0@27,98,5,5,0,5,5,5,0,0,5,5,0,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,29,33,26,37,36,36,37,36,36,36,37,30,22
+5,71,71,94,93,93,94,5,5,5,98,98,0,0,0,5,5,5,0,0,0,0,0,0,0,0,97,5,5,5,5,5,5,5,5,30,35,25,36,36,36,36,36,36,36,36,30,22
+5,71,93,94,93,0,0,5,5,5,5,5,5,122,123,122,122,122,122,122,122,122,122,122,0,1,0,5,5,5,5,5,5,5,29,33,26,36,37,36,36,36,36,37,37,36,30,22
+5,93,0@28,98,98,0,0,98,5,5,5,5,5,122,170,170,170,170,170,170,170,170,198$8,138,0,93,0,98,5,5,5,5,5,5,30,35,25,36,36,37,36,36,37,36,29,28,33,24
+5,93,0,94,5,5,5,1,0,0,0,0,5,122,122,122,122,122,170,170,170,170,170,122,1,0,0,0,5,5,5,5,5,29,33,26,37,36,36,37,36,37,36,29,33,35,25,5
+5,97,94,0,5,5,5,5,5,5,5,0,5,122,191:4,191:4,191:4,170,197$16,197$15,170,170,207,122,0,0,0,0,97,5,5,5,29,33,24,25,37,36,36,36,37,36,29,33,35,25,5,5
+5,0@29,98,5,5,5,5,5,5,5,5,0,0,122,170,170,170,170,185,185,170,170,198$7,138,0,0,93,0,5,5,5,29,33,26,36,36,37,37,37,36,36,29,33,35,25,5,5,5
+5,5,5,5,5,5,5,0,0,98,0,0,0,122,170,170,170,170,195$14,195,170,170,170,122,0,0,93,0,5,5,5,30,35,25,36,36,37,36,36,37,36,30,35,25,5,5,5,5
+5,5,5,5,5,5,97,0,0,0$18,93,0,0,125,170,170,170,170,170,170,170,170,170,122,5,5,0,0,5,5,5,30,26,37,36,37,36,36,29,28,28:0,33,26,5,5,5,5,5
+5,5,5,5,5,98,0,1$19,0,0,0,0,0,122,122,122,122,126,122,126,122,122,122,122,5,5,0,0,5,5,5,30,34,27,36,36,36,29,33,35,24:0,24,25,5,5,5,5,5
+5,5,5,5,0,0,0,0,104,0,0,0,0,122,170,170,170,170,122,170,170,170,170@23&12,122,5,5,0,1,5,5,5,31,32,34,28,28,28,33,35,25,0,0,0,5,5,5,5,5
+5,5,5,5,97,0,98,0$17,93,1$20,98,0,5,122,170,170,170,170,122,170,170,170,170,122,5,5,5,0,0,5,5,5,31,32,22,22,22,35,25,5,5,5,0:2,5,5,5,5,5
+5,5,5,5,5,0,0,0,0,0,5,5,5,122,177@24,177,177@25,177@26,122,170@19&11,170@20&11,170@21&11,170@22&12,122,5,5,5,0,0,0,5,5,5,31,24,24,24,25,5,5,5,5,0,5,5,5,5,5
+5,5,5,5,5,5,0,0,0,5,5,5,5,122,122,122,122,122,122,122,122,122,122,122,5,0,0,0,94,0,0,5,5,5,5,5,5,5,5,5,5,0,0,0,5,5,5,5
+5,5,101@30,5,5,5,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,98,0,0,0,0,0,0,5,5,5,5,5,5,5,5,0,0,0,0,5,5,5,5
+5,0,0,101@31@32,5,5,0,0,97,5,5,5,5,98,5,5,5,5,93,71,71,5,5,5,0,0,0,0,104,0,0,0,5,5,5,5,5,5,5,0,1,0,0,5,5,5,5,5
+5,0,0,0,5,5,0,0,1,0,5,5,5,0,5,5,5,5,93,71,71,93,0,0,0,0,0,0,0,0,0,97,5,5,5,5,5,0,0,0,0,0,0,5,5,5,5,5
+5,0,0,101@33@34@35,5,5,0,1,0,0,1,0,0,0,0,0,0,93,0,71,71,5,5,5,5,1,0,94,0,0,0,5,5,5,5,5,1,0,0,104,0,0,5,5,5,5,5,5
+5,0:5,5,5,5,5,5,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,5,5,5,0,0,0,0,0,0,0,0,5,5,5,5,5,5
+5,0:5,5,5,5,5,5,0,98,0,0,0,5,5,5,5,5,5,122,122,136,122,122,122,136,122,122,5,0,0,0,5,5,0,1,0,0,0,0,0,0,0,5,5,5,5,5,5
+5,0,1,5,5,5,5,5,97,0,0,0,0,98,5,5,5,5,122,170,170,198,184,196,170,170,122,0,0,0,5,5,5,1,0,122,122,138,122,122,122,138,122,122,5,5,5,5
+5,5,0,5,5,5,5,5,5,5,5,0,0,0,0,5,5,5,122,170,170,198,184@16,196$13,170,198$4,138,0,0,0,5,5,5,0,5,122,170,195$6,170,170,170,195$0,170,122,5,5,5,5
+5,5,0,5,122,122,122,122,122,122,5,1,0,0,0,98,0,5,122,170,170,198$12,184,196,170,207,122,0,0,0,5,5,0,0,5,122,170,197,197,197$11,197,170,170,122,5,5,5,5
+5,5,0,5,122,170,199,199,170,122,5,1,0,0,0,0,0,98,122,170,170,170,170,170,170,170,122,0,0,0,5,5,0,0,5,122,170,185@12,185@13,185@14,185@15,170,207,122,5,5,5,5
+5,5,0,5,122,170,170,170,170,122,1,0,0,0,0,1$24,0,0,138,196$5,170,170,170,170,170,198$3,138,1,0,1,5,5,0,0,0,138,196$1,195,195$10,195,195,170,170,122,5,5,5,5
+5,5,0,0,123,170,170,170,204,127,0,5,5,98,0$23,0,0,0,122,170,170,170,170,170,170,170,122,0,0,0,5,5,104,0,0,122,170,170,170,170,170,170,202,122,5,5,5,5
+5,5,0,5,122,201@18,170,170,188,122,5,5,5,104,0,0,0$22,0,122,170,170,199,199,199,199,201@0@17,122,5,5,0,5,5,5,0,0,122,170,170,170,122,122,122,122,122,5,5,5,5
+5,0,0,5,122,122,122,122,122,122,5,5,5,5,5,93,0,0,122,170,170,170,170,170,170,170,122,5,5,0,5,5,5,0,0,138,196$2,170,170,125,170,170,199,122,5,5,5,5
+5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,125,170,170,199,199,199,199,201@1@2@3@4,122,5,5,0,0,5,5,5,0,122,170,170,170,122,170,170,170,122,5,5,5,5
+5,0,5,5,5,0,0,0,0,0,5,5,0,5,5,5,0,5,122,122,122,122,122,122,122,122,122,5,5,5,0,5,5,5,0,122,170,170,170,122,201@9@10@11,170,199,122,5,5,5,5
+5,0,5,5,5,0,5,5,5,0,1,0,0,0,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,1,1,0:3,1,0,122,170,122,125,122,122,122,122,122,5,5,5,5
+5,0,0,5,5,0,5,5,5,1,5,5,5,0,5,5,5,5,5,5,5,5,5,0,0,0,0,0,5,5,5,5,5,5,5,122,170,122,170$9,170,175@8,170,201@5@6@7,122,5,5,5,5
+5,5,0,5,5,0,5,5,0,0,5,5,5,0,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,122,170,122,170,170,195,170,170,122,5,5,5,5
+5,5,0,5,5,0,5,5,0,0,0,5,5,0,0,0,0,0,0,0,98,5,5,0,5,5,5,5,5,5,5,5,0,5,5,122,170,122,170,170,170,170,199,122,5,5,5,5
+5,5,1,5,5,0,5,5,0,5,5,5,5,5,5,5,5,5,5,5,0,0,0,0,0,0,0,0,0,0,5,5,0,5,5,122,126,122,122,122,122,123,122,122,5,5,5,5
+5,5,0:6,5,5,0:8,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,0,0,0,0,0,0,0$21,0,5,5,5,122,170,170,122,5,5,5,5
+5,5,0,5,5,0,5,5,0,0,0,98,0,0,0,0,0,0,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,122,170:10,122,5,5,5,5
+5,0,0,5,5,0,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,194@36@37@38@39,170,122,5,5,5,5
+5,0,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,122,122,122,5,5,5,5
+5,0,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,0,5,5,5,1,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,0,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
diff --git a/rsrc/scenarios/valleydy/towns/town18.map b/rsrc/scenarios/valleydy/towns/town18.map
index 0281ff715..308019e06 100644
--- a/rsrc/scenarios/valleydy/towns/town18.map
+++ b/rsrc/scenarios/valleydy/towns/town18.map
@@ -1,48 +1,48 @@
-5,5,5,5,5,5,5,5,21,6,6,6,6,6,6,18,5,5,5,5,5,5,5,5,21,6,6,6,18,5,5,21,6,6,6,6,6,6,18,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,21,6,6,8,71,71,71,0@1,92,1,15,5,21,6,6,6,6,18,21,8,0,0,92,17,6,6,8,0,96,0,93,1,0,17,6,6,6,18,5,5,5,5,5
-5,5,21,6,6,8,1,92,0,0,71,1,1,0,0,17,6,8,1,1,0,93,17,8,0,93@12,93,0,92,0,0,93,1,14,12,12,11,0,0,93,1,0,17,6,6,18,5,5
-5,21,8,0,0,1,96,93,0,1,96,92,0,1,1,0,94,1,93,14,11,0,0,93,0,92,1,92,92,96,1,93,93,15,5,5,20,12,11,71,1,0,0,93,93,17,18,5
-21,8,1,0,92,1,92,0,1,94,93,0,0,0,14,11,96,0,93,15,20,12,11,0,94v,96,93,91,96,92,0,1,0,15,5,5,5,5,9,71,0,0*1,0,92,0,94,15,5
-9,0,93,0,0,0,94,92,1,0,0,0,92,0,15,20,12,12,12,19,5,5,20,12,11,0,92,71,71,0,0,14,12,19,5,5,21,6,8,0,92,96,1,0,0,0,17,18
-9,0,0,1@11,0,71,71,14,12,12,12,11,0,14,19,21,6,6,6,6,6,6,6,18,20,11,71,71,71,0,14,19,5,5,5,21,8,1,1,1,93,0,71,71,0,93,0,15
-9,96,1,0,0@2,71,71,15,5,5,5,20,12,19,5,9,0,0,93,0@13,1,96,0,17,18,20,12,12,12,12,19,5,5,21,6,8,0,0,0,92,0,14,11,71,71,94,0,15
-9,94,0,0,0,71,71,15,5,5,5,5,5,5,21,8,92,14,12,12,12,11,0,93,15,5,5,5,5,21,6,6,6,8,0,0,0,14,12,12,12,19,20,11,71,92,1,15
-20,11,0,0,0,93,1,17,18,5,5,5,5,5,9,0,93,17,6,18,5,9,93,14,19,5,5,5,21,8,93,0,0,93,1,14,12,19,21,6,6,6,18,20,12,11,0,15
-5,9,0,0,1,0,92,0,17,6,18,5,5,5,9,0,1,93,1,17,18,20,12,19,21,6,6,6,8,0,0,14,12,12,12,19,21,6,8,0,93,0,17,18,5,9,0,15
-5,20,12,11,1,1,0,93,0,96,15,5,5,21,8,0,14,11,94,93,17,18,5,5,9,93,0,0,0,92,14,19,5,5,5,5,9,71,0,0,0@16,93,1,15,21,8,93,15
-5,5,5,20,11,0,1,0,93,0,15,21,6,8,1,0,15,20,11,0,0,17,18,21,8,93,14,12,12,12,19,5,5,5,5,5,9,0,0,0,93,0,1,15,9,0,1,15
-5,5,5,5,20,12,11,93,0,0,15,9,0,93,92,1,15,5,20,11,0,92,15,8,93,93,15,5,5,5,21,6,6,6,6,18,9,0,96,92,0,93,14,19,9,92,14,19
-5,5,5,5,5,5,20,11,0,14,19,9,71,71,1,93,17,18,5,20,11,0,17,0,0,0,15,5,21,6,8,93,93,1,0,15,20,11,93,93,14,12,19,21,8,93,15,5
-5,5,21,6,6,6,6,8,92,15,5,9,71,93,0@20,0,93,15,5,5,9,0,93,0,0,93,17,6,8,0,0,0,14,11,1,17,18,20,11,1,17,6,18,9,0,93,17,18
-5,21,8,94,0,0,1,0,94,15,21,8,71,1,0,0,0,15,5,5,9,1,93,0,93*0,92,0,0,1,0,14,12,19,9,0,1,17,18,9,93@15,0,0,15,9,1,1,0,15
-5,9,71,0,14,12,12,12,12,19,9,71,71,0@3,91,0,1,15,5,5,9,93,0,0,0,1,93,14,12,12,19,21,6,8,0,92,0,17,8,96,14,12,19,9,0,93,93@14,15
-21,8,71,0,17,6,6,18,5,5,20,12,11,0,0,0,93,17,18,5,9,93,0,93,1,93,14,19,5,5,21,8,0,0,1,0,1,96,0,1,15,5,21,8,71,1,0,15
-9,71,71,0,0,0,0,17,6,18,5,5,20,11,0,0,0,0,17,18,9,71,71,0,1,14,19,5,21,6,8,0,91,0,93,96,0,0,0,92,15,5,9,71,71,0,0,15
-9,71,71,93,0,92,93,93,1,17,6,18,5,9,92,0,0,93,93,15,9,71,71,0@4,14,19,5,21,8,93,0,93,94,94,93,71,71,71,0,14,19,21,8,71,93,93,94,15
-9,71,71,1,0,0,0,0,92,0,0,17,6,18,12,11,92,93,0,15,20,11,71,14,19,21,6,8,0,93,0,0,93,0,71,71,14,12,12,19,5,9,71,71,71,0,96,15
-9,71,71,71,1,93,91,1,0,93,1,92,0,15,5,20,11,0,93,17,18,20,12,19,21,8,93,93,92,14,12,12,12,12,12,12,19,5,5,5,5,9,71,1,71,1,0,15
-20,11,71,71,93,92,0,0,92,0,1,1,0,17,18,5,20,11,0,1,15,5,5,21,8,93,93,14,12,19,5,5,5,5,5,5,5,5,5,5,5,9,71,0,91,0,92,15
-5,20,11,1,0,0,92,0,1,1,96,93,0@19,0,17,6,18,20,11,1,15,5,21,8,93,93,14,19,5,5,139,139,139,139,139,139,139,139,139,139,139,9,71,0,0,0,0,15
-5,5,20,12,12,11,94,93,1,0,0,1,0,0,0,96,15,5,9,93,15,21,8,0,94,14,19,5,5,5,139,210&22,210,210&22,210,210$3,210@26,210,210,214:4,139,9,93,1,93,1,0,15
-5,5,5,5,5,20,12,11,1,0,92,0,0,0,93,0,15,5,9,1,17,8,93,0,14,19,5,5,21,6,139,210,210@22,216,210$2,216,210$5,210$4,210,210@30,139,9,1,1,96,0,0,15
-5,5,5,5,5,5,5,9,94,14,11,96,1,0,14,12,19,21,8,93,94,93,1,14,19,21,6,6,8,0&22,149!0,139,210:2&22,210&21,210,210,210,210,218@27,210,139,20,11,0,0,94,14,19
-5,5,5,5,5,21,6,8,92,15,20,12,12,12,19,5,21,8,1,0,93,14,12,19,21,8,0$0,0@21,0,93,1:1,140,210:2,210,210&22,210,210,210,218@31$9,210:5,139,5,20,11,94,0,15,5
-5,5,5,5,5,9,93,0,93,15,5,5,21,6,6,6,8,0,0,96,93,17,6,6,8,93,0,14,11,92,139,139,210:2,210&22,210,210@25,210,210,218@28,210,139,5,5,9,92,1,17,18
-5,5,5,21,6,8,0,14,12,19,21,6,8,0@5,0,0,92,0@8,0,92*3,0,93,1,0,93$1,1&22,14,19,20,12,139,210,210@23,216,210$6,216,210$8,210,210@29,210@32,139,5,5,9,1,1,96,15
-5,5,5,9,92,0,1,17,18,5,9,1,0,1,96,0,1,0,1,0,91,1,93,93,14,12,19,5,5,5,139,210&22,210,210@24,210&23,210$7,210,210,210,214,139,5,5,20,12,11,0,15
-5,5,21,8,71,0,0@17,92,15,5,20,12,11,93,1,0@6,93,93,0,0,93,0,1,92,15,5,5,5,5,5,139,139,139,139,139,139,139,139,139,139,139,5,5,5,21,8,0,15
-5,21,8,71,71,93,1,0,17,6,18,5,20,12,12,12,12,11,0@7,71,71,71,93,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,6,8,1,0,15
-5,9,71,71,71,93,92,1,0,0,17,18,5,5,5,5,5,9,71,71,71,71,14,12,19,5,5,5,21,6,6,6,6,6,18,5,5,21,6,6,8,0,93,0,0,0,14,19
-5,9,71,71,71,91,92,0,1,93,0,17,6,18,5,5,5,20,12,12,12,12,19,5,5,21,6,6,8,0,0,93,0,0,17,6,18,9,0,0,0,0,14,12,12,12,19,5
-5,9,71,71,1,0,0,0,0*2,92,92,0,0,17,6,18,21,6,6,6,18,5,5,5,5,9,92,0,94,93,93,0,96,0,92,0,17,8,0,14,12,12,19,5,5,5,5,5
-5,20,11,71,71,1,0,92,0,93@9,0,94,0,1,92,17,8,0,0@18,0,17,18,5,21,6,8,93,93,0,1,0,0,0,0,0,0,0,93,0,17,18,5,5,5,21,6,18,5
-5,5,20,11,0,0,0,0,93,1,1,92,1,1,1,0,0,0,0,0,0,17,6,8,1,93,0,93,0,0,94,0,0@10,1,91,0,94,91,0,96,17,6,6,18,9,0@33,15,5
-5,5,5,20,12,12,11,0,96,0,0,0,1,92,93,14,12,12,12,11,1,0,93,0,0,0,0,92,96,0,0,0,91,0,1,0,1,1,91,92,0,93,71:99,16,10,0@34,15,5
-5,5,5,5,5,21,8,94:0,14,11,0,0,0,93,1,15,5,5,5,20,12,12,11,0,0,0,0,0,14,11,0,1,1,0,91,0,0,1,92,93,1,96,71,15,20,12,19,5
-5,5,5,5,21,8,0,92,15,9,0,92,0@0,14,12,19,5,5,5,5,5,5,9,71,0,1,14,12,19,20,11,0,91,0,0,0,91,1,94,94,71,71,71,15,5,5,5,5
-5,5,5,5,9,0,0,14,19,20,12,12,12,19,5,5,5,5,5,5,5,5,9,71,71,71,15,5,5,5,20,12,12,11,0,1,0,71,71,71,71,71,71,15,5,5,5,5
-5,5,5,5,9,93<^>,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,12,12,19,5,5,5,5,5,5,20,12,12,12,12,12,12,12,12,12,19,5,5,5,5
-5,5,5,5,9,92,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,9,93,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,9,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,9,1,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,71,71,71,0@1,92,1,5,5,5,5,5,5,5,5,5,5,0,0,92,5,5,5,5,0,96,0,93,1,0,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,1,92,0,0,71,1,1,0,0,5,5,5,1,1,0,93,5,5,0,93@12,93,0,92,0,0,93,1,5,5,5,5,0,0,93,1,0,5,5,5,5,5,5
+5,5,5,0,0,1,96,93,0,1,96,92,0,1,1,0,94,1,93,5,5,0,0,93,0,92,1,92,92,96,1,93,93,5,5,5,5,5,5,71,1,0,0,93,93,5,5,5
+5,5,1,0,92,1,92,0,1,94,93,0,0,0,5,5,96,0,93,5,5,5,5,0,94v,96,93,91,96,92,0,1,0,5,5,5,5,5,5,71,0,0*1,0,92,0,94,5,5
+5,0,93,0,0,0,94,92,1,0,0,0,92,0,5,5,5,5,5,5,5,5,5,5,5,0,92,71,71,0,0,5,5,5,5,5,5,5,5,0,92,96,1,0,0,0,5,5
+5,0,0,1@11,0,71,71,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,0,5,5,5,5,5,5,5,1,1,1,93,0,71,71,0,93,0,5
+5,96,1,0,0@2,71,71,5,5,5,5,5,5,5,5,5,0,0,93,0@13,1,96,0,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,92,0,5,5,71,71,94,0,5
+5,94,0,0,0,71,71,5,5,5,5,5,5,5,5,5,92,5,5,5,5,5,0,93,5,5,5,5,5,5,5,5,5,5,0,0,0,5,5,5,5,5,5,5,71,92,1,5
+5,5,0,0,0,93,1,5,5,5,5,5,5,5,5,0,93,5,5,5,5,5,93,5,5,5,5,5,5,5,93,0,0,93,1,5,5,5,5,5,5,5,5,5,5,5,0,5
+5,5,0,0,1,0,92,0,5,5,5,5,5,5,5,0,1,93,1,5,5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,0,93,0,5,5,5,5,0,5
+5,5,5,5,1,1,0,93,0,96,5,5,5,5,5,0,5,5,94,93,5,5,5,5,5,93,0,0,0,92,5,5,5,5,5,5,5,71,0,0,0@16,93,1,5,5,5,93,5
+5,5,5,5,5,0,1,0,93,0,5,5,5,5,1,0,5,5,5,0,0,5,5,5,5,93,5,5,5,5,5,5,5,5,5,5,5,0,0,0,93,0,1,5,5,0,1,5
+5,5,5,5,5,5,5,93,0,0,5,5,0,93,92,1,5,5,5,5,0,92,5,5,93,93,5,5,5,5,5,5,5,5,5,5,5,0,96,92,0,93,5,5,5,92,5,5
+5,5,5,5,5,5,5,5,0,5,5,5,71,71,1,93,5,5,5,5,5,0,5,0,0,0,5,5,5,5,5,93,93,1,0,5,5,5,93,93,5,5,5,5,5,93,5,5
+5,5,5,5,5,5,5,5,92,5,5,5,71,93,0@20,0,93,5,5,5,5,0,93,0,0,93,5,5,5,0,0,0,5,5,1,5,5,5,5,1,5,5,5,5,0,93,5,5
+5,5,5,94,0,0,1,0,94,5,5,5,71,1,0,0,0,5,5,5,5,1,93,0,93*0,92,0,0,1,0,5,5,5,5,0,1,5,5,5,93@15,0,0,5,5,1,1,0,5
+5,5,71,0,5,5,5,5,5,5,5,71,71,0@3,91,0,1,5,5,5,5,93,0,0,0,1,93,5,5,5,5,5,5,5,0,92,0,5,5,96,5,5,5,5,0,93,93@14,5
+5,5,71,0,5,5,5,5,5,5,5,5,5,0,0,0,93,5,5,5,5,93,0,93,1,93,5,5,5,5,5,5,0,0,1,0,1,96,0,1,5,5,5,5,71,1,0,5
+5,71,71,0,0,0,0,5,5,5,5,5,5,5,0,0,0,0,5,5,5,71,71,0,1,5,5,5,5,5,5,0,91,0,93,96,0,0,0,92,5,5,5,71,71,0,0,5
+5,71,71,93,0,92,93,93,1,5,5,5,5,5,92,0,0,93,93,5,5,71,71,0@4,5,5,5,5,5,93,0,93,94,94,93,71,71,71,0,5,5,5,5,71,93,93,94,5
+5,71,71,1,0,0,0,0,92,0,0,5,5,5,5,5,92,93,0,5,5,5,71,5,5,5,5,5,0,93,0,0,93,0,71,71,5,5,5,5,5,5,71,71,71,0,96,5
+5,71,71,71,1,93,91,1,0,93,1,92,0,5,5,5,5,0,93,5,5,5,5,5,5,5,93,93,92,5,5,5,5,5,5,5,5,5,5,5,5,5,71,1,71,1,0,5
+5,5,71,71,93,92,0,0,92,0,1,1,0,5,5,5,5,5,0,1,5,5,5,5,5,93,93,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,0,91,0,92,5
+5,5,5,1,0,0,92,0,1,1,96,93,0@19,0,5,5,5,5,5,1,5,5,5,5,93,93,5,5,5,5,139,139,139,139,139,139,139,139,139,139,139,5,71,0,0,0,0,5
+5,5,5,5,5,5,94,93,1,0,0,1,0,0,0,96,5,5,5,93,5,5,5,0,94,5,5,5,5,5,139,210&22,210,210&22,210,210$3,210@26,210,210,214:4,139,5,93,1,93,1,0,5
+5,5,5,5,5,5,5,5,1,0,92,0,0,0,93,0,5,5,5,1,5,5,93,0,5,5,5,5,5,5,139,210,210@22,216,210$2,216,210$5,210$4,210,210@30,139,5,1,1,96,0,0,5
+5,5,5,5,5,5,5,5,94,5,5,96,1,0,5,5,5,5,5,93,94,93,1,5,5,5,5,5,5,0&22,149!0,139,210:2&22,210&21,210,210,210,210,218@27,210,139,5,5,0,0,94,5,5
+5,5,5,5,5,5,5,5,92,5,5,5,5,5,5,5,5,5,1,0,93,5,5,5,5,5,0$0,0@21,0,93,1:1,140,210:2,210,210&22,210,210,210,218@31$9,210:5,139,5,5,5,94,0,5,5
+5,5,5,5,5,5,93,0,93,5,5,5,5,5,5,5,5,0,0,96,93,5,5,5,5,93,0,5,5,92,139,139,210:2,210&22,210,210@25,210,210,218@28,210,139,5,5,5,92,1,5,5
+5,5,5,5,5,5,0,5,5,5,5,5,5,0@5,0,0,92,0@8,0,92*3,0,93,1,0,93$1,1&22,5,5,5,5,139,210,210@23,216,210$6,216,210$8,210,210@29,210@32,139,5,5,5,1,1,96,5
+5,5,5,5,92,0,1,5,5,5,5,1,0,1,96,0,1,0,1,0,91,1,93,93,5,5,5,5,5,5,139,210&22,210,210@24,210&23,210$7,210,210,210,214,139,5,5,5,5,5,0,5
+5,5,5,5,71,0,0@17,92,5,5,5,5,5,93,1,0@6,93,93,0,0,93,0,1,92,5,5,5,5,5,5,139,139,139,139,139,139,139,139,139,139,139,5,5,5,5,5,0,5
+5,5,5,71,71,93,1,0,5,5,5,5,5,5,5,5,5,5,0@7,71,71,71,93,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,1,0,5
+5,5,71,71,71,93,92,1,0,0,5,5,5,5,5,5,5,5,71,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,93,0,0,0,5,5
+5,5,71,71,71,91,92,0,1,93,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,93,0,0,5,5,5,5,0,0,0,0,5,5,5,5,5,5
+5,5,71,71,1,0,0,0,0*2,92,92,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,92,0,94,93,93,0,96,0,92,0,5,5,0,5,5,5,5,5,5,5,5,5
+5,5,5,71,71,1,0,92,0,93@9,0,94,0,1,92,5,5,0,0@18,0,5,5,5,5,5,5,93,93,0,1,0,0,0,0,0,0,0,93,0,5,5,5,5,5,5,5,5,5
+5,5,5,5,0,0,0,0,93,1,1,92,1,1,1,0,0,0,0,0,0,5,5,5,1,93,0,93,0,0,94,0,0@10,1,91,0,94,91,0,96,5,5,5,5,5,0@33,5,5
+5,5,5,5,5,5,5,0,96,0,0,0,1,92,93,5,5,5,5,5,1,0,93,0,0,0,0,92,96,0,0,0,91,0,1,0,1,1,91,92,0,93,71:99,5,5,0@34,5,5
+5,5,5,5,5,5,5,94:0,5,5,0,0,0,93,1,5,5,5,5,5,5,5,5,0,0,0,0,0,5,5,0,1,1,0,91,0,0,1,92,93,1,96,71,5,5,5,5,5
+5,5,5,5,5,5,0,92,5,5,0,92,0@0,5,5,5,5,5,5,5,5,5,5,71,0,1,5,5,5,5,5,0,91,0,0,0,91,1,94,94,71,71,71,5,5,5,5,5
+5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,0,1,0,71,71,71,71,71,71,5,5,5,5,5
+5,5,5,5,5,93<^>,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,92,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,93,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
diff --git a/rsrc/scenarios/valleydy/towns/town19.map b/rsrc/scenarios/valleydy/towns/town19.map
index 8b57a874d..9edac45cd 100644
--- a/rsrc/scenarios/valleydy/towns/town19.map
+++ b/rsrc/scenarios/valleydy/towns/town19.map
@@ -2,29 +2,29 @@
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,21,6,6,6,18,21,6,6,6,6,6,18v,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,9,101:0@5@6@7@8@9,0,0,16,10,93,0,0,0,101@10@11@12@13@14,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,20,12,12,12,19,9,0,0@15,105$1,0,0,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,21,8,0@20,0@18,0,0,0@19,0,0,17,18,5,5,5,5,5,5,5,5,5,5,21,6
-5,5,5,5,21,6,6,18,5,9,0,105$0,1,104,0@16,0,0,95,0,15,5,5,5,5,5,5,21,6,6,6,8,0
-5,5,5,21,8,103@3@4,103&22,15,5,9,0,0,0@17,0,0,105@21$2,1,0,0,17,6,18,5,21,6,6,8,97,82,82,82,82
-5,5,5,9,103&22,103&22,14,19,5,9,84,0,0,0,0,0,0,0,0,0,0,17,6,8,0,82:2,82,82<,82,82,82,82
-5,5,5,9,103@0,103@2,15,5,5,20,11,85,86,0,0,0,82,82,82,82,82,82,82:4,82:3,82,82:2,82,82,82,82,0,14
-5,5,5,9,103&22,103@1,17,6,18,5,9,84,0,0,0,82,82,82,82,82,82,82,82:4,82:3,82,82:2,0,0,1,0,0,15
-5,5,5,20,11,0,0,0,15,5,20,11,0,0,82,82,82,0,0,0,0,0,0:4,0:3,0,97,0,14,12,12,12,19
-5,5,5,5,20,12,11,0,15,5,5,9,84,0,82,82,0,0,93,14,11,0,14,12,12,12,12,19,5,5,5,5
-5,5,5,5,5,5,9,0,17,6,18,20,11,0,82,82,0,14,12,19,9,0,17,6,6,18,5,5,5,5,5,5
-5,5,5,5,5,5,9,0,0,0,17,6,8,0,82,82,97,15,5,5,9,0,0,0,97,15,5,5,5,5,5,5
-5,5,5,5,5,5,20,12,11,0,0,0,0,0,82,82,14,19,5,5,20,11,0,0,14,19,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,20,12,12,11,0,82,82,82,17,6,18,5,5,20,11,0,17,6,18,5,5,5,5,5
-5,5,5,5,5,5,5,21,6,18,21,8,82,82,82,0,0,98,17,18,5,5,9,0,0,0,15,5,5,5,5,5
-6,6,6,18,5,5,21,8,98,16,10:1,82,82,82,14,12,11,0,0,17,6,18,20,12,11,0,15,5,5,5,5,5
-0,0,0,17,6,6,8,97,0,16,10:1,82,82,0,15,21,6,11,0,98,98,17,6,18,9,94,17,6,18,5,5,5
-0,0,1,0,0,98,0,0,98,16,10:1,0,14,12,19,9,0,15,12,11,0,98,0,15,9,0,94,94,15,5,5,5
-0,0,0,0,0>,0,85,86,0,15,20,12,19,5,5,20,12,19,5,20,12,11,0,17,8,98,14,12,19,5,5,5
-0,0,0,0,0,0,0,0,98,15,5,5,5,5,21,6,6,6,6,6,6,8,0,0,0,0,15,5,5,5,5,5
-12,12,12,11,0,97,98,84,14,19,5,5,5,5,9,0,0,97,0,0,0,0,0,14,12,12,19,5,5,5,5,5
-5,5,5,20,12,12,12,12,19,5,5,5,5,5,20,12,12,12,12,12,12,12,12,19,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5v,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,101:0@5@6@7@8@9,0,0,5,5,93,0,0,0,101@10@11@12@13@14,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,0,0@15,105$1,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,0@20,0@18,0,0,0@19,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,0,105$0,1,104,0@16,0,0,95,0,5,5,5,5,5,5,5,5,5,5,5,5,0
+5,5,5,5,5,103@3@4,103&22,5,5,5,0,0,0@17,0,0,105@21$2,1,0,0,5,5,5,5,5,5,5,5,97,82,82,82,82
+5,5,5,5,103&22,103&22,5,5,5,5,84,0,0,0,0,0,0,0,0,0,0,5,5,5,0,82:2,82,82<,82,82,82,82
+5,5,5,5,103@0,103@2,5,5,5,5,5,85,86,0,0,0,82,82,82,82,82,82,82:4,82:3,82,82:2,82,82,82,82,0,5
+5,5,5,5,103&22,103@1,5,5,5,5,5,84,0,0,0,82,82,82,82,82,82,82,82:4,82:3,82,82:2,0,0,1,0,0,5
+5,5,5,5,5,0,0,0,5,5,5,5,0,0,82,82,82,0,0,0,0,0,0:4,0:3,0,97,0,5,5,5,5,5
+5,5,5,5,5,5,5,0,5,5,5,5,84,0,82,82,0,0,93,5,5,0,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,0,5,5,5,5,5,0,82,82,0,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,0,0,0,5,5,5,0,82,82,97,5,5,5,5,0,0,0,97,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,0,0,0,0,0,82,82,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,0,82,82,82,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,82,82,82,0,0,98,5,5,5,5,5,0,0,0,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,98,5,5:1,82,82,82,5,5,5,0,0,5,5,5,5,5,5,0,5,5,5,5,5,5
+0,0,0,5,5,5,5,97,0,5,5:1,82,82,0,5,5,5,5,0,98,98,5,5,5,5,94,5,5,5,5,5,5
+0,0,1,0,0,98,0,0,98,5,5:1,0,5,5,5,5,0,5,5,5,0,98,0,5,5,0,94,94,5,5,5,5
+0,0,0,0,0>,0,85,86,0,5,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,98,5,5,5,5,5,5
+0,0,0,0,0,0,0,0,98,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,0,5,5,5,5,5,5
+5,5,5,5,0,97,98,84,5,5,5,5,5,5,5,0,0,97,0,0,0,0,0,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5^,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
diff --git a/rsrc/scenarios/valleydy/towns/town20.map b/rsrc/scenarios/valleydy/towns/town20.map
index d31e70a39..ca69b13d4 100644
--- a/rsrc/scenarios/valleydy/towns/town20.map
+++ b/rsrc/scenarios/valleydy/towns/town20.map
@@ -1,32 +1,32 @@
-5,21,6,6,6,6,6,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-21,8,1,84,84,0,0,15,5,21,6,6,6,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-9,84,14,12,12,12,12,19,21,8,0,0,84,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-9,84,17,18,5,5,5,21,8,0,14,12,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-9,0,0,15,5,5,21,8,0,0,15,5,5,5,5,5,5v,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-20,11,0,17,6,6,8,1,0,14,19,5,5,5,5,5,5,21,6,6,6,6,6,18,5,5,5,5,5,5,5,5
-5,9,0,0,0,1,0,84,0,15,5,5,21,6,6,6,6,8,0,85,86,0,0,17,6,18,5,5,5,5,5,5
-5,20,12,12,12,12,11,84,14,19,21,6,8,0,84,0,0,0,84,0,84,84,1,85,86,17,6,6,18,5,5,5
-6,6,6,18,5,5,9,84,15,21,8,0,0,0,0,0,0,84,85,86,84,84,0,0,84,0,0,75,15,5,5,5
-0,0,0,15,5,5,9,1,17,8,0,84,0,84,0,0,0,85,86,0,14,11,84,0,0,0,84,0,15,5,5,5
-12,11,0,17,6,6,8,0,84,84,0,0,84,0,84,14,12,12,12,12,19,9,85,86,84,84,0,0,17,18,5,5
-5,9,84,0,0:0&9,0:1,0,0,0,0,84,0,1,14,12,19,21,6,6,6,6,8,0,14,11,0,84,84,0,15,5,5
-5,20,12,12,12>,11,0,84,84,85,86,14,12,19,5,5,9,84,1,85,86,0,84,15,9,75,0,0,0,15,5,5
-5,5,5,5,5,20,11,0,85,86,14,19,5,5,21,6,8,0,14,12,12,11,0,15,20,11,85,86,0,15,5,5
-5,5,5,5,5,5,20,12,12,12,19,5,21,6,8,84,0,0,17,6,18,9,0,15,5,9,0,85,86,15,5,5
-5,5,5,5,21,6,18,5,5,5,5,21,8,84,85,86,75,75,75,75,15,9,84,15,21,8,0,0,0,15,5,5
-5,5,5,5,9,0,15,5,21,6,6,8,85,86,75,75,75,75,0$0,75,17,8,0,15,9,75,0,84<,0,15,5,5
-5,5,5,5,9,84,17,6,8,0,0,84,0,75,75,75,75,75,75,75,84,0,84,15,9,84,0,84,75,15,5,5
-5,21,6,18,9,84,0,85,86,84,75,75,75,75,75,75,0$2,75,75,75,84,14,12,19,9,0,0,84,14,19,5,5
-5,9,0,16,10,84,14,11,0,0,75,75,75,75,75,75,75,75,75,0,0,15,5,5,9,0,0,84,15,5,5,5
-21,8,75,15,9,0,15,9,0,84,75,75,75,84$1,75,75,75,75,84,84,14,19,5,5,9,84,0,84,15,5,5,5
-9,0@0,0@1,15,9,0,17,8,0,14,12,11,1,0,75,75,75,75,0,14,19,5,5,5,9,85,86,0,15,5,5,5
-9,0@3,0@4,15,9,85$3,86,0,84,17,18,9,75,75,75,75,75,0,84,15,5,5,5,5,9,0,84,0,15,5,5,5
-9,0@2,84@8,15,9,0,14,11,84,0,17,8,75,75,75,75,75,0,14,19,5,5,5,5,9,0,85,86,15,5,5,5
-9,84@7,0@6,15,9,0,15,20,11,0,84,84,75,75,75,75,84,84,15,5,5,5,5,21,8,0:2,0:2,84:2,15,5,5,5
-9,0@5,14,19,9,0,17,18,9,0,0,84,0,14,11,0,84,14,19,5,5,5,5,9,85,86,84,0,15,5,5,5
-20,12,19,5,9,0,84,17,8,1,14,11,0,17,8,0,0,15,5,5,5,5,21,8,0,0,84,0,15,5,5,5
-5,5,5,5,20,11,0,84,85,86,15,9,84,0,0,84,14,19,5,5,5,5,9,84,84,0^,0,14,19,5,5,5
-5,5,5,5,5,20,12,12,12,12,19,20,12,12,12,12,19,5,5,5,5,5,9,84,84,84,0,15,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,84,14,19,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,1,0,15,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0,15,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,1,84,84,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,84,5,5,5,5,5,5,5,5,0,0,84,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,84,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,0,0,5,5,5,5,5,0,0,5,5,5,5,5,5,5v,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,0,5,5,5,5,1,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,0,0,0,1,0,84,0,5,5,5,5,5,5,5,5,5,0,85,86,0,0,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,84,5,5,5,5,5,0,84,0,0,0,84,0,84,84,1,85,86,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,84,5,5,5,0,0,0,0,0,0,84,85,86,84,84,0,0,84,0,0,75,5,5,5,5
+0,0,0,5,5,5,5,1,5,5,0,84,0,84,0,0,0,85,86,0,5,5,84,0,0,0,84,0,5,5,5,5
+5,5,0,5,5,5,5,0,84,84,0,0,84,0,84,5,5,5,5,5,5,5,85,86,84,84,0,0,5,5,5,5
+5,5,84,0,0:0&9,0:1,0,0,0,0,84,0,1,5,5,5,5,5,5,5,5,5,0,5,5,0,84,84,0,5,5,5
+5,5,5,5,5>,5,0,84,84,85,86,5,5,5,5,5,5,84,1,85,86,0,84,5,5,75,0,0,0,5,5,5
+5,5,5,5,5,5,5,0,85,86,5,5,5,5,5,5,5,0,5,5,5,5,0,5,5,5,85,86,0,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,84,0,0,5,5,5,5,0,5,5,5,0,85,86,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,84,85,86,75,75,75,75,5,5,84,5,5,5,0,0,0,5,5,5
+5,5,5,5,5,0,5,5,5,5,5,5,85,86,75,75,75,75,0$0,75,5,5,0,5,5,75,0,84<,0,5,5,5
+5,5,5,5,5,84,5,5,5,0,0,84,0,75,75,75,75,75,75,75,84,0,84,5,5,84,0,84,75,5,5,5
+5,5,5,5,5,84,0,85,86,84,75,75,75,75,75,75,0$2,75,75,75,84,5,5,5,5,0,0,84,5,5,5,5
+5,5,0,5,5,84,5,5,0,0,75,75,75,75,75,75,75,75,75,0,0,5,5,5,5,0,0,84,5,5,5,5
+5,5,75,5,5,0,5,5,0,84,75,75,75,84$1,75,75,75,75,84,84,5,5,5,5,5,84,0,84,5,5,5,5
+5,0@0,0@1,5,5,0,5,5,0,5,5,5,1,0,75,75,75,75,0,5,5,5,5,5,5,85,86,0,5,5,5,5
+5,0@3,0@4,5,5,85$3,86,0,84,5,5,5,75,75,75,75,75,0,84,5,5,5,5,5,5,0,84,0,5,5,5,5
+5,0@2,84@8,5,5,0,5,5,84,0,5,5,75,75,75,75,75,0,5,5,5,5,5,5,5,0,85,86,5,5,5,5
+5,84@7,0@6,5,5,0,5,5,5,0,84,84,75,75,75,75,84,84,5,5,5,5,5,5,5,0:2,0:2,84:2,5,5,5,5
+5,0@5,5,5,5,0,5,5,5,0,0,84,0,5,5,0,84,5,5,5,5,5,5,5,85,86,84,0,5,5,5,5
+5,5,5,5,5,0,84,5,5,1,5,5,0,5,5,0,0,5,5,5,5,5,5,5,0,0,84,0,5,5,5,5
+5,5,5,5,5,5,0,84,85,86,5,5,84,0,0,84,5,5,5,5,5,5,5,84,84,0^,0,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,84,84,84,0,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,84,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,1,0,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,5,5,5,5,5,5
diff --git a/rsrc/scenarios/valleydy/towns/town6.map b/rsrc/scenarios/valleydy/towns/town6.map
index d01dda962..8cf2a7010 100644
--- a/rsrc/scenarios/valleydy/towns/town6.map
+++ b/rsrc/scenarios/valleydy/towns/town6.map
@@ -1,20 +1,20 @@
-122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,6,6,18,5
-122,170@35,170,199,122,71,71,122,170,170,170,170,122,170,170,170,199,199,201@38,122,170&22,170,170,122,170&22,170,170,122,170,170,170&22,122,199,170,201:0,122,199@13,170,201@11,122,199,170,201@44,122,0@7&22,1&17,17,18
-122,170,170,199,122,170,170,122,185@36,185,196,170,122,199,199@23$31,170,170,170,199$32,122,170&22,170,170,122,170&22,170,170,122,170,170,170&22,123,170,170,170,122,170,170,170,122,170,170,170,122,0@9,0&16,0,15
-122,170,199,170,125,170,170,122,195,195,195,170,122,170,199,170,170,170,199,122,122,133,0,122,122,133,0,122,0,133,122,122,170@10,170,170,122,170,170,170,122,170,170,170,122,0@8&22,0,1,15
-122,122,122,122,122,170,170,122,170,170,170,198,122,170,170,170,199@24$30,170,170,122,108,1,0,108,0v,0,0,108,0,0,0,122,170,170,204,122,170,170,204,122,204,170,170@12,122,0&16,0,0,15
-122,199,170,170@34,125,170,170,125,170,198,185,185@37,122,170,170,170,170,199,170,122,12,11,0,0,0$38,0,0,0,84,14,12,122,122,132!6,125,122,122,132!8,125,122,125,132!7,122,122,122,122,123:1,19
-122,199,170,199,122,170,170,122,122,122,122,122,122,125,122,122,122,122,122,122,5,9,108,1$36,108,0$1,0*3,0,14,19,5,122,170,170,170,170,170,170,170,170,170,170,170,170,233,122,84,15
-122,199,170,170,122,170,170,125,196,170,198,198,122,170,170,170,170,170,170,122,21,8,108$39,0,104,0$37,108,0,17,6,6,122,170,170,170,170,170,170,170,170,170,170,170,170,170,122,0,15
-122,122,122,122,122,170,170,122,170,170,170,170,122,170,187,170,170,187,170,122,8,0&23,0,0$35,0,0,0$33,0,0,108,0,122,170,170,122,170,170,122,122,122,122,122,122,170,170,122,0,15
-122,199@33$24,170,170,122,170,170,122,170,198,196,170,122,170,170,170,170$27,170,170,122,108,0,108,0,0$34,107!3,108,0,0,0,0,122,170,170,122,170,170,122,170,170,170&11,170,122,170,170,122,0,15
-122,170,170,199$23,122,170,170,122,122,122,122,122,122,170,170,170,170,170$29,170,122,1,0,107!2,14,12,12,12,12,11,0,108,122,170,170,122,170,170@6,122,170&11,170,170,170,122,170,170,122,84,15
-122,170,170$25,170,125,170,170,170,170,170,170,170,170,170,170,170$26,192,170,170,125:10,0,0,1,15,5,21,6,6,8,107!4,0,127,170,170,122,170,170,122,170,170,170,170,122,170,170,122,0,15
-122,123,122,122,122,170,170,170,170,170,170,170,170,170,170,170,170,170$28,170,125:10,0,0,0,15,21,8,0,0,0,0,0,127,170,170,122,170:17&9,170:17&9,122,170,170,170&23,170,125,170,170,122,0,15
-122,172,172,191@26,122,170,170,122,122,122,122,122,122,170,170,170,170,170,170,122,0,0,108,15,9,0,0,108,104,108,107!1,122,170,170,122,122,122,122,122,122,122,122,122,170,170,122,0,15
-122,122,122,122,122,170,170,122,199$10,199,199,199,122,170,170,170,170,170,170,122,1,0,14,19,8,1,0,0,14,11,1,134,170,170,122,177,177,177,177,176,170,170,122,170,170,122,0,15
-122,170,170,170,125,170,170,122,170,170,170&22,170,122,170,187,170,170,187,170,122,108,108,15,9,108,1,1,107!0!5,15,9,0,122,170,170,122,170,170,170,170,170,170,170,133,170,170,122,0,15
-122,199,170,170,122,170,170,122,201@25,170,170,170,132!9,170,170,170,170,170,170,122,122,122,122,122,122,85:11,86:11,122,122,122,122,122,170,170,122,170,170,170,170,170,170,170,133,170,170,122,0,15
+122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,5,5,5,5
+122,170@35,170,199,122,71,71,122,170,170,170,170,122,170,170,170,199,199,201@38,122,170&22,170,170,122,170&22,170,170,122,170,170,170&22,122,199,170,201:0,122,199@13,170,201@11,122,199,170,201@44,122,0@7&22,1&17,5,5
+122,170,170,199,122,170,170,122,185@36,185,196,170,122,199,199@23$31,170,170,170,199$32,122,170&22,170,170,122,170&22,170,170,122,170,170,170&22,123,170,170,170,122,170,170,170,122,170,170,170,122,0@9,0&16,0,5
+122,170,199,170,125,170,170,122,195,195,195,170,122,170,199,170,170,170,199,122,122,133,0,122,122,133,0,122,0,133,122,122,170@10,170,170,122,170,170,170,122,170,170,170,122,0@8&22,0,1,5
+122,122,122,122,122,170,170,122,170,170,170,198,122,170,170,170,199@24$30,170,170,122,108,1,0,108,0v,0,0,108,0,0,0,122,170,170,204,122,170,170,204,122,204,170,170@12,122,0&16,0,0,5
+122,199,170,170@34,125,170,170,125,170,198,185,185@37,122,170,170,170,170,199,170,122,5,5,0,0,0$38,0,0,0,84,5,5,122,122,132!6,125,122,122,132!8,125,122,125,132!7,122,122,122,122,123:1,5
+122,199,170,199,122,170,170,122,122,122,122,122,122,125,122,122,122,122,122,122,5,5,108,1$36,108,0$1,0*3,0,5,5,5,122,170,170,170,170,170,170,170,170,170,170,170,170,233,122,84,5
+122,199,170,170,122,170,170,125,196,170,198,198,122,170,170,170,170,170,170,122,5,5,108$39,0,104,0$37,108,0,5,5,5,122,170,170,170,170,170,170,170,170,170,170,170,170,170,122,0,5
+122,122,122,122,122,170,170,122,170,170,170,170,122,170,187,170,170,187,170,122,5,0&23,0,0$35,0,0,0$33,0,0,108,0,122,170,170,122,170,170,122,122,122,122,122,122,170,170,122,0,5
+122,199@33$24,170,170,122,170,170,122,170,198,196,170,122,170,170,170,170$27,170,170,122,108,0,108,0,0$34,107!3,108,0,0,0,0,122,170,170,122,170,170,122,170,170,170&11,170,122,170,170,122,0,5
+122,170,170,199$23,122,170,170,122,122,122,122,122,122,170,170,170,170,170$29,170,122,1,0,107!2,5,5,5,5,5,5,0,108,122,170,170,122,170,170@6,122,170&11,170,170,170,122,170,170,122,84,5
+122,170,170$25,170,125,170,170,170,170,170,170,170,170,170,170,170$26,192,170,170,125:10,0,0,1,5,5,5,5,5,5,107!4,0,127,170,170,122,170,170,122,170,170,170,170,122,170,170,122,0,5
+122,123,122,122,122,170,170,170,170,170,170,170,170,170,170,170,170,170$28,170,125:10,0,0,0,5,5,5,0,0,0,0,0,127,170,170,122,170:17&9,170:17&9,122,170,170,170&23,170,125,170,170,122,0,5
+122,172,172,191@26,122,170,170,122,122,122,122,122,122,170,170,170,170,170,170,122,0,0,108,5,5,0,0,108,104,108,107!1,122,170,170,122,122,122,122,122,122,122,122,122,170,170,122,0,5
+122,122,122,122,122,170,170,122,199$10,199,199,199,122,170,170,170,170,170,170,122,1,0,5,5,5,1,0,0,5,5,1,134,170,170,122,177,177,177,177,176,170,170,122,170,170,122,0,5
+122,170,170,170,125,170,170,122,170,170,170&22,170,122,170,187,170,170,187,170,122,108,108,5,5,108,1,1,107!0!5,5,5,0,122,170,170,122,170,170,170,170,170,170,170,133,170,170,122,0,5
+122,199,170,170,122,170,170,122,201@25,170,170,170,132!9,170,170,170,170,170,170,122,122,122,122,122,122,85:11,86:11,122,122,122,122,122,170,170,122,170,170,170,170,170,170,170,133,170,170,122,0,5
 122,170,170,170@31,122,170,170@32,122,170,170,170,170,126,170,170,170,170,170,170,122,170,170,170,170,85,86,0,170,1,170,170,134,170,170,125,170,170,170,170,170,85,86,0,84,0,122,170,122
 122,170,199,170,122,170,170,122,201,170,170,170,122,170,187,170,170,187,170,122,170,170,170,0,0,0,0,84,170,170,170,134,170,170,122,122,122,122,133,133,0,0,85,86,84,122,170,122
 122,122,122,122,122,170,170,122,170,170&22,170,170,122,170,170,170,170*1,170,170,122,170@1,170&22,170,0,170,84,170,170,0,170&22,170@2,122,170,170,122,191:3,170,191:3,170,0,84,1,0,85,86,122,170,122
diff --git a/rsrc/scenarios/valleydy/towns/town9.map b/rsrc/scenarios/valleydy/towns/town9.map
index 66f85fe1c..46be26ae2 100644
--- a/rsrc/scenarios/valleydy/towns/town9.map
+++ b/rsrc/scenarios/valleydy/towns/town9.map
@@ -1,64 +1,64 @@
-5,122,122,122,122,5,5,5,5,5,5,5,5,5,122,122,122,122,5,5,5,5,5,5,5,21,6,6,6,6,18,5,5,5,5,5,5,5,5,21,6,6,6,6,6,18,5,5,5,21,6,6,6,18,5,5,5,5,5,5,5,5,5,5
-5,122,170:8&9,170:8&9,122,5,5,5,5,5,5,5,5,5,122,170:10&9,170:10&9,122,5,5,5,5,5,5,21,8,255,255,255,255,17,6,6,18,21,6,6,18,5,9,0,0,97,0,0,17,6,6,6,8,0,84,71,15,5,5,5,5,5,5,5,5,5,5
-5,122,170,170,122,5,5,5,5,5,5,5,5,5,122,170,170,122,5,5,21,6,18,5,9,255,255,14,11,255,255,255,255,15,9,0,0,17,6,8,0,93,0,94,98,0,93,93,0,93,0,71,71,15,5,122,6,6,6,6,6,18,5,5
-5,122,170,170,122,5,5,5,5,5,5,5,5,5,122,170,170,122,5,5,9,98,15,5,9,255:29,1,17,8,0,93,0,255,15,9,0,0,0,0,0,0,0,0,93,1,14,12,11,97,0,0$17,0,0,15,5,122,71,71,71,71,71,17,6,18
-5,122,170:19,170:19,132!0,18,5,5,5,5,5,5,5,5,132!1,170:19,170:19,122,133,18,9,98,15,5,9,255,0,98$18,255,255,255,0,93v,15,20,11,0,14,12,12,12,12,12,12,12,19,5,20,11,0,93,0,93,15,5,122,71,96,71,0:26&9,71,71,71,15
-5,133,170,170,170,17,18,5,5,5,5,5,5,5,9,170,170,170,0,17,8,98,15,5,9,255,255,0$19,255,94,1,0&22,0,17,18,9,1,15,21,6,6,6,6,6,6,6,6,18,20,12,11,0,14,19,5,133,96,96$14,96,96$16,96,96,71,15
-21,133,170,170,170,170,15,5,5,5,5,5,5,5,133,170,170,170,170,0,0,0,17,18,20,11,255,0,0,0,255,255,255,0,15,9,0,17,8,0,0,0,0$28,0,0,0,93,17,6,6,8,0,15,5,5,122,0$13,96,0$15,96,96,71,71,15
-9,0,0,170,0,14,19,5,5,5,5,5,5,5,122,0,0,0,170,0,0,0,0,15,5,9,255,255,255,0,0,85,86,98,15,9,0,0,0,98,14,11,0,14,12,11,0,0,0,0,1$30,0,15,5,5,9,96,0,93,93,14,12,12,19
-20,11,0,0,0,17,18,5,122,122,122,133,133,18,20,11,0,0,0,0,0,97,14,19,5,20,12,12,11,0,85,86,0,14,19,20,11,0,1,0,15,9,0$29,15,5,20,12,12,12,11,94,14,19,5,5,20,11,93,0,14,19,122,122,122
-5,9,97,0,93,98,17,18,122,170,170,170,0,17,18,20,11,94,84,0,0,14,19,21,6,6,6,18,9,0,14,11,0:28,17,6,18,9,0,0,0,15,9,1:31,17,6,6,6,18,5,9,0,17,18,5,21,6,8,0,14,19,5,122,194:27@0@1,122
-21,8,0,0,0,0,0,17,122,170,170$47,0,0,0,17,18,20,11,93,0,0,17,6,8,0,71,71,15,9,0,15,9,0,85,86,17,8,84,0,14,19,8,170,170,170,170,170,17,18,20,11,0,15,21,8,0,0,0,15,122,122,122,123,122
-9,97,97,0,98,0,0,0,122,170,0,0,0$46,93,0,17,18,20,12,11,0,0,0,0,98,0,71,15,20,12,19,20,12,11,0,0,0,0,14,122,8,170,170$3,170,170,170,170,170,17,18,9,0,17,8,0,93,14,12,19,133,170$12,170,170,122
-20,12,12,11,0,93,0,98,0,170,93,0$48,93,0,1,0,17,6,6,8,0,0,97,0,0,0,0,15,5,5,5,5,5,20,12,12,11,0,17,122,170,170,170,170,71,170,170,170,170,15,9,0,0,1,0,14,19,21,6,8,0,170$11,170,122
-5,5,5,20,11,0,93,98,0,1,71,71,92,133,84,93,0,1$49,0,1,170,170$44,0,0&19,0,1,14,19,5,5,5,21,6,6,6,18,9,93,0,133,170,170,170,71,71,71,170,170$2,170,122,20,11,0,14,12,19,21,8,93,0,0,0,170$10,122
-5,5,5,5,20,12,11,1,0,92,71,71,133,122,0,0,14,12,12,11,170,170,0,0$43,0,14,19,5,5,5,21,8,84,0,0,15,9,0,0,122,170,170,71,71,189,71,71,170,170,122,21,8,0,15,21,6,8,0,1,0,0,0,170,122
-5,5,5,5,5,21,8,0,0,93,0,93,0,122,84,14,19,5,5,9,94,98,0,0,1,15,5,5,5,5,9,0,98,0,14,19,9,0,14,122,170,170,170,71,71,71,170,170,170,122,9,0,0,15,9,0,0,170,170,0,0,122,122,122
-5,5,5,5,5,9,0,1,98,14,11,93,14,122,12,19,21,6,18,20,12,12,11,0,14,19,5,5,5,5,9,93,0,0,17,6,8,93,15,122,170,170,170,170,71,170$1,170,170,170,15,9,0,0,15,20,11,93,170,170,0,14,19,5,5
-5,5,5,5,5,9,0,14,12,19,9,0,17,18,5,21,8,0,15,5,122,122,122,0,17,134,134,133,134,18,9,93,93,93,0,93,0,0,17,18,11,170,170,170,170,170,170,170,14,19,8,0,94,15,21,8,0,0,93,14,19,5,5,5
-5,5,5,21,6,8,0,15,5,5,9,0,98,15,21,8,0,84,133,122,122,5,9,170,170,170,170,170,170,15,9,97,97,0$22,98,14,11,0,0,17,18,11,170,170,170,170,170,14,19,9,0,0,14,19,9,0,0,14,12,19,5,5,5,5
-5,21,6,8,170,0@18,0,17,6,18,20,12,12,19,9,0,98,0,170,170,132!2,6,8,0,0,0,170,170,170,15,9,0@17,93,98,93,15,20,11,0,0,15,20,12,12,12,11,0:31,15,21,8,0,1,17,6,8,0,14,19,21,6,6,6,18,5
-5,9,170,84,170,170,0,0,0,17,6,18,5,21,8,0,0$42,170,170,170,129,170,170,170,170,0,84,170,170,15,9,0,0,98,93$21,15,5,20,11,0,17,6,18,21,6,8,0,17,8,170,0,0,0,0,0,0,15,21,8,94,0,0,15,5
-5,9,196,170,170,170,170,0,0,0,98,15,5,9,0,0,0,170,170,170,122,11,170,170,85,86,0,0,0@16,15,122,0,93,0,0,17,18,5,9,0,0,0,17,8,0,0,170$27,170,170,170,14,11,98,14,12,12,19,9,0,0,0$9,0,17,18
-5,9,170,170,84,170,170,85,86,0,0,17,6,8,0,98,85,86,170$41,170,133,9,170,1,0,0,85,86,14,19,122,0,0,84,0,84,15,5,9,0,0,0,0,0,0,14,122,122,122,122,19,20,12,19,5,5,21,8,0,0,0,98,0,15
-5,20,11,0,14,11,85,86,0,0,0,0,0,0,0,98,0,98,133,122,122,122,170,0,133,134,12,12,19,5,122,12,11,1,0,0,15,21,8,0,14,12,12,12,12,19,21,6,6,6,6,18,5,21,6,6,8,98,0,0,0,0,98,15
-5,5,9,0,15,20,11,0,0,97,14,12,12,11,0,93,0,98,15,5,21,8,0,14,19,5,5,5,5,5,122,5,20,12,12,12,19,9,0,0,15,5,5,5,5,21,8,0,94$6,93,0,17,6,8,0,0,0,0,0,97,0,93,93$8,15
-5,5,9,0,15,5,20,12,12,12,19,5,5,20,12,12,11,0,15,21,8,0,0,15,5,5,21,122,122,122,122,122,5,21,6,6,6,8,0,14,19,5,5,5,21,8,0,1$5,1,98,0,0,0,0,0,14,12,11,0,0,0,0,14,19
-5,21,8,0,17,6,18,5,5,21,6,6,122,21,6,18,9,0,15,9,0,0,14,19,5,21,8,0,0,170$55,170,122,21,8,0,97,0,0,0,17,6,18,5,5,9,93,93$4,0,0,0,0,1,14,12,12,19,5,20,11,0,0$7,93,15,5
-122,8,84,98,0,98,15,5,5,9,0,0,133,9,170$50,15,20,12,19,9,0,14,19,21,6,8,0,0$53,170,170,170,122,9,0,0$25,0,0,0,84,0,0,17,6,6,8,93,93,93,0,0,0,0,17,18,5,5,5,5,9,93,0,0,15,5
-122,170,170,170,170,0,17,6,6,8,1,14,122,9,170,15,5,5,21,8,0,15,21,8,85,86,170,170&22,170,0$54,170,122,9,0,0,85$24,86,0,0,93,0,0,0,98,0,0,0,94,0,14,11,0,0,17,6,122,122,122,20,12,12,13,19,5
-122,170,170,170,0,84,0,97,0,0,0,15,133,122,134,122,122,6,8,94,0,15,9,0,0,0,170,0,0&19,0,14,19,9,97,0$26,0,97,93,1,0,98,0,0,14,12,12,12,12,12,19,20,11,93,0,171,170,170,122,5,5,21,7,18,5
-122,122,129,122,84,0,98$39,98,98,1,1,15,122,170,170,170,0,98,92,0,0,17,8,170,170,0,0,0,0,84,15,5,20,11,0,0,85,86,98,14,11,0,14,19,5,5,5,5,5,5,5,9,0,97,171,187,171:25,122,5,5,9,0,17,18
-122,9,170,170,85,86$40,0,0,0$38,14,12,19,122,170,170,170,85,86,71,91,1,0,170,0,170,0,0,0,14,12,19,5,5,20,12,12,13,12,12,19,20,12,19,5,5,5,5,5,5,5,5,20,12,11,170,171:25,171,17,18,5,9,0&22&17,0&22,15
-122,9,170,170,170>,0&20,0,98,98,17,18,21,122,84,170,85,86,92,1,0,0@15,14,11,0,170,170,0,14,19,5,5,122,122,122,122,122,133,122,122,122,5,5,122,133,122,122,122,122,122,122,122,122,122,20,12,11,0,0,17,18<,20,11,0&22&17,15
-122,20,11,85,86,98,0$37,0,93,93,15,9,0,0,0,0,0,0,0,0,0,15,9,170,170,0,0,15,122,5,5,122,71,170,170,170,170,170,192,122,122,122,122,170,170,197,170,197,170,197,170$56,191:33,122,5,5,20,11,0,0,15,5,20,12,19
-5,5,20,11,0,0@19,0,0,0,0,17,8,0,0,0,98,0,98,1,14,12,19,20,11,0,0,171,17,122,5,5,122,71,71,170,170,170,170,170,125,170,170,125,170,170,185@2,170,185@3,170,185@4,170,191:32,122,5,5,5,9,0,0,15,5,5,5,5
-5,5,5,20,11,0,14,11,93,0,0,0,0,0,0,0@14,14,12,12,19,5,5,5,20,122,0,171:24,171:24,122,18,5,122,71,170,170,170,170,170,192,122,122,122,122,170,170,195,170,195,170,195,170$57,191:32,122,5,5,21,8,0$0,14,19,5,5,5,5
-5,122,122,18,9,0,15,20,11,0,0,0,93,0,0,0,15,5,5,5,5,5,5,5,122,122,122,0,0,15,5,122,122,122,122,127,122,122,122,122,5,5,122,122,122,122,122,122,122,122,122,122,122,5,5,9,0,0,17,6,6,18,5,5
-5,122,170,17,8,0,17,18,9,97,0,133,122,122,122,122,122,122,122,5,5,5,5,5,5,5,20,11,0&10,17,6,6,18,5,9,170,15,5,5,21,6,6,6,18,21,6,6,6,6,18,5,5,5,21,6,8,0,0,0,1&10,1,15,5,5
-5,122,170,0,0,0,170,15,9,0,0,0,122,175@5@6@7,170,175:23,170,175:23,122,122,122,122,122,122,5,5,5,9,0,0,0,0,15,5,20,12,19,5,5,9,0,1,0,17,8,0,0&10,94,0,17,18,5,5,9,0&10,0,1,0,0&10,97,0&10,15,5,5
-5,122,170,0,0,0,170,122,9,98,0,0,122,195,170,195,170,195,122,186,170$33,170,170,122,5,5,21,8,0,14,11,0,17,6,6,6,6,6,18,20,11,0,94,93,0,1,97,94,0,0,15,5,21,8,0,0,0,0,0,0,1,15,5,5
-5,122,0,170$36,170,0$35,170,122,9,0,0,0,122,170,170,170,170,204,122,195:20,170,170,170,122,5,21,8,0,0,15,9,0,0,0,0,0&10,0&10,0,17,18,9,94,93,0$23,94,93,93&10,94,0,14,19,21,8,170,0,84,0,0$20,0,0,14,19,5,5
-5,20,11,0,0,0,14,122,20,11,170,170,122,122,122,122,122,252,122,122,170,170,170,122,5,9,0,0,14,19,9,0,0,0,0,97,0&10,0,0,17,8,0,93,1,0,0,0,14,12,19,21,8,170,170,84,0,0,1,0,14,19,5,5,5
-5,5,20,12,12,13,19,5,5,9,170,170,125,170,170,170,170,170@13,170,252,204,170,170,122,5,9,0&10,14,19,5,20,11,0,0,0,0,0,0,0,0,0,0,0,14,11,0,14,19,21,6,8,0,0,85,86,0,14,11,0,17,18,5,5,5
-5,5,21,6,6,7,6,6,6,133,170,170,122,122,122,125,122,122,125,122,122,122,122,122,5,9,0,17,6,6,18,9,0&10,97,0,0,0,0,0,14,11,0,14,19,9,0,17,6,8,85,86,0,0,0,1&10,14,19,9,0,0,15,5,5,5
-5,122,8,170,170,170,170,187,170,122,170,170,122,170,170,170,170,122,170,0,0&19,103,103$32,133,18,9,85,86,85&10,86&10,15,9,0,0&10,0,1,1,14,12,19,20,12,19,5,9,0,0,0,0&10,97,85,86,0,0,14,19,5,20,11,0,15,5,5,5
-5,122,170,193,170:12&9,170,170,170,170,122,170,170,122,170&21,170,170,170,122,170,170,84,103$31,103,84,15,20,12,12,12,12,19,20,12,11,0,14,12,19,21,6,6,6,6,18,9,0,0,0,0,0&10,0,0,85,86,15,5,5,21,8,0,17,18,5,5
-5,122,170,0,0,84,170,187,170,133,170,170,122,170,170,170@12,170&21,122,170,84,0,85,86,133,19,5,21,6,6,6,18,5,21,8,0,15,5,5,9,0,0&10,0,0,15,20,12,12,12,12,12,12,12,12,12,19,5,122,133,0,0,0&10,17,18,5
-5,122,85,86,84,170,170,170,170,122,170,170,122,173,170,170,170,122,170&19,170,0,84,85,86,15,21,8,0,94,0&10,15,21,8,0,0,15,21,6,8,0&10,97,0,0,15,5,5,122,122,122,122,122,133,122,5,5,5,122,0&10,0,0,0,0,15,5
-5,122,123,122,122,122,122,122,122,122,125:2,125:2,122,122,122,122,122,122,122,122,122,122,122,122,19,9,0,0,0,0,17,8,0,0,14,19,9,96,0,0,0,0,14,19,5,5,122,8,170,170&10,170,170,122,122,122,122,133,0,0,98,93,0,15,5
-5,122,170,194@20,122,170,170,170,170,170,170,170,170,170,122,5,5,5,5,5,5,5,5,5,5,9,0&10,97,0,84,0,93,0,14,19,21,8,96,0,0,0,0,17,6,18,21,122,170,170,187,170&10,170,0,15,5,5,9,98,93,0,71,71,15,5
-5,122,122,122,122,170,187,170,187,170,187,170,187,170,122,5,5,5,21,6,6,6,18,5,5,9,0,84,0,0$34,85,86,0,15,5,9,96,0,0,0,0,0,0,0,17,8,0,0,0$59,0,0,170,0,17,6,6,8,0,0,93,93,71,15,5
-5,5,5,5,122,170@11,170,170,170,170,170,170,170,170@9,122,5,5,21,8,103,0,0&10,17,18,5,20,12,11,84,1,0$45,85,86,15,5,9,0,0,0,1,14,12,11,0,0,0,0$58,0,170,0,0,0,0,0,0,0,0,0,0,0,0,93,15,5
-5,5,5,5,122,170,170,170,170,170,170,170,170@10,170,122,5,5,9,103,103,0,0,0,17,6,6,18,20,12,11,0,14,12,19,5,20,11,0,0,0&10,15,5,20,11,0,0,0,0,170&10,187,170,0,0,14,12,11,0,0,98,97,0,14,19,5
-5,5,5,5,122,170,187,170$51,187,170,187,170$52,187,170,122,5,5,9,103,0,1,0,0,0:36,0,0,17,6,6,8,0,17,6,6,6,6,8,0,0,14,19,5,5,20,11,0,0,1,170,170,170,0&10,14,19,5,20,12,11,0,0,0,15,5,5
-5,5,5,5,122,170,170,170,170,170,170,170,170,170@8,122,5,5,9,0&10,0,103,1,14,12,11,1,0,1,0,0,0,0,0,0,0,0&10,0,1,14,19,5,5,5,5,20,12,122,122,122,122,133,122,19,5,5,5,5,20,12,12,12,19,5,5
-5,122,122,122,122,122,122,122,149!3,149!4,149!5,122,122,122,122,5,5,20,12,12,12,12,19,5,20,12,12,11,0,14,12,12,12,11,0,14,12,12,19,5,21,6,6,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,5,5,5,5
-5,5,5,5,5,5,9,0,82,82,82,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,19,5,5,5,20,12,19,5,5,5,5,9,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,5,5,5,5
-5,5,5,5,5,5,9,0,82,82,82,0,0,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,5,5,5,5
-5,5,5,5,5,5,20,11,0,82,82^,82,0,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,5,5,5,5
-5,5,5,5,5,5,5,20,11,0,82,82,82,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,122,122,122,122
-5,5,5,5,5,5,5,5,9,0,82,82,82,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,9,0,82,82,82,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,9,0,82,82,82,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,5,5,5,5,9,0,82,82,82,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,122,122,122,122,5,5,5,5,5,5,5,5,5,122,122,122,122,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,122,170:8&9,170:8&9,122,5,5,5,5,5,5,5,5,5,122,170:10&9,170:10&9,122,5,5,5,5,5,5,5,5,255,255,255,255,5,5,5,5,5,5,5,5,5,5,0,0,97,0,0,5,5,5,5,5,0,84,71,5,5,5,5,5,5,5,5,5,5,5
+5,122,170,170,122,5,5,5,5,5,5,5,5,5,122,170,170,122,5,5,5,5,5,5,5,255,255,5,5,255,255,255,255,5,5,0,0,5,5,5,0,93,0,94,98,0,93,93,0,93,0,71,71,5,5,122,5,5,5,5,5,5,5,5
+5,122,170,170,122,5,5,5,5,5,5,5,5,5,122,170,170,122,5,5,5,98,5,5,5,255:29,1,5,5,0,93,0,255,5,5,0,0,0,0,0,0,0,0,93,1,5,5,5,97,0,0$17,0,0,5,5,122,71,71,71,71,71,5,5,5
+5,122,170:19,170:19,132!0,5,5,5,5,5,5,5,5,5,132!1,170:19,170:19,122,133,5,5,98,5,5,5,255,0,98$18,255,255,255,0,93v,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,0,93,0,93,5,5,122,71,96,71,0:26&9,71,71,71,5
+5,133,170,170,170,5,5,5,5,5,5,5,5,5,5,170,170,170,0,5,5,98,5,5,5,255,255,0$19,255,94,1,0&22,0,5,5,5,1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,133,96,96$14,96,96$16,96,96,71,5
+5,133,170,170,170,170,5,5,5,5,5,5,5,5,133,170,170,170,170,0,0,0,5,5,5,5,255,0,0,0,255,255,255,0,5,5,0,5,5,0,0,0,0$28,0,0,0,93,5,5,5,5,0,5,5,5,122,0$13,96,0$15,96,96,71,71,5
+5,0,0,170,0,5,5,5,5,5,5,5,5,5,122,0,0,0,170,0,0,0,0,5,5,5,255,255,255,0,0,85,86,98,5,5,0,0,0,98,5,5,0,5,5,5,0,0,0,0,1$30,0,5,5,5,5,96,0,93,93,5,5,5,5
+5,5,0,0,0,5,5,5,122,122,122,133,133,5,5,5,0,0,0,0,0,97,5,5,5,5,5,5,5,0,85,86,0,5,5,5,5,0,1,0,5,5,0$29,5,5,5,5,5,5,5,94,5,5,5,5,5,5,93,0,5,5,122,122,122
+5,5,97,0,93,98,5,5,122,170,170,170,0,5,5,5,5,94,84,0,0,5,5,5,5,5,5,5,5,0,5,5,0:28,5,5,5,5,0,0,0,5,5,1:31,5,5,5,5,5,5,5,0,5,5,5,5,5,5,0,5,5,5,122,194:27@0@1,122
+5,5,0,0,0,0,0,5,122,170,170$47,0,0,0,5,5,5,5,93,0,0,5,5,5,0,71,71,5,5,0,5,5,0,85,86,5,5,84,0,5,5,5,170,170,170,170,170,5,5,5,5,0,5,5,5,0,0,0,5,122,122,122,123,122
+5,97,97,0,98,0,0,0,122,170,0,0,0$46,93,0,5,5,5,5,5,0,0,0,0,98,0,71,5,5,5,5,5,5,5,0,0,0,0,5,122,5,170,170$3,170,170,170,170,170,5,5,5,0,5,5,0,93,5,5,5,133,170$12,170,170,122
+5,5,5,5,0,93,0,98,0,170,93,0$48,93,0,1,0,5,5,5,5,0,0,97,0,0,0,0,5,5,5,5,5,5,5,5,5,5,0,5,122,170,170,170,170,71,170,170,170,170,5,5,0,0,1,0,5,5,5,5,5,0,170$11,170,122
+5,5,5,5,5,0,93,98,0,1,71,71,92,133,84,93,0,1$49,0,1,170,170$44,0,0&19,0,1,5,5,5,5,5,5,5,5,5,5,5,93,0,133,170,170,170,71,71,71,170,170$2,170,122,5,5,0,5,5,5,5,5,93,0,0,0,170$10,122
+5,5,5,5,5,5,5,1,0,92,71,71,133,122,0,0,5,5,5,5,170,170,0,0$43,0,5,5,5,5,5,5,5,84,0,0,5,5,0,0,122,170,170,71,71,189,71,71,170,170,122,5,5,0,5,5,5,5,0,1,0,0,0,170,122
+5,5,5,5,5,5,5,0,0,93,0,93,0,122,84,5,5,5,5,5,94,98,0,0,1,5,5,5,5,5,5,0,98,0,5,5,5,0,5,122,170,170,170,71,71,71,170,170,170,122,5,0,0,5,5,0,0,170,170,0,0,122,122,122
+5,5,5,5,5,5,0,1,98,5,5,93,5,122,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,93,0,0,5,5,5,93,5,122,170,170,170,170,71,170$1,170,170,170,5,5,0,0,5,5,5,93,170,170,0,5,5,5,5
+5,5,5,5,5,5,0,5,5,5,5,0,5,5,5,5,5,0,5,5,122,122,122,0,5,134,134,133,134,5,5,93,93,93,0,93,0,0,5,5,5,170,170,170,170,170,170,170,5,5,5,0,94,5,5,5,0,0,93,5,5,5,5,5
+5,5,5,5,5,5,0,5,5,5,5,0,98,5,5,5,0,84,133,122,122,5,5,170,170,170,170,170,170,5,5,97,97,0$22,98,5,5,0,0,5,5,5,170,170,170,170,170,5,5,5,0,0,5,5,5,0,0,5,5,5,5,5,5,5
+5,5,5,5,170,0@18,0,5,5,5,5,5,5,5,5,0,98,0,170,170,132!2,5,5,0,0,0,170,170,170,5,5,0@17,93,98,93,5,5,5,0,0,5,5,5,5,5,5,0:31,5,5,5,0,1,5,5,5,0,5,5,5,5,5,5,5,5
+5,5,170,84,170,170,0,0,0,5,5,5,5,5,5,0,0$42,170,170,170,129,170,170,170,170,0,84,170,170,5,5,0,0,98,93$21,5,5,5,5,0,5,5,5,5,5,5,0,5,5,170,0,0,0,0,0,0,5,5,5,94,0,0,5,5
+5,5,196,170,170,170,170,0,0,0,98,5,5,5,0,0,0,170,170,170,122,5,170,170,85,86,0,0,0@16,5,122,0,93,0,0,5,5,5,5,0,0,0,5,5,0,0,170$27,170,170,170,5,5,98,5,5,5,5,5,0,0,0$9,0,5,5
+5,5,170,170,84,170,170,85,86,0,0,5,5,5,0,98,85,86,170$41,170,133,5,170,1,0,0,85,86,5,5,122,0,0,84,0,84,5,5,5,0,0,0,0,0,0,5,122,122,122,122,5,5,5,5,5,5,5,5,0,0,0,98,0,5
+5,5,5,0,5,5,85,86,0,0,0,0,0,0,0,98,0,98,133,122,122,122,170,0,133,134,5,5,5,5,122,5,5,1,0,0,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,98,0,0,0,0,98,5
+5,5,5,0,5,5,5,0,0,97,5,5,5,5,0,93,0,98,5,5,5,5,0,5,5,5,5,5,5,5,122,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,0,94$6,93,0,5,5,5,0,0,0,0,0,97,0,93,93$8,5
+5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,0,0,5,5,5,5,122,122,122,122,122,5,5,5,5,5,5,0,5,5,5,5,5,5,5,0,1$5,1,98,0,0,0,0,0,5,5,5,0,0,0,0,5,5
+5,5,5,0,5,5,5,5,5,5,5,5,122,5,5,5,5,0,5,5,0,0,5,5,5,5,5,0,0,170$55,170,122,5,5,0,97,0,0,0,5,5,5,5,5,5,93,93$4,0,0,0,0,1,5,5,5,5,5,5,5,0,0$7,93,5,5
+122,5,84,98,0,98,5,5,5,5,0,0,133,5,170$50,5,5,5,5,5,0,5,5,5,5,5,0,0$53,170,170,170,122,5,0,0$25,0,0,0,84,0,0,5,5,5,5,93,93,93,0,0,0,0,5,5,5,5,5,5,5,93,0,0,5,5
+122,170,170,170,170,0,5,5,5,5,1,5,122,5,170,5,5,5,5,5,0,5,5,5,85,86,170,170&22,170,0$54,170,122,5,0,0,85$24,86,0,0,93,0,0,0,98,0,0,0,94,0,5,5,0,0,5,5,122,122,122,5,5,5,5,5,5
+122,170,170,170,0,84,0,97,0,0,0,5,133,122,134,122,122,5,5,94,0,5,5,0,0,0,170,0,0&19,0,5,5,5,97,0$26,0,97,93,1,0,98,0,0,5,5,5,5,5,5,5,5,5,93,0,171,170,170,122,5,5,5,5,5,5
+122,122,129,122,84,0,98$39,98,98,1,1,5,122,170,170,170,0,98,92,0,0,5,5,170,170,0,0,0,0,84,5,5,5,5,0,0,85,86,98,5,5,0,5,5,5,5,5,5,5,5,5,5,0,97,171,187,171:25,122,5,5,5,0,5,5
+122,5,170,170,85,86$40,0,0,0$38,5,5,5,122,170,170,170,85,86,71,91,1,0,170,0,170,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,170,171:25,171,5,5,5,5,0&22&17,0&22,5
+122,5,170,170,170>,0&20,0,98,98,5,5,5,122,84,170,85,86,92,1,0,0@15,5,5,0,170,170,0,5,5,5,5,122,122,122,122,122,133,122,122,122,5,5,122,133,122,122,122,122,122,122,122,122,122,5,5,5,0,0,5,5<,5,5,0&22&17,5
+122,5,5,85,86,98,0$37,0,93,93,5,5,0,0,0,0,0,0,0,0,0,5,5,170,170,0,0,5,122,5,5,122,71,170,170,170,170,170,192,122,122,122,122,170,170,197,170,197,170,197,170$56,191:33,122,5,5,5,5,0,0,5,5,5,5,5
+5,5,5,5,0,0@19,0,0,0,0,5,5,0,0,0,98,0,98,1,5,5,5,5,5,0,0,171,5,122,5,5,122,71,71,170,170,170,170,170,125,170,170,125,170,170,185@2,170,185@3,170,185@4,170,191:32,122,5,5,5,5,0,0,5,5,5,5,5
+5,5,5,5,5,0,5,5,93,0,0,0,0,0,0,0@14,5,5,5,5,5,5,5,5,122,0,171:24,171:24,122,5,5,122,71,170,170,170,170,170,192,122,122,122,122,170,170,195,170,195,170,195,170$57,191:32,122,5,5,5,5,0$0,5,5,5,5,5,5
+5,122,122,5,5,0,5,5,5,0,0,0,93,0,0,0,5,5,5,5,5,5,5,5,122,122,122,0,0,5,5,122,122,122,122,127,122,122,122,122,5,5,122,122,122,122,122,122,122,122,122,122,122,5,5,5,0,0,5,5,5,5,5,5
+5,122,170,5,5,0,5,5,5,97,0,133,122,122,122,122,122,122,122,5,5,5,5,5,5,5,5,5,0&10,5,5,5,5,5,5,170,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,0,1&10,1,5,5,5
+5,122,170,0,0,0,170,5,5,0,0,0,122,175@5@6@7,170,175:23,170,175:23,122,122,122,122,122,122,5,5,5,5,0,0,0,0,5,5,5,5,5,5,5,5,0,1,0,5,5,0,0&10,94,0,5,5,5,5,5,0&10,0,1,0,0&10,97,0&10,5,5,5
+5,122,170,0,0,0,170,122,5,98,0,0,122,195,170,195,170,195,122,186,170$33,170,170,122,5,5,5,5,0,5,5,0,5,5,5,5,5,5,5,5,5,0,94,93,0,1,97,94,0,0,5,5,5,5,0,0,0,0,0,0,1,5,5,5
+5,122,0,170$36,170,0$35,170,122,5,0,0,0,122,170,170,170,170,204,122,195:20,170,170,170,122,5,5,5,0,0,5,5,0,0,0,0,0&10,0&10,0,5,5,5,94,93,0$23,94,93,93&10,94,0,5,5,5,5,170,0,84,0,0$20,0,0,5,5,5,5
+5,5,5,0,0,0,5,122,5,5,170,170,122,122,122,122,122,252,122,122,170,170,170,122,5,5,0,0,5,5,5,0,0,0,0,97,0&10,0,0,5,5,0,93,1,0,0,0,5,5,5,5,5,170,170,84,0,0,1,0,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,170,170,125,170,170,170,170,170@13,170,252,204,170,170,122,5,5,0&10,5,5,5,5,5,0,0,0,0,0,0,0,0,0,0,0,5,5,0,5,5,5,5,5,0,0,85,86,0,5,5,0,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,133,170,170,122,122,122,125,122,122,125,122,122,122,122,122,5,5,0,5,5,5,5,5,0&10,97,0,0,0,0,0,5,5,0,5,5,5,0,5,5,5,85,86,0,0,0,1&10,5,5,5,0,0,5,5,5,5
+5,122,5,170,170,170,170,187,170,122,170,170,122,170,170,170,170,122,170,0,0&19,103,103$32,133,5,5,85,86,85&10,86&10,5,5,0,0&10,0,1,1,5,5,5,5,5,5,5,5,0,0,0,0&10,97,85,86,0,0,5,5,5,5,5,0,5,5,5,5
+5,122,170,193,170:12&9,170,170,170,170,122,170,170,122,170&21,170,170,170,122,170,170,84,103$31,103,84,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,0,0,0,0,0&10,0,0,85,86,5,5,5,5,5,0,5,5,5,5
+5,122,170,0,0,84,170,187,170,133,170,170,122,170,170,170@12,170&21,122,170,84,0,85,86,133,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,0,0&10,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,122,133,0,0,0&10,5,5,5
+5,122,85,86,84,170,170,170,170,122,170,170,122,173,170,170,170,122,170&19,170,0,84,85,86,5,5,5,0,94,0&10,5,5,5,0,0,5,5,5,5,0&10,97,0,0,5,5,5,122,122,122,122,122,133,122,5,5,5,122,0&10,0,0,0,0,5,5
+5,122,123,122,122,122,122,122,122,122,125:2,125:2,122,122,122,122,122,122,122,122,122,122,122,122,5,5,0,0,0,0,5,5,0,0,5,5,5,96,0,0,0,0,5,5,5,5,122,5,170,170&10,170,170,122,122,122,122,133,0,0,98,93,0,5,5
+5,122,170,194@20,122,170,170,170,170,170,170,170,170,170,122,5,5,5,5,5,5,5,5,5,5,5,0&10,97,0,84,0,93,0,5,5,5,5,96,0,0,0,0,5,5,5,5,122,170,170,187,170&10,170,0,5,5,5,5,98,93,0,71,71,5,5
+5,122,122,122,122,170,187,170,187,170,187,170,187,170,122,5,5,5,5,5,5,5,5,5,5,5,0,84,0,0$34,85,86,0,5,5,5,96,0,0,0,0,0,0,0,5,5,0,0,0$59,0,0,170,0,5,5,5,5,0,0,93,93,71,5,5
+5,5,5,5,122,170@11,170,170,170,170,170,170,170,170@9,122,5,5,5,5,103,0,0&10,5,5,5,5,5,5,84,1,0$45,85,86,5,5,5,0,0,0,1,5,5,5,0,0,0,0$58,0,170,0,0,0,0,0,0,0,0,0,0,0,0,93,5,5
+5,5,5,5,122,170,170,170,170,170,170,170,170@10,170,122,5,5,5,103,103,0,0,0,5,5,5,5,5,5,5,0,5,5,5,5,5,5,0,0,0&10,5,5,5,5,0,0,0,0,170&10,187,170,0,0,5,5,5,0,0,98,97,0,5,5,5
+5,5,5,5,122,170,187,170$51,187,170,187,170$52,187,170,122,5,5,5,103,0,1,0,0,0:36,0,0,5,5,5,5,0,5,5,5,5,5,5,0,0,5,5,5,5,5,5,0,0,1,170,170,170,0&10,5,5,5,5,5,5,0,0,0,5,5,5
+5,5,5,5,122,170,170,170,170,170,170,170,170,170@8,122,5,5,5,0&10,0,103,1,5,5,5,1,0,1,0,0,0,0,0,0,0,0&10,0,1,5,5,5,5,5,5,5,5,122,122,122,122,133,122,5,5,5,5,5,5,5,5,5,5,5,5
+5,122,122,122,122,122,122,122,149!3,149!4,149!5,122,122,122,122,5,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,5,5,5,5
+5,5,5,5,5,5,5,0,82,82,82,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,5,5,5,5
+5,5,5,5,5,5,5,0,82,82,82,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,5,5,5,5
+5,5,5,5,5,5,5,5,0,82,82^,82,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,5,5,5,5
+5,5,5,5,5,5,5,5,5,0,82,82,82,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,122,122,122,122,122
+5,5,5,5,5,5,5,5,5,0,82,82,82,0,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,0,82,82,82,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,0,82,82,82,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,0,82,82,82,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
diff --git a/rsrc/schemas/readme.md b/rsrc/schemas/readme.md
index b2c5d4328..7087e5ec7 100644
--- a/rsrc/schemas/readme.md
+++ b/rsrc/schemas/readme.md
@@ -340,7 +340,7 @@ type.
 `crunch`, `squish`, `splash`, `none`.
 * `<trim>` - (required) The trim type of this terrain. Must be one of `none`, `wall`, `s`,
 `n`, `e`, `w`, `sw`, `ne`, `se`, `nw`, `sw-inner`, `ne-inner`, `se-inner`, `nw-inner`,
-`frills`, `road`, `walkway`, `waterfall`, `city`.
+`frills`, `road`, `walkway`, `waterfall`, `city`, `smart-border`.
 * `<arena>` - (required) The combat arena to use if outdoor combat is initiated while the
 party is on this space.
 * `<ground>` - The ground type of this terrain.
diff --git a/rsrc/schemas/terrain.xsd b/rsrc/schemas/terrain.xsd
index 5f225641a..69ca8c9b6 100644
--- a/rsrc/schemas/terrain.xsd
+++ b/rsrc/schemas/terrain.xsd
@@ -69,6 +69,7 @@
 			<xs:enumeration value="walkway"/>
 			<xs:enumeration value="waterfall"/>
 			<xs:enumeration value="city"/>
+			<xs:enumeration value="smart-border"/>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="stepSound">
diff --git a/rsrc/strings/trim-names.txt b/rsrc/strings/trim-names.txt
index 25c6e81cb..ca45472db 100644
--- a/rsrc/strings/trim-names.txt
+++ b/rsrc/strings/trim-names.txt
@@ -16,4 +16,5 @@ Frills (draw edge frills)
 Road (connect with roads)
 Walkway (round off corners)
 Waterfall (both wall and water)
-City trim (connect to roads)
\ No newline at end of file
+City trim (connect to roads)
+Smart border (automatic transitions)
\ No newline at end of file
diff --git a/src/fileio/estreams.cpp b/src/fileio/estreams.cpp
index bfb457cbf..f8156f0f8 100644
--- a/src/fileio/estreams.cpp
+++ b/src/fileio/estreams.cpp
@@ -580,7 +580,7 @@ std::istream& operator >> (std::istream& in, eTerSpec& e){
 
 cEnumLookup ter_trims = {
 	"none", "wall", "s", "se", "e", "ne", "n", "nw", "w", "sw",
-	"ne-inner", "se-inner", "sw-inner", "nw-inner", "frills", "road", "walkway", "waterfall", "city",
+	"ne-inner", "se-inner", "sw-inner", "nw-inner", "frills", "road", "walkway", "waterfall", "city", "smart-border"
 };
 
 std::ostream& operator << (std::ostream& out, eTrimType e){
diff --git a/src/fileio/fileio_scen.cpp b/src/fileio/fileio_scen.cpp
index b9751f0ed..3a8bfba88 100644
--- a/src/fileio/fileio_scen.cpp
+++ b/src/fileio/fileio_scen.cpp
@@ -1960,12 +1960,29 @@ void readDialogueFromXml(ticpp::Document&& data, cSpeech& talk, int town_num) {
 	}
 }
 
+std::map<ter_num_t, ter_num_t> ter_swaps;
+
+static void init_ter_swaps() {
+	for (int i = 6; i <= 21; ++i){
+		ter_swaps[i] = 5;
+	}
+}
+
+static ter_num_t swap_ter(ter_num_t in) {
+	if(ter_swaps.find(in) != ter_swaps.end())
+		return ter_swaps[in];
+	return in;
+}
+
 void loadOutMapData(map_data&& data, location which, cScenario& scen) {
+	if(ter_swaps.empty())
+		init_ter_swaps();
+	
 	cOutdoors& out = *scen.outdoors[which.x][which.y];
 	int num_towns = 0;
 	for(int x = 0; x < 48; x++) {
 		for(int y = 0; y < 48; y++) {
-			out.terrain[x][y] = data.get(x,y);
+			out.terrain[x][y] = swap_ter(data.get(x,y));
 			auto features = data.getFeatures(x,y);
 			for(auto feat : features) {
 				bool is_boat = false;
@@ -2024,10 +2041,13 @@ void loadOutMapData(map_data&& data, location which, cScenario& scen) {
 }
 
 void loadTownMapData(map_data&& data, int which, cScenario& scen) {
+	if(ter_swaps.empty())
+		init_ter_swaps();
+	
 	cTown& town = *scen.towns[which];
 	for(int x = 0; x < town.max_dim; x++) {
 		for(int y = 0; y < town.max_dim; y++) {
-			town.terrain(x,y) = data.get(x,y);
+			town.terrain(x,y) = swap_ter(data.get(x,y));
 			auto features = data.getFeatures(x,y);
 			for(auto feat : features) {
 				bool is_boat = false;
diff --git a/src/game/boe.graphics.cpp b/src/game/boe.graphics.cpp
index a0f2b9e5e..3ef5f0c31 100644
--- a/src/game/boe.graphics.cpp
+++ b/src/game/boe.graphics.cpp
@@ -23,6 +23,7 @@
 #include "dialogxml/widgets/button.hpp"
 #include "tools/enum_map.hpp"
 #include "tools/drawable_manager.hpp"
+#include "location.hpp"
 
 #include "boe.party.hpp"
 #include "boe.town.hpp"
@@ -700,7 +701,7 @@ void refresh_text_bar() {
 	mainPtr.setActive();
 }
 
-// this is used for determinign whether to round off walkway corners
+// this is used for determining whether to round off walkway corners
 // right now, trying a restrictive rule (just cave floor and grass, mainly)
 bool is_nature(short x, short y, unsigned short ground_t) {
 	ter_num_t ter_type;
@@ -840,12 +841,12 @@ void draw_terrain(short mode) {
 			spot_seen[q][r] = can_draw;
 			
 			if(fog_lifted) can_draw = true;
-			
+
+			eTrimType trim = univ.scenario.ter_types[spec_terrain].trim_type;
+
 			if((can_draw != 0) && (overall_mode != MODE_RESTING)) { // if can see, not a pit, and not resting
 				if(is_combat()) anim_ticks = 0;
 				
-				eTrimType trim = univ.scenario.ter_types[spec_terrain].trim_type;
-				
 				// Finally, draw this terrain spot
 				if(trim == eTrimType::WALKWAY){
 					int trim = -1;
@@ -880,6 +881,102 @@ void draw_terrain(short mode) {
 					draw_one_terrain_spot(q,r,trim < 0 ? spec_terrain : ground_ter);
 					if(trim >= 0)
 						draw_trim(q,r,trim + 50,spec_terrain);
+				}else if(trim == eTrimType::SMART_BORDER) {
+					std::map<eDirection,ter_num_t> neighbor_terrains;
+					std::map<eDirection,ter_num_t> diag_neighbor_terrains;
+					std::map<ter_num_t,short> ground_candidates;
+					auto count_ground_candidate = [&ground_candidates](ter_num_t ter) {
+						if(ground_candidates.find(ter) == ground_candidates.end()){
+							ground_candidates[ter] = 0;
+						}
+						ground_candidates[ter]++;
+					};
+
+					neighbor_terrains[DIR_N] = coord_to_ter(where_draw.x, where_draw.y - 1, spec_terrain);
+					diag_neighbor_terrains[DIR_NE] = coord_to_ter(where_draw.x + 1, where_draw.y - 1, spec_terrain);
+					neighbor_terrains[DIR_E] = coord_to_ter(where_draw.x + 1, where_draw.y, spec_terrain);
+					diag_neighbor_terrains[DIR_SE] = coord_to_ter(where_draw.x + 1, where_draw.y + 1, spec_terrain);
+					neighbor_terrains[DIR_S] = coord_to_ter(where_draw.x, where_draw.y + 1, spec_terrain);
+					diag_neighbor_terrains[DIR_SW] = coord_to_ter(where_draw.x - 1, where_draw.y + 1, spec_terrain);
+					neighbor_terrains[DIR_W] = coord_to_ter(where_draw.x - 1, where_draw.y, spec_terrain);
+					diag_neighbor_terrains[DIR_NW] = coord_to_ter(where_draw.x - 1, where_draw.y - 1, spec_terrain);
+					
+					// Check that the given directions all match, and are the only cardinal directions that do
+					auto only_match = [&neighbor_terrains, &ground_candidates, &count_ground_candidate, spec_terrain](std::vector<eDirection> directions){
+						bool count_candidates = ground_candidates.empty();
+						for(auto dir_ter_pair : neighbor_terrains){
+							if(dir_ter_pair.second == spec_terrain){
+								if(std::find(directions.begin(), directions.end(), dir_ter_pair.first) == directions.end()){
+									return false;
+								}
+							}else{
+								// This is not the border terrain, so it could be what we transition to
+								if(count_candidates){
+									count_ground_candidate(dir_ter_pair.second);
+								}
+								if(std::find(directions.begin(), directions.end(), dir_ter_pair.first) != directions.end()){
+									return false;
+								}
+							}
+						}
+
+						return true;
+					};
+					// Check that only one corner does not match (making this an inner corner)
+					auto corner_no_match = [&diag_neighbor_terrains, &ground_candidates, &count_ground_candidate, spec_terrain](eDirection corner) {
+						bool count_candidates = ground_candidates.empty();
+						std::map<eDirection, ter_num_t> copy_diag_neighbors = diag_neighbor_terrains;
+						auto ter = copy_diag_neighbors[corner];
+						copy_diag_neighbors.erase(corner);
+						if(ter == spec_terrain){
+							return false;
+						}
+						if(count_candidates)
+							count_ground_candidate(ter);
+						for(auto dir_ter_pair : copy_diag_neighbors){
+							if(dir_ter_pair.second != spec_terrain){
+								return false;
+							}
+						}
+						return true;
+					};
+					
+					int offset = 0;
+					// 4 cardinal walls
+					if(only_match({DIR_N, DIR_W, DIR_S})){
+						offset = 3;
+					}else if(only_match({DIR_N, DIR_W, DIR_E})){
+						offset = 1;
+					}else if(only_match({DIR_S, DIR_W, DIR_E})){
+						offset = 5;
+					}else if(only_match({DIR_N, DIR_E, DIR_S})){
+						offset = 7;
+					}
+					// Outer corners
+					else if(only_match({DIR_N, DIR_W})){
+						offset = 2;
+					}else if(only_match({DIR_N, DIR_E})){
+						offset = 8;
+					}else if(only_match({DIR_S, DIR_W})){
+						offset = 4;
+					}else if(only_match({DIR_S, DIR_E})){
+						offset = 6;
+					}
+					// Inner corners
+					else if(corner_no_match(DIR_SE)){
+						offset = 12;
+					}else if(corner_no_match(DIR_NW)){
+						offset = 10;
+					}else if(corner_no_match(DIR_NE)){
+						offset = 11;
+					}else if(corner_no_match(DIR_SW)){
+						offset = 9;
+					}
+					if(!ground_candidates.empty()){
+						current_ground = univ.scenario.get_ground_from_ter(ground_candidates.begin()->first);
+						draw_one_terrain_spot(q,r,current_ground);
+					}
+					draw_one_terrain_spot(q,r,spec_terrain, offset);
 				}else if(spec_terrain == 65535) {
 					draw_one_terrain_spot(q,r,-1);
 				}else{
diff --git a/src/game/boe.graphutil.cpp b/src/game/boe.graphutil.cpp
index aec88f1be..640bfc6fa 100644
--- a/src/game/boe.graphutil.cpp
+++ b/src/game/boe.graphutil.cpp
@@ -58,7 +58,7 @@ bool gave_no_g_error = false;
 //short dest; // 0 - terrain gworld   1 - screen
 // if terrain_to_draw is -1, do black
 // if terrain_to_draw >= 10000, force to draw graphic which is terrain_to_draw - 10000
-void draw_one_terrain_spot (short i,short j,short terrain_to_draw) {
+void draw_one_terrain_spot (short i,short j,short terrain_to_draw, int graphic_offset) {
 	rectangle where_draw;
 	rectangle source_rect;
 	std::shared_ptr<const sf::Texture> source_gworld;
@@ -86,7 +86,7 @@ void draw_one_terrain_spot (short i,short j,short terrain_to_draw) {
 		graf_pos_ref(source_gworld, source_rect) = spec_scen_g.find_graphic(univ.scenario.ter_types[terrain_to_draw].picture - 2000 + (anim_ticks % 4));
 	}
 	else if(univ.scenario.ter_types[terrain_to_draw].picture >= 1000) { // custom
-		graf_pos_ref(source_gworld, source_rect) = spec_scen_g.find_graphic(univ.scenario.ter_types[terrain_to_draw].picture - 1000);
+		graf_pos_ref(source_gworld, source_rect) = spec_scen_g.find_graphic(univ.scenario.ter_types[terrain_to_draw].picture + graphic_offset - 1000);
 	}
 	else if(univ.scenario.ter_types[terrain_to_draw].picture >= 960) { // animated
 		source_gworld = &ResMgr::graphics.get("teranim");
@@ -94,14 +94,14 @@ void draw_one_terrain_spot (short i,short j,short terrain_to_draw) {
 		source_rect = calc_rect(4 * ((terrain_to_draw - 960) / 5) + (anim_ticks % 4),(terrain_to_draw - 960) % 5);
 	}
 	else {
-		terrain_to_draw = univ.scenario.ter_types[terrain_to_draw].picture;
+		terrain_to_draw = univ.scenario.ter_types[terrain_to_draw].picture + graphic_offset;
 		int which_sheet = terrain_to_draw / 50;
 		source_gworld = &ResMgr::graphics.get("ter" + std::to_string(1 + which_sheet));
 		terrain_to_draw %= 50;
 		source_rect = calc_rect(terrain_to_draw % 10, terrain_to_draw / 10);
 	}
 	
-	rect_draw_some_item(*source_gworld, source_rect, terrain_screen_gworld, where_draw);
+	rect_draw_some_item(*source_gworld, source_rect, terrain_screen_gworld, where_draw, sf::BlendAlpha);
 }
 
 void draw_monsters() {
diff --git a/src/game/boe.graphutil.hpp b/src/game/boe.graphutil.hpp
index e0ae08ae2..53b67039d 100644
--- a/src/game/boe.graphutil.hpp
+++ b/src/game/boe.graphutil.hpp
@@ -6,7 +6,7 @@
 #include "location.hpp"
 #include "gfx/gfxsheets.hpp"
 
-void draw_one_terrain_spot (short i,short j,short terrain_to_draw);
+void draw_one_terrain_spot (short i,short j,short terrain_to_draw, int graphic_offset=0);
 void draw_monsters();
 void play_see_monster_str(unsigned short m, location monst_loc);
 void draw_combat_pc(class cPlayer& who, location center, bool attacking);
diff --git a/src/game/boe.locutils.cpp b/src/game/boe.locutils.cpp
index f338f97ac..4fa8a11b7 100644
--- a/src/game/boe.locutils.cpp
+++ b/src/game/boe.locutils.cpp
@@ -212,12 +212,12 @@ short combat_obscurity(short x, short y) {
 	return sight_obscurity(x,y);
 }
 
-ter_num_t coord_to_ter(short x,short y) {
+ter_num_t coord_to_ter(short x,short y,ter_num_t out_of_bounds) {
 	if(is_out()) {
-		if(!univ.out.is_on_map(x, y)) return 0;
+		if(!univ.out.is_on_map(x, y)) return out_of_bounds;
 		return univ.out[x][y];
 	}
-	if(!univ.town.is_on_map(x, y)) return 0;
+	if(!univ.town.is_on_map(x, y)) return out_of_bounds;
 	return univ.town->terrain(x,y);
 }
 
diff --git a/src/game/boe.locutils.hpp b/src/game/boe.locutils.hpp
index ecf6e0c5d..8ecce1657 100644
--- a/src/game/boe.locutils.hpp
+++ b/src/game/boe.locutils.hpp
@@ -20,7 +20,7 @@ bool is_lava(short x,short y);
 short sight_obscurity(short x,short y);
 short can_see_light(location p1, location p2, std::function<short(short,short)> get_obscurity);
 short combat_obscurity(short x,short y);
-ter_num_t coord_to_ter(short x,short y);
+ter_num_t coord_to_ter(short x,short y,ter_num_t out_of_bounds=0);
 bool is_container(location loc);
 void update_explored(location dest);
 bool is_blocked(location to_check);
diff --git a/src/scenario/terrain_abilities.hpp b/src/scenario/terrain_abilities.hpp
index 93e501c63..bab8d80f9 100644
--- a/src/scenario/terrain_abilities.hpp
+++ b/src/scenario/terrain_abilities.hpp
@@ -68,6 +68,7 @@ enum class eTrimType {
 	WALKWAY = 16, // the game will draw walkway corners; trim_ter is base terrain to draw on
 	WATERFALL = 17, // special case for waterfalls
 	CITY = 18, // the game will join roads up to this space but not draw roads on the space
+	SMART_BORDER = 19 // the game will automatically transition this against adjacent terrains
 };
 
 enum class eTerObstruct {