diff --git a/rsrc/scenarios/busywork/out/out0~0.map b/rsrc/scenarios/busywork/out/out0~0.map
index e28a5791..2b632a71 100644
--- a/rsrc/scenarios/busywork/out/out0~0.map
+++ b/rsrc/scenarios/busywork/out/out0~0.map
@@ -10,39 +10,39 @@
 22,22,22,22,22,22,26,49,38,38,39,114,114,113,113,114,112,112,114:3,113,115,114,2,113,2,2,112,115,114,2,2,87,112,2,112,112,111,113,2,45,46,30,22,22,22,22,22,22
 22,22,22,22,22,35,25,40,3,113,2,114,4,115,2,113,2,113,114,113,112,113,114,114,2,4,114,2,115,112,114,113,112,111,113,113,56,54,112,112,44,31,24,32,22,22,22,22
 22,22,22,22,22,26,36,40,3,115,2,114,114,114,113,2,112,113,114,112,3,114,112,113,112,114,115,112,113,114,115,114,112,115,111:4,113,57,53,114,87,45,38,46,30,22,22,22,22
-22,22,22,22,22,26,36,40,113,112,114,113,114,113,113,2,112,112,113,115,80&25,80&25,80&25,80&25,80&25,80&25,80&25,114,112,2,3,114,112,113,113,56,60,53,111,113,114,2,44,30,22,22,22,22
-22,22,22,22,22,34,27,48,41,113,114,112,113,112,115,113,2,113,80&25,80&25,80&25,113,113,112,113,113,80&25,80&25,80&25,115,114,113,112,113,111,57,50,53,113,115,2,114,44,31,32,22,22,22
-22,22,22,22,22,22,26,36,48,41,114,2,2,115,115,112,80&25,80&25,80&25,113,112,112,114,112,113,114,112,114,80&25,114,2,114,113,112,113,58,59,53,112,112,2,3,45,46,30,22,22,22
-22,22,22,22,22,22,26,36,36,40,114,112,112,2,112,80&25,80&25,112,115,113,3,112,114,113,113,112,2,113,80&25,113,114,114,113,113,114,113,58,52,80&25,80&25,112,114,114,44,30,22,22,22
-22,22,22,22,22,22,26,36,36,40,112,112,2,114,80&25,80&25,114,115,113,115,112,112,114,113,3,114,113,2,80&25,80&25,115,114,114,115,2,118,118,118,118,80&25,115,2,114,44,30,22,22,22
-22,22,22,22,22,22,26,36,36,40,113,114,114,112,80&25,2,115,112,112,113,114,113,113,114,2,112,113,2,114,80&25,114,113,3,115,114,2,2,2,2,80&25,80&25,114,2,44,30,22,22,22
-22,22,22,22,22,22,26,37,37,40,114,2,114,2,80&25,112,112,113,112,2,3,112,2,114,113,3,2,113,2,80&25,80&25,2,2,2,2,118,118,118,118,113,80&25,113,2,44,30,22,22,22
-22,22,22,22,22,22,26,36,49,39,114,2,2,2,80&25,2,114,112,114,2,2,2,114,113,113,2,112,2,113,114,80&25,80&25,115,2,113,4,2,234@0,80&25,80&25,80&25,113,4,44,30,22,22,22
-22,22,22,22,22,22,26,37,40,113,113,4,112,2,80&25,112,115,114,114,113,2,114,114,2,2,4,112,115,114,113,114,80&25,80&25,80&25,114,113,114,80&25,114,113,2,113,113,44,30,22,22,22
-22,22,22,22,22,22,26,36,40,3,2,112,112,112,80&25,2,114,2,114,114,115,114,2,114,114,2,114,114,2,112,113,2,2,80&25,80&25,80&25,80&25,80&25,113,2,2,2,43,47,30,22,22,22
-22,22,22,22,22,22,26,36,40,2*0,2,114,2,113,80&25,114,113,112,112,115,115,112,2,112,112,2,2,4,115,114,115,112,113,114,112,112,115,3,2,113,2,3,44,29,33,22,22,22
-22,22,22,22,22,22,26,36,40,113,114,114,112,2,80&25,80&25,114,112,115,112,112,114,114,113,114,2,114,2,113,2,112,113,114,114,113,112,112,113,2,114,113,2,44,30,22,22,22,22
-22,22,22,22,22,22,26,36,48,41,2,114,112,112,112,80&25,2,112,114,43,41,3,3,114,114,114,113,112,115,2,115,112,2,112,2,112,114,112,3,2,2,43,47,30,22,22,22,22
-22,22,22,22,22,22,26,36,36,40,113,114,114,112,115,80&25,114,112,112,45,39,114,113,115,114,112,2,112,113,112,113,2,113,114,2,2,113,112,112,2,112,44,29,33,22,22,22,22
-22,22,22,22,22,22,34,27,37,48,41,2,112,112,113,80&25,80&25,115,112,112,114,113,112,115,2,113,114,2,113,115,113,4,113,3,2,113,112,112,2,114,43,47,30,22,22,22,22,22
-22,22,22,22,22,22,22,26,36,40,112,112,3,112,2,114,80&25,112,113,2,112,112,2,2,112,113,112,112,114,115,114,113,43,42,41,2,3,3,114,43,47,29,33,22,22,22,22,22
-22,22,22,22,22,22,22,34,27,40,2,112,113,2,113,2,80&25,80&25,112,2,113,112,112,115,113,250&9:5,112,113,115,2,112,2,45,46,40,114,4,43,42,47,29,33,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,26,40,113,113,115,2,113,112,112,80&25,80&25,114,112,114,114,2,112,114,2,114,113,3,2,113,2,44,48,42,42,47,29,28,33,22,35,24,32,22,22,22
-22,22,22,22,22,22,22,22,26,40,112,112,2,113,112,114:0,113,115,80&25,2,112,112,113,2,113,112,113,113,112,114,114,2,43,47,36,37,36,29,33,22,22,35,25,36,30,22,22,22
-22,22,22,22,22,22,22,22,26,40,2,114,2,112,113,114,112,112,80&25,112,112,2,112,112,114,113,114,2,113,2,113,43,47,29,28,28,28,33,22,22,35,25,36,29,33,22,22,22
-22,22,22,22,22,22,22,22,26,40,2,115,2,2,115,113,112,2,80&25,80&25,114,114,114,2,114,2,2,113,2,114,2,44,29,33,22,22,22,22,22,35,25,36,29,33,22,22,22,22
-22,22,22,22,22,22,22,22,26,40,115,114,2,115,113,4,113,112,113,80&25,2,113,2,114,114,114,2,2,114,2,43,47,30,22,22,22,22,22,22,26,36,29,33,22,22,22,22,22
-22,22,22,22,22,22,22,22,26,48,41,2,2,115,113,113,113,115,2,80&25,80&25,2,112,2,114,2,2,3,2,2,44,29,33,22,22,22,22,22,22,26,36,30,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,34,27,48,41,2,2,113,114,2,114,113,113,80&25,2,2,113,2,2,2,2,113,2,44,30,22,22,22,35,24,24,24,25,36,30,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,34,27,48,42,41,2,115,114,113,112,2,80&25,80&25,113,113,113,113,2,2,2,2,44,31,24,24,24,25,49,38,38,38,46,31,24,32,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,34,28,27,48,41,115,115,114,114,115,2,80&25,80&25,2,2,2,115,2,2,112,45,38,38,38,38,38,39,87,115,2,45,38,46,30,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,34,27,48,41,114,2,115,2,2,2,80&25,2,2,115,2,2,2,2,2,2,2,2,2,2,2,112,2,2,2,87,44,30,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,34,27,48,41,2,2,2,2,115,80&25,2,2,2,2,115,87,87,2,2,2,2,2,2,115,87,3,3,2,2,44,30,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,34,27,48,41,115,2,114,114,80&25,114,114,3,2,3,115,43,42,41,2,2,112,2,2,115,87,2,87,2,44,30,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,34,27,40,2,114,2,2,80&25,80&25,2,2,115,2,2,44,36*2,48,42,41,115,2,115,2,115,2,2,3,44,30,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,26,48,41,114,2,2,114,80&25,80&25,2,115,87,43,47,36,36,36,40,115,87,87,2,115,3,43,42,47,30,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,34,27,40,87,115,2,3,115,80&25,2,2,2,44,37,36,36,37,48,41,115,2,3,2,112,44,29,28,33,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,26,48,41,2,2,3,2,80&25,121!0,2,2,44,37,36,36,36,36,40,2,2,2*3,2,4,44,30,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,34,27,48,41,2,2,2,80&25,80&25,2,2,44,36,36,36,36,49,39,2,2,2,2,2,44,30,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,35,24,32,22,22,22,22,22,22,22,34,27,40,87,2,2,115,80&25,3,2,45,46,36,36,49,39,2,2,2,2,2,2,44,30,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,26,36,30,22,22,22,22,22,22,22,22,26,40,2,2,2,115,80&25,2,2,2,44,37,36,40,2,2,2,2,2,2,2,44,30,22,22,22,22,22,22
+22,22,22,22,22,26,36,40,113,112,114,113,114,113,113,2,112,112,113,115,2&25,2&25,2&25,2&25,2&25,2&25,2&25,114,112,2,3,114,112,113,113,56,60,53,111,113,114,2,44,30,22,22,22,22
+22,22,22,22,22,34,27,48,41,113,114,112,113,112,115,113,2,113,2&25,2&25,2&25,113,113,112,113,113,2&25,2&25,2&25,115,114,113,112,113,111,57,50,53,113,115,2,114,44,31,32,22,22,22
+22,22,22,22,22,22,26,36,48,41,114,2,2,115,115,112,2&25,2&25,2&25,113,112,112,114,112,113,114,112,114,2&25,114,2,114,113,112,113,58,59,53,112,112,2,3,45,46,30,22,22,22
+22,22,22,22,22,22,26,36,36,40,114,112,112,2,112,2&25,2&25,112,115,113,3,112,114,113,113,112,2,113,2&25,113,114,114,113,113,114,113,58,52,2&25,2&25,112,114,114,44,30,22,22,22
+22,22,22,22,22,22,26,36,36,40,112,112,2,114,2&25,2&25,114,115,113,115,112,112,114,113,3,114,113,2,2&25,2&25,115,114,114,115,2,118,118,118,118,2&25,115,2,114,44,30,22,22,22
+22,22,22,22,22,22,26,36,36,40,113,114,114,112,2&25,2,115,112,112,113,114,113,113,114,2,112,113,2,114,2&25,114,113,3,115,114,2,2,2,2,2&25,2&25,114,2,44,30,22,22,22
+22,22,22,22,22,22,26,37,37,40,114,2,114,2,2&25,112,112,113,112,2,3,112,2,114,113,3,2,113,2,2&25,2&25,2,2,2,2,118,118,118,118,113,2&25,113,2,44,30,22,22,22
+22,22,22,22,22,22,26,36,49,39,114,2,2,2,2&25,2,114,112,114,2,2,2,114,113,113,2,112,2,113,114,2&25,2&25,115,2,113,4,2,234@0,2&25,2&25,2&25,113,4,44,30,22,22,22
+22,22,22,22,22,22,26,37,40,113,113,4,112,2,2&25,112,115,114,114,113,2,114,114,2,2,4,112,115,114,113,114,2&25,2&25,2&25,114,113,114,2&25,114,113,2,113,113,44,30,22,22,22
+22,22,22,22,22,22,26,36,40,3,2,112,112,112,2&25,2,114,2,114,114,115,114,2,114,114,2,114,114,2,112,113,2,2,2&25,2&25,2&25,2&25,2&25,113,2,2,2,43,47,30,22,22,22
+22,22,22,22,22,22,26,36,40,2*0,2,114,2,113,2&25,114,113,112,112,115,115,112,2,112,112,2,2,4,115,114,115,112,113,114,112,112,115,3,2,113,2,3,44,29,33,22,22,22
+22,22,22,22,22,22,26,36,40,113,114,114,112,2,2&25,2&25,114,112,115,112,112,114,114,113,114,2,114,2,113,2,112,113,114,114,113,112,112,113,2,114,113,2,44,30,22,22,22,22
+22,22,22,22,22,22,26,36,48,41,2,114,112,112,112,2&25,2,112,114,43,41,3,3,114,114,114,113,112,115,2,115,112,2,112,2,112,114,112,3,2,2,43,47,30,22,22,22,22
+22,22,22,22,22,22,26,36,36,40,113,114,114,112,115,2&25,114,112,112,45,39,114,113,115,114,112,2,112,113,112,113,2,113,114,2,2,113,112,112,2,112,44,29,33,22,22,22,22
+22,22,22,22,22,22,34,27,37,48,41,2,112,112,113,2&25,2&25,115,112,112,114,113,112,115,2,113,114,2,113,115,113,4,113,3,2,113,112,112,2,114,43,47,30,22,22,22,22,22
+22,22,22,22,22,22,22,26,36,40,112,112,3,112,2,114,2&25,112,113,2,112,112,2,2,112,113,112,112,114,115,114,113,43,42,41,2,3,3,114,43,47,29,33,22,22,22,22,22
+22,22,22,22,22,22,22,34,27,40,2,112,113,2,113,2,2&25,2&25,112,2,113,112,112,115,113,2&9:5,112,113,115,2,112,2,45,46,40,114,4,43,42,47,29,33,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,26,40,113,113,115,2,113,112,112,2&25,2&25,114,112,114,114,2,112,114,2,114,113,3,2,113,2,44,48,42,42,47,29,28,33,22,35,24,32,22,22,22
+22,22,22,22,22,22,22,22,26,40,112,112,2,113,112,114:0,113,115,2&25,2,112,112,113,2,113,112,113,113,112,114,114,2,43,47,36,37,36,29,33,22,22,35,25,36,30,22,22,22
+22,22,22,22,22,22,22,22,26,40,2,114,2,112,113,114,112,112,2&25,112,112,2,112,112,114,113,114,2,113,2,113,43,47,29,28,28,28,33,22,22,35,25,36,29,33,22,22,22
+22,22,22,22,22,22,22,22,26,40,2,115,2,2,115,113,112,2,2&25,2&25,114,114,114,2,114,2,2,113,2,114,2,44,29,33,22,22,22,22,22,35,25,36,29,33,22,22,22,22
+22,22,22,22,22,22,22,22,26,40,115,114,2,115,113,4,113,112,113,2&25,2,113,2,114,114,114,2,2,114,2,43,47,30,22,22,22,22,22,22,26,36,29,33,22,22,22,22,22
+22,22,22,22,22,22,22,22,26,48,41,2,2,115,113,113,113,115,2,2&25,2&25,2,112,2,114,2,2,3,2,2,44,29,33,22,22,22,22,22,22,26,36,30,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,34,27,48,41,2,2,113,114,2,114,113,113,2&25,2,2,113,2,2,2,2,113,2,44,30,22,22,22,35,24,24,24,25,36,30,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,34,27,48,42,41,2,115,114,113,112,2,2&25,2&25,113,113,113,113,2,2,2,2,44,31,24,24,24,25,49,38,38,38,46,31,24,32,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,34,28,27,48,41,115,115,114,114,115,2,2&25,2&25,2,2,2,115,2,2,112,45,38,38,38,38,38,39,87,115,2,45,38,46,30,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,34,27,48,41,114,2,115,2,2,2,2&25,2,2,115,2,2,2,2,2,2,2,2,2,2,2,112,2,2,2,87,44,30,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,34,27,48,41,2,2,2,2,115,2&25,2,2,2,2,115,87,87,2,2,2,2,2,2,115,87,3,3,2,2,44,30,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,34,27,48,41,115,2,114,114,2&25,114,114,3,2,3,115,43,42,41,2,2,112,2,2,115,87,2,87,2,44,30,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,34,27,40,2,114,2,2,2&25,2&25,2,2,115,2,2,44,36*2,48,42,41,115,2,115,2,115,2,2,3,44,30,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,26,48,41,114,2,2,114,2&25,2&25,2,115,87,43,47,36,36,36,40,115,87,87,2,115,3,43,42,47,30,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,34,27,40,87,115,2,3,115,2&25,2,2,2,44,37,36,36,37,48,41,115,2,3,2,112,44,29,28,33,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,26,48,41,2,2,3,2,2&25,121!0,2,2,44,37,36,36,36,36,40,2,2,2*3,2,4,44,30,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,34,27,48,41,2,2,2,2&25,2&25,2,2,44,36,36,36,36,49,39,2,2,2,2,2,44,30,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,35,24,32,22,22,22,22,22,22,22,34,27,40,87,2,2,115,2&25,3,2,45,46,36,36,49,39,2,2,2,2,2,2,44,30,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,26,36,30,22,22,22,22,22,22,22,22,26,40,2,2,2,115,2&25,2,2,2,44,37,36,40,2,2,2,2,2,2,2,44,30,22,22,22,22,22,22
diff --git a/rsrc/scenarios/busywork/out/out0~1.map b/rsrc/scenarios/busywork/out/out0~1.map
index 129a4127..c249770e 100644
--- a/rsrc/scenarios/busywork/out/out0~1.map
+++ b/rsrc/scenarios/busywork/out/out0~1.map
@@ -1,48 +1,48 @@
-22,22,22,26,36,30,22,22,22,22,22,22,22,22,22,22,22,22,22,26,40,2,3,114,2,80&25,2,2,2,44,37,37,40,114,114,2,2,2,3,2,44,30,22,22,22,22,22,22
-22,22,22,34,28,33,22,22,22,22,22,22,22,22,22,22,35,24,24,25,40,112,2,2,2,80&25,80&25,2,2,44,36,36,48,42,42,41,2,2,112,4,44,30,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,35,24,25,49,38,38,39,2,113,2,114,2,80&25,2,2,45,38,46,36,37,36,48,42,42,42,42,47,30,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,35,25,49,38,39,112,2,4,112,114,114,112,114,80&25,3,2,2,112,45,38,46,37,37,36,36,29,28,28,33,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,35,24,25,49,39,2,2,112,114,2,2,113,114,4,2,80&25,2,113,113,4,2,114,45,38,38,46,37,30,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,35,25,49,38,39,114,2,2,2,112,2,2,4,113,2,3,80&25,114,113,113,2,2,113,2,4,2,44,36,30,22,22,22,22,22,22,22,22,22
+22,22,22,26,36,30,22,22,22,22,22,22,22,22,22,22,22,22,22,26,40,2,3,114,2,2&25,2,2,2,44,37,37,40,114,114,2,2,2,3,2,44,30,22,22,22,22,22,22
+22,22,22,34,28,33,22,22,22,22,22,22,22,22,22,22,35,24,24,25,40,112,2,2,2,2&25,2&25,2,2,44,36,36,48,42,42,41,2,2,112,4,44,30,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,35,24,25,49,38,38,39,2,113,2,114,2,2&25,2,2,45,38,46,36,37,36,48,42,42,42,42,47,30,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,35,25,49,38,39,112,2,4,112,114,114,112,114,2&25,3,2,2,112,45,38,46,37,37,36,36,29,28,28,33,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,35,24,25,49,39,2,2,112,114,2,2,113,114,4,2,2&25,2,113,113,4,2,114,45,38,38,46,37,30,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,35,25,49,38,39,114,2,2,2,112,2,2,4,113,2,3,2&25,114,113,113,2,2,113,2,4,2,44,36,30,22,22,22,22,22,22,22,22,22
 22,22,22,22,22,22,22,22,22,35,25,49,39,112,2,2,4,2,112,113,2,2,114,2,43,42,42&25,42,42,42,42,42,42,42,41,2,44,29,33,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,35,25,49,39,112,112,2,113,2,2,112,113,43,42,42,42,47,36,81&25,36,49,38,46,29,28,27,48,42,47,30,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,35,25*0,49,39,114,113,113,113,2,2,43,42,42,47,29,28,28,27,36,81&25,36,40,112,44,30,22*1,34,28,27,37,30,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,26,36,40,114,2,112,112,2,43,42,47,29,28,28,33,22,22,26,36,81&25,81&25,40,3,44,31,32,22,22,34,28,33,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,26,36,40,2,2,2,43,42,47,29,28,33,22,22,35,24,24,25,36,36,81&25,40,3,45,46,31,24,32,22,22,22,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,34,27,48,42,42,42,47,29,28,33,22,35,24,24,25,36,36,36,36,36,81&25,40,2,2,45,38,46,31,24,32,22,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,35,25,36,29,28,28,28,33,22,22,35,25,49,38,38,38,46,36,36,81&25,81&25,48,42,41,2,2,45,38,46,31,32,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,238@3,36,36,30,22,22,35,24,24,24,25,49,39,2,2,2,44,36,36,81&25,37,36,36,48,42,41,112,3,45,46,31,32,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,35,25,49,39,112,112,2,113,2,2,112,113,43,42,42,42,47,36,36&25,36,49,38,46,29,28,27,48,42,47,30,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,35,25*0,49,39,114,113,113,113,2,2,43,42,42,47,29,28,28,27,36,36&25,36,40,112,44,30,22*1,34,28,27,37,30,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,26,36,40,114,2,112,112,2,43,42,47,29,28,28,33,22,22,26,36,36&25,36&25,40,3,44,31,32,22,22,34,28,33,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,26,36,40,2,2,2,43,42,47,29,28,33,22,22,35,24,24,25,36,36,36&25,40,3,45,46,31,24,32,22,22,22,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,34,27,48,42,42,42,47,29,28,33,22,35,24,24,25,36,36,36,36,36,36&25,40,2,2,45,38,46,31,24,32,22,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,35,25,36,29,28,28,28,33,22,22,35,25,49,38,38,38,46,36,36,36&25,36&25,48,42,41,2,2,45,38,46,31,32,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,238@3,36,36,30,22,22,35,24,24,24,25,49,39,2,2,2,44,36,36,36&25,37,36,36,48,42,41,112,3,45,46,31,32,22,22,22,22,22,22,22,22,22
 22,22,22,22,22,22,22,34,28,28,33,22,35,25,36,36,49,38,39,2,2,112,112,45,38,38,38&25,38,38,46,36,36,48,41,2,2,45,46,30,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,35,24,25,36,36,36,40,113,2,112,2,2,2,2,2,2,80&25,2,2,45,46,37,37,40,2,2,2,44,31,32,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,35,24,25,49,38,38,46,36,48,41,112,2,112,112,80&25,80&25,80&25,80&25,80&25,113,2,2,44,36,37,40,4,112,3,45,46,31,32,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,26,49,38,39,113,2,44,36,36,40,2,112,80&25,80&25,80&25,2,2,43,42,42,42,42,47,36,36,40,2,114,114,113,45,46,31,24,32,22,22,22,22,22
-22,22,22,22,22,22,22,35,25,40,112,2,2,4,44,36,81&25,40&25,80&25,80&25,80&25,2,112,3,2,44,29,28,28,28,28,28,27,48,41,3,113,114,113,45,38,46,30,22,22,22,22,22
-22,22,22,22,22,22,35,25,49,39,2,2,113,43,47,81&25,81&25,40,2,2,112,113,2,112,43,47,30,22,22,22,22,22,34,27,48,41,113,3,113,112,112,44,30,22,22,22,22,22
-22,22,22,22,22,22,26,36,40,114,112,2,113,44,36,81&25,37,40,113,113,2,2,3,43,47,29,33,22,35,24,32,22,22,34,27,48,41,113,112,250&9:13,113,44,30,22,22,22,22,22
-22,22,22,22,22,22,34,27,40,114,2,3,43,47,36,81&25,49,39,2,43,42,42,42,47,29,33,22,35,25,36,31,32,22,22,34,27,48,41,112,113,3,44,30,22,22,22,22,22
-22,22,22,22,22,22,22,26,40,2,2,3,44,36,36,81&25,40,2,2,44,29,28,28,28,33,22,22,26,36,36,36,31,32,22,22,34,27,48,42,41,113,44,30,22,22,22,22,22
-22,22,22,22,22,22,22,26,48,41,114,3,44,36,36,81&25,48,42,42,47,30,22,22,22,22,22,35,25,36,36,36,36,31,32,22,22,34,28,27,48,42,47,30,22,22,22,22,22
-22,22,22,22,22,22,22,34,27,48,42,42,47,37,37,81&25,36,29,28,28,33,22,22,35,24,24,25,36,36,36,36,36,37,31,24,32,22,22,34,28,28,28,33,22,22,22,22,22
-22,22,22,22,22,22,22,22,34,28,27,36,29,27,36:2,81&25:2,29,33,22,22,35,24,24,25,49,38,38,46,36,37,36,49,38,38,46,31,32,22,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,26,36:1,30,26,36,81&25,31,24,24,24,25,49,38,38,39,112,2,44,36,36,36,40,2,113,45,46,31,32,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,34,28:5,33,26,36,81&25,49,38,38,38,38,39,2,113,112,80&25,80&25,44&25,81&25,81&25,81&25,40,114,2,114,45,46,31,32,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,35,24:5,24,25,36,81&25,40,113,2,113,2,2,113,80&25,80&25,80&25,112,45,46,36,81&25,40,113,2,114,112,44,36,31,32,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,26,49,38,46,36,81&25,40&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,112,2,2,113,44,36,81&25,48,42,42,42,42,47,36,36,30,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,35,25,40,2,44,36,37,40,2,4,2,2,2,112,3,2,113,43,42,47,37,81&25,37,36,36,36,36,36,36,36,30,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,35,25,49,39,2,44,36,37,40,3,2,43,42,42,42,42,42,42,47,36,36,36,81&25,81&25,81&25,81&25,81&25,81&25:0,36,37,36,30,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,35,24,25,36,36,36,40,113,2,112,2,2,2,2,2,2,2&25,2,2,45,46,37,37,40,2,2,2,44,31,32,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,35,24,25,49,38,38,46,36,48,41,112,2,112,112,2&25,2&25,2&25,2&25,2&25,113,2,2,44,36,37,40,4,112,3,45,46,31,32,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,26,49,38,39,113,2,44,36,36,40,2,112,2&25,2&25,2&25,2,2,43,42,42,42,42,47,36,36,40,2,114,114,113,45,46,31,24,32,22,22,22,22,22
+22,22,22,22,22,22,22,35,25,40,112,2,2,4,44,36,36&25,40&25,2&25,2&25,2&25,2,112,3,2,44,29,28,28,28,28,28,27,48,41,3,113,114,113,45,38,46,30,22,22,22,22,22
+22,22,22,22,22,22,35,25,49,39,2,2,113,43,47,36&25,36&25,40,2,2,112,113,2,112,43,47,30,22,22,22,22,22,34,27,48,41,113,3,113,112,112,44,30,22,22,22,22,22
+22,22,22,22,22,22,26,36,40,114,112,2,113,44,36,36&25,37,40,113,113,2,2,3,43,47,29,33,22,35,24,32,22,22,34,27,48,41,113,112,2&9:13,113,44,30,22,22,22,22,22
+22,22,22,22,22,22,34,27,40,114,2,3,43,47,36,36&25,49,39,2,43,42,42,42,47,29,33,22,35,25,36,31,32,22,22,34,27,48,41,112,113,3,44,30,22,22,22,22,22
+22,22,22,22,22,22,22,26,40,2,2,3,44,36,36,36&25,40,2,2,44,29,28,28,28,33,22,22,26,36,36,36,31,32,22,22,34,27,48,42,41,113,44,30,22,22,22,22,22
+22,22,22,22,22,22,22,26,48,41,114,3,44,36,36,36&25,48,42,42,47,30,22,22,22,22,22,35,25,36,36,36,36,31,32,22,22,34,28,27,48,42,47,30,22,22,22,22,22
+22,22,22,22,22,22,22,34,27,48,42,42,47,37,37,36&25,36,29,28,28,33,22,22,35,24,24,25,36,36,36,36,36,37,31,24,32,22,22,34,28,28,28,33,22,22,22,22,22
+22,22,22,22,22,22,22,22,34,28,27,36,29,27,36:2,36&25:2,29,33,22,22,35,24,24,25,49,38,38,46,36,37,36,49,38,38,46,31,32,22,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,26,36:1,30,26,36,36&25,31,24,24,24,25,49,38,38,39,112,2,44,36,36,36,40,2,113,45,46,31,32,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,34,28:5,33,26,36,36&25,49,38,38,38,38,39,2,113,112,2&25,2&25,44&25,36&25,36&25,36&25,40,114,2,114,45,46,31,32,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,35,24:5,24,25,36,36&25,40,113,2,113,2,2,113,2&25,2&25,2&25,112,45,46,36,36&25,40,113,2,114,112,44,36,31,32,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,26,49,38,46,36,36&25,40&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,112,2,2,113,44,36,36&25,48,42,42,42,42,47,36,36,30,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,35,25,40,2,44,36,37,40,2,4,2,2,2,112,3,2,113,43,42,47,37,36&25,37,36,36,36,36,36,36,36,30,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,35,25,49,39,2,44,36,37,40,3,2,43,42,42,42,42,42,42,47,36,36,36,36&25,36&25,36&25,36&25,36&25,36&25:0,36,37,36,30,22,22,22,22,22,22,22,22
 22,22,22,22,22,22,22,22,26*2,36,40,3,43,47,36,36,48,42,42,47,29,28,28,28,27,49,38,38,38,38,38&25,46,36*3,36,49,38,38,38,46,30,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,26,36,48,42,47,29,28,28,28,28,28,28,33,22,22,22,26,40,2,3,112,2,80&25,45,46,37,40,114,112,114,44,31,32,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,34,28,28,28,28,33,22,22,22,22,22,22,22,22,22,35,25,40,113,113,113,80&25,80&25,2,44,36,40,112,2,2,45,46,30,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,35,25,49,39,2,4,113,80&25,43,42,47,36,40,2,2,2,2,44,30,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,35,24,25,49,39,2,80&25,80&25,80&25,80&25,44,29,28,27,40,4,2,2,2,44,30,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,35,24,24,24,24,25,49,38,39,113,112,80&25,43,42,42,47,30,22,26,48,41,2,2,43,47,30,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,35,24,24,25,49,38,38,38,38,39,113,113,2,112,80&25,44,36,36,36,30,22,34,27,48,42,42,47,29,33,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,35,25,37,49,38,39,2,114,3,3,2,2,3,43,41,80&25,44,36,36,36,31,32,22,34,28,28,28,28,33,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,35,24,25,36,36,40,2,2,4,4,2,2,2,2,113,44,40,80&25,44,36,49,38,46,31,24,32,22,22,22,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,26,36,48,42,47,29,28,28,28,28,28,28,33,22,22,22,26,40,2,3,112,2,2&25,45,46,37,40,114,112,114,44,31,32,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,34,28,28,28,28,33,22,22,22,22,22,22,22,22,22,35,25,40,113,113,113,2&25,2&25,2,44,36,40,112,2,2,45,46,30,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,35,25,49,39,2,4,113,2&25,43,42,47,36,40,2,2,2,2,44,30,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,35,24,25,49,39,2,2&25,2&25,2&25,2&25,44,29,28,27,40,4,2,2,2,44,30,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,35,24,24,24,24,25,49,38,39,113,112,2&25,43,42,42,47,30,22,26,48,41,2,2,43,47,30,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,35,24,24,25,49,38,38,38,38,39,113,113,2,112,2&25,44,36,36,36,30,22,34,27,48,42,42,47,29,33,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,35,25,37,49,38,39,2,114,3,3,2,2,3,43,41,2&25,44,36,36,36,31,32,22,34,28,28,28,28,33,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,35,24,25,36,36,40,2,2,4,4,2,2,2,2,113,44,40,2&25,44,36,49,38,46,31,24,32,22,22,22,22,22,22,22,22,22,22,22,22,22
 22,22,22,22,22,22,22,22,35,25,49,38,46,36,48,42,42,42,42,41,2,2,112,2,44,48,42&25,47,36,40,2,45,38,46,31,32,22,22,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,26,49,39,2,45,38,46,36,36,37,36,48,42,41,2,2,44,36,81&25,37,49,39,113,2,4,45,46,31,24,24,24,32,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,26,40,2,2,2,2,45,38,38,46,37,36,36,48,42,42,47,36,81&25,36,40,2,2,2,113,2,45,38,38,38,46,30,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,26,49,39,2,45,38,46,36,36,37,36,48,42,41,2,2,44,36,36&25,37,49,39,113,2,4,45,46,31,24,24,24,32,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,26,40,2,2,2,2,45,38,38,46,37,36,36,48,42,42,47,36,36&25,36,40,2,2,2,113,2,45,38,38,38,46,30,22,22,22,22,22,22,22,22
 22,22,22,22,22,22,22,35,25,40,3,2,113,113,2,2,2,45,38,38,46,36,36,36,49,38,38&25,38,39,113,112,114,113,2,2,2,2,2,44,31,32,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,26,36,40,114,2,114,113,113,2,112,2,3,2,45,46,36,49,39,113,80&25,113,2,2,113,112,112,112,2,2,2,4,45,46,30,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,26,37,48,42,41,114,113,113,3,4,2,2,114,2,45,38,39,80&25,80&25,80&25,3,114,2,3,2,2,2,4,2,2,2,2,44,30,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,26,36,37,36,40,3,2,2,112,2,2,2,2,2,113,2,114,80&25,2,2,2,2,3,112,4,114,2,4,2,2,2,2,44,30,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,26,36,40,114,2,114,113,113,2,112,2,3,2,45,46,36,49,39,113,2&25,113,2,2,113,112,112,112,2,2,2,4,45,46,30,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,26,37,48,42,41,114,113,113,3,4,2,2,114,2,45,38,39,2&25,2&25,2&25,3,114,2,3,2,2,2,4,2,2,2,2,44,30,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,26,36,37,36,40,3,2,2,112,2,2,2,2,2,113,2,114,2&25,2,2,2,2,3,112,4,114,2,4,2,2,2,2,44,30,22,22,22,22,22,22,22
diff --git a/rsrc/scenarios/busywork/out/out0~2.map b/rsrc/scenarios/busywork/out/out0~2.map
index 33a4b6a8..055db390 100644
--- a/rsrc/scenarios/busywork/out/out0~2.map
+++ b/rsrc/scenarios/busywork/out/out0~2.map
@@ -1,48 +1,48 @@
-22,22,22,22,22,22,22,26,37,36,36,40,2,3,2,2,114,114,112,113,112,112,113,113,80&25,2,112,2,2,113,112,2,2,2,44,36,37,36,36,36,30,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,26,37,36,36,40,2,4,113,2,114,2,113,2,114,112,250&9:13,2,80&25,3,2,112,112,2,3,2,2,87,44,36,36,36,36,36,30,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,26,36,36,36,40,2,113,113,113,114,2,2,112,112,112,2,2,80&25,2,114,114,114,112,2,114,3,2,44,37,37,36,37,29,33,22,22,22,22,22,22,22
-22,22,22,22,22,22,35,25,37,36,49,39,113,4,113,114,113,113,114,4,113,112,114,113,80&25,112,112,112,113,87,114,114,2,43,47,36,36,36,36,30,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,26,36,36,36,40,2,113,112,112,2,2,114,2,2,114,2,112,2,80&25,2,2,2,112,112,114,113,113,44,37,36,36,36,29,33,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,26,36,37,36,40,113,112,115,114,112,114,2,113,114,112,112,113,4,80&25,2,112,2,2,2,2,113,43,47,36,36,36,36,30,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,26,36,36,36,40,112,112,112,115,112,112,3,2,2,2,2,2,80&25,80&25,112,112,2,2,113,113,43,47,36,36,36,36,36,30,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,26,37,36,49,39,2,114,112,114,112,112,2,113,114,2,112,2,80&25,112,3,2,112,2,2,113,44,36,36,36,36*0,37,36,30,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,26,37,36,40,2,114,112,112,114:9,114:9,112,3,112,2,114,115,112,80&25,115,113,112,2,2,2,43,47,36,36,36,36,37,36,31,32,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,26,36,37,40,2,3,2,112,112,112,112,43,42,42,41,114,3,80&25,2,112,112,112,2,43,47,37,36,36,36,36,36,36,36,30,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,26,36,36,40,113,2,112,2,112,3,2,44,36,36,40,112,112,80&25,112,115,114,112,43,47,36,37,37,37,37,36,36,36,37,30,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,26,37,36,48,41,112,110,113,110,112,43,47,49,38,39,114,2,80&25,2,112,113,113,44,36,36,36,36,37,36,36,36,37,36,30,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,26,36,36,36*2,48,41,2,2,2,43,47,36,40,2,114,112,80&25,80&25,112,113,115,112,44,37,36,36,36,36,36,37,36,36,36,30,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,26,36,36,36,36,40,110,112,2,44,36,49,39,113,112,114,80&25,114,2,113,112,2,44,36,36,37,37,36,36,36,36,36,29,33,22,22,22,22,22,22,22,22
-22,22,22,22,22,35,25,36,36,36,36,40,112,112,112,44,36,40,2,2,115,113,80&25,112,112,113,2,113,44,37,36,36,36,37,36,36,36,29,33,22,22,35,24,32,22,22,22,22
-22,22,22,22,22,26,36,36,36,36,37,40,2,112,112,44,36,40,112,113,2,3,80&25,113,2,113,115,2,44,36,36,36,36,37,36,36,37,30,22,22,22,26,251&9:12,30,22,22,22,22
-22,22,22,22,22,26,37,36,36,36,49,39,112,112,43,47,36,40,114,2,115,80&25,80&25,113,112,2,2,115,44,36,37,49,38,38,46,36,29,33,22,22,22,26,36,30,22,22,22,22
-22,22,22,22,22,26,36,36,36,36,40,112,113,112,44,36,49,39,2,112,115,80&25,113,2,113,2,43,42,47,36,36,40,2,2,44,36,30,22,22,22,35,25,36,30,22,22,22,22
-22,22,22,22,22,26,36,36,36,36,40,2,2,112,44,36,40,2,112,2,2,80&25,113,2,113,113,44,36,36,36,49,39,2,2,44,29,33,22,22,22,26,36,29,33,22,22,22,22
-22,22,22,22,22,26,36,36,36,36,40,2,2,43,47,36,40,112,2,114,80&25,80&25,112,113,112,43,47,36,36,49,39,114,114,2,44,31,24,24,24,24,25,36,30,22,22,22,22,22
-22,22,22,22,22,26,36,36,36,49,39,2,2,44,37,36,40,112,2,113,80&25,115,4,112,112,44,37*1,36,37,40,114,3,2,115,44,36,36,36:11,36,36,36,29,33,22,22,22,22,22
-22,22,22,22,22,26,36,36,36,40,113,112,43,47,36,36,40,112,114,2,80&25,112,112,113,43,47,37,36,49,39,115,2,115,2,44,29,28,28,27,36,29,33,22,22,22,22,22,22
-22,22,22,35,24,25,36,36,36,40,113,112,44,36,36,49,39,114,2,80&25,80&25,113,112,43,47,36,36,36,40,3,110,2,2,2,44,31,32,22,26,36,30,22,22,22,22,22,22,22
-22,22,22,26,36,36,37,36,36,48,41,112,44,36,36,40,112,2,2,80&25,113,113,113,44,36,36,36,49,39,2,114,2,110,114,45,46,30,22,26,36,31,32,22,22,22,22,22,22
-22,22,22,34,28,27,36,36,36,36,48,42,47,36,36,40,112,2,80&25,80&25,113,2,2,44,37,36,36,40,2,114,2,2,3,56,54,44,31,32,34,27,36,31,32,22,22,22,22,22
-22,22,22,22,22,26,37,36,36,36,37,37,36,37,49,39,112,112,80&25,3,112,2,43,47,36,36,49,39,2,2,115,110,114,58,52,44,37,31,32,34,27,36,30,22,22,22,22,22
-22,22,22,22,22,26,36,36,36,36,36,36,36,36,40,2,112,3,80&25,3,113,4,44,37,37,36,40,2,115,3,2,114,114,114,2,44,36,36,30,22,26,36,30,22,22,22,22,22
-22,22,22,22,22,26,36,36,36,36,36*3,36,37,36,40,112,114,113,80&25,2,3,112,45,38,46,37,40,3,2,2,2,2,2,110,43,47,36,36,30,22,34,28,33,22,22,22,22,22
-22,22,22,22,22,26,36,37,36,36,36,36,36,36,40,112,113,2,80&25,115,2,2,112,115,44,37,48,41,2,114,115,114,114,43,47,37,37,36,31,32,22,22,22,22,22,22,22,22
-22,22,22,22,22,34,27,36,36,36,36,37,37,36,40,114,2,112,80&25,113,112,2,2,2,44,36,36,40,2,235@1,2,2,114,44,36,36,36,36,36,30,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,26,37,37,37,36,37,36,49,39,112,87,112,80&25,80&25,2,113,2,4,45,38,38,39,2,80&25,114,114,110,44,37,36,36,36,36,31,32,22,22,22,22,22,22,22
-22,22,22,22,22,22,26,36,36,36,37,37,49,39,115,113,3,2,114,80&25,113,113,113,4,113,113,2,113,4,80&25,110,110,2,45,38,46,37,49,38,46,30,22,22,22,22,22,22,22
-22,22,22,22,22,22,26,36,36,37,37,36,40,87,2,114,114,113,113,80&25,2,112,115,3,2,114,113,3,114,80&25,110,110,114,2,4,44,37,40,4,44,30,22,22,22,22,22,22,22
-22,22,22,22,22,22,26,36,37,36,36,36,40,2,112,112,112,112,2,80&25,80&25,113,113,113,3,113,80&25,80&25,80&25,80&25,2,2,110,2,2,44,37,48,42,47,31,32,22,22,22,22,22,22
-22,22,22,22,22,22,26,36,36,36,36,36,40,113,2,112,114,112,2,3,80&25,80&25,121!0,80&25,80&25,80&25,80&25,2,112,113,2,3,110,2,2,44,36,36,36,37,36,30,22,22,22,22,22,22
-22,22,22,22,22,22,34,28,27,36,36,37,40,112,2,114,4,2,114,2,2,80&25,80&25,80&25,2,115,3,114,114,3,2,2,113,113,2,45,46,36,36,36,36,30,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,26,36,37,36,48,41,113,112,3,2,112,2,115,2,80&25,2,3,113,112,2,114,2,2,110,2,110,110,110,44,37,36,36,37,30,22,22,22,22,22,22
+22,22,22,22,22,22,22,26,37,36,36,40,2,3,2,2,114,114,112,113,112,112,113,113,2&25,2,112,2,2,113,112,2,2,2,44,36,37,36,36,36,30,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,26,37,36,36,40,2,4,113,2,114,2,113,2,114,112,2&9:13,2,2&25,3,2,112,112,2,3,2,2,87,44,36,36,36,36,36,30,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,26,36,36,36,40,2,113,113,113,114,2,2,112,112,112,2,2,2&25,2,114,114,114,112,2,114,3,2,44,37,37,36,37,29,33,22,22,22,22,22,22,22
+22,22,22,22,22,22,35,25,37,36,49,39,113,4,113,114,113,113,114,4,113,112,114,113,2&25,112,112,112,113,87,114,114,2,43,47,36,36,36,36,30,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,26,36,36,36,40,2,113,112,112,2,2,114,2,2,114,2,112,2,2&25,2,2,2,112,112,114,113,113,44,37,36,36,36,29,33,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,26,36,37,36,40,113,112,115,114,112,114,2,113,114,112,112,113,4,2&25,2,112,2,2,2,2,113,43,47,36,36,36,36,30,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,26,36,36,36,40,112,112,112,115,112,112,3,2,2,2,2,2,2&25,2&25,112,112,2,2,113,113,43,47,36,36,36,36,36,30,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,26,37,36,49,39,2,114,112,114,112,112,2,113,114,2,112,2,2&25,112,3,2,112,2,2,113,44,36,36,36,36*0,37,36,30,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,26,37,36,40,2,114,112,112,114:9,114:9,112,3,112,2,114,115,112,2&25,115,113,112,2,2,2,43,47,36,36,36,36,37,36,31,32,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,26,36,37,40,2,3,2,112,112,112,112,43,42,42,41,114,3,2&25,2,112,112,112,2,43,47,37,36,36,36,36,36,36,36,30,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,26,36,36,40,113,2,112,2,112,3,2,44,36,36,40,112,112,2&25,112,115,114,112,43,47,36,37,37,37,37,36,36,36,37,30,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,26,37,36,48,41,112,110,113,110,112,43,47,49,38,39,114,2,2&25,2,112,113,113,44,36,36,36,36,37,36,36,36,37,36,30,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,26,36,36,36*2,48,41,2,2,2,43,47,36,40,2,114,112,2&25,2&25,112,113,115,112,44,37,36,36,36,36,36,37,36,36,36,30,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,26,36,36,36,36,40,110,112,2,44,36,49,39,113,112,114,2&25,114,2,113,112,2,44,36,36,37,37,36,36,36,36,36,29,33,22,22,22,22,22,22,22,22
+22,22,22,22,22,35,25,36,36,36,36,40,112,112,112,44,36,40,2,2,115,113,2&25,112,112,113,2,113,44,37,36,36,36,37,36,36,36,29,33,22,22,35,24,32,22,22,22,22
+22,22,22,22,22,26,36,36,36,36,37,40,2,112,112,44,36,40,112,113,2,3,2&25,113,2,113,115,2,44,36,36,36,36,37,36,36,37,30,22,22,22,26,36&9:12,30,22,22,22,22
+22,22,22,22,22,26,37,36,36,36,49,39,112,112,43,47,36,40,114,2,115,2&25,2&25,113,112,2,2,115,44,36,37,49,38,38,46,36,29,33,22,22,22,26,36,30,22,22,22,22
+22,22,22,22,22,26,36,36,36,36,40,112,113,112,44,36,49,39,2,112,115,2&25,113,2,113,2,43,42,47,36,36,40,2,2,44,36,30,22,22,22,35,25,36,30,22,22,22,22
+22,22,22,22,22,26,36,36,36,36,40,2,2,112,44,36,40,2,112,2,2,2&25,113,2,113,113,44,36,36,36,49,39,2,2,44,29,33,22,22,22,26,36,29,33,22,22,22,22
+22,22,22,22,22,26,36,36,36,36,40,2,2,43,47,36,40,112,2,114,2&25,2&25,112,113,112,43,47,36,36,49,39,114,114,2,44,31,24,24,24,24,25,36,30,22,22,22,22,22
+22,22,22,22,22,26,36,36,36,49,39,2,2,44,37,36,40,112,2,113,2&25,115,4,112,112,44,37*1,36,37,40,114,3,2,115,44,36,36,36:11,36,36,36,29,33,22,22,22,22,22
+22,22,22,22,22,26,36,36,36,40,113,112,43,47,36,36,40,112,114,2,2&25,112,112,113,43,47,37,36,49,39,115,2,115,2,44,29,28,28,27,36,29,33,22,22,22,22,22,22
+22,22,22,35,24,25,36,36,36,40,113,112,44,36,36,49,39,114,2,2&25,2&25,113,112,43,47,36,36,36,40,3,110,2,2,2,44,31,32,22,26,36,30,22,22,22,22,22,22,22
+22,22,22,26,36,36,37,36,36,48,41,112,44,36,36,40,112,2,2,2&25,113,113,113,44,36,36,36,49,39,2,114,2,110,114,45,46,30,22,26,36,31,32,22,22,22,22,22,22
+22,22,22,34,28,27,36,36,36,36,48,42,47,36,36,40,112,2,2&25,2&25,113,2,2,44,37,36,36,40,2,114,2,2,3,56,54,44,31,32,34,27,36,31,32,22,22,22,22,22
+22,22,22,22,22,26,37,36,36,36,37,37,36,37,49,39,112,112,2&25,3,112,2,43,47,36,36,49,39,2,2,115,110,114,58,52,44,37,31,32,34,27,36,30,22,22,22,22,22
+22,22,22,22,22,26,36,36,36,36,36,36,36,36,40,2,112,3,2&25,3,113,4,44,37,37,36,40,2,115,3,2,114,114,114,2,44,36,36,30,22,26,36,30,22,22,22,22,22
+22,22,22,22,22,26,36,36,36,36,36*3,36,37,36,40,112,114,113,2&25,2,3,112,45,38,46,37,40,3,2,2,2,2,2,110,43,47,36,36,30,22,34,28,33,22,22,22,22,22
+22,22,22,22,22,26,36,37,36,36,36,36,36,36,40,112,113,2,2&25,115,2,2,112,115,44,37,48,41,2,114,115,114,114,43,47,37,37,36,31,32,22,22,22,22,22,22,22,22
+22,22,22,22,22,34,27,36,36,36,36,37,37,36,40,114,2,112,2&25,113,112,2,2,2,44,36,36,40,2,235@1,2,2,114,44,36,36,36,36,36,30,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,26,37,37,37,36,37,36,49,39,112,87,112,2&25,2&25,2,113,2,4,45,38,38,39,2,2&25,114,114,110,44,37,36,36,36,36,31,32,22,22,22,22,22,22,22
+22,22,22,22,22,22,26,36,36,36,37,37,49,39,115,113,3,2,114,2&25,113,113,113,4,113,113,2,113,4,2&25,110,110,2,45,38,46,37,49,38,46,30,22,22,22,22,22,22,22
+22,22,22,22,22,22,26,36,36,37,37,36,40,87,2,114,114,113,113,2&25,2,112,115,3,2,114,113,3,114,2&25,110,110,114,2,4,44,37,40,4,44,30,22,22,22,22,22,22,22
+22,22,22,22,22,22,26,36,37,36,36,36,40,2,112,112,112,112,2,2&25,2&25,113,113,113,3,113,2&25,2&25,2&25,2&25,2,2,110,2,2,44,37,48,42,47,31,32,22,22,22,22,22,22
+22,22,22,22,22,22,26,36,36,36,36,36,40,113,2,112,114,112,2,3,2&25,2&25,121!0,2&25,2&25,2&25,2&25,2,112,113,2,3,110,2,2,44,36,36,36,37,36,30,22,22,22,22,22,22
+22,22,22,22,22,22,34,28,27,36,36,37,40,112,2,114,4,2,114,2,2,2&25,2&25,2&25,2,115,3,114,114,3,2,2,113,113,2,45,46,36,36,36,36,30,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,26,36,37,36,48,41,113,112,3,2,112,2,115,2,2&25,2,3,113,112,2,114,2,2,110,2,110,110,110,44,37,36,36,37,30,22,22,22,22,22,22
 22,22,22,22,22,22,22,22,26,36,36,36,36,40,2,2,113,113,3,43,42,42,42&25,42,42,41,2,2,113,113,2,2,114,114,115,2,44,36,36,29,28,33,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,34,28,28,28,27,40,113,2,2,43,42,47,37,36,81&25,36,36,48,41,2,2,2,115,2,2,43,42,42,47,29,28,33,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,26,40,3,4,2,44,37,36,36,36,81&25,81&25,36,37,48,41,2,113,2,3,2,44,29,28,28,33,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,26,48,42,41,2,44,36,36,36,36,36,81&25,36,29,27,48,42,42,42,42,42,47,30,22,22,22,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,34,28,27,48,42,47,36,29,28,27,36,81&25,36,30,26,36,29,28,28,28,28,28,33,22,22,22,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,34,28,28,28,28,33,22,26,37:0,81&25:0,81&25:0,30,34,28,33,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,26,36,36,81&25,31,32,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,26,37,37,81&25,36,30,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,26,36,37,81&25,36,30,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,34,27,36,81&25,37,30,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,26,36,81&25,36,30,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,34,28,28,28,27,40,113,2,2,43,42,47,37,36,36&25,36,36,48,41,2,2,2,115,2,2,43,42,42,47,29,28,33,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,26,40,3,4,2,44,37,36,36,36,36&25,36&25,36,37,48,41,2,113,2,3,2,44,29,28,28,33,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,26,48,42,41,2,44,36,36,36,36,36,36&25,36,29,27,48,42,42,42,42,42,47,30,22,22,22,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,34,28,27,48,42,47,36,29,28,27,36,36&25,36,30,26,36,29,28,28,28,28,28,33,22,22,22,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,34,28,28,28,28,33,22,26,37:0,36&25:0,36&25:0,30,34,28,33,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,26,36,36,36&25,31,32,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,26,37,37,36&25,36,30,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,26,36,37,36&25,36,30,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,34,27,36,36&25,37,30,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,26,36,36&25,36,30,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
diff --git a/rsrc/scenarios/busywork/towns/town0.map b/rsrc/scenarios/busywork/towns/town0.map
index 4caa2b71..2404c297 100644
--- a/rsrc/scenarios/busywork/towns/town0.map
+++ b/rsrc/scenarios/busywork/towns/town0.map
@@ -7,10 +7,10 @@
 2,2,2,2,2,2,2,4,2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2,2,2,2,2,2
 2,2,2,3,2,2,2,2,2,2,122,122,122,122,122,122,122,122,122,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,4,2,2
 2,2,2,4,2,4,2,2,4,2,122,198,184@5,196,198,184@7,196,170,122,2,2,2,2,2,2,4,2,3,2,2,2,2,2,2,2,2,2,122,122,122,122,126,122,2,4,2,2,2
-2,3,2,2,2,2,2,2,2,2,122,198,184@4,196,198,184@6,196,170,122,2,2,3,2,2,2,2,2,2,3,139,139,139,139,139,139,139,2,122,247:38&9,170,170,170,122,2,4,2,2,2
+2,3,2,2,2,2,2,2,2,2,122,198,184@4,196,198,184@6,196,170,122,2,2,3,2,2,2,2,2,2,3,139,139,139,139,139,139,139,2,122,170:38&9,170,170,170,122,2,4,2,2,2
 3,3,2,2,2,2,88,89,87,2,122,170,170,170,170,170,170,170,125:16,2,2,2,2,2,2,2,2,2,139,139,210,210,210,210,139,139,2,122,122,122,122,122,122,2,2,2,2,2
 2,2,2,3,2,88,89,2,122,122,122,170,170,170,170,170,170,170,132!0,2,2,2,4,2,2,2,83,83,142:23,210,210,210,210,210,212,139,2,122,192,196$13,170,199,122,2,2,3,2,2
-2,2,2,2,2,3@2,2,2,122,247:37&9,122,170,170,122,125,122,122,122,122,2,2,2,2,2,2,83,83,2,139,139,210,210,210,210,139,139,2,122,170,170,170,201,122,4,2,2,2,2
+2,2,2,2,2,3@2,2,2,122,170:37&9,122,170,170,122,125,122,122,122,122,2,2,2,2,2,2,83,83,2,139,139,210,210,210,210,139,139,2,122,170,170,170,201,122,4,2,2,2,2
 2,2,2,2,3,2,88,89,122,170:11,122,170,170,122,170,199,199,199,122,4,2,2,2,2,83,83,2,2,3,139,139,139,139,139,139,2,3,122,125,122,122,122,122,2,2,2,2,2
 4,2,2,88,89,87,2@1,2,122,125,132!1,170,170,122,170,170,170,170,122,2,2,4,3,83,83,83,2,2,4,3,2,2,2,2,3,2,2,4,2,2,2,2,2,2,2,2,4,2
 2,2,2,2,4@0$4,154,87@3,2,122,170,170,170,188:12,122,170,170,170,170,122,2,3,2,2,83,83,83,2,2,2,2,4,2,2,2,4,2,2,2,2,2,2,2,2,2,2,2,2,2
@@ -19,14 +19,14 @@
 2,2,2,2,2,154,2,2,122,170,126,170,170,202,122,170,175@14,170,122,3,2,2,4,83,83,83,164!5,170,181,170,170,170,154,170,154,154,154,170,170,197,197,154,2,2,2,4,2,2
 2,3,2,3,2,154,2,2,122,170,122,122,122,122,122,170,195$14,170,122,2,2,2,2,83,83,83,157:18,170,170,170,205@22,170$11,154,170,160,194:21,154,202,170,185@29,185,154,2,3,2,2,2,2
 2,2,2,2,3,154,4,2,122,170,126,170,170,202,122,170,170,170,122,2,2,2$10,2,83,83,83,154,170,179,170,170,170,154,155,154,154,154,170,170,195,195,154,2,3,2,2,2,2
-2,2,2,2,2,154,2,2,122,170,132!7,177@13,177@12,177@11,122,170,204,170,122,2,2,2,2,83,83,83,169,170,180,170,71,170@23@24@25&11,154,170,170:10,247:39&9,154,199,170,170,204,154,2,2,2,2,2,3
+2,2,2,2,2,154,2,2,122,170,132!7,177@13,177@12,177@11,122,170,204,170,122,2,2,2,2,83,83,83,169,170,180,170,71,170@23@24@25&11,154,170,170:10,170:39&9,154,199,170,170,204,154,2,2,2,2,2,3
 2,2,4,2,4,154,2,2,122,170,122,122,122,122,122,122,125,122,122,2,3,3,3,83,83,83,154,154,154,154,154,154,154,154,154,154,154,154,154,154,158,154,2,2,2,2,2,3
 2,2,2,2,2,154,2,2,122,170,122,191:22,191:22,191:22,191:22,189,170,189,122,2,2,2,83,83,83,83,2,2,2,3,2,2,2,2,4,2,2,2,2,3,2,2,2,2,4,2,2,2
 2,3,2,3,2>,154,2,4,122,170,122,170,170,170,170,170,170,170,125:16,83,83,83,83,83,83,83,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2<,2,3,3,2
 2,2,2,2,2,154,2,2,122,170,122,170,198,184,196,170,170,170,125:16,83,83,83,83$15,83,83,83,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,2,2,2,2,2,2
 3,2,2,2,2,154,2,2,122,170,170,170,170,170,170,170,170,170,122,2,2,2,83,83,83,83,122,170,170,170,170,170,136*2,170,170,170,170,127,170,173:3,170,123,2,2,2,2,2,2
 2,2,2,2,2,154,3,2,122,122,122,122,122,122,122,122,122,122,122,2,2,2,2,83,83,83,122,170,189,170,189,170,125:35,204,170,175,170,122,122,122,170,122,2,2,3,2,2,2
-2,2,2,2,2,154,2,2,2,2,2,2,2,3,2,2,2,2,2,4,3,2,2,83,83,83,122,170,170,170,170,170*1,136*3,170,170,195$12,170,127,204,122,247:40&9,122,2,2,3,2,2,2
+2,2,2,2,2,154,2,2,2,2,2,2,2,3,2,2,2,2,2,4,3,2,2,83,83,83,122,170,170,170,170,170*1,136*3,170,170,195$12,170,127,204,122,170:40&9,122,2,2,3,2,2,2
 2,2,2,2,2,154,2,4,2,4,2,2,2,2,2,2,3,4,3,2,2,2,3,83,83,83,122,170,170,71,170,170*0,122,122,122,122,122,122,170,122,122,122,4,2,2,2,2,2
 2,2,4,2,2,154,2,2,122,122,122,122,122,122,122,122,138,122,122,2,2,2,83,83$9,83,83,122,170,170,71,170,170,122,199,199,170&21,201@26,122,170,170,185@21,122,3,2,2,2,2,2
 2,2,4,2,3,154,3,2,122,199,199,199,199$7,199,122,170,170,204,125,83,83,83,83,83,83,83,122,170,170,170,170,170,122,170@17,170,170,170,122,170,170,195,122,2,2,2,2,2,2
@@ -34,7 +34,7 @@
 3,3,2,2,2,154,3,2,122,199,199,199$6,199,199,122,170,170,170,132!2,2,2,2,83,83,83,83,122,170,170,170,170,170,122,194@18,170&21,170,170,122,199,170,201@19@20,122,2,3,2,2,2,2
 2,2,3,2,2,154,2,2,122,122,122,122,122,122,122,170,170,170,122,2,2,2,2,83,83,83,122,122,122,125,132!4,122,122,122,122,122,126,122,122,122,122,122,2,2,3,2,3,2
 2,2,2,2,2,154,2,2,122,199,170,170,125,170,170,170,197,197,122,3,2,3,2,83,83$8,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,2,2,2,2,2,2,2
-2,2,2,2,2,154,2,2,122,201@15,247:0&9,170,132!3,170,170,170,185@28,185,138,2,2,2,2,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,2,3,2,2,2,2,2,2
+2,2,2,2,2,154,2,2,122,201@15,170:0&9,170,132!3,170,170,170,185@28,185,138,2,2,2,2,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,2,3,2,2,2,2,2,2
 2,3,2,4,2,154,3,2,122,199,170,185@16,122,202,170,170,195$5,195,122,2,4,2,2,83,83,83,154,157,154,154,154,2,2,4,3,2,2,3,2,3,2,2,2,2,2,2,2,3
 2,2,3,2,2,154,2,2,122,122,122,122,122,122,122,122,122,122,122,2,2,2,2,83,83,83,154,170,170,181@27,154,2,2,2,4,2,2,2,2,2,2,2,4,2,2,3,3,2
 2,2,2,2,2,154,154,2,2,2,2,2,2,2,2,3,2,2,2,88,89,2$16,2,83,83,83,169,196$0,170,170,154,2,2,2,2,2,2,2,2,3,2,3,2,2,2,2,2,2
diff --git a/rsrc/scenarios/busywork/towns/town1.map b/rsrc/scenarios/busywork/towns/town1.map
index e8c1e42c..602fc05d 100644
--- a/rsrc/scenarios/busywork/towns/town1.map
+++ b/rsrc/scenarios/busywork/towns/town1.map
@@ -13,7 +13,7 @@
 2,2,2,114,2,3,2,44,40,2,3,3,2,114,2,4,2,2,2,2,2,114,2,2,2,4,2,2,2,2,2,2
 3,2,114,113,113,2,4,45,39,2,2,2,154,154,154,154,154,154,154,154,2@8,2,2,2,87,4,2,2,3,3,113,2
 2,2,112,113,113,2@18&11,2,2,2,3,2,4,154,199@17,199,170,170&21,170,170,154,2,2@9,2,4,2,2,2,3,3,2,2,2
-114,2,2,112,2,113,113,2,2,2@11,3,114,154,170,247:0&9,170,170,197,197,154,114,2,2,2,2,87,87,112,113,2,2,2
+114,2,2,112,2,113,113,2,2,2@11,3,114,154,170,170:0&9,170,170,197,197,154,114,2,2,2,2,87,87,112,113,2,2,2
 114,112,112,2,2>,113,2,2,2,2,114,114@10,154,170,170&23,170,198,185@14,185@15,154,2,2,88,89,87,2,2,87<,113,3,2,2
 2,2,113,2,2,2,113,2,2,114,2,2,154,170@1,170,170,170,195,195,154,2,2,2,88,89,3,2,2,2,2,2,4
 2,114,2,114,2,112,2,2,2,2,3,2,154,170@2,170@3,170@0,170,170,170&21,154,2,2,2,4,2,2,2,2,2,2,2,3
diff --git a/rsrc/scenarios/busywork/towns/town2.map b/rsrc/scenarios/busywork/towns/town2.map
index ebbce443..4d355de6 100644
--- a/rsrc/scenarios/busywork/towns/town2.map
+++ b/rsrc/scenarios/busywork/towns/town2.map
@@ -1,5 +1,5 @@
 122,122,122,5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,6,6,18,21,6,6,6,18,5,5,5,122,122,122
-122,247:0&9,122,5,5,5,5,122,122,122,122,122,5,5,5,9,0,0,1,94,17,8,0,96,103,17,18,5,5,122,247:1&9,122
+122,170:0&9,122,5,5,5,5,122,122,122,122,122,5,5,5,9,0,0,1,94,17,8,0,96,103,17,18,5,5,122,170:1&9,122
 122,170,122,5,5,5,5,122,180@0,170,180,122,5,21,6,8,103,14,11,0,1,0$0,103,95,0$2,96,15,5,5,122,170,122
 122,170,122,122,122,122,122,122,180,170,180@2,122,5,9,0,96,103,15,20,12,11,96,103,96,0,103,17,6,6,122,170,122
 122,170:13,122,177,177@26,177,177@27,122,181,170,180,122,5,20,11,96$10,95v,17,18,5,20,11,94$4,103,96$1,103,0,0,0,170,170,122
@@ -9,8 +9,8 @@
 122,122,122,122,122,122,123,122,179@3,170,180,122,5,5,20,13,12,11,1$6,96,96,0,1,0,1,15,5,5,5,5,5,5
 5,5,5,5,5,122,170,122,180,170,180@4,122,5,21,6,7,18,20,12,11,96,103,14,12,12,19,5,5,5,5,5,5
 5,5,5,5,5,122,170:10,122,180,170,180,122,5,9,107!3,0,15,5,5,20,12,12,19,5,5,5,5,5,5,5,5,5
-122,122,122,5,122,122,170:11,122,122,122,122,122,5,20,11,246:8&9,15,5,5,5,5,154,154,154,154,154,154,154,154,154,154,154
-122,194,122,5,122,194@34,170,122,5,5,5,5,5,5,9,101@33,15,5,5,5,5,154,180@18@19,170,170,170,170,170,170,170,247:2&9,154
+122,122,122,5,122,122,170:11,122,122,122,122,122,5,20,11,0:8&9,15,5,5,5,5,154,154,154,154,154,154,154,154,154,154,154
+122,194,122,5,122,194@34,170,122,5,5,5,5,5,5,9,101@33,15,5,5,5,5,154,180@18@19,170,170,170,170,170,170,170,170:2&9,154
 122,128,122,122,122,170,170,122,5,5,5,5,5,5,20,12,19,5,5,5,5,154,180@17,170,170&19,170,170,154,154,154,154,154
 122,170,172,172,123,194@35@36@37,170,122,5,5,5,5,5,5,5,5,5,5,5,5,5,154,180@16,170,170,170&17,170,154,5,5,5,5
 122,122,122,122,122,122,122,122,5,5,5,5,5,5,5,5,5,5,5,5,5,154,154,170,170,170,170,154,5,5,5,5
@@ -21,8 +21,8 @@
 5,5,5,5,5,5,9,0,0,0,0,15,5,5,5,5,5,5,20,12,12,154,154,154,154,154,154,154,5,5,5,5
 5,5,5,5,5,5,9,0,0,0,101,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,107!0,0,0,0,15,5,5,5,5,5,5,5,5,5,122,122,122,122,122,132!2,122,122,122,122,122
-5,5,21,6,6,18,20,11,0,0,97,15,5,5,5,5,5,122,122,122,122,122,191:6,170,191:5,170,170,170,170,170,247:3&9,122
-5,5,9,246&9,0,15,5,9,98&13,0&13,0&13,15,5,5,5,5,5,122,170,193,170,122,191:5,170,191:5,170,122,123,122,122,122,122
+5,5,21,6,6,18,20,11,0,0,97,15,5,5,5,5,5,122,122,122,122,122,191:6,170,191:5,170,170,170,170,170,170:3&9,122
+5,5,9,0&9,0,15,5,9,98&13,0&13,0&13,15,5,5,5,5,5,122,170,193,170,122,191:5,170,191:5,170,122,123,122,122,122,122
 5,5,9,98,0,15,5,9,0,0,97,15,5,5,122,122,122,122,170,204:4,170,122,191:5,170,191:5,170,122,0&13,122,5,5,5
 5,5,20,11,0,17,6,8,0,0,14,19,5,5,122,170,194,122,170,170,170,122,170,170,170,207,122,123,122,122,122,5
 5,5,5,9,0,0,0,0,0,98,15,5,5,5,122,170,194^,122,170,170,170,126,170,170,170,170,130,170,170,180@20,122,5
diff --git a/rsrc/scenarios/stealth/out/out0~0.map b/rsrc/scenarios/stealth/out/out0~0.map
index 8706424a..97b2541b 100644
--- a/rsrc/scenarios/stealth/out/out0~0.map
+++ b/rsrc/scenarios/stealth/out/out0~0.map
@@ -8,39 +8,39 @@
 50,50,50,50,50,50,50,62,51,51,51,51,59,50,50,62,52,114,3,57,50,50,50,50,50,53,114,114,44,29,27,40,114,4,113,112,3,110,57,50,50,50,50,50,50,50,50,50
 50,50,50,50,50,50,62,52,113,113,114,2,58,51,51,52,2,114,114,58,51,51,51,51,51,52,2,114,44,31,25,40,114,114,114,113,114,56,60,50,50,50,50,50,50,50,50,50
 50,50,50,50,50,50,53,113,113,113,114,114,112,112,110,2,114,114,114,3,2,2,234@6,2,114,114,114,114,45,38,46,40,2,113,113,114,114,57,50,50,50,50,50,50,50,50,50,50
-50,50,50,50,50,50,53,2,113,113,113,114,2,112,112,3,2,114,118,114,118,2,80&25,114,114,114,114,114,2,2,45,39,2,2,112,113,113,58,59,50,50,50,50,50,50,50,50,50
-50,50,50,50,50,62,52,87,2,2,2,2,2,4,4,112,2,2,118,2,118,2,80&25,2,114,114,114,2,112,114,112,112,112,2,2,4,113,113,58,59,50,50,50,50,50,50,50,50
-50,50,50,50,50,53,87,87,3,3,2,2,2,4,4,3,2,4,2,2,2,2,80&25,2,2,114,114,2,112,114,114,114,112,2,4,2,2,113,3,57,50,50,50,50,50,50,50,50
-50,50,50,50,50,53,2,87,2,3,112,112,2,2,2,4,4,118,118,118,118,118,80&25,2,2,2,2,2,112,112,112,114,114,2,2,113,113,3,110,57,50,50,50,50,50,50,50,50
-50,50,50,50,50,53,87,2,2,112,112,112,2,2,2,4,4,4,4,250&9:22,4,4,80&25,2,2,2,2,2,2,112,112,112,112,2,113,4,2,113,4,57,50,50,50,50,50,50,50,50
-50,50,50,50,50,53,2,3,112,110,112,2,2,2,2,4,4,118,118,118,118,118,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,2,2,2,2,2,113,113,56,55,60,50,50,50,50,50,50,50,50
-50,50,50,50,50,61,54,2,2,112,2,112,2,2,2,4,4,118,118,118,118,118,80&25,118,4,118,4,118,2,80&25,2,2,2,113,2,56,55,60,50,50,50,50,50,50,50,50,50,50
-50,50,50,50,50,50,53,2,2,3,4,4,4,2,2,2,2,112,112,112,112,2,80&25,118,4,118,4,118,2,80&25,80&25,80&25,2,2,2,57,50,50,50,50,50,50,50,50,50,62,51,51
-50,50,50,50,50,50,53,2,3,3,4,114,4,114,2,2,2,112,114,115,112,2,80&25,118,4,118,4,118,2,118,2,80&25,80&25,80&25,56,60,50,50,50,50,50,50,50,50,62,52,3,3
-50,50,50,50,50,50,53,2,115,2,2,4,114,114,114,2,2,112,114,112,112,2,80&25,118,4,118,4,118,118,118,2,2,2,80&25,57,50,50,50,50,50,50,50,50,50,53,110,111,111
-50,50,50,50,50,50,61,54,2,2,2,2,114,114,114,114,2,2,4,4,3,2,80&25,2,2,2,2,2,2,2,2,2,56,68:6,60,50,50,50,50,50,50,50,50,62,52,2,2,111
+50,50,50,50,50,50,53,2,113,113,113,114,2,112,112,3,2,114,118,114,118,2,2&25,114,114,114,114,114,2,2,45,39,2,2,112,113,113,58,59,50,50,50,50,50,50,50,50,50
+50,50,50,50,50,62,52,87,2,2,2,2,2,4,4,112,2,2,118,2,118,2,2&25,2,114,114,114,2,112,114,112,112,112,2,2,4,113,113,58,59,50,50,50,50,50,50,50,50
+50,50,50,50,50,53,87,87,3,3,2,2,2,4,4,3,2,4,2,2,2,2,2&25,2,2,114,114,2,112,114,114,114,112,2,4,2,2,113,3,57,50,50,50,50,50,50,50,50
+50,50,50,50,50,53,2,87,2,3,112,112,2,2,2,4,4,118,118,118,118,118,2&25,2,2,2,2,2,112,112,112,114,114,2,2,113,113,3,110,57,50,50,50,50,50,50,50,50
+50,50,50,50,50,53,87,2,2,112,112,112,2,2,2,4,4,4,4,2&9:22,4,4,2&25,2,2,2,2,2,2,112,112,112,112,2,113,4,2,113,4,57,50,50,50,50,50,50,50,50
+50,50,50,50,50,53,2,3,112,110,112,2,2,2,2,4,4,118,118,118,118,118,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2,2,2,2,2,113,113,56,55,60,50,50,50,50,50,50,50,50
+50,50,50,50,50,61,54,2,2,112,2,112,2,2,2,4,4,118,118,118,118,118,2&25,118,4,118,4,118,2,2&25,2,2,2,113,2,56,55,60,50,50,50,50,50,50,50,50,50,50
+50,50,50,50,50,50,53,2,2,3,4,4,4,2,2,2,2,112,112,112,112,2,2&25,118,4,118,4,118,2,2&25,2&25,2&25,2,2,2,57,50,50,50,50,50,50,50,50,50,62,51,51
+50,50,50,50,50,50,53,2,3,3,4,114,4,114,2,2,2,112,114,115,112,2,2&25,118,4,118,4,118,2,118,2,2&25,2&25,2&25,56,60,50,50,50,50,50,50,50,50,62,52,3,3
+50,50,50,50,50,50,53,2,115,2,2,4,114,114,114,2,2,112,114,112,112,2,2&25,118,4,118,4,118,118,118,2,2,2,2&25,57,50,50,50,50,50,50,50,50,50,53,110,111,111
+50,50,50,50,50,50,61,54,2,2,2,2,114,114,114,114,2,2,4,4,3,2,2&25,2,2,2,2,2,2,2,2,2,56,68:6,60,50,50,50,50,50,50,50,50,62,52,2,2,111
 50,50,50,50,50,50,50,61,54,2,114,2,4,114,4,114,114,2,115,3,114,114,2,2,2,2,2,2,2,3,3,56,60,50,50,50,50,50,50,50,50,50,62,52,3,113,2,2
 50,50,50,50,50,50,50,50,61,54,2,2,114,114,4,114,2,114,114,114,2,114,114,112,4,3,88,89,4,56,55,60,64,50,50,50,50,50,50,50,50,62,52,3,113,3,113,2
 50,50,50,50,50,50,50,50,50,53,2,2,2,2,113,114,115,114,2,114,114,114,112,112,3,56,55,55,55,60,64,64,50,50,50,50,50,50,50,50,50,53,2,114,113,113:15,112,3
-50,50,50,50,50,50,50,50,50,61,54,2,2,113,87,113,114,2,114,114,2,112,56,55,55,60,50,50,64,64,50,50,50,50,50,50,50,50,50,50,62,52,2,113,113,250&9:16,112,114
+50,50,50,50,50,50,50,50,50,61,54,2,2,113,87,113,114,2,114,114,2,112,56,55,55,60,50,50,64,64,50,50,50,50,50,50,50,50,50,50,62,52,2,113,113,2&9:16,112,114
 50,50,50,50,50,50,50,50,50,50,61,55,54,3,110,113,2,114,56,55,55,55,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,70:0,52,110,2,113,113,112,112,112
-50,50,50,50,50,50,50,50,50,50,50,50,61,55,55,55,55,55,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,80&25,121!1,2,113,2,87,114,112,2
-50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,2,80&25,80&25,80&25,2,110,2,87,2,87
-50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,51,52,87,3,87,80&25,4,2,87,2,2,87
-50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,64,53,4,2,2,87,2,80&25,114,88,89,3,2,87
-50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,51,52,2,2,87,4,87,80&25,80&25,114,114,112,112,2
-50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,51,51,52,2,87,2,87,2,2,4,2,80&25,80&25,80&25,80&25,112,2
-50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,87,110,87,2,4,2,110,87,2,87,2,114,114,114,80&25,4,87
-50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,87,87,87,2,87,87,87,87,3,88,89*0,4,2,114,4,80&25,80&25,80&25
-50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,51,52,112,87,4,2,2,87,4,88,89,2,87,87,4,2,2,113,2,87,80&25
-50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,114,114,114,87,2,87,2,2,2,2,2,2,110,88,89,2,87,2,4,2,80&25
-50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,51,51,51,51,59,50,50,50,62,52,2,114,114,87,2,87,2,87,2,112,2,112,2,2,2,87,2,2,87,87,121!0,80&25
+50,50,50,50,50,50,50,50,50,50,50,50,61,55,55,55,55,55,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,2&25,121!1,2,113,2,87,114,112,2
+50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,2,2&25,2&25,2&25,2,110,2,87,2,87
+50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,51,52,87,3,87,2&25,4,2,87,2,2,87
+50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,64,53,4,2,2,87,2,2&25,114,88,89,3,2,87
+50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,51,52,2,2,87,4,87,2&25,2&25,114,114,112,112,2
+50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,51,51,52,2,87,2,87,2,2,4,2,2&25,2&25,2&25,2&25,112,2
+50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,87,110,87,2,4,2,110,87,2,87,2,114,114,114,2&25,4,87
+50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,87,87,87,2,87,87,87,87,3,88,89*0,4,2,114,4,2&25,2&25,2&25
+50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,51,52,112,87,4,2,2,87,4,88,89,2,87,87,4,2,2,113,2,87,2&25
+50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,114,114,114,87,2,87,2,2,2,2,2,2,110,88,89,2,87,2,4,2,2&25
+50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,51,51,51,51,59,50,50,50,62,52,2,114,114,87,2,87,2,87,2,112,2,112,2,2,2,87,2,2,87,87,121!0,2&25
 50,50,50,50,50,50,50,50,50,50,50,50,50,62,51,52,2,2,2,2,58,51,51,51,52,87,110,114,114,114,2,2,2,2,87,87,112,2,112,2,2,87,88,89,2,87,87,87
 50,50,50,50,50,50,50,50,50,50,50,50,50,53,2,2,2,2,2,2,3,2,2,3,2,87,87,2,2,87,87,2,87,87,2,87,112,4,112,4,87,87,3,87,2,4,2,2
 50,50,50,50,50,50,50,50,50,50,50,62,51,52,2,112,112,114,2,2,2,2,87,3,4,3,2,2,87,87,4,2,2,87,2*1,4,112,113,2,2,2,2,4,2,87,87,2,87
 50,50,50,50,50,50,50,50,50,50,50,53,110,112,112,112,114,114,2,2,87,2,3,87,87,2,2,87,2,87,4,114,87,2,87,2,2,110,113,87,87,2,87,87,2,87,2,2
 50,50,50,50,50,50,50,50,50,62,51,52,3,112,4,112,112,114,2,2,87,2,87,2,3,112,112,2*2,4,4,4,114,2,2,87,2,3,113,113,113,2,2,2,2,87,2,2,87
-50,50,50,50,50,50,50,50,50,53,88,89,110,4,4,250&9:21,112,2*3,87,2,2,113,2,113,87,87,113,2,2,87,87,2,87,2,3,87,4,2,87,2,2,2,87,87,87,87,87,87
+50,50,50,50,50,50,50,50,50,53,88,89,110,4,4,2&9:21,112,2*3,87,2,2,113,2,113,87,87,113,2,2,87,87,2,87,2,3,87,4,2,87,2,2,2,87,87,87,87,87,87
 50,50,50,50,50,50,50,50,50,53,3,110,3,112,4,112,112,87,2,2,87,2,113,4,87,113,3,2,113,2,2,2,87,2,4,3,87,2,2,2,87,2,87,2,87,87,2,2
 50,50,50,50,50,50,50,50,50,61,54,3,3,112,112,112,4,2,87,4,2,113,2,4,113,4,4,4,2,2,87,2,87,87,3,87,3,87,110,3,2,87,2,87,2,2,2,2
 50,50,50,50,50,50,50,50,50,62,52,110,87,88,89,4,88,89,2,4,87,87,2,87,113,3,88,89,2,87,87,2,87,4,2,87,2,4,87,87,2,87,87,87,87,4,2,87
diff --git a/rsrc/scenarios/stealth/out/out0~1.map b/rsrc/scenarios/stealth/out/out0~1.map
index 4b113317..00dcf603 100644
--- a/rsrc/scenarios/stealth/out/out0~1.map
+++ b/rsrc/scenarios/stealth/out/out0~1.map
@@ -8,13 +8,13 @@
 50,50,50,50,50,50,50,53,113,2,112,2,113,114,87,2,2,4,2,2,4,2,2,87,2,110,87,87,2,87,2,2,2,2,2,2,2*2,87,3,2,87,87,2,3,3,2,87,2
 50,50,50,50,50,50,62,52,114,3,3,113,3,114,2,87,2,2,87,2,2,87,2,2,87,4,110,87,2,88,89,2,2,87,88,89,2,2,87,87,2,87,88,89,4,4,2,2
 50,50,50,50,50,50,53,2,2,114,2,113,3,2,2,87,4,2,2,2,2,2,2,2,2,110,110,110,2,87,2,88,89,3,115,87,2,110,2,2,2,87,2,88,89,2,2,87
-50,50,50,50,50,50,53,4,2,114,2,2,112,2,3,87,2,115,2,87,87,87,2,87,2,110,250&9:15,110,87,87,87,87,2,2,87,2,2,87,2,2,2,87,2,2,87,4,2,87
+50,50,50,50,50,50,53,4,2,114,2,2,112,2,3,87,2,115,2,87,87,87,2,87,2,110,2&9:15,110,87,87,87,87,2,2,87,2,2,87,2,2,2,87,2,2,87,4,2,87
 50,50,50,50,50,50,53,2,114,115,112,115,113,2,2,3,3,2,2,2,2,114,2,87,110,110,87,110,110,87,87,87,87,87,4,2,2,87,2,4,87,115,87,2,2,3,2,2
 50,50,50,50,50,50,53,2,4,113,114,113,115,2,115,2,112,112,87,2,2,87,115,115,2,2,4,87,2,87,87,87,2,87,87,2,2,87,2,2,2,2,2,87,121!1,88,89,2
 50,50,50,50,50,50,53,2,112,113,2,112,112,115,112,112,110,112,2,115,2,2,87,2,87,87,2,87,87,2,87,2,87,87,87,2,87,2,2,4,87,2,2,2,2,2,4,3
 50,50,50,50,50,50,53,113,113,114,114,2,114,112,3,115,114,112,87,2,87,2,2,2,2,2,87,2,2,3,87,2,3,110,2,2,2,115,2,110,2,2,87,2,87,2,87,4
 50,50,50,50,50,50,53,113,114,114,113,113,113,112,114,115,115,4,2,87,2,87,87,4,2,87,2,88,89,2,2,110,87,2,2,4,87,2,2,2,87,2,88,89,4,2,87,3
-50,50,50,50,50,50,53,113,4,112,113,114,250&9:16,112,115,115,115,115,112,112,2,3,3,115,87,2,2,2,3,2,2,2,87,115,2,2,2,87,2,87,2,3,2,43,42,42,42,42
+50,50,50,50,50,50,53,113,4,112,113,114,2&9:16,112,115,115,115,115,112,112,2,3,3,115,87,2,2,2,3,2,2,2,87,115,2,2,2,87,2,87,2,3,2,43,42,42,42,42
 50,50,50,50,50,50,53,113,112,4,114,3,112,112,2,3,115,2,87,112,87,2,2,2,2,4,87,2,3,3,2,2,3,87,2,87,2,2,2,2,2,43,42,47,29,28,28,28
 50,50,50,50,50,50,53,114,114,114,112,113,112,87,112,112,112,112,3,112,2,87,2,87,3,87,87,2,87,87,2,87,2,2,87,88,89,87,115,115,43,47,29,28,33,22,22,22
 50,50,50,50,50,50,53,114,113,113,112,3,112,3,114,2,115,2,2,87,87,87,3,2,2,2,3,2,2,2,2,2,2,87,2,115,87,43,42,42,29,28,33,22,22,22,22,23
@@ -23,18 +23,18 @@
 50,50,50,50,50,53,2,112,110,113,113,112,3,3,115,2,2,2,2,87,2,2,2,87,2,2,87,2,87,2,88,89,2,115,43,47,29,28,33,22,26,36,30,22,22,22,22,23
 50,50,50,50,50,53,2,2,114,113,112,113,2,110,2,3,2,2,3,2,2,2,2,2,3,4,87,2,87,2,2,2,87,43,47,29,33,22,22,22,26,36,31,32,22,22,22,23
 50,50,50,50,50,53,2,114,113,2,114,87,2,2,2,114,87,2,115,110,3,2,2,87,2,2,87,4,2,2,2,2,4,44,29,33,22,22,22,22,34,27,36,30,22,23,23,23
-50,50,50,50,50,53,2,2,114,113,113,2,2,2,114,114,3,110,2,3,2,2,87,2,2,2,2,2,2,2,2,2,2,44,30,22,22,35,24,32,22,26,251&9:0,30,22,23,22,22
+50,50,50,50,50,53,2,2,114,113,113,2,2,2,114,114,3,110,2,3,2,2,87,2,2,2,2,2,2,2,2,2,2,44,30,22,22,35,24,32,22,26,36&9:0,30,22,23,22,22
 50,50,50,50,50,53,113,2,2,2,2,114,2,2,114,114,2,2,2,2,2,2,2,2,2,2,2,88,89,2,3,2,2,44,30,23,22,26,36,30,22,34,28,33,23,23,22,22
 50,50,50,50,50,53,2,2,2,114,2,2,114,2,114,2,2,2,2,4,2,2,2,2,2,115,2,3,3,2,2,2,43,47,30,22,22,34,28,33,22,22,22,23,23,22,22,22
 50,50,50,50,50,53,4,112,112,113,2,2,112,2,114,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,44,29,33,22,23,22,23,23,23,23,23,23,22,35,24,24
 50,50,50,50,50,53,4,112,112,114,115,115,3,114,112,2,2,2,2,3,2,2,2,2,2,2,2,3,2,2,4,2,44,30,22,22,35,24,24,24,32,22,22,35,24,25,56,55
-50,50,50,50,50,53,2,2,114,2,112,114,2,112,2,112,114,112,2,2,2,2,2,2,2,2,2,2,2,2,4,2,44,31,24,24,25,36,36,251&9:2,30,22,22,26,56,55,60,64
+50,50,50,50,50,53,2,2,114,2,112,114,2,112,2,112,114,112,2,2,2,2,2,2,2,2,2,2,2,2,4,2,44,31,24,24,25,36,36,36&9:2,30,22,22,26,56,55,60,64
 50,50,50,50,50,53,2,112,112,2,114,3,114,2,114,112,114,112,2,2,2,115,2,2,3,2,2,3,2,2,2,2,44,36,36:1,36,36,36,29,28,33,22,35,25,57,50,62,51
 50,50,50,50,50,61,54,112,112,114,114,2,56,54,114,112,114,112,2,2,2,2,2,2,3,2,2,2,2,2,2,4,44,29,28,28,28,28,33,22,22,22,26,56,60,62,52,28
 50,50,50,50,50,50,61,54,2,114,112,2,57,53,2,112,2,112,2,2,2,2,2,2,3,4,2,2,2,2,2,2,44,31,24,32,22,22,22,22,22,35,25,57,50,53,29,22
 50,50,50,50,50,50,50,61,54,3,112,2,58,52,114,2,114,112,2,4,2,3,2,2,2,2,2,2,2,2,2,2,45,38,46,31,32,22,22,22,22,26,56,60,62,52,31,24
 50,50,50,50,50,62,51,59,61,54,3,114,2,114,2,112,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,2,2,45,46,31,24,24,24,24,25,57,64,53,87,45,38
-50,50,50,50,50,53,250&9:8,57,50,61,55,54,3,112,112,2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,114,2,2,2,45,38,38,38,38,39,56,60,62,52,115,115,2
+50,50,50,50,50,53,2&9:8,57,50,61,55,54,3,112,112,2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,114,2,2,2,45,38,38,38,38,39,56,60,62,52,115,115,2
 50,50,50,50,50,53,2,58,51,51,59,53,2,2,2,2,2,2,2,2,4,2,2,2,2,2,2,2,2,2,114,2,2,2,112,4,112,112,115,56,55,60,62,52,112,112,115,2
 50,50,50,50,50,53,2,2,2,2,58,52,2,2,2,2,2,2,4,113,113,113,4,2,2,2,2,4,2,2,2,114,2,112,112,113,112,87,56,60,50,62,52,2,87,112,112,112
 50,50,50,50,50,61,55,55,54,2,2,2,2,2,2,2,2,113,4,113,4,4,113,113,2,2,2,113,112,112,2,114,114,114,112,114,110,56,60,50,50,53,2,2,112,113,113,113
diff --git a/rsrc/scenarios/stealth/out/out0~2.map b/rsrc/scenarios/stealth/out/out0~2.map
index dc57164c..c2819a1a 100644
--- a/rsrc/scenarios/stealth/out/out0~2.map
+++ b/rsrc/scenarios/stealth/out/out0~2.map
@@ -15,7 +15,7 @@
 50,50,50,50,50,53,111,3,2,114,112,112,56,55,60,62,51,51,52,3,2,2,113,2,115,114,112:14,112,112,112,113,114,2,2,2,113,2,2,2,4,2,110,2,2,2,2,3,2
 50,50,50,50,50,53,87,111,56,55,55,55,60,62,51,52,2,3,2,2,2,112,112,112,112,112:14,113,2,112,112,2,2,2,113,2,2,2,114,2,2,2,2,2,2,2,3,2,2
 50,50,50,50,50,61,55,55,60,62,51,51,51,52,111,114,114,2,2,114,114,2,2,2,113,2,112,112,2,112,112,114,113,2,2,3,2,2,2,2,2,2,3,2,2,2,2,2
-50,50,50,50,50,50,50,50,50,53,87,111,2,113,112,113,113,2,113,2,2,114,114,112,113,113,250&9:15,112,112,112,113,113,2,2,2,2,2,2,2,4,2,2,2,2,2,4,2,2
+50,50,50,50,50,50,50,50,50,53,87,111,2,113,112,113,113,2,113,2,2,114,114,112,113,113,2&9:15,112,112,112,113,113,2,2,2,2,2,2,2,4,2,2,2,2,2,4,2,2
 50,50,50,50,50,50,50,50,62,52,111,2,113,2,113,2,112,113,114,2,112,3,114,113,2,113,112,112,2,2,2,2,2,2,110,2,2,2,2,2,2,2,2,4,2,2,2,2
 50,50,50,50,50,50,50,62,52,2,115,112,2,113,2,4,2,2,2,2,3,114,114,114,2,114,2,2,2,2,2,2,2,2,2,2,2,43,42,41,2,2,2,2,2,2,2,2
 50,50,50,50,50,50,50,53,114,4,115,2,113,2,2,2,113,3,2,114,114,2,112,114,2,2,2,2,2,2,4,2,2,2,3,2,87,44,36,40,2,2,2,3,2,2,3,2
@@ -28,7 +28,7 @@
 50,50,50,50,50,50,50,61,54,2,112,2,112,2,2,43,42,42,42,42,42,42,41,2,2,2,2,2,2,2,43,42,42,42,47,36,36,36,36,40,2,2,2,2,4,2,3,4
 50,50,50,50,50,50,50,50,53,3,3,2,2,2,2,44,29,28,28,28,28,27,40,2,2,2,2,2,2,43,47,36,36,36,36,36,36,36,36,40,2,4,2,3,2,2,2,2
 50,50,50,50,50,50,50,50,61,54,4,2,2,2,2,44,30,35,24,24,32,26,40,87,2,2,2,3,3,44,36,36,36,36,36,36,36,37,36,48,41,2,2,110,2,2,2,3
-50,50,50,50,50,50,50,50,50,53,2,110,110,2,43,47,30,26,251&9:7,36,31,25,40,87,2,110,3,87,43,47,36,36,37,36,37,29,27,36,36,36,40,3,2,2,2,2,2,2
+50,50,50,50,50,50,50,50,50,53,2,110,110,2,43,47,30,26,36&9:7,36,31,25,40,87,2,110,3,87,43,47,36,36,37,36,37,29,27,36,36,36,40,3,2,2,2,2,2,2
 50,50,50,50,50,50,50,50,50,53,2,3,87,2,44,29,33,34,28,27,49,38,39,2,4,3,2,87,44,36,36,36,29,237@14,28,33,26,36,36,49,39,2,43,42,41,3,4,3
 50,50,50,50,50,50,50,50,50,53,2,2,2,2,44,30,22,35,24,25,40,2,2,2,2,110,110,3,44,36,37,36,30,22,22,22,26,37,36,40,2,2,44,36,40,2,2,2
 50,50,50,50,50,50,50,50,50,61,54,2,2,2,44,31,24,25,49,38,39,2,87,2,3,3,88,89,44,36,36,29,33,22,22,35,25,36,36,40,2,2,45,38,39,3,2,2
diff --git a/rsrc/scenarios/stealth/out/out1~0.map b/rsrc/scenarios/stealth/out/out1~0.map
index c48afe08..82ac4d0a 100644
--- a/rsrc/scenarios/stealth/out/out1~0.map
+++ b/rsrc/scenarios/stealth/out/out1~0.map
@@ -19,7 +19,7 @@
 88,89,3,3,2,111,111,111,111,57,50,50,53,111,111,111,111,87,111,111,111,111,111,111,57,62,52,111,111,111,111,110,111,111,111,111,111,56,60,53,111,111,111,111,111,2,2,3
 2,2,3,2,111,111,111,111,111,57,50,62,52,111,111,111,111,111,111,111,111,111,111,56,60,53,111,111,111,111,111,111,111,111,111,111,56,60,62,52,111,111,111,111,111,111,4,112
 111,3,2,111,111,111,111,111,111,57,50,53,111,111,111,111,111,111,111,111,111,111,56,60,62,52,111,111,111,114,111,111*2,111,111,111,111,57,62,52,111,111,111,111,111,111,111,111,2
-113,3,111,111,111,111,111,111,111,57,50,53,111,111,111,111,250&9:19,111,111,111,111,111,57,62,52,111,111,111,111,111,111,111,111,114,111,56,60,53,111,111,114,111,111,111,3,3,111,2
+113,3,111,111,111,111,111,111,111,57,50,53,111,111,111,111,2&9:19,111,111,111,111,111,57,62,52,111,111,111,111,111,111,111,111,114,111,56,60,53,111,111,114,111,111,111,3,3,111,2
 3,111,111,111,111,2,111,111,111,57,50,53,111,111,111,111,111,111,111,111,111,56,60,53,111,111,111,111,111,111,111,111,111,111,111,57,62,52,111,111,111,111,111,111,111,111,111,2
 111,111,111,110,2,2,112,111,111,57,50,53,111,114,111,111,111,111,111,111,56,60,62,52,111,111,111,111,87,111,111,111,111,111,56,60,53,111,111,111,111,111,111,111,111,111,3,2
 111,111,111,112,111,111,111,111,111,57,50,53,111,111,111,111,111,111,111,111,57,50,53,111,111,111,111,111,111,111,111,111,111,56,60,62,52,111,111,111,111,111,2,87,3,111,111,112
@@ -30,19 +30,19 @@
 2,110,113,114,87,111,111,111,111,111,111,58,59,50,50,61,55,55,55,60,50,61,54,111,111,110,111,111,111,56,60,53,111,111,111,111,111,111,111,111,111,111,2,113,111,111,2,2
 87,87,113,114,2,111,111,111,111,111,111,111,58,51,59,50,50,62,51,51,51,59,53,111,111,111,111,111,56,60,50,53,111,111,111:1,111,111,111,111,111,111,111,114,87,112,114,113,113
 112,2,4,110,114,2,111,111,111,111,111,111,111,111,58,51,59,53,111,111,111,57,53,111,111,111,111,111,57,50,62,52,111,111,110,111,111,111,111,111,111,2,113,114,113,113,113,113
-112,87,2,112,112,87,2,111,111,111,111,111,111,111,111,111,57,61,55,54,111,57,53,111,111,111,56,55,60,62,52,111,111,111,111,111,111,111,111,111,111,111,2,87,2,80&25,80&25,80&25
-87,112,2,87,112,87,114,113,2,114,111,111,111,111,111,111,58,51,59,61,55,60,61,54,111,111,57,50,62,52,111,111,111,111,111,111,111,234@5,2,111,111,111,114,110,80&25,80&25,114,3
-3,88,89,112,2,113,112,114,2,2,2,114,111,111,111,111:6,111,111,58,59,50,50,50,61,55,55,60,62,52,111,111,111,111,111,111,111,111,80&25,2,111,111,111,114,114,80&25,2,110,112
-114,2,113,113,112,112,87,2,2,112,2,2,2,111,111,110,111,111,111,58,51,59,50,50,50,50,50,53,111,111,111,111,111,111,111,111,2,80&25,2,114,2,2,110,114,80&25,112,114,3
-80&25,80&25,80&25:24,80&25,110,114,112,87,110,114*1,112,114,3,2,111,111,111,111,111,111,111,58,51,59,50,50,50,53,111,111,111,111,111,111,111,111,2,80&25,121!1,2,113,2,112,80&25,80&25,2,112,112
-114,87,112,80&25,80&25,80&25,87,110,2,112,2,2,2,113,2,111,111,111,111,111,111,111,111,58,59,50,50,53,111,111,111,111,111,111,2,112,110,80&25,80&25,80&25,80&25,80&25,80&25*0,80&25,2,2,2,87
-2,112,113,2,114,80&25,3,113,114,110,111,111,111,3,113,111,111,111,2,110,111,111,111,111,58,59,50,61,54,111,111,111,114,114,112,2,80&25,80&25,2,2,114,114,2,112,2,87,3,3
-87,112,2,87,114,80&25,87,110,114,112,111,111,111,2,2,2,112,2,114,2,114,111,111,111,111,57,50,50,53,111,111,111,114,112,80&25,80&25,80&25,110,87,2,113,2,113,2,112,2,3,2
-88,89,112,2,112,80&25,80&25,2,2,110,111,111,111,112,112,112,114,113,114,4,114,114,112,112,112,57,50,62,52,111,111,114,3,80&25,80&25,114,2,110,112,110,113,87,113,110,2,3,3,2
-3,87,3,112,87,113,80&25,80&25,114,2,113,2,112,112,2,2,112,114,112,4,114,114,112,114,3,57,50,53,111,111,111,2,80&25,80&25,110,2,2,2,3,3,113,112,2,3,112,3,87,2
-4,88,89,87,2,112,110,80&25,2,2,2,114,113,112,2,2,112,4,4,4,4,114,114,112,56,60,50,53,4,112,113,113,80&25,112,110,113,87,113,112,113,2,87,87,3,87,87,87,3
-88,89,87,114,114,112,112,80&25,2,113,2,112,2,2,2,112,112,114,4,113,114,114,3,2,57,50,62,52,3,112,2,80&25,80&25,110,2,2,2,2,112,112,112,3,87,2,88,89,3,2
-112,3,87,114,112,3,112,80&25,80&25,2,113,87,87,114,114,112,110,112,112,114,113,114,3,56,60,50,53,4,114,2,80&25,80&25,121!0,112,2,113,113,2,2,112,110,110,87,87,87,3,87,2
-3,112,3,114,87,2,114,112,80&25,80&25,2,112,87,2,114,114,113,110,2,2,3,114,56,60,50,50,53,114,114,113,80&25,112,2,2,2,112,87,2,87,3,87,87,88,89,87,112,3,2
-87,2,114,3,114,114,3,114,87,80&25,112,3,112,112,112,112,2,87,2,113,2,113,57,50,50,62,52,114,114,80&25,80&25,2,2,3,110,2,114,2,87,87,87,88,89,3,87,3,87,2
-3,87,3,114,112,3,3,87,3,80&25,2,2,2,2,87,87,2,87,87,2,2,2,57,50,50,53,2,114,80&25,80&25,2,112,2,4,113,2,3,110,113,87,112,87,3,87,87,3,2,2
+112,87,2,112,112,87,2,111,111,111,111,111,111,111,111,111,57,61,55,54,111,57,53,111,111,111,56,55,60,62,52,111,111,111,111,111,111,111,111,111,111,111,2,87,2,2&25,2&25,2&25
+87,112,2,87,112,87,114,113,2,114,111,111,111,111,111,111,58,51,59,61,55,60,61,54,111,111,57,50,62,52,111,111,111,111,111,111,111,234@5,2,111,111,111,114,110,2&25,2&25,114,3
+3,88,89,112,2,113,112,114,2,2,2,114,111,111,111,111:6,111,111,58,59,50,50,50,61,55,55,60,62,52,111,111,111,111,111,111,111,111,2&25,2,111,111,111,114,114,2&25,2,110,112
+114,2,113,113,112,112,87,2,2,112,2,2,2,111,111,110,111,111,111,58,51,59,50,50,50,50,50,53,111,111,111,111,111,111,111,111,2,2&25,2,114,2,2,110,114,2&25,112,114,3
+2&25,2&25,2&25:24,2&25,110,114,112,87,110,114*1,112,114,3,2,111,111,111,111,111,111,111,58,51,59,50,50,50,53,111,111,111,111,111,111,111,111,2,2&25,121!1,2,113,2,112,2&25,2&25,2,112,112
+114,87,112,2&25,2&25,2&25,87,110,2,112,2,2,2,113,2,111,111,111,111,111,111,111,111,58,59,50,50,53,111,111,111,111,111,111,2,112,110,2&25,2&25,2&25,2&25,2&25,2&25*0,2&25,2,2,2,87
+2,112,113,2,114,2&25,3,113,114,110,111,111,111,3,113,111,111,111,2,110,111,111,111,111,58,59,50,61,54,111,111,111,114,114,112,2,2&25,2&25,2,2,114,114,2,112,2,87,3,3
+87,112,2,87,114,2&25,87,110,114,112,111,111,111,2,2,2,112,2,114,2,114,111,111,111,111,57,50,50,53,111,111,111,114,112,2&25,2&25,2&25,110,87,2,113,2,113,2,112,2,3,2
+88,89,112,2,112,2&25,2&25,2,2,110,111,111,111,112,112,112,114,113,114,4,114,114,112,112,112,57,50,62,52,111,111,114,3,2&25,2&25,114,2,110,112,110,113,87,113,110,2,3,3,2
+3,87,3,112,87,113,2&25,2&25,114,2,113,2,112,112,2,2,112,114,112,4,114,114,112,114,3,57,50,53,111,111,111,2,2&25,2&25,110,2,2,2,3,3,113,112,2,3,112,3,87,2
+4,88,89,87,2,112,110,2&25,2,2,2,114,113,112,2,2,112,4,4,4,4,114,114,112,56,60,50,53,4,112,113,113,2&25,112,110,113,87,113,112,113,2,87,87,3,87,87,87,3
+88,89,87,114,114,112,112,2&25,2,113,2,112,2,2,2,112,112,114,4,113,114,114,3,2,57,50,62,52,3,112,2,2&25,2&25,110,2,2,2,2,112,112,112,3,87,2,88,89,3,2
+112,3,87,114,112,3,112,2&25,2&25,2,113,87,87,114,114,112,110,112,112,114,113,114,3,56,60,50,53,4,114,2,2&25,2&25,121!0,112,2,113,113,2,2,112,110,110,87,87,87,3,87,2
+3,112,3,114,87,2,114,112,2&25,2&25,2,112,87,2,114,114,113,110,2,2,3,114,56,60,50,50,53,114,114,113,2&25,112,2,2,2,112,87,2,87,3,87,87,88,89,87,112,3,2
+87,2,114,3,114,114,3,114,87,2&25,112,3,112,112,112,112,2,87,2,113,2,113,57,50,50,62,52,114,114,2&25,2&25,2,2,3,110,2,114,2,87,87,87,88,89,3,87,3,87,2
+3,87,3,114,112,3,3,87,3,2&25,2,2,2,2,87,87,2,87,87,2,2,2,57,50,50,53,2,114,2&25,2&25,2,112,2,4,113,2,3,110,113,87,112,87,3,87,87,3,2,2
diff --git a/rsrc/scenarios/stealth/out/out1~1.map b/rsrc/scenarios/stealth/out/out1~1.map
index 36299e39..4c2ea8c7 100644
--- a/rsrc/scenarios/stealth/out/out1~1.map
+++ b/rsrc/scenarios/stealth/out/out1~1.map
@@ -1,48 +1,48 @@
-2,4,87,87,2,87,2,2,2,80&25,4,3,3,2,87,2,2,87,2,87,114,87,57,50,50,53,3,80&25,80&25,2,113,2,112,2,3,2,2,2,2,2,87,3,2,87,2,2,3,2
-2,87,2,114,114,4,114,2,2,80&25,80&25,80&25,80&25,2,4,87,87,2,114,114,114,56,60,50,62,52,114,80&25,114,114,114,3,2,2,87,2,2,114,87,87,87,114,87,2,87,3,2,114
-87,2,2,3,87,113,2,114,2,2,2,114,80&25,80&25,80&25,80&25,4,87,114,114,114,57,50,50,53,112,114,80&25,114,112,113,2,114,2,2,3,87,88,89,3,87,2,87,87,2,2,87,2
-87,87,2,114,2,113,2,2,2,114,2,2,2,4,2,80&25,80&25,80&25,114,114,121!3,57,50,62,52,3,114,80&25,3,87,2,2,4,114,87,87,87,87,2,87,250&9:0,87,87,2,88,89,2,2
-2,2,2,87,2,2,113,2,2,2,112,112,2,114,113,4,2,80&25,80&25,80&25,80&25,65,66:3,67,80&25,80&25,80&25,80&25,3,112,2,87,2,87,2,87,2,87,3,87,87,88,89,3,87,2,87,2
-87,2,2,113,2,2,2,3,2,112,4,112,4,112,114,114,114,114,114,87,56,60,62,52,121!2,114,80&25,121!1,2,2,3,87,2,87,2,3,3,87,114,87,110,3,87,4,2,87,88,89
-87,87,3,3,87,3,2,2,114,4,114,2,2,4,2,113,114,114,114,2,57,50,53,2,114,114,80&25,80&25,113,113,2,87,2,114,3,114,114,114,114,88,89,3,87,87,2,87,87,87
-2,3,87,87,2,87,114,2,4,112,112,2,114,112,113,113,114,114,2,3,57,62,52,2,114,114,114,80&25,2,113,2,87,87,3,2,87,87,114,114,3,87,87,3,87,87,2,87,2
-4,87,2,87,2,2,2,2,4,4,2,112,2,2,2,113,114,2,2,56,60,53,2,114,114,113,114,80&25,80&25,113,2,113,2,87,2,2,114,114,114,114,87,88,89,87,87,3,87,2
-2,2,2,87,113,2,114,2,113,114,114,113,114,115,113,112,87,2,56,60,62,52,114,114,2,114,2,2,80&25,2,113,87,2,3,87,2,87,87,3,87,87,3,87,3,2,88,89,87
-2,87,2,2,2,2,114,2,113,2,2,115,115,114,112,115,2,56,60,62,52,110,114,114,114,2,2,2,80&25,2,2,2,87,4,2,87,87,2,2,114,87,87,87,87,2,87,87,87
-3,2,2,2,2,2,2,113,114,114,114,2,115,115,113,112,2,57,62,52,2,112,112,3,3,2,113,2,80&25,2,114,2,2,2,3,2,87,114,87,3,114,2,87,87,114,87,87,2
-2,2,2,115,2,3,2,2,2,2,2,112,112,114,114,112,56,60,53,87,112,112,3,3,113,113,113,2,80&25,2,2,2,2,3,87,3,2,2,3,2,4,4,87,2,87,3,87,87
-3,115,2,110,2,115,2,113,113,2,112,113,112,114,113,56,60,62,52,112,4,113,115,2,113,2,2,2,80&25,2,2,2,114,2,2,2,114,2,2,2,114,2,87,87,2,2,110,87
-2,2,115,2,2,2,2,113,113,112,114,113,113,3,56,60,62,52,113,113,113,115,113,2,113,113,2,2,80&25,2,2,2,2,2,2,3,2,2,2,2,87*0,110,2,87,2,87,3,87
-2,43,42,42,42,41,2,2,2,113,2,113,113,250&9:28,57,62,52,110,112,113,112,115,4,2,115,2,2,115,80&25,2,3,3,3,3,2,2,3,2,114,2,2,87,2,2,87,2,2,87
-42,47,29,28,27,48,42,42,42,42,42,42,41,56,60,53,43,42,42,42,42,42,42,41,2,2,115,3,80&25,2,3,2,2,2,3,2,3,2,2,3,2,2,2,87,2,87,2,2
-28,28,33,22,34,28,28,28,28,28,28,27,56,60,62,52,44,29,28,27,36:8,29,27,48,42,41,4,115,80&25,4,2,4,2,2,2,3,3,2,2,2,2,4,87,2,87,2,2,2
-22,22,22,22,22,22,22,22,22,22,26,56,60,50,53,29,28,33,35,25,36,30,34,28,27,40,2,2,80&25,2,2,2,2,2,4,2,2,2,3,2,2,2,2,2,2,87,2,4
-22,22,22,22,22,22,22,22,22,35,25,57,50,62,52,30,22,35,25,36,29,33,22,22,26,48,41,2,80&25,80&25,3,2,2,2,2,2,2,2,3,2,2,2,2,3,2,2,2,2
-22,35,24,32,22,22,22,22,35,25,56,60,62,52,29,33,22,26,36,29,33,22,22,22,34,27,48,41,2,80&25,80&25,2,2,3,2,4,4,2,2,4,2,2,2,2,2,2,2,2
-22,25,37,30,22,22,22,35,25,56,60,50,53,29,33,22,22,26,36,31,32,35,24,32,22,34,27,40,2,2,80&25,2,2,2,2,2,2,2,2,2,2,4,3,2,2,2,2,2
-22,36,29,33,22,22,35,25,56,60,50,62,52,30,35,24,32:7,34:7,27,37,30,26,251&9:22,30,22,22,26,40,2,2,80&25,2,4,2,2,3,3,2,2,2,2,2,2,2,2,2,2,2
-22,36,31,32,35,24,25,56,60,50,62,52,29,33,26,36,30,22,26,36,30,26,36,30,22,22,26,48,41,2,80&25,80&25,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2
-22,27,36,31,25,56,55,60,62,51,52,29,33,22,26,36:14,31,24,25,36:13,31,25,36,30,22,22,34,27,40,2,3,80&25,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-22,34,27,40,56,60,50,62,52,29,28,33,22,35,25,36,36,36,36:17,36,36,36,36,30,22,22,22,26,40,115,3,80&25,2,2,2,2,3,2,2,2,2,2,2,2,2,2,2,2
-22,22,34,27,57,50,62,52,29,33,35,24,24,25,36,36,29,28,28,27,36,29,28,33,22,22,22,26,40,3,4,80&25,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2
-22,35,25,56,60,62,52,43,30,22,26,251&9:15,36,36,29,28,33,22,35,25,36,30,22,22,22,22,35,25,39,115,2,80&25,2,2,2,2,4,2,2,2,2,2,2,2,2,2,2,2
-24,25,56,60,62,52,43,47,30,22,34,28,28,28,33,22,23,22,26,36,36,30,22,22,35,24,25,40,115,2,115,80&25,2,2,2,2,2,2,2,3,2,2,2,4,3,2,2,2
-55,55,60,62,52,43,47,29,33,35,240@7,32,22,22,22,22,22,23,26,36,29,33,35,24,25,49,38,39,2,2,2,80&25,2,2,2,2,3,2,2,2,2,3,2,3,2,2,2,2
-50,62,51,52,43,47,29,33,22,26,42&25,31,32,22,22,22,22,22,26,251&9:26,30,22,26,49,38,39,2,2,2,80&25,80&25,80&25,2,2,2,2,2,3,2,2,2,2,4,4,2,2,2,2
-51,52,43,42,47,29,33,22,22,26,81&25,81&25,30,22,22,22,22,22,34,28,33,22,26,40,2,2,2,2,2,80&25,4,2,2,2,2,2,2,3,2,2,2,2,2,2,2,2,2,3
-28,27,47,29,28,33,22,22,22,26,36,81&25,30,22,22,22,22,22,35,24,32,24,25,40,2,115,110,2,80&25,80&25,2,2,2,2,2,2,2,2,3,3,2,2,2,2,2,2,2,4
-22,34,28:29,33,22,22,22,22,35,25,36,81&25,31,24,24,24,24,24,25,37,31,49,38,39,4,2,2,80&25,80&25,2,2,2,2,2,3,3,2,2,2,2,2,2,2,2,3,2,2,2
-24,24,24:29,24,24,24,32,22,26,49,38,38&25,38,38,38,38,38,38,38,38,38,39,3,2,2,2,2,80&25,2,2,2,2,2,2,2,4,2,2*1,2,4,2,2,2,2,2,2,2,112
-38,38,38,38,38,46,31,24,25,40,2,80&25,121!0,3,115,2,2,2,2,2,2,2,2,2,2,2,2,80&25,2,2,3,3,2,2,2,2,2,2,2,4,2,2,2,2,2,2,2,2
-4,2,115,2,115,45,38,38,38,39,2,80&25,3,110,2,2,2,2,2,2,2,2,2,2,2,2,2,80&25,2,2,4,2,2,2,2,2,2,2,2,2,2,2,3,112,2,2,3,2
-2,2,2,88,89,2,2,2,2,2,2,115,2,2,2,2,2,2,2,2,2,3,3,2,2,2,80&25,80&25,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-2,2,2,2,115,2,4,2,4,2,2,2,2,4,2,2,2,2,2,2,2,2,2,2,2,4,80&25,3,3,2,2,2,2,3,2,2,2,3,2,2,2,2,3,2,2,3,2,2
-2,2,2,2,2,2,2,2,2,4,2,2,2,2,2,2,2,2,2,2,4,2,2,2,2,2,80&25,3,2,2,2,2,2,2,3,2,2,2,2,2,112,2,2,2,2,2,2,2
-2,2,2,2,2,3,2,2,2,3,2,2,4,2,2,2,2,4,2,2,2,2,2,2,3,2,80&25,2,2,2,2,2,2,2,2,2,2,3,2,2,2,3,110,2,110,2,2,2
-2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2,2,2,2,2,3,2,3,2,2,80&25,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2,2
-2,3,2,2,2,2*3,2,2,2,2,3,2,2,2,2,2,2,3,2,2*2,2,2,2,2,2,3,80&25,2,2,3,2,2,2,2,2,2,2,2,3,113,2,2,2,2,2,2,2,2
-2,4,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,112,2,2,2,2,2,2,2,2,80&25,2,2,2,2,2,2,114,2,2,2,3,2,2,114,2,3,2,3,112,2,2
-4,2,2,2,2,3,2,2,2,112,2,2,2,2,2,2,2,2,3,2,2,112,2,3,2,2,80&25,80&25,2,2,114,2,2,2,2,4,2,2,114,2,2,2,2,2,2,2,2,2
-2,3,2,2,2,2,2,2,2,2,114,2,2,2,2,113,2,2,2,2,2,2,2,2,2,2,2,80&25,4,2,2,113,2,2,2,4,2,113,2,2,2,2,2,112,2,2,2,4
-3,2,3,2,2,4,2,2,112,2,2,2,2,2,2,2,2,2,2,2,2,3,2,113,2,2,2,80&25,2,2,3,2,2,114,2,2,2,2,2,2,2,2,3,2,2,2,2,2
-2,2,2,112,2,4,3,2,2,2,2,2,2,2,4,2,2,4,2,2,2,2,2,2,2,2,2,80&25,2,114,2,2,2,3,3,4,2,2,2,2,4,2,2,2,2,2,2,2
+2,4,87,87,2,87,2,2,2,2&25,4,3,3,2,87,2,2,87,2,87,114,87,57,50,50,53,3,2&25,2&25,2,113,2,112,2,3,2,2,2,2,2,87,3,2,87,2,2,3,2
+2,87,2,114,114,4,114,2,2,2&25,2&25,2&25,2&25,2,4,87,87,2,114,114,114,56,60,50,62,52,114,2&25,114,114,114,3,2,2,87,2,2,114,87,87,87,114,87,2,87,3,2,114
+87,2,2,3,87,113,2,114,2,2,2,114,2&25,2&25,2&25,2&25,4,87,114,114,114,57,50,50,53,112,114,2&25,114,112,113,2,114,2,2,3,87,88,89,3,87,2,87,87,2,2,87,2
+87,87,2,114,2,113,2,2,2,114,2,2,2,4,2,2&25,2&25,2&25,114,114,121!3,57,50,62,52,3,114,2&25,3,87,2,2,4,114,87,87,87,87,2,87,2&9:0,87,87,2,88,89,2,2
+2,2,2,87,2,2,113,2,2,2,112,112,2,114,113,4,2,2&25,2&25,2&25,2&25,65,66:3,67,2&25,2&25,2&25,2&25,3,112,2,87,2,87,2,87,2,87,3,87,87,88,89,3,87,2,87,2
+87,2,2,113,2,2,2,3,2,112,4,112,4,112,114,114,114,114,114,87,56,60,62,52,121!2,114,2&25,121!1,2,2,3,87,2,87,2,3,3,87,114,87,110,3,87,4,2,87,88,89
+87,87,3,3,87,3,2,2,114,4,114,2,2,4,2,113,114,114,114,2,57,50,53,2,114,114,2&25,2&25,113,113,2,87,2,114,3,114,114,114,114,88,89,3,87,87,2,87,87,87
+2,3,87,87,2,87,114,2,4,112,112,2,114,112,113,113,114,114,2,3,57,62,52,2,114,114,114,2&25,2,113,2,87,87,3,2,87,87,114,114,3,87,87,3,87,87,2,87,2
+4,87,2,87,2,2,2,2,4,4,2,112,2,2,2,113,114,2,2,56,60,53,2,114,114,113,114,2&25,2&25,113,2,113,2,87,2,2,114,114,114,114,87,88,89,87,87,3,87,2
+2,2,2,87,113,2,114,2,113,114,114,113,114,115,113,112,87,2,56,60,62,52,114,114,2,114,2,2,2&25,2,113,87,2,3,87,2,87,87,3,87,87,3,87,3,2,88,89,87
+2,87,2,2,2,2,114,2,113,2,2,115,115,114,112,115,2,56,60,62,52,110,114,114,114,2,2,2,2&25,2,2,2,87,4,2,87,87,2,2,114,87,87,87,87,2,87,87,87
+3,2,2,2,2,2,2,113,114,114,114,2,115,115,113,112,2,57,62,52,2,112,112,3,3,2,113,2,2&25,2,114,2,2,2,3,2,87,114,87,3,114,2,87,87,114,87,87,2
+2,2,2,115,2,3,2,2,2,2,2,112,112,114,114,112,56,60,53,87,112,112,3,3,113,113,113,2,2&25,2,2,2,2,3,87,3,2,2,3,2,4,4,87,2,87,3,87,87
+3,115,2,110,2,115,2,113,113,2,112,113,112,114,113,56,60,62,52,112,4,113,115,2,113,2,2,2,2&25,2,2,2,114,2,2,2,114,2,2,2,114,2,87,87,2,2,110,87
+2,2,115,2,2,2,2,113,113,112,114,113,113,3,56,60,62,52,113,113,113,115,113,2,113,113,2,2,2&25,2,2,2,2,2,2,3,2,2,2,2,87*0,110,2,87,2,87,3,87
+2,43,42,42,42,41,2,2,2,113,2,113,113,2&9:28,57,62,52,110,112,113,112,115,4,2,115,2,2,115,2&25,2,3,3,3,3,2,2,3,2,114,2,2,87,2,2,87,2,2,87
+42,47,29,28,27,48,42,42,42,42,42,42,41,56,60,53,43,42,42,42,42,42,42,41,2,2,115,3,2&25,2,3,2,2,2,3,2,3,2,2,3,2,2,2,87,2,87,2,2
+28,28,33,22,34,28,28,28,28,28,28,27,56,60,62,52,44,29,28,27,36:8,29,27,48,42,41,4,115,2&25,4,2,4,2,2,2,3,3,2,2,2,2,4,87,2,87,2,2,2
+22,22,22,22,22,22,22,22,22,22,26,56,60,50,53,29,28,33,35,25,36,30,34,28,27,40,2,2,2&25,2,2,2,2,2,4,2,2,2,3,2,2,2,2,2,2,87,2,4
+22,22,22,22,22,22,22,22,22,35,25,57,50,62,52,30,22,35,25,36,29,33,22,22,26,48,41,2,2&25,2&25,3,2,2,2,2,2,2,2,3,2,2,2,2,3,2,2,2,2
+22,35,24,32,22,22,22,22,35,25,56,60,62,52,29,33,22,26,36,29,33,22,22,22,34,27,48,41,2,2&25,2&25,2,2,3,2,4,4,2,2,4,2,2,2,2,2,2,2,2
+22,25,37,30,22,22,22,35,25,56,60,50,53,29,33,22,22,26,36,31,32,35,24,32,22,34,27,40,2,2,2&25,2,2,2,2,2,2,2,2,2,2,4,3,2,2,2,2,2
+22,36,29,33,22,22,35,25,56,60,50,62,52,30,35,24,32:7,34:7,27,37,30,26,36&9:22,30,22,22,26,40,2,2,2&25,2,4,2,2,3,3,2,2,2,2,2,2,2,2,2,2,2
+22,36,31,32,35,24,25,56,60,50,62,52,29,33,26,36,30,22,26,36,30,26,36,30,22,22,26,48,41,2,2&25,2&25,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2
+22,27,36,31,25,56,55,60,62,51,52,29,33,22,26,36:14,31,24,25,36:13,31,25,36,30,22,22,34,27,40,2,3,2&25,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+22,34,27,40,56,60,50,62,52,29,28,33,22,35,25,36,36,36,36:17,36,36,36,36,30,22,22,22,26,40,115,3,2&25,2,2,2,2,3,2,2,2,2,2,2,2,2,2,2,2
+22,22,34,27,57,50,62,52,29,33,35,24,24,25,36,36,29,28,28,27,36,29,28,33,22,22,22,26,40,3,4,2&25,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2
+22,35,25,56,60,62,52,43,30,22,26,36&9:15,36,36,29,28,33,22,35,25,36,30,22,22,22,22,35,25,39,115,2,2&25,2,2,2,2,4,2,2,2,2,2,2,2,2,2,2,2
+24,25,56,60,62,52,43,47,30,22,34,28,28,28,33,22,23,22,26,36,36,30,22,22,35,24,25,40,115,2,115,2&25,2,2,2,2,2,2,2,3,2,2,2,4,3,2,2,2
+55,55,60,62,52,43,47,29,33,35,240@7,32,22,22,22,22,22,23,26,36,29,33,35,24,25,49,38,39,2,2,2,2&25,2,2,2,2,3,2,2,2,2,3,2,3,2,2,2,2
+50,62,51,52,43,47,29,33,22,26,42&25,31,32,22,22,22,22,22,26,36&9:26,30,22,26,49,38,39,2,2,2,2&25,2&25,2&25,2,2,2,2,2,3,2,2,2,2,4,4,2,2,2,2
+51,52,43,42,47,29,33,22,22,26,36&25,36&25,30,22,22,22,22,22,34,28,33,22,26,40,2,2,2,2,2,2&25,4,2,2,2,2,2,2,3,2,2,2,2,2,2,2,2,2,3
+28,27,47,29,28,33,22,22,22,26,36,36&25,30,22,22,22,22,22,35,24,32,24,25,40,2,115,110,2,2&25,2&25,2,2,2,2,2,2,2,2,3,3,2,2,2,2,2,2,2,4
+22,34,28:29,33,22,22,22,22,35,25,36,36&25,31,24,24,24,24,24,25,37,31,49,38,39,4,2,2,2&25,2&25,2,2,2,2,2,3,3,2,2,2,2,2,2,2,2,3,2,2,2
+24,24,24:29,24,24,24,32,22,26,49,38,38&25,38,38,38,38,38,38,38,38,38,39,3,2,2,2,2,2&25,2,2,2,2,2,2,2,4,2,2*1,2,4,2,2,2,2,2,2,2,112
+38,38,38,38,38,46,31,24,25,40,2,2&25,121!0,3,115,2,2,2,2,2,2,2,2,2,2,2,2,2&25,2,2,3,3,2,2,2,2,2,2,2,4,2,2,2,2,2,2,2,2
+4,2,115,2,115,45,38,38,38,39,2,2&25,3,110,2,2,2,2,2,2,2,2,2,2,2,2,2,2&25,2,2,4,2,2,2,2,2,2,2,2,2,2,2,3,112,2,2,3,2
+2,2,2,88,89,2,2,2,2,2,2,115,2,2,2,2,2,2,2,2,2,3,3,2,2,2,2&25,2&25,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+2,2,2,2,115,2,4,2,4,2,2,2,2,4,2,2,2,2,2,2,2,2,2,2,2,4,2&25,3,3,2,2,2,2,3,2,2,2,3,2,2,2,2,3,2,2,3,2,2
+2,2,2,2,2,2,2,2,2,4,2,2,2,2,2,2,2,2,2,2,4,2,2,2,2,2,2&25,3,2,2,2,2,2,2,3,2,2,2,2,2,112,2,2,2,2,2,2,2
+2,2,2,2,2,3,2,2,2,3,2,2,4,2,2,2,2,4,2,2,2,2,2,2,3,2,2&25,2,2,2,2,2,2,2,2,2,2,3,2,2,2,3,110,2,110,2,2,2
+2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2,2,2,2,2,3,2,3,2,2,2&25,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2,2
+2,3,2,2,2,2*3,2,2,2,2,3,2,2,2,2,2,2,3,2,2*2,2,2,2,2,2,3,2&25,2,2,3,2,2,2,2,2,2,2,2,3,113,2,2,2,2,2,2,2,2
+2,4,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,112,2,2,2,2,2,2,2,2,2&25,2,2,2,2,2,2,114,2,2,2,3,2,2,114,2,3,2,3,112,2,2
+4,2,2,2,2,3,2,2,2,112,2,2,2,2,2,2,2,2,3,2,2,112,2,3,2,2,2&25,2&25,2,2,114,2,2,2,2,4,2,2,114,2,2,2,2,2,2,2,2,2
+2,3,2,2,2,2,2,2,2,2,114,2,2,2,2,113,2,2,2,2,2,2,2,2,2,2,2,2&25,4,2,2,113,2,2,2,4,2,113,2,2,2,2,2,112,2,2,2,4
+3,2,3,2,2,4,2,2,112,2,2,2,2,2,2,2,2,2,2,2,2,3,2,113,2,2,2,2&25,2,2,3,2,2,114,2,2,2,2,2,2,2,2,3,2,2,2,2,2
+2,2,2,112,2,4,3,2,2,2,2,2,2,2,4,2,2,4,2,2,2,2,2,2,2,2,2,2&25,2,114,2,2,2,3,3,4,2,2,2,2,4,2,2,2,2,2,2,2
diff --git a/rsrc/scenarios/stealth/out/out1~2.map b/rsrc/scenarios/stealth/out/out1~2.map
index d92ee349..628ee384 100644
--- a/rsrc/scenarios/stealth/out/out1~2.map
+++ b/rsrc/scenarios/stealth/out/out1~2.map
@@ -1,42 +1,42 @@
-2,2,3,2,2,2,2,2,2,2,4,2,2,2,2,2,2,2,2,2,3,2,4,2,2,2,2!2,80&25,2,2,2,2,2,2,3,3,2,2,2,2,113,114,112,114,2,2,2,2
-2,2,2,2,2,2,2,2,2,2,4,2,2,2,3,2,3,2,2,2,2,2,2,2,2,2,2,80&25,121!4,2,2,2,2,2,2,2,2,2,2,114,112,114,112,2,113,2,114,2
-2,2,2,2,2,3,4,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2,2,2,2,80&25,80&25,2,2,2,2,2,3,2,2,115,2,113,112,112,114:15,112,113,2,114,2,2
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,121!3,80&25,2,2,2,2,4,2,2,115,112,115,2,114,114,114,114,113,113,2,2,80&25,80&25
-2,2,2,2,2,2,3,2,3,2,2,2,2,4,2,2,2,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,2,2,3,2,2,2,115,115,88,89,115,112,112,114,113,2,2,112,80&25,80&25,2
-3,2,110,88,89,2,2,2,2,2,2,4,4,2,2,2,2,80&25,3,2,4,2,3,80&25,2,3,2,2,2,2,2,2,2,2,2,115,112,2,2,112,113,113,80&25,80&25,80&25,80&25,2,2
-2,2,87,2:13,87,2,2,2,2*2,2,2,4,118,118,4,118,118,80&25,118,118,118,118,118,80&25,112,112,112,2,2,2,2,2,2,2,2,2,4,2,80&25,80&25,80&25,80&25,80&25,112,114,114,2,114
-2,2,88,89,110,3,2,2,2,2,2,4,118,118,2,118,118,80&25,4,4,4,4,4,80&25,112,114,114,2,2,2,2,2,3,2,121!1,80&25*1,80&25,80&25,80&25,2,112,2,112,114,112,112,114,112
-2,2,2,2,2,2,2,2,2,2,2,4,118,118,4,118,118,80&25,118,118,118,118,118,80&25,114,114,112,2,2,2,2,2,2,2,80&25,80&25,2,2,2,2,114,2,112,2,114,114,2,112
-3,2,2,2,4,2,4,2,2,2,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,112,2:0,112,112,4:0,80&25:0,112,112,112,2,2,2,2,2,80&25,80&25,80&25,2,2,2,2,112,2,2,2,114,3,112,114,2
-4,2,3,2,2,2,2,2,2,2,2,4,118,118,118,118,118,80&25,118:0,118,118,118,118,80&25,2,2,2:0,2,2,80&25,80&25,80&25,80&25,2,2,2,2,2,114,3,3,114,112,2,4,4,2,2
-2,2,2,2,3,2,2,2,2,2,2,4,4,4,4,4,4,80&25,112,80&25,80&25,80&25,80&25,80&25,121!0,2,112,2,2,80&25,3,2,2,2,2,2,2,2,114,112,3,3,112,112,114,2,56,55
-3,2,3,3,2,2,2,2,2,4,4,4,118,118,118,118,118,80&25,80&25:0,80&25,244@1,243@1,245@1,80&25,80&25,80&25,80&25:0,80&25,80&25,80&25,2,2,2,2,114,114,114,112,112,114,112,112,56,55,55,55,60,50
-2,2,4,2,4,2,2,2,2,3,2,4,4,4,4,4,4,2,56,55,55,55,55,55,55,55,55,54,2,80&25,80&25,80&25,2,114,114,2,114,2,2,3,56,55,60,62,51,51,51,51
-2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,2,56,55,60,50,50,50,50,50,50,50,50,61,54,2,2,80&25,80&25,80&25,80&25,80&25,80&25,2,56,55,60,62,51,52,113,2,113,113
+2,2,3,2,2,2,2,2,2,2,4,2,2,2,2,2,2,2,2,2,3,2,4,2,2,2,2!2,2&25,2,2,2,2,2,2,3,3,2,2,2,2,113,114,112,114,2,2,2,2
+2,2,2,2,2,2,2,2,2,2,4,2,2,2,3,2,3,2,2,2,2,2,2,2,2,2,2,2&25,121!4,2,2,2,2,2,2,2,2,2,2,114,112,114,112,2,113,2,114,2
+2,2,2,2,2,3,4,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2,2,2,2,2&25,2&25,2,2,2,2,2,3,2,2,115,2,113,112,112,114:15,112,113,2,114,2,2
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,121!3,2&25,2,2,2,2,4,2,2,115,112,115,2,114,114,114,114,113,113,2,2,2&25,2&25
+2,2,2,2,2,2,3,2,3,2,2,2,2,4,2,2,2,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2,2,3,2,2,2,115,115,88,89,115,112,112,114,113,2,2,112,2&25,2&25,2
+3,2,110,88,89,2,2,2,2,2,2,4,4,2,2,2,2,2&25,3,2,4,2,3,2&25,2,3,2,2,2,2,2,2,2,2,2,115,112,2,2,112,113,113,2&25,2&25,2&25,2&25,2,2
+2,2,87,2:13,87,2,2,2,2*2,2,2,4,118,118,4,118,118,2&25,118,118,118,118,118,2&25,112,112,112,2,2,2,2,2,2,2,2,2,4,2,2&25,2&25,2&25,2&25,2&25,112,114,114,2,114
+2,2,88,89,110,3,2,2,2,2,2,4,118,118,2,118,118,2&25,4,4,4,4,4,2&25,112,114,114,2,2,2,2,2,3,2,121!1,2&25*1,2&25,2&25,2&25,2,112,2,112,114,112,112,114,112
+2,2,2,2,2,2,2,2,2,2,2,4,118,118,4,118,118,2&25,118,118,118,118,118,2&25,114,114,112,2,2,2,2,2,2,2,2&25,2&25,2,2,2,2,114,2,112,2,114,114,2,112
+3,2,2,2,4,2,4,2,2,2,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,112,2:0,112,112,4:0,2&25:0,112,112,112,2,2,2,2,2,2&25,2&25,2&25,2,2,2,2,112,2,2,2,114,3,112,114,2
+4,2,3,2,2,2,2,2,2,2,2,4,118,118,118,118,118,2&25,118:0,118,118,118,118,2&25,2,2,2:0,2,2,2&25,2&25,2&25,2&25,2,2,2,2,2,114,3,3,114,112,2,4,4,2,2
+2,2,2,2,3,2,2,2,2,2,2,4,4,4,4,4,4,2&25,112,2&25,2&25,2&25,2&25,2&25,121!0,2,112,2,2,2&25,3,2,2,2,2,2,2,2,114,112,3,3,112,112,114,2,56,55
+3,2,3,3,2,2,2,2,2,4,4,4,118,118,118,118,118,2&25,2&25:0,2&25,244@1,243@1,245@1,2&25,2&25,2&25,2&25:0,2&25,2&25,2&25,2,2,2,2,114,114,114,112,112,114,112,112,56,55,55,55,60,50
+2,2,4,2,4,2,2,2,2,3,2,4,4,4,4,4,4,2,56,55,55,55,55,55,55,55,55,54,2,2&25,2&25,2&25,2,114,114,2,114,2,2,3,56,55,60,62,51,51,51,51
+2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,2,56,55,60,50,50,50,50,50,50,50,50,61,54,2,2,2&25,2&25,2&25,2&25,2&25,2&25,2,56,55,60,62,51,52,113,2,113,113
 4,2,2,2,2,2,2,2,2,2,2,2,2,3,56,55,60,50,50,50,50,50,50,50,50,50,50,64,61,55,54,2,2,114,56,55,68,55,60,62,51,52,113,2,2,2,113,2
 2,4,2,3,2,2,2,3,2,2,2,2,56,55,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,61,54,112,56,60,62,70,51,51,52,112,113,2,2,2,2,2,2
-3,4,2,2,2,2,2,2,4,2,2,56,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,61,55,60,62,52,80&25,112,3,3,2,2,4,2,2,2,2,4
-3,2,2,2,2,2,2,2,2,2,2,57,50,64,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,2,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,2
-2,2,2,2,2,3,3,2,2,2,2,57,50,50,64,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,4,2,3,2,2,2,2,2,2,2,2,2,80&25,2
-2,2,2,2,2,2,2,2,3,2,2,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,61,54,2,2,2,2,2,2,118,4,118,4,118,80&25,2
-2,2,2,2,2,2,2,2,2,4,56,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,61,54,2,2,2,2,2,118,4,118,4,118,80&25,4
-2,2,2,2,2,2,2,4,2,2,57,50,64,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,61,54,2,2,2,2,118,250&9:6,118,4,118,80&25,2
-2,3,2,2,2,2,2,2,2,2,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,2,3,2,2,118,2,118,4,118,80&25,4
-2,2,2,2,2,2,2,2,2,2,58,59,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,4,2,2,2,118,4,118,4,118,80&25,4
-2,2,2,2,3,2,2,2,3,2,2,58,59,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,2,2,2,2,4,4,4,4,4,80&25,4
-2,2,2,2,2,2,2,2,2,2,2,2,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,2,2,2,2,118,118,118,118,118,80&25,4
-2,2,3,2,2,2,2,2,2,2,2,2,57,50,50,64,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,2,2,2,4,4,4,4,4,4,80&25,2
-2,2,2,2,250&9:14,2,2,2,2,2,2,2,58,51,59,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,2,2,2,2,80&25,80&25,80&25*0,80&25,80&25,80&25,80&25,80&25
-2,2,2,2,2,2,2,2*3,2,2,2,2,2,2,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,64,53,2,2,2,2,4,4,4,4,4,4,80&25,2
-2,2,2,4,2,2,2,2,4,4,2,2,2,2,58,51,59,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,2,2,2,2,2,118,118,118,118,118,80&25,4
-3,2,2,88,89,2,2,2,2,2,2,2,2,112,2,2,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,2,2,2,2,2,4,4,4,4,4,80&25,2
-2,2,2,2,2,2,2,2,2,2,112,2,2,2,3,3,58,51,59,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,2,2,2,2,2,3,118,4,118,4,118,80&25,4
-2,2,2,2,2,3,2,113,2,2,2,2,3,113,2,3,111,2,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,2,2,2,2,4,4,118,4,118,4,118,80&25,4
-3,2,2,3,2,2,2,2,2,112,2,113,112,2,112,2,112,2,58,59,50,50,50,50,50,50,50,50,50,50,50,50,50,53,113,2,113,2,2,2,4,118,250&9:8,118,4,118,80&25,4
-2,2,2,3,2,2,2,2,2,2,114,2,2,113,111,113,111,111,111,57,50,50,50,50,50,50,50,50,50,50,50,50,62,52,3,113,4,112,112,3,4,118,4,118,4,118,80&25,4
-2,2,2,2,4,2,3,2,114,114,2,112,113,114,2,111,114,111,111,57,50,50,50,50,50,50,50,50,50,50,50,50,53,110,4,4,112,112,4,2,2,118,4,118,4,118,80&25,4
-2,2,3,2,2,2,2,2,2,113,2,114,2,111,113,111,4,113,111,57,50,50,50,50,50,50,50,50,50,50,50,50,53,2,4,112,112,114,112,2,4,2,2,4,2,4,80&25,2
-2,2,2,87,2,2,2,2,113,114,2,2,114,2,111,111,111,111,250&9:3,57,50,50,50,50,50,50,50,50,50,50,50,50,61,54,4,3,114,3,112,113,2,4,4,2,4,3,2,4
+3,4,2,2,2,2,2,2,4,2,2,56,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,61,55,60,62,52,2&25,112,3,3,2,2,4,2,2,2,2,4
+3,2,2,2,2,2,2,2,2,2,2,57,50,64,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,2,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2
+2,2,2,2,2,3,3,2,2,2,2,57,50,50,64,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,4,2,3,2,2,2,2,2,2,2,2,2,2&25,2
+2,2,2,2,2,2,2,2,3,2,2,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,61,54,2,2,2,2,2,2,118,4,118,4,118,2&25,2
+2,2,2,2,2,2,2,2,2,4,56,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,61,54,2,2,2,2,2,118,4,118,4,118,2&25,4
+2,2,2,2,2,2,2,4,2,2,57,50,64,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,61,54,2,2,2,2,118,2&9:6,118,4,118,2&25,2
+2,3,2,2,2,2,2,2,2,2,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,2,3,2,2,118,2,118,4,118,2&25,4
+2,2,2,2,2,2,2,2,2,2,58,59,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,4,2,2,2,118,4,118,4,118,2&25,4
+2,2,2,2,3,2,2,2,3,2,2,58,59,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,2,2,2,2,4,4,4,4,4,2&25,4
+2,2,2,2,2,2,2,2,2,2,2,2,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,2,2,2,2,118,118,118,118,118,2&25,4
+2,2,3,2,2,2,2,2,2,2,2,2,57,50,50,64,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,2,2,2,4,4,4,4,4,4,2&25,2
+2,2,2,2,2&9:14,2,2,2,2,2,2,2,58,51,59,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,2,2,2,2,2&25,2&25,2&25*0,2&25,2&25,2&25,2&25,2&25
+2,2,2,2,2,2,2,2*3,2,2,2,2,2,2,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,64,53,2,2,2,2,4,4,4,4,4,4,2&25,2
+2,2,2,4,2,2,2,2,4,4,2,2,2,2,58,51,59,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,2,2,2,2,2,118,118,118,118,118,2&25,4
+3,2,2,88,89,2,2,2,2,2,2,2,2,112,2,2,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,2,2,2,2,2,4,4,4,4,4,2&25,2
+2,2,2,2,2,2,2,2,2,2,112,2,2,2,3,3,58,51,59,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,53,2,2,2,2,2,3,118,4,118,4,118,2&25,4
+2,2,2,2,2,3,2,113,2,2,2,2,3,113,2,3,111,2,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,2,2,2,2,4,4,118,4,118,4,118,2&25,4
+3,2,2,3,2,2,2,2,2,112,2,113,112,2,112,2,112,2,58,59,50,50,50,50,50,50,50,50,50,50,50,50,50,53,113,2,113,2,2,2,4,118,2&9:8,118,4,118,2&25,4
+2,2,2,3,2,2,2,2,2,2,114,2,2,113,111,113,111,111,111,57,50,50,50,50,50,50,50,50,50,50,50,50,62,52,3,113,4,112,112,3,4,118,4,118,4,118,2&25,4
+2,2,2,2,4,2,3,2,114,114,2,112,113,114,2,111,114,111,111,57,50,50,50,50,50,50,50,50,50,50,50,50,53,110,4,4,112,112,4,2,2,118,4,118,4,118,2&25,4
+2,2,3,2,2,2,2,2,2,113,2,114,2,111,113,111,4,113,111,57,50,50,50,50,50,50,50,50,50,50,50,50,53,2,4,112,112,114,112,2,4,2,2,4,2,4,2&25,2
+2,2,2,87,2,2,2,2,113,114,2,2,114,2,111,111,111,111,2&9:3,57,50,50,50,50,50,50,50,50,50,50,50,50,61,54,4,3,114,3,112,113,2,4,4,2,4,3,2,4
 2,2,87,2,4,2,2,2,2,113,2,113,2,111,111,56,55,55,55,60,50,50,50,50,50,50,50,50,50,50,50,50,50,61,54,2,114,2,114,4,114,3,3,2,4,2,3,2
 55,55,54,2,87,87,2,2,2,3,2,56,55,55,55,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,61,54,2,2,114,114,2,114,113,2,2,4,2,4
 50,50,61,55,55,54,110,2,56,55,55,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,61,54,3,2,2,114,113,113,2,114,3,3,2
diff --git a/rsrc/scenarios/stealth/out/out2~0.map b/rsrc/scenarios/stealth/out/out2~0.map
index 8d12bac4..19b92c99 100644
--- a/rsrc/scenarios/stealth/out/out2~0.map
+++ b/rsrc/scenarios/stealth/out/out2~0.map
@@ -17,7 +17,7 @@
 2,2,2,2,2,2,2,114,2,4,2,2*0,2,3,2,2,2,2,2,2,2,4,58,51,51,52,43,42,42,42,41,58,59,50,50,50,62,51,52,29,28,33,22,22,22,22,22,22
 2,3,2,3,2,2,2,2,2,2,3,3,4,2,2,2,2,2,4,4,2,2,2:3,3,43,42,47,29,28,27,48,41,58,59,62,51,52,29,28,33,22,22,22,22,22,22,22,22
 4,2,2,4,3,3,2,2,2,43,42,42,41,2,2,2,2,43,42,42,42,42,42:3,42,47,29,28,33,22,26,36,29,27,58,52,29,28,33,22,22,22,22,22,22,23,23,23,23
-3,2,88,89,2,3,2,2,3,44,36,36,48,41,4,2,2,44,29,28,28,28,28:3,28,28,33,22,22,22,26,251&9:0,30,34,28,28,33,22,22,23,23,23,23,23,23,23,22,22,22
+3,2,88,89,2,3,2,2,3,44,36,36,48,41,4,2,2,44,29,28,28,28,28:3,28,28,33,22,22,22,26,36&9:0,30,34,28,28,33,22,22,23,23,23,23,23,23,23,22,22,22
 3,3,2,2,3,2,2,2,2,45,46,36,36,48,42,42,42,47,30,22,22,22,22,23,23,23,23,23,23,34,28,33,22,23,23,23,23,23,23,23,22,22,22,22,23,23,23,22
 2,2,3,2,2,114,2,3,4,3,45,46,36,36,36,29,28,28,33,23,23,23,23,23,22,22,22,22,23,23,23,23,23,23,23,22,22,22,35,24,24,32,22,22,22,22,23,22
 4,3,3,2,4,4*1,4,3,3,2,2,44,36,37,36,30,23,23,23,23,35,24,24,24,24,32,22,35,24,24,24,24,32,35,24,24,24,24,25,36,36,31,24,24,32,22,23,22
@@ -30,8 +30,8 @@
 112,3,2,2,87,112,3,114,2,44,36,30,22,22,23,22,26,36,36,40,2,114,2,114,2,3,44,29,28,28,33,22,22,26,36,36,48,42,42,42,42,41,4,2,44,29,28,28
 2,2,2,87,87,2,112,3,2,44,29,33,23,23,23,22,34,27,36,40,114,114,114,2,2,2,44,30,22,22,22,22,35,25,36,36,36,36,29,28,27,40,2,2,44,30,22,22
 3,2,2,2,87,112,2,2,2,44,31,32,23,23,22,22,22,34,27,48,41,2,114,3,113,4,44,31,24,24,24,24,25,36,36,37,29,28,33,22,26,40,3,2,44,30,22,22
-80&25,80&25,80&25,3,2,3,2,2,2,45,46,31,32,23,23,23,23,22,34,27,40,2,114,112,4,2,45,38,38,38,38,38,38,46,36,29,33,22,22,22,26,48,42,42,47,30,22,22
-2,2,80&25,80&25,80&25,80&25,80&25,250&9:8,2,3,45,46,30,22,23,22,23,22,35,25,40,2,112,112,114,113,2,2,3,2,2,2,3,44,29,33,22,22,35,24,25,36,36,37,36,30,22,22
+2&25,2&25,2&25,3,2,3,2,2,2,45,46,31,32,23,23,23,23,22,34,27,40,2,114,112,4,2,45,38,38,38,38,38,38,46,36,29,33,22,22,22,26,48,42,42,47,30,22,22
+2,2,2&25,2&25,2&25,2&25,2&25,2&9:8,2,3,45,46,30,22,23,22,23,22,35,25,40,2,112,112,114,113,2,2,3,2,2,2,3,44,29,33,22,22,35,24,25,36,36,37,36,30,22,22
 2,2,4,2,2,2,3,2,3,3,3,44,31,32,22,23,23,22,26,49,39,2,112,112,112,4,2,2,2,4,43,41,2,44,30,22,22,35,25,36,36,37,29,28,28,33,22,22
 2,2,3,2,3,2,3,3,3,2,3,45,46,30,22,22,23,22,26,40,2,2,3,112,114,114,2,112,2,2,45,39,3,44,30,22,35,25,36,36,36,36,30,22,23,22,22,22
 2,2,2,2*2,2,2,3,2,2,4,2,2,44,31,24,32,23,23,26,48,42,42,41,114,114,114,2,2,3,3,3,2,2,44,31,24,25,37,37,36,36,36,30,22,22,22,23,23
diff --git a/rsrc/scenarios/stealth/out/out2~1.map b/rsrc/scenarios/stealth/out/out2~1.map
index 277ef4dc..cc658e61 100644
--- a/rsrc/scenarios/stealth/out/out2~1.map
+++ b/rsrc/scenarios/stealth/out/out2~1.map
@@ -5,44 +5,44 @@
 3,87,87,2,2,87,87,2,87,2,2,87,2,43,47,29,33,22,22,22,22,26,57,53,30,23,22,26,36,36,31,24,25,36,36,36,37,36,49,38,46,36,31,24,32,22,22,22
 2,87,2,3,87,88,89,2,2,87,87,87,2,44,29,33,22,22,22,22,35,25,57,53,30,23,22,26,49,38,38,38,38,38,38,46,36,36,40,118,45,46,36,36,30,22,22,22
 87,2,2,87,87,2,2,87,2,2,3,3,43,47,30,22,22,22,22,22,26,56,60,53,30,23,23,26,40,2,118,2,118,2,3,45,38,38,39,118,2,45,46,36,31,32,22,22
-3,2,87*3,2,2,87,88,89,87,110,3,2,44,29,33,22,22,22,22,35,25,57,62,52,30,22,23,26,40,2,4,2,118,4,118,2,118,80&25,80&25,80&25,2,2,45,46,36,30,22,22
-2,3,2,87,87,2,87,3,3,87,3,2,44,31,24,32,22,22,22,26,56,60,53,29,33,22,23,26,40,2,118,2,118,2,3,118,118,80&25,244@12,245@12,118,118,118,44,36,30,22,22
-4,2,87,88,89,2,110,2,2,2,2,2,45,38,46,30,22,22,35,25,57,62,52,30,22,22,23,26,48,41,2,2,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,3,3,118,44,36,30,22,22
-2,2,2,3,88,89,2*2,2,2,2,2,87,2,2,44,31,32,22,26,56,60,53,29,33,22,22,23,34,27,48,42,41,80&25,43,42,42,41,118,2,118,118,2,118,44,29,33,22,22
-2,87,2,2,2,2,87,2,2,87,2,2,2,2,45,46,31,32,26,57,62,52,30,22,22,22,23,22,34,27,36,40,80&25,44,36,36,40,118,118,118,2,118,2,44,31,32,22,22
-3,87,2,87,87,2,2,2,2,110,2,4,2,2,2,45,46,31,25,57,53,29,33,22,22,22,23,22,22,34,27,39,80&25,45,29,27,48,41,4,3,2,2,43,47,36,31,32,22
-2,4,2,2,87,2,87,2,2,2,87,2,3,2,2,2,45,38,39,57,53,30,22,22,22,22,23,23,22,22,26,116,250&9:21,116,31,25,46,48,41,2,2,43,47,36,36,36,31,24
-2,87,2,2,2,2,2,87,2,2,2,2,2,2,113,115,2,113,56,60,53,30,22,22,22,22,22,23,22,22,26,41,80&25,43,40,117,44,36,40,2,43,47,36,36,36,36,36,36
+3,2,87*3,2,2,87,88,89,87,110,3,2,44,29,33,22,22,22,22,35,25,57,62,52,30,22,23,26,40,2,4,2,118,4,118,2,118,2&25,2&25,2&25,2,2,45,46,36,30,22,22
+2,3,2,87,87,2,87,3,3,87,3,2,44,31,24,32,22,22,22,26,56,60,53,29,33,22,23,26,40,2,118,2,118,2,3,118,118,2&25,244@12,245@12,118,118,118,44,36,30,22,22
+4,2,87,88,89,2,110,2,2,2,2,2,45,38,46,30,22,22,35,25,57,62,52,30,22,22,23,26,48,41,2,2,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,3,3,118,44,36,30,22,22
+2,2,2,3,88,89,2*2,2,2,2,2,87,2,2,44,31,32,22,26,56,60,53,29,33,22,22,23,34,27,48,42,41,2&25,43,42,42,41,118,2,118,118,2,118,44,29,33,22,22
+2,87,2,2,2,2,87,2,2,87,2,2,2,2,45,46,31,32,26,57,62,52,30,22,22,22,23,22,34,27,36,40,2&25,44,36,36,40,118,118,118,2,118,2,44,31,32,22,22
+3,87,2,87,87,2,2,2,2,110,2,4,2,2,2,45,46,31,25,57,53,29,33,22,22,22,23,22,22,34,27,39,2&25,45,29,27,48,41,4,3,2,2,43,47,36,31,32,22
+2,4,2,2,87,2,87,2,2,2,87,2,3,2,2,2,45,38,39,57,53,30,22,22,22,22,23,23,22,22,26,116,2&9:21,116,31,25,46,48,41,2,2,43,47,36,36,36,31,24
+2,87,2,2,2,2,2,87,2,2,2,2,2,2,113,115,2,113,56,60,53,30,22,22,22,22,22,23,22,22,26,41,2&25,43,40,117,44,36,40,2,43,47,36,36,36,36,36,36
 2,87,87,2,3,2,2,87,2,3,2,2,2,2,113,2,113,2,57,62,52,30,22,22,22,22,22,23,22,22,26,48,42&25,47,40,117,44,36,48,42,47,36,36,36,36,36,29,28
-4,2,2,3,87,2,2,2,2,2,3,2,2,2,4,115,88,89,57,53,29,33,22,22,22,22,22,23,23,23,23,36,81&25,36,29,27,47,36,36,36,36,36,36,36,36,29,33,22
-2,2,2,2,2,2,87,2,2,2,2,2,3,2,115,113,2,56,60,53,31,24,24,32,22,22,22,22,22,35,23,81&25:17,81&25:17,23,33,34,28,27,36,36,36,29,28,28,28,33,22,22
-2,4,2,2,2,2,2,2,2,2,2,2,2,2,2,115,2,57,62,52,45,38,46,30,22,22,22,22,35,25,81&25,81&25,29,23,23,22,22,34,28,28,28,33,22,22,22,22,22,22
-2,2,2,4,2,2,3,2,2,2,2,2,115,3,115,115,2,57,53,110,2,2,44,31,24,32,35,24,25,81&25:16,81&25:16,29,33,22,23,23,23,23,23,22,22,22,22,23,23,23,23,23
-2,2,3,2,2,2,4,2,2,4,2,2,2,112,112,4,2,57,53,3,115,115,45,38,46,31,25,81&25,81&25,81&25,29,33,22,22,22,22,22,22,23,23,23,23,23,23,22,22,22,22
+4,2,2,3,87,2,2,2,2,2,3,2,2,2,4,115,88,89,57,53,29,33,22,22,22,22,22,23,23,23,23,36,36&25,36,29,27,47,36,36,36,36,36,36,36,36,29,33,22
+2,2,2,2,2,2,87,2,2,2,2,2,3,2,115,113,2,56,60,53,31,24,24,32,22,22,22,22,22,35,23,36&25:17,36&25:17,23,33,34,28,27,36,36,36,29,28,28,28,33,22,22
+2,4,2,2,2,2,2,2,2,2,2,2,2,2,2,115,2,57,62,52,45,38,46,30,22,22,22,22,35,25,36&25,36&25,29,23,23,22,22,34,28,28,28,33,22,22,22,22,22,22
+2,2,2,4,2,2,3,2,2,2,2,2,115,3,115,115,2,57,53,110,2,2,44,31,24,32,35,24,25,36&25:16,36&25:16,29,33,22,23,23,23,23,23,22,22,22,22,23,23,23,23,23
+2,2,3,2,2,2,4,2,2,4,2,2,2,112,112,4,2,57,53,3,115,115,45,38,46,31,25,36&25,36&25,36&25,29,33,22,22,22,22,22,22,23,23,23,23,23,23,22,22,22,22
 2,3,3,2,2,2,2,2,2,2,2,2,2,2,112,113,2,57,53,3,2,4,2,2,45,38,38,38&25,46,36,30,22,22,22,22,22,22,22,22,22,22,22,22,22,35,24,32,22
-2,2,2,2,2,2,2,2,2,2,2,2,112,115,112,3,56,60,53,4,2,114,2,4,2,2,121!2,80&25,44,36,30,22,22,22,22,22,22,22,22,22,35,24,32,22,26,37:14,30,22
-2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,4,57,62,52,2,2,114,2,2,2,3,2,80&25,44,29,33,22,22,22,22,22,22,22,22,22,26,36,30,35,25,36,30,22
-2,2,2,2,2,2,2,4,2,4,2,2,112,112,112,2,57,53,87,2,114,80&25,80&25,80&25,80&25,80&25,80&25,80&25,44,31,24,32,22,22,22,22,22,22,22,22,26,37,31,25,36,36,30,22
-2,2,4,2,2,2,2,2,2,3,2,2,2,113,2,113,57,61,54,2,2,80&25,112,112,2,80&25,121!0,2,45,38,46,31,24,24,32,22,22,22,22,22,26,36,36,36,29,28,33,22
-2,2,2,3,2,2,2,2,2,2,2,4,112,2,2,2,58,59,53,2,112,80&25,112,4,4,80&25,2,2,2,2,45,38,38,46,31,24,32,35,24,32,34,28,27,37,30,22,22,22
-2,2,3,2,2,2,2,2,2,2,2,2,2,114,114,2,114,57,53,2,112,80&25,2,4,2,80&25,3,2,2,114,2,3,2,45,38,46,31,25,36,31,24,24,25,36,30,22,22,22
-4,2,2,2,2,2,2,2,4,2,2,2,2,2,4,80&25,80&25,65:10,67,80&25,80&25,80&25,2,112,112,80&25:11,112,112,112,114,112,112,115,3,115,45,38,38,38,38,38,38,38,46,31,24,24,24
-3,2,3,2,2,2,2,2,2,3,2,2,2,114,2,80&25,2,57,61,54,2,112,112,112,3,80&25,80&25,115,3:11,2,2,3,114,114,2,113,2,2,110,3,4,3,2,45,38,38,38,38
-2,2,2,2,2,2,2,2,2,2,4,2,2,112,114,80&25,114,58,59,53,112,3,112,114,3,4,80&25,3,112,112,112,113,114,112,112,2,114,2,2,2,112,2,2,2,2,2,3,2
-2,2,2,2,2,2,2,2,2,2,2,2,112,112,114,80&25,114,2,57,53,2,4,113,114:11,4,3,234@11,3,115,2,114,112,4,112,113,112,113,114,113,113,2,3,114,2,2,2*0,2,2
-2,2,2,2,2,2,2,2,2,3,3,3,114,2,80&25,80&25,2,2,57,61,54,112,112,115:11,4,4,4,3,3,115,115,112,112,115,112,113,2,2,2,114,2,114,3,2,2,2,3,2
-2,2,2,2,2,2,2,2,3,2,2,2,114,112,80&25,112,2,112,58,59,53,113,4,112,114,4,3,3,3,115,2:11,112,114,112,115,112,112,112,112,2,2,2,112,2,2,114,112,2
-3,2,2,3,2,2,2,2,4,2,2,2,2,80&25,80&25,2,114,4,113,57,53,113,2,113,113,114:11,112,4*1,4,112,112,2,112,114,112,112,114,2,114,112,115,112,112,2,2,2,2,2
-2,2,3,2,2,2,2,2,2,3,2,112,80&25,80&25,114,112,114,2,2,57,61,54,112,113,114,114,113,3:11,113,112,115,2,112,115,112,113,112,2,114,114,2,113,114,2,3,2,113,4
-2,2,2,2,2,2,2,2,2,2,2,80&25,80&25,2,114,2,114,2,112,58,59,53,3,87,114,113,113,112,114,112,112,114,113,3,112,114,2,2,2,114,2,2,112,112,112,2,2,2
-2,2,3,2,2,2,2,3,2,2,2,80&25,2,112,2,112,114,2,114,2,57,53,2,113,114,112,2,112,2,113,115,114,114,114,114,114,112,112,2,112,2,2,113,4,3,2,56,55
-2,2,2,2,2,2,2,2,2,2,2,80&25,4,2,2,114,112,2,87,2,57,53,113,113,112,113,113,2,112,112,2,114,113,112,112,114,4,113,2,112,2,2,2,87,2,56,60,50
-4,3,3,2,2,2,3,3,2,2,2,80&25,2,3,2,114,114,2,113,114,57,61,54,114,114,2,114,113,112,112,112,2,112,2,114,114,113,2,112,114,3,2,114,56,55,60,62,51
-2,2,2,2,3,2,112,3,115,2,113,80&25,2,2,2,112,114,2,114,2,58,59,53,112,113,2,114,113,112,2,2,2,114,113,114,114,113,112,2,4,2,56,55,60,62,51,52,112
-3,2,2,2,2,112,113,113,113,113,2,80&25,121!1,2,2,113,2,2,112,2,3,57,53,2,3,114,2,114,115,114,113,113,114,114,114,114,2,113,113,56,55,60,62,51,52,87,112,112
-2,2,2,2,112,112,114,2,115,113,2,80&25,2,2,2,2,2,114,114,113,112,57,61,54,3,114,114,113,2,114,113,2,114,114,114,2,112,2,2,57,62,51,52,112,113,112,113,112
-2,2,4,2,112,112,113,114,113,113,115,80&25,2,113,3,2,2,113,112,112,2,58,59,53,113,114,114,114,2,2,112,112,112,112,2,114,114,112,56,60,53,2,112,112,3,4,114:3,113
-4,3,2,2,2,112,113,113,2,2,2,80&25,2,2,2,114,112,2,2,112,2,112,57,53,2,114,113,3,2,113,112,4,114,114,2,114,112,2,57,62,52,113,113,114,114:5,112,112,112
-3,2,2,2,3,2,2,2,2,2,2,80&25,2,4,2,114,114,2,2,2,112,2,57,53,2,114,114,113,3,114,112,250&9:12,113,112,112,2,87,56,60,53,112,114,113,112,112,112,114,2
-2,2,2,2,2,2,2,4,2,2,80&25,80&25,2,2,114,114,112,2,112,2,113,2,57,53,2,2,114,2,2,115,112,112,112,2,2,2,56,60,62,52,114,114,115,112,3:5,113,114,2
-2,2,2,2,2,2,2,4,2,80&25,80&25,4,3,114,114,3,2,112,2,2,3,2,57,53,112,2,112,2,114,112,112,2,2,112,2,114,57,50,53,2,2,112,2,112,114,114,114,2
+2,2,2,2,2,2,2,2,2,2,2,2,112,115,112,3,56,60,53,4,2,114,2,4,2,2,121!2,2&25,44,36,30,22,22,22,22,22,22,22,22,22,35,24,32,22,26,37:14,30,22
+2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,4,57,62,52,2,2,114,2,2,2,3,2,2&25,44,29,33,22,22,22,22,22,22,22,22,22,26,36,30,35,25,36,30,22
+2,2,2,2,2,2,2,4,2,4,2,2,112,112,112,2,57,53,87,2,114,2&25,2&25,2&25,2&25,2&25,2&25,2&25,44,31,24,32,22,22,22,22,22,22,22,22,26,37,31,25,36,36,30,22
+2,2,4,2,2,2,2,2,2,3,2,2,2,113,2,113,57,61,54,2,2,2&25,112,112,2,2&25,121!0,2,45,38,46,31,24,24,32,22,22,22,22,22,26,36,36,36,29,28,33,22
+2,2,2,3,2,2,2,2,2,2,2,4,112,2,2,2,58,59,53,2,112,2&25,112,4,4,2&25,2,2,2,2,45,38,38,46,31,24,32,35,24,32,34,28,27,37,30,22,22,22
+2,2,3,2,2,2,2,2,2,2,2,2,2,114,114,2,114,57,53,2,112,2&25,2,4,2,2&25,3,2,2,114,2,3,2,45,38,46,31,25,36,31,24,24,25,36,30,22,22,22
+4,2,2,2,2,2,2,2,4,2,2,2,2,2,4,2&25,2&25,65:10,67,2&25,2&25,2&25,2,112,112,2&25:11,112,112,112,114,112,112,115,3,115,45,38,38,38,38,38,38,38,46,31,24,24,24
+3,2,3,2,2,2,2,2,2,3,2,2,2,114,2,2&25,2,57,61,54,2,112,112,112,3,2&25,2&25,115,3:11,2,2,3,114,114,2,113,2,2,110,3,4,3,2,45,38,38,38,38
+2,2,2,2,2,2,2,2,2,2,4,2,2,112,114,2&25,114,58,59,53,112,3,112,114,3,4,2&25,3,112,112,112,113,114,112,112,2,114,2,2,2,112,2,2,2,2,2,3,2
+2,2,2,2,2,2,2,2,2,2,2,2,112,112,114,2&25,114,2,57,53,2,4,113,114:11,4,3,234@11,3,115,2,114,112,4,112,113,112,113,114,113,113,2,3,114,2,2,2*0,2,2
+2,2,2,2,2,2,2,2,2,3,3,3,114,2,2&25,2&25,2,2,57,61,54,112,112,115:11,4,4,4,3,3,115,115,112,112,115,112,113,2,2,2,114,2,114,3,2,2,2,3,2
+2,2,2,2,2,2,2,2,3,2,2,2,114,112,2&25,112,2,112,58,59,53,113,4,112,114,4,3,3,3,115,2:11,112,114,112,115,112,112,112,112,2,2,2,112,2,2,114,112,2
+3,2,2,3,2,2,2,2,4,2,2,2,2,2&25,2&25,2,114,4,113,57,53,113,2,113,113,114:11,112,4*1,4,112,112,2,112,114,112,112,114,2,114,112,115,112,112,2,2,2,2,2
+2,2,3,2,2,2,2,2,2,3,2,112,2&25,2&25,114,112,114,2,2,57,61,54,112,113,114,114,113,3:11,113,112,115,2,112,115,112,113,112,2,114,114,2,113,114,2,3,2,113,4
+2,2,2,2,2,2,2,2,2,2,2,2&25,2&25,2,114,2,114,2,112,58,59,53,3,87,114,113,113,112,114,112,112,114,113,3,112,114,2,2,2,114,2,2,112,112,112,2,2,2
+2,2,3,2,2,2,2,3,2,2,2,2&25,2,112,2,112,114,2,114,2,57,53,2,113,114,112,2,112,2,113,115,114,114,114,114,114,112,112,2,112,2,2,113,4,3,2,56,55
+2,2,2,2,2,2,2,2,2,2,2,2&25,4,2,2,114,112,2,87,2,57,53,113,113,112,113,113,2,112,112,2,114,113,112,112,114,4,113,2,112,2,2,2,87,2,56,60,50
+4,3,3,2,2,2,3,3,2,2,2,2&25,2,3,2,114,114,2,113,114,57,61,54,114,114,2,114,113,112,112,112,2,112,2,114,114,113,2,112,114,3,2,114,56,55,60,62,51
+2,2,2,2,3,2,112,3,115,2,113,2&25,2,2,2,112,114,2,114,2,58,59,53,112,113,2,114,113,112,2,2,2,114,113,114,114,113,112,2,4,2,56,55,60,62,51,52,112
+3,2,2,2,2,112,113,113,113,113,2,2&25,121!1,2,2,113,2,2,112,2,3,57,53,2,3,114,2,114,115,114,113,113,114,114,114,114,2,113,113,56,55,60,62,51,52,87,112,112
+2,2,2,2,112,112,114,2,115,113,2,2&25,2,2,2,2,2,114,114,113,112,57,61,54,3,114,114,113,2,114,113,2,114,114,114,2,112,2,2,57,62,51,52,112,113,112,113,112
+2,2,4,2,112,112,113,114,113,113,115,2&25,2,113,3,2,2,113,112,112,2,58,59,53,113,114,114,114,2,2,112,112,112,112,2,114,114,112,56,60,53,2,112,112,3,4,114:3,113
+4,3,2,2,2,112,113,113,2,2,2,2&25,2,2,2,114,112,2,2,112,2,112,57,53,2,114,113,3,2,113,112,4,114,114,2,114,112,2,57,62,52,113,113,114,114:5,112,112,112
+3,2,2,2,3,2,2,2,2,2,2,2&25,2,4,2,114,114,2,2,2,112,2,57,53,2,114,114,113,3,114,112,2&9:12,113,112,112,2,87,56,60,53,112,114,113,112,112,112,114,2
+2,2,2,2,2,2,2,4,2,2,2&25,2&25,2,2,114,114,112,2,112,2,113,2,57,53,2,2,114,2,2,115,112,112,112,2,2,2,56,60,62,52,114,114,115,112,3:5,113,114,2
+2,2,2,2,2,2,2,4,2,2&25,2&25,4,3,114,114,3,2,112,2,2,3,2,57,53,112,2,112,2,114,112,112,2,2,112,2,114,57,50,53,2,2,112,2,112,114,114,114,2
diff --git a/rsrc/scenarios/stealth/out/out2~2.map b/rsrc/scenarios/stealth/out/out2~2.map
index 47a084ec..4d32b294 100644
--- a/rsrc/scenarios/stealth/out/out2~2.map
+++ b/rsrc/scenarios/stealth/out/out2~2.map
@@ -1,8 +1,8 @@
-2,2,2,2,2,2,2,2,80&25,80&25,2,2,2,4,2,2,3,2,2,114,4,2,57,53,2,2,4,113,2,113,113,113,3,2,112,2,57,50,53,2,3,3,2,2,2,2,2,2
-2,2,113,2,3,114,2,2,80&25,112,2,3,4,2,2,2,4,2,2,2,2,2,57,61,54,2,2,3,112,114,2,2,2,114,2,112,57,62,52,2,112,114,2,2,2,2,2,2
-80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,2,2,2,2,2,2,112,114,2,2,3,2,2,58,59,61,54,112,3,2,112,2,3,113,3,2,56,60,53,2,3,114,112,2,2,114,112,2,3
-80&25,4,112,112,2,113,114,114,2,114,112,114,2,112,2,114,2,112,2,2,2*0,3,2,58,59,53,2,114,113,112,112,113,112,112,56,60,62,52,112,112,112,2,2,112,112,114,2,2
-2,112,114,2,114,114,112,114,2,113,114,4,114,112,113,2,113,2,114,112,2,87,3,2,57,53,87,113,114,112,250&9:24,3,112,56,60,62,52,2,3,112,2,114,114,2,2,114,2,3
+2,2,2,2,2,2,2,2,2&25,2&25,2,2,2,4,2,2,3,2,2,114,4,2,57,53,2,2,4,113,2,113,113,113,3,2,112,2,57,50,53,2,3,3,2,2,2,2,2,2
+2,2,113,2,3,114,2,2,2&25,112,2,3,4,2,2,2,4,2,2,2,2,2,57,61,54,2,2,3,112,114,2,2,2,114,2,112,57,62,52,2,112,114,2,2,2,2,2,2
+2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2,2,2,2,2,2,112,114,2,2,3,2,2,58,59,61,54,112,3,2,112,2,3,113,3,2,56,60,53,2,3,114,112,2,2,114,112,2,3
+2&25,4,112,112,2,113,114,114,2,114,112,114,2,112,2,114,2,112,2,2,2*0,3,2,58,59,53,2,114,113,112,112,113,112,112,56,60,62,52,112,112,112,2,2,112,112,114,2,2
+2,112,114,2,114,114,112,114,2,113,114,4,114,112,113,2,113,2,114,112,2,87,3,2,57,53,87,113,114,112,2&9:24,3,112,56,60,62,52,2,3,112,2,114,114,2,2,114,2,3
 2,2,2,2,113,113,3,3,4,3,114,2,112,2,2,112,112,2,3,2,112,3,2,3,57,53,110,56,55,55,55,55,55,60,62,52,236@20,2,113,2,4,113,112,112,112,114,2,2
 2,2,114,114,112,114,2,2,2,112,2,114,114,114,2,2,112,112,112,2,88,89,87,87,57,61,55,60,62,51,51,51,51,51,52,112,2,2,112,114,2,112,2:19,114,113,114,2,2
 2,2,2,2,112,112,113,2,2,2,2,2,4,2,2,2,2,2,112,2,87,88,89,56,60,50,50,62,52,2,2,2,2,2,2,112,2,112,113,115,4,112,112,114,112,112,2,2
@@ -18,23 +18,23 @@
 4,2,113,2,112,3,3,2,2,2,2,2,2,4,2,2,2,2,2,113,114,112,114,112,2,2,2,2,2,2,2,4,2,2,2,2,2,2,2,113,4,2,4,114,2,2,2,3
 3,2,2,4,113,2,2,2,2,2,2,2,2,2,2,2,2,2,2,112,2:22,113,2,114,3,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2,2,2,2,2
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,4,3,112,112,112,113,114,2,3,2,2,2,3,2,2,2,2,2,2,2,118,2,118,118,2,2,2,2,2,2,2
-2,2,2,2,2,2,2,2,2,2,3,4,2,2,2,2,2,2,2,2,2,2,114,113,2,2,3,3,2,3,2,2,2,2,2,2,2,2,3,250&9:9,2,4,3,2,2,2,2,2
-4,2,3,2,4,2,2,4,2,2,2,2,2,2,2,2,3,2,2,113,2,113,2,113,2,2,2,2,4,118,4,118,4,3,2,80&25,2,118,118,118,118,118,2,2,2,2,2,2
-118,118,118,118,118,80&25,4,4,4,118,118,2,2,118,4,4,2,2,2,2,2,4,2,112,2,2,2,2,2,118,4,118,118,4,2,80&25,2,2,2,2,4,4,2,2,2,3,2,2
-4,4,4,4,4,80&25,4,4,4,118,118,118,118,118,118,4,4,2,2,3,114,114,114,114,113,113,2,2,4,118,4,118,118,2,4,80&25,2,118,118,118,118,118,2,2,2,2,2,2
-118,118,118,118,118,80&25,3,4,3,118,2,2,118,2,118,4,4,2,2,2,2,114,114,2,2,3,2,2,4,118,3,118,118,3,2,80&25,2,2,118,118,4,118,2,2,121!0,2,80&25,80&25
-4,4,250&9:0,4,4,80&25,4,4,4,118,118,118,118,118,118,4,4,4,4,3,3,114,80&25,80&25,80&25,80&25,80&25,80&25,2,4,2,4,4,4,112,80&25,234@3,2,4,4,4,4,2,2,80&25,80&25,80&25,2
-118,118,118,118,118,80&25,4,4,4,118,2,2,2,2,2,4,4,4,80&25,80&25,80&25,80&25,80&25,2,113,2,2,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25:23,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,2,2,2
-4,2,4,4,2,80&25,3,4,4,118,118,118,118,118,118,4,80&25,80&25,80&25,2,2,114,112,114,113,2,2,2,2,3,3,2,2,2,112,80&25:23,112,2,2,2,2,2,2,2,2,2,2,2
-80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,2,2,2,114,2,2,112,2,2,2,2,3,118,118,118,118,118,2,80&25,4,4,4,118,4,118,4,2,2,2,2,2
-2,80&25,234@0,2,2,2,2,2,80&25,4,4,2,4,2,3,3,2,2,2,2,114,114,114,3,114,2,2,2,4,4,3,4,4,4,2,80&25,4,118,4,118,4,118,4,4,2,2,2,2
-4,80&25,80&25,3,2,2,2,2,80&25,4,4,4,4,4,2,2,2,2,2,2,114,2,114,112,2,3,2,2,4,118,118,118,118,118,2,80&25,3,118,4,118,250&9:7,118,4,4,2,2,3,2
-3,2,80&25,2,2,2,3,2,80&25,118,118,118,118,118,118,118,3,2,2,2,114,2,113,112,2,2,2,2,4,4,2,4,4,4,3,80&25,3,118,4,118,4,118,3,2,2,2,2,3
-118,2,118,2,118,4,118,4,80&25,2,3,2,4,2,2,2,3,2,2,4,2,114,112,3,2,2,2,2,2,118,118,118,118,118,2,80&25,3,118,4,118,4,118*2,2,2,2,2,2,2
-118,4,118,3,118,2,118,4*3,80&25,118,118,118,118,118,118,118,2,2,2,2,114,2,114,2,2,2,2,2,2,2,4,250&9:7,2,4,2,80&25,3,118,2,118,4,118,4,2,2,2,2,2
-118,4,118,4,118,4,118,4,80&25,2,2,2,2,2,2,2,2,2,2,2,2,114,2,114,3,2,2,2,2,118,118,118,118,118,4,80&25,4,2,4,2,3,4,2,2,3,4,2,2
-118,2,118,4,118,250&9:2,118,4,80&25,118,118,118,118,118,118,118,2,2,2,2,2,2,114,2,2,2,2,2,2,4,4,4,4,4,2,2,2,2,2,2,2,2,2,2,2,2,4,2
-118,2,118,2,118,4,118,4,80&25,118,118,118,118,118,118,118,4,2,2,2,112,2,3,4,2,2,2,2,2,3,4,4,4,3,4,2,2,2,2,2,2,2,4,2,2,2,2,2
+2,2,2,2,2,2,2,2,2,2,3,4,2,2,2,2,2,2,2,2,2,2,114,113,2,2,3,3,2,3,2,2,2,2,2,2,2,2,3,2&9:9,2,4,3,2,2,2,2,2
+4,2,3,2,4,2,2,4,2,2,2,2,2,2,2,2,3,2,2,113,2,113,2,113,2,2,2,2,4,118,4,118,4,3,2,2&25,2,118,118,118,118,118,2,2,2,2,2,2
+118,118,118,118,118,2&25,4,4,4,118,118,2,2,118,4,4,2,2,2,2,2,4,2,112,2,2,2,2,2,118,4,118,118,4,2,2&25,2,2,2,2,4,4,2,2,2,3,2,2
+4,4,4,4,4,2&25,4,4,4,118,118,118,118,118,118,4,4,2,2,3,114,114,114,114,113,113,2,2,4,118,4,118,118,2,4,2&25,2,118,118,118,118,118,2,2,2,2,2,2
+118,118,118,118,118,2&25,3,4,3,118,2,2,118,2,118,4,4,2,2,2,2,114,114,2,2,3,2,2,4,118,3,118,118,3,2,2&25,2,2,118,118,4,118,2,2,121!0,2,2&25,2&25
+4,4,2&9:0,4,4,2&25,4,4,4,118,118,118,118,118,118,4,4,4,4,3,3,114,2&25,2&25,2&25,2&25,2&25,2&25,2,4,2,4,4,4,112,2&25,234@3,2,4,4,4,4,2,2,2&25,2&25,2&25,2
+118,118,118,118,118,2&25,4,4,4,118,2,2,2,2,2,4,4,4,2&25,2&25,2&25,2&25,2&25,2,113,2,2,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25:23,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2,2,2
+4,2,4,4,2,2&25,3,4,4,118,118,118,118,118,118,4,2&25,2&25,2&25,2,2,114,112,114,113,2,2,2,2,3,3,2,2,2,112,2&25:23,112,2,2,2,2,2,2,2,2,2,2,2
+2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2,2,2,114,2,2,112,2,2,2,2,3,118,118,118,118,118,2,2&25,4,4,4,118,4,118,4,2,2,2,2,2
+2,2&25,234@0,2,2,2,2,2,2&25,4,4,2,4,2,3,3,2,2,2,2,114,114,114,3,114,2,2,2,4,4,3,4,4,4,2,2&25,4,118,4,118,4,118,4,4,2,2,2,2
+4,2&25,2&25,3,2,2,2,2,2&25,4,4,4,4,4,2,2,2,2,2,2,114,2,114,112,2,3,2,2,4,118,118,118,118,118,2,2&25,3,118,4,118,2&9:7,118,4,4,2,2,3,2
+3,2,2&25,2,2,2,3,2,2&25,118,118,118,118,118,118,118,3,2,2,2,114,2,113,112,2,2,2,2,4,4,2,4,4,4,3,2&25,3,118,4,118,4,118,3,2,2,2,2,3
+118,2,118,2,118,4,118,4,2&25,2,3,2,4,2,2,2,3,2,2,4,2,114,112,3,2,2,2,2,2,118,118,118,118,118,2,2&25,3,118,4,118,4,118*2,2,2,2,2,2,2
+118,4,118,3,118,2,118,4*3,2&25,118,118,118,118,118,118,118,2,2,2,2,114,2,114,2,2,2,2,2,2,2,4,2&9:7,2,4,2,2&25,3,118,2,118,4,118,4,2,2,2,2,2
+118,4,118,4,118,4,118,4,2&25,2,2,2,2,2,2,2,2,2,2,2,2,114,2,114,3,2,2,2,2,118,118,118,118,118,4,2&25,4,2,4,2,3,4,2,2,3,4,2,2
+118,2,118,4,118,2&9:2,118,4,2&25,118,118,118,118,118,118,118,2,2,2,2,2,2,114,2,2,2,2,2,2,4,4,4,4,4,2,2,2,2,2,2,2,2,2,2,2,2,4,2
+118,2,118,2,118,4,118,4,2&25,118,118,118,118,118,118,118,4,2,2,2,112,2,3,4,2,2,2,2,2,3,4,4,4,3,4,2,2,2,2,2,2,2,4,2,2,2,2,2
 2,2,2,3,2,2,2,3,2,2,2,2,2,2,2,3,2,2,2,3,2,114,3,3,2,2,4,2,2,2,2,2,2,2,2,2,4,2,2,2,4,2,2,2,3,4,2,2
 2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2,3,2,114,2,2,2,2,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,87,110,3,87,56,55
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2,112,112,2,114,112,2,2,2,2,2,2,2,114,2,2,2,3,2,3,2,2,87,56,55,55,55,55,60,50
diff --git a/rsrc/scenarios/stealth/out/out3~1.map b/rsrc/scenarios/stealth/out/out3~1.map
index 27b08fd9..f6655027 100644
--- a/rsrc/scenarios/stealth/out/out3~1.map
+++ b/rsrc/scenarios/stealth/out/out3~1.map
@@ -1,8 +1,8 @@
 22,22,23,22,22,26,40,57,53,2,30,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,26,40,2,2,44,30,23,23,26,36,30,22,23,23,23,57,50,50,50,50,50,50
 22,22,23,22,22,34,27,57,53,29,33,22,35,24,24,24,24,32,22,22,22,22,22,22,22,22,26,40,2,4,44,30,23,35,25,36:17,30,22,22,22,26,57,50,50,50,50,50,50
-22,22,23,22,22,22,26,57,53,31,24,24,25,36,36,36,251&9:2,30,22,22,22,22,22,22,22,22,26,40,2,4,44,30,23,26,36,36,31,32,22,35,25,57,50,50,50,50,50,50
+22,22,23,22,22,22,26,57,53,31,24,24,25,36,36,36,36&9:2,30,22,22,22,22,22,22,22,22,26,40,2,4,44,30,23,26,36,36,31,32,22,35,25,57,50,50,50,50,50,50
 22,22,23,22,22,22,26,57,61,54,44,36,36,36,29,28,28,33,22,35,24,32,22,22,22,22,26,40,2,2,44,30,23,34,27,36,36,31,24,26,40,57,50,50,50,50,50,50
-22,22,23,22,22,22,26,58,59,53,44,29,28,28,33,22,22,22,22,26,251&9:12,31,32,22,22,35,25,40,4,2,44,30,23,23,34,28,27,36,36,30,40,57,50,50,50,50,50,50
+22,22,23,22,22,22,26,58,59,53,44,29,28,28,33,22,22,22,22,26,36&9:12,31,32,22,22,35,25,40,4,2,44,30,23,23,34,28,27,36,36,30,40,57,50,50,50,50,50,50
 22,22,23,22,22,22,26,41,57,53,44,30,22,22,22,22,22,35,24,25,36,36,31,24,24,25,49,39,3,2,44,30,22,23,23,22,26,36,29,26,40,57,50,50,50,50,50,50
 22,22,23,22,22,35,25,40,57,53,44,30,22,22,22,22,35,25,49,38,38,38,38,38,38,46,40,2,2,43,47,31,24,32,23,23,34,28,33,26,40,57,50,50,50,50,50,50
 22,22,23,22,22,26,49,39,57,53,44,30,22,22,22,35,25,36,40,2,2,87,4,2,3,44,48,42,42,47,49,38,46,31,32,23,23,23,22,26,40,57,50,50,50,50,50,50
@@ -10,7 +10,7 @@
 22,22,23,22,22,26,40,57,62,52,44,31,24,25,37,36,37,36,29,28,27,40,88,89,43,47,30,22,26,36,48,41,4,45,38,46,30,23,26,37,40,58,59,50,50,50,50,50
 22,22,23,22,22,26,40,57,53,43,47,36,49,38,38,46,29,28,33,22,26,48,42,42,47,29,33,22,34,28,27,40,4,2,4,44,30,23,34,27,48:10,41:10,57,50,50,50,50,50
 22,22,23,22,22,26,40,57,53,45,46,36,40,2,2,44,30,22,22,22,26,36,36,37,36,30,35,24,32,22,26,40,2,2,2,44,30,23,35,25,36,40,57,50,50,50,50,50
-24,24,23,24,24,25,40,57,53,2,44,37,40,2,4,44,31,24,24,24,25,37,36,36,36,31,25,251&9:13,30,22,26,40,2,2,2,44,30,23,26,36,49,39,57,50,50,50,50,50
+24,24,23,24,24,25,40,57,53,2,44,37,40,2,4,44,31,24,24,24,25,37,36,36,36,31,25,36&9:13,30,22,26,40,2,2,2,44,30,23,26,36,49,39,57,50,50,50,50,50
 36,40,117,45,38,38,39,57,53,87,44,37,40,2,2,45,38,46,36,36,36,36,36,36,49,38,38,46,31,24,25,40,2,2,43,47,30,23,34,27,40,56,60,50,50,50,50,50
 37,40,2:0,2,2,2,2,65,67:15,2,44,37,40,4,88,89,2,44,29,28,28,28,28,27,40,88,89,44,36,49,38,39,3,2,44,29,33,23,23,26,40,57,50,50,50,50,50,50
 36,40,117,43,42,42,41,57,53,43,47,36,48,41,2,88,89,44,30,22,22,22,22,26,48,42,42,47,37,40,2,2,4,43,47,30,22,23,35,25,40:9,57,50,50,50,50,50,50
@@ -18,7 +18,7 @@
 22,22,23,22,34,28,27,57,53,30,22,26,36,29,27,48,42,47,36,37,36,31,24,25,36,36,36,37,37,40,2,43,47,29,33,23,23,35,25,40,56,60,50,50,50,50,50,50
 22,22,23,22,22,22,26,57,53,30,22,26,36,30,34,27,36,36,36,36,36,36,36,37,36,36,36,36,36,48,42,47,29,33,22,23,35,25,49,39,57,50,50,50,50,50,50,50
 23,23,23,22,23,23,23,57,53,30,22,26,36,30,22,34,28,28,28,27,36,36,29,28,27,36,29,28,28,27,36,29,33,22,23,23,26,49,39,56,60,50,50,50,50,50,50,50
-22,22,23,23,23,35,25,57,53,30,22,34,28,33,22,22,22,22,22,34,28,28,33,22,34,28,33,22,22,26,251&9:12,30,22,23,23,22,26,40,56,60,50,50,50,50,50,50,50,50
+22,22,23,23,23,35,25,57,53,30,22,34,28,33,22,22,22,22,22,34,28,28,33,22,34,28,33,22,22,26,36&9:12,30,22,23,23,22,26,40,56,60,50,50,50,50,50,50,50,50
 22,22,22,22,22,26,56,60,53,30,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,34,28,33,23,23,22,35,25,40,57,50,50,50,50,50,50,50,50,50
 22,22,22,22,22,26,57,62,52,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,22,22,26,49,39,57,50,50,50,50,50,50,50,50,50
 22,22,22,22,22,26,57,53,29,33,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,35,24,32,22,22,22,22,35,25,40:7,56,60,50,50,50,50,50,50,50,50,50
diff --git a/rsrc/scenarios/stealth/out/out3~2.map b/rsrc/scenarios/stealth/out/out3~2.map
index 26d4e496..735f1ecd 100644
--- a/rsrc/scenarios/stealth/out/out3~2.map
+++ b/rsrc/scenarios/stealth/out/out3~2.map
@@ -4,7 +4,7 @@
 2,115,2,2,2,115,2,2,114,114,2,2,2,114,2,2,3,2,2,2,2,111,3,2,2,114,2,2,2,3,4,2,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 2,114,2,2,2,113,2,112,2,113,2,2,2,2,2,2,2,2,2,114,2,114,114,2,114,114,2,111,111,111,111,111,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 2,2,2,115,2,114,113,114,3,3,113,2,2,2,2,114,3,2,2,2,2,2,114,2,2,3,111,2,111,111,111,111,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
-2,114,2,114,113,113,112,2,112,114,2,2,2,2,2,2,2,2,2,114,114,2,2,114,111,111,111,111,111,111,250&9:14,111,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
+2,114,2,114,113,113,112,2,112,114,2,2,2,2,2,2,2,2,2,114,114,2,2,114,111,111,111,111,111,111,2&9:14,111,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 2,113,114,2,113,114:16,113,112,2,112,114,2,2,2,2,2,114,3,2,4,2,114,111,111,111,111,111,111,111,111,111,111,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 2,2,114,2,113,112,115,112,112,2,114,2,2,2,2,114,114,2,114,114,2,111,111,111,2,111,3,111,111,2,111,56,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 2,112,112,3,2,112,112,115,112,114,114,3,112,3,114,2,114,114,2,114,3,111,111,111,111,111,111,111*0,111,111,111,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
@@ -20,7 +20,7 @@
 2,2,2,2,2,2,2,114,114,111,111,111,111,114,114,111,111,112,111,111,112,111,111,56,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 2,2,2,2,114,114,114,4,111,111,111,111,114,3,111,111,111,111,111,111,111,111,111,57,50,50,50,50,62,51,51,51,51,59,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 2,2,2,2,2,2,2,111,111,111,114,111,114,111,111,111,111,111,111,2,2,3,111,57,50,50,62,51,52,43,42,42,41,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50
-2,4,2,3,2,2,114,111,111,111,111,111,111,114,111,111,111,2,2,114,111,250&9:0,56,60,50,50,53,2,43,47,23,27,40,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50
+2,4,2,3,2,2,114,111,111,111,111,111,111,114,111,111,111,2,2,114,111,2&9:0,56,60,50,50,53,2,43,47,23,27,40,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 2,2,2,2,2,2,2,111,111,111,111,111,111,3,114,3,114,2,111,111,111,56,60,50,50,50,53,2,44,29,24,25,40,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 2,2,114,2,2,2,111,111,111,111,111,111,111,111,111,111,87,114,111,111,56,60,50,50,50,50,53,2,45,38,38,38,39,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 114,114,3,2,3,2*3,111,111,111,88,89,111,111,111,111,111,111,87,3,111,57,50,50,50,50,50,61,55,54,3,2,2,56,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50
@@ -30,7 +30,7 @@
 2,2,111,111,2,111,111,111,111,111,111,111,111,111,56,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 2,114,2,111,111,111,111,111,111,111,111,111,111,56,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 2,4,2,2,111,87,111,111,111,111,111,56,55,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
-111,2,114,114,111,111,111,250&9:12,111,111,111,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
+111,2,114,114,111,111,111,2&9:12,111,111,111,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 2,111,4,111,2,111,111,111,111,111,56,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 114,2,111,111,4,2,111,111,56,55,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 4,2,2,114,110,2,111,56,60,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
diff --git a/rsrc/scenarios/stealth/towns/town0.map b/rsrc/scenarios/stealth/towns/town0.map
index fb0dba1e..51808771 100644
--- a/rsrc/scenarios/stealth/towns/town0.map
+++ b/rsrc/scenarios/stealth/towns/town0.map
@@ -29,7 +29,7 @@
 2,2,2,2,2,154,170,154,170,170,170,154,2,154,170@27,170,170,154,170,170,170,170,154,2,2,154,170&12&10,170@9,170,170,170,164!1,2,2,2,2,2,154,170,170,170,170,154,3,2,2,2,2
 2,2,2,2,3,154,170,154,170@44,170,197,154,2,154,170,192,170@28,154,170,170,170,170,154,2,2,154,170&11,170,170,170,170,159:9,2,4,112,4,2,154,199,170,170,170,154,3,2,2,4,2
 2,2,2,2,2,154,170,154,170,170,185@43,154,2,154,170,170,170,154,170,198,184,196,154,2,2,154,170@31&10&11,170,170,170,170,154,2,2,2,2,2,154,154,154,154,159:7,154,3,2,2,2,3
-2,3,2,2,2,154,247:14&9,154,170,170,195,154,2,154,199@26,199,201@17,154,170,170,170,170,154,2,2,154,154,177,177,177@10,154,154,3,2,3,2,2,164!5,170,170,170,170,154,4,2,2,2,2
+2,3,2,2,2,154,170:14&9,154,170,170,195,154,2,154,199@26,199,201@17,154,170,170,170,170,154,2,2,154,154,177,177,177@10,154,154,3,2,3,2,2,164!5,170,170,170,170,154,4,2,2,2,2
 2,2,2,2,2,154,154,154,158,154,154,154,2,154,154,154,154,154,154,158,154,154,154,2,2,3,154,154,154,154,154,2,2,2$11,2@39,2,2,157,204,170,173,196$15,154,4,2,2,2,2
 2,2,2,4,2,2,2,2,2,2,2,3,2,2,3,2,2,2,2,2,2,2,2,2,2,2@38,2,2,2,4,3,2,2,3,2,4,2,154,170,170,170,170,154,2,2,2,2,2
 2,2,2,2,2,2,2,2,2,2,3,2,3,2,4,4,2,2$10,2,3,3,2,2,2,2,2,2,2,2,2,2,2,2,4,2,2,2,154,154,154,154,154,154,2,2,2,2,2
diff --git a/rsrc/scenarios/stealth/towns/town1.map b/rsrc/scenarios/stealth/towns/town1.map
index 41eb3330..4004a177 100644
--- a/rsrc/scenarios/stealth/towns/town1.map
+++ b/rsrc/scenarios/stealth/towns/town1.map
@@ -19,10 +19,10 @@
 2,3,2,2,2,138,185,185,170,185,185,185,170,170,132!8,83,83,83,83,83,83,2,4,2,125,170,170,199,199,201,122,2,2,83,83,2,2,2,2,2,4,122,122,122,122,122,122,2,2,122,122,122,122,122,122,122,122,122,122,2,2,2,2,2
 2,3,2,2,2,122,195,195$4,170,195,195,195,170,170,125,83,83,83,83,83,83,2,4,2,122,122,122,122,122,122,122,2,3,83,83,3,2,2,2,2,2,2,2,3,2,2,2,112,4,2,4,2,2,2,2,2,114,2,3,2,2,3,2,2
 3,2,2,2,2,122,197,197,170,197,197,197,170,170,122,83,83,83,83,83,83,2,4,2,2,4,2,2,4,2,114,3,2,83,83,2,2,2,139,139,139,139,139,139,2,2,2,2,2,113,2,2,2,2,114,114,3,2,113,2,2,3,4,2
-2,2,2,2,2,138,185,185@19,170,185,185,185,170,170,138,83,83,83,83,83,83,2,2,2,2,2,2,2,2,114,2,2,2,83,83,2,2,139,139,248:10&9,210,210,210,139,139,2,2,2,3,2,2,112,3,2,113,2,3,2,2,3,4,2,2,2
+2,2,2,2,2,138,185,185@19,170,185,185,185,170,170,138,83,83,83,83,83,83,2,2,2,2,2,2,2,2,114,2,2,2,83,83,2,2,139,139,210:10&9,210,210,210,139,139,2,2,2,3,2,2,112,3,2,113,2,3,2,2,3,4,2,2,2
 2,2,3,2,2,122,195,195,170,195,195,195,170,170,122,3,2,2,3,83,83,2,3,2,113,2,112,110,2,4,2,2,2,83,83,2,139,139,210,210,210,216,210,210,139,139,2,3,2,2,2,2,56,55,54,2,114,2,2,2,2,2,3,2
 2,3,2,2,3,122,122,122,122,122,122,122,125,122,122,2,2,2,2,83,83,2,2,2,2,114,114,2,2,113,2,112,2,83$23,83,83,149!0,210,210,71,210,210,210,210,210,139,2,2,112,2,2,56,60,50,61,55,54,2,2,2,2,2,2,2
-2,2,2,2,2,122,2H1,122,2&19H2,122,2H3,122,2,2,122,3,2,2,2,83,83,2,2,2,112,2,113,2,2,2&23,2,4,2,83,83,83,142,210,71,71,71,210,248:14&9,212,210,139,2,2,2,2,2,57,50,50,50,50,53,2,2,2,2,2,3,2
+2,2,2,2,2,122,2H1,122,2&19H2,122,2H3,122,2,2,122,3,2,2,2,83,83,2,2,2,112,2,113,2,2,2&23,2,4,2,83,83,83,142,210,71,71,71,210,210:14&9,212,210,139,2,2,2,2,2,57,50,50,50,50,53,2,2,2,2,2,3,2
 2,2,2,2,2,122,2,122,2,122,2,122,2,2,122,2,2,3,2,83,83,2,4,3,2,110,2,2,114,2,4,2,2,83,83,83,139,210,210,71,210,210,210,210,210,139,4,3,113,2,2,58,59,50,50,50,53,3,4,2,2,2,2,2
 2,2,2,2,2,122,2,2,2,2,2,2,2,2,132!11,2,2,2,2,83,83,2,2@46,2,2,114,4,2,4,2,2,112,2,83,83,2,139,139,210,210,210,216,210,210,139,139,2,2,2,2,2,112,58,59,50,50,53,113,4,2,2,112,2,2
 2,2,2,2,2,122,56,54,2,2,2,2,2,2,131,2,2,3,2,83,83,2,4,2,2,2,113,2,112,114,2,3$9,2,83,83,2,2,139,139,210,210,210,210,139,139,2,2,2,2,114,113,2,2,58,51,51,52,2,4,2,4,2,2,2
diff --git a/rsrc/scenarios/stealth/towns/town10.map b/rsrc/scenarios/stealth/towns/town10.map
index 65b6ecb2..b2257b6a 100644
--- a/rsrc/scenarios/stealth/towns/town10.map
+++ b/rsrc/scenarios/stealth/towns/town10.map
@@ -10,7 +10,7 @@
 5,5,5,5,5,168,170,185@5,185,185,185,170,170,154,154,154,154,154,154,154,154,154,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,154,170$8,195,195,195,170,170,170,157,170,170,199,199,199,199,199,154,5,5,5,5,5,21,6,6,6,6
 5,5,5,5,5,154,170,197,170,197,170,170,170,154,170,170,170,170,170,170,170@4,154,5,5,5,5,21,8,29,28,28,28
-21,6,6,6,18,168,170,185,185,185,185,170,170$4,154,201@9,170,170@3,170,247:8&9,170,170,154,5,5,5,5,9,29,33,22,22,22
+21,6,6,6,18,168,170,185,185,185,185,170,170$4,154,201@9,170,170@3,170,170:8&9,170,170,154,5,5,5,5,9,29,33,22,22,22
 9,71,71,71,15,154,170,170,195,170,195$5,170,170,154,170,170,199,199,199@1,199,199,154,5,5,5,5,9,30,22,35,24,24
 9,71,71,71,15,154,170,197,197$2,197,197,170$7,170,154,201,170,170,170,170,170,170,154,5,5,5,21,8,30,35,25,49,38
 20,11,71,14,19,168,170$1,185,185,185,185,170,170$0,154,170,170,170,170,170@2,170,170,154,5,5,21,8,0,30,26,49,39,2
@@ -27,6 +27,6 @@
 5,5,5,5,5,154,170,154,5,5,5,5,21,6,6,6,6,6,6,8,0,14,19,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,154,170,154,5,5,5,5,9,98,0,0,0^,0,0,0,0,15,5,5,5,5,5,5,5,5,5,5
 5,154,154,154,154,154,170:17,154,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,154,247:3&9,170,170,170,170,154,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,154,170:3&9,170,170,170,170,154,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,154,154,154,154,154,154,154,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,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/stealth/towns/town11.map b/rsrc/scenarios/stealth/towns/town11.map
index eb6f0aee..cc530cb8 100644
--- a/rsrc/scenarios/stealth/towns/town11.map
+++ b/rsrc/scenarios/stealth/towns/town11.map
@@ -8,7 +8,7 @@
 2,87,87,87,87,87,88,89,87,87,2@10,88,89,87,87,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,110,87,87,87,87,87,88,89,88,89,87,87,88,89,4
 2,110,110,88,89,87,87,87,110,87*3,87,2&21,110,87,87,165,165,154,154,154,154,154,154,154,2,83*2,83,2,154,154,165,154,166,165,87,88,89,2&21,88,89,87@11,87*1,88,89,87,88,89,2
 2,87,87,87,87,87,87,110,87,2,110,87,88,89,87,170&23,170$1,170,170,159,170,170,170$0,154,2,83,83,2,166,170,170,170,170,170,110,87,88,89,87,110,87,87,87,87,87,87,87,2
-4,87,87,87,2&21,88,89,110,2,88,89,87,87,87,165,88,89,170$2,170,154,170&13,154,170&14,154,2,83,83,2,157,170,170,170,170,110,87,87,250:0&9,88,89,87,87,110,88,89,87,87,87,4
+4,87,87,87,2&21,88,89,110,2,88,89,87,87,87,165,88,89,170$2,170,154,170&13,154,170&14,154,2,83,83,2,157,170,170,170,170,110,87,87,2:0&9,88,89,87,87,110,88,89,87,87,87,4
 2,87,88,89,87,87,110,88,89,87,87,87,87,170&23,2,88$3,89,170,170,154,194@23@24@25,154,194@26@27@28,154,2,83*0,83,2,164!0,170,170,170,170,170,87,87,87,110,87,87,87,87,87,87,87,88,89,2
 2,2,87,87,88,89,87,88,89,87,170,170&23,170,170,165,170,179@22,170$4,170,154,154,154,154,164!2,2,83,83,3,166,177,177,177,176,170,87,170,87,110,2&21,87,2&21,110,87,87,87,2,110,2
 2,4,2,87,87,110,87,87,87,170&23,170,170&21$6,170,170,154,170,180,170,170,170$5,170,170,170&14,157,2,83,83,2,154,170&10,170,170,170,170&10,165,170,154,154,87,87,87,87,87,87,87,2,3,2
diff --git a/rsrc/scenarios/stealth/towns/town12.map b/rsrc/scenarios/stealth/towns/town12.map
index 72120bf2..4d3f8130 100644
--- a/rsrc/scenarios/stealth/towns/town12.map
+++ b/rsrc/scenarios/stealth/towns/town12.map
@@ -20,7 +20,7 @@
 2,3,3,2,3,169,2,154,83,83,154,170,170,197,154,199,170,170,170,154,83,154,170,170,179,170,154,170:6,154,83,154,170,170,170,170,170,170,170,154,83,154,3,169,3,3,2,2,3
 2,2,2,2,3,154,4,154,83,83,154,170,170,185,154,154,154,154,157,154,83,154,170,170,180,170,154,170,154,83,154,197,197$6,197,170,197,197,197,154,83,154,2,154,2,2,2,3,2
 2,2,2,3,2,154,2,154,83,83,154,170,170,195,154,170,170,170,170,154,83,154,170,170,180,196$1,154,170,154,83,169,183,183,183,170,183,183,183,169,83,154,4,154,2,114,2,3,113
-2,2,2,2,3,169,2,154,83,83,154,202,170,170,154,170,198,184,196,154,83,154,170,170,180,170,154,247:8&9,154,83,154,195,195,195,170,195,195,195,154,83,154,2,169,2,114,2,2,2
+2,2,2,2,3,169,2,154,83,83,154,202,170,170,154,170,198,184,196,154,83,154,170,170,180,170,154,170:8&9,154,83,154,195,195,195,170,195,195,195,154,83,154,2,169,2,114,2,2,2
 2,2,4,3,3,154,2,154,83,83,154,154,154,158,154,160,154,154,154,154,83,154,157,164!3,154,154,154,154,154,83,154,169,154,154,157,164!7,154,169,154,83,154,2,154,2,2,2,3,2
 2,3,2,2,2>,154,2,154,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83$21,83,83,83,83,154,2,154,3<,2,2,2,3
 4,2,3,2,2,169,3$15,154,2,2,2,2,2,2,2,2,83,83,83$20,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,83,154,2$17,169,2,114,2,2,4
diff --git a/rsrc/scenarios/stealth/towns/town13.map b/rsrc/scenarios/stealth/towns/town13.map
index b14c5721..1aaab571 100644
--- a/rsrc/scenarios/stealth/towns/town13.map
+++ b/rsrc/scenarios/stealth/towns/town13.map
@@ -25,7 +25,7 @@
 5,5,5,21,8,0,0,0,0,0,1,0,0,105,0,105,0,0,0,17,18,5,5,5,9,90,0,90,15,5,5,5
 5,5,5,9,98,0,14,12,11,98,0,0,0,14,11,0,0,0,0,105,15,5,5,5,9,90,0,0,15,5,5,5
 5,5,5,20,12,12,19,5,20,11,105,0,0,17,8,105,0,0,0,0,17,18,5,5,20,12,11,0,15,5,5,5
-5,5,5,5,5,5,5,5,5,20,11,0,0,0,0,0,0^,0,0,105,97,15,5,5,5,5,9,246:20&9,15,5,5,5
+5,5,5,5,5,5,5,5,5,20,11,0,0,0,0,0,0^,0,0,105,97,15,5,5,5,5,9,0:20&9,15,5,5,5
 5,5,5,5,5,5,5,5,5,5,9,105,0,105,1,105,0,105,14,12,12,19,5,5,5,5,20,12,19,5,5,5
 5,5,5,5,5,5,5,5,5,5,20,12,12,11,0,14,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,20,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
diff --git a/rsrc/scenarios/stealth/towns/town14.map b/rsrc/scenarios/stealth/towns/town14.map
index 6d01215b..f84d1985 100644
--- a/rsrc/scenarios/stealth/towns/town14.map
+++ b/rsrc/scenarios/stealth/towns/town14.map
@@ -6,7 +6,7 @@
 12,12,11,31,24,32,26,122,122,122,122,122,122,122,122,3,2,2,2,3,3,3,2,2,4,4,2,3,2,118,2,3,118,2,118,2,118,2,118,2,118,2,2,2,2,2,2,2
 5,5,20,12,11,31,25,122,170,170,170,170,170,170,125,2,2,3,4,2,2,3,2,2,4,2,2,2,2,2,3,2,2,2,2,2,2,4,118,3,118,2,118@2,2,118,2,2,2
 5,5,5,5,20,12,12,122,170,184,196,170,170,170,125,2,2,3,2,4,4,2,2,118$7,3,4,2,118,2,2,118,118,118,118,118,118,118,3,2,2,3,2,3,2,3,2,2,2
-5,122,122,122,122,122,5,122,198,184,170,170,170,170,138,43,42,41,2,3,2,2,3,118,2,118,4,118,4,2,2,2,3,2,2,250:5&9,2,2,118,118,2,118,3,118,2,2,3,2
+5,122,122,122,122,122,5,122,198,184,170,170,170,170,138,43,42,41,2,3,2,2,3,118,2,118,4,118,4,2,2,2,3,2,2,2:5&9,2,2,118,118,2,118,3,118,2,2,3,2
 5,122,186,122,186,122,5,122,198,184,196$15,170,170,170,138,44,36,48,41,3,3,2,2,118,2,118,2,118$6,3,4,2,118,118,118,2,118,118,118,2,2,3,2,2,2,2,2,2,2
 5,122,170:13,122,170:14,122,5,122,170,170,198,184,170,170,122,29,28,27,48,41,2,2,3,118,2,118,2,118,2,2,2,2,2$13,3,2,2,2,4,118$4,118,2,118,118,118,118,2,2,2
 5,122,170,192,170,122,6,122,170,170,170,184,196$16,170@59&11,122,31,32,34,27,48,41,2,2,3,2,118,4,118,2,3,118$5,2,118,118@0,118,4,118,2,2,2,4,4,2,2<,2,2,2,2
diff --git a/rsrc/scenarios/stealth/towns/town15.map b/rsrc/scenarios/stealth/towns/town15.map
index ef845e47..0fa25b15 100644
--- a/rsrc/scenarios/stealth/towns/town15.map
+++ b/rsrc/scenarios/stealth/towns/town15.map
@@ -33,7 +33,7 @@
 5,5,5,5,5,122,75,170,170,170,170,170,75,122,196$38,170,170,122,5,5,5,5,122,125,122,122,122,122,122,125,122,122,122,122,122,125,122,122,122,122,122,12,19,5,9,71,71,71
 5,5,5,5,5,122,170,170,170,170,170,170,170,122,170,170,170,122,5,5,5,5,122,170,170,170&12,170,202,122,210,210,210,210,210,122,170:22,191,191,191,191,122,5,5,5,20,12,12,12
 5,5,5,5,5,122,170,170,170,170,170,170,170,122,170,170,170,122,5,5,5,5,122,170,170,170,170,170,122,210,214,210,214,210,122,170,170,170,170,170,122,5,5,5,5,5,5,5
-5,5,5,5,5,122,75,170,170,170,170,170,75,122,196,122,130,122,5,5,5,5,122,170,170,170,170,170,122,210,210,248:21&9$37,210,210,122,170,198,184,196,170,122,5,5,5,5,5,5,5
+5,5,5,5,5,122,75,170,170,170,170,170,75,122,196,122,130,122,5,5,5,5,122,170,170,170,170,170,122,210,210,210:21&9$37,210,210,122,170,198,184,196,170,122,5,5,5,5,5,5,5
 5,5,5,5,5,122,75,75,187,170:3,187,75,75,122,170,122,208:19,122,5,5,5,5,122,177@42,177@41,176@43,170,202,122,210,210,212,210,210,122,170,198,184,196,170,122,5,5,5,5,5,5,5
 5,5,5,5,5,122,122,122,122,131,122,122,122,122,122,122,122,122,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,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
diff --git a/rsrc/scenarios/stealth/towns/town16.map b/rsrc/scenarios/stealth/towns/town16.map
index 90649c67..02c59766 100644
--- a/rsrc/scenarios/stealth/towns/town16.map
+++ b/rsrc/scenarios/stealth/towns/town16.map
@@ -1,5 +1,5 @@
 22,22,22,26,15,5,5,5,5,5,5,5,5,5,122,122,122,122,122,122,122,122,122,122,122,122,137,122,122,122,122,122,122,122,122,122,122,5,5,5,21,6,6,6,18,9,30,22
-24,24,32,26,15,122,122,122,122,122,122,6,6,18,122,174,247:55&9,170,128,170:20,170,170,170,125,170,128,170:23,191:26,191:26,191:27,122,199,122,199,122,199,122,5,5,5,9,0&20,0,95,15,9,30,22
+24,24,32,26,15,122,122,122,122,122,122,6,6,18,122,174,170:55&9,170,128,170:20,170,170,170,125,170,128,170:23,191:26,191:26,191:27,122,199,122,199,122,199,122,5,5,5,9,0&20,0,95,15,9,30,22
 38,46,30,26,15,122,0,93,0,0,0,0&13,101:0,15,122,174,170,170,122,122,122,122,122,122,170,122,170:23,170,170,170,122,170,122,170,122,170,122,5,5,5,9,0,93,0,15,9,30,22
 4,44,31,25,17,122,122,0:32,0,0,14,12,12,19,122,138,122,138,122,177@29,177@26,177@28,177@30,176@25,170,122,198,184,187,170,122,170,170,170,170,170,122,5,5,21,8,0,0,14,19,9,30,22
 4,44,36,40,0>,0:30,130,0:32,93,0,17,18,5,5,122,170,170$37,170,122,170$36,170,170,170,170,170v,122,198,184,196,170,122,170,170,201@15@19,201@16@17,201@18@31,122,5,21,8,0,0,0$39,15,5,9,30,22
diff --git a/rsrc/scenarios/stealth/towns/town17.map b/rsrc/scenarios/stealth/towns/town17.map
index 3f668b3a..32a33e89 100644
--- a/rsrc/scenarios/stealth/towns/town17.map
+++ b/rsrc/scenarios/stealth/towns/town17.map
@@ -1,7 +1,7 @@
 3,2,15,5,5,5,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,21,6,6,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122
 2,2,15,5,5,5,122,170,128,170,122,170,170,189,170,122,170,170,170,170,122,186,170,186,170,122,170,170,170,170,170,170,170,170,170,122,5,5,5,21,8,0,0,123,199,199,199,199,199$30,122,199,199$27,199,199,199,122,199,199,199,199,199,199,199,122
 4,3,15,5,5,5,122,170,122,170:54,122,194:43,170,170,170,122,170,193:45,204:44,170,122,195:47,170,195:50,170,122,170,197,197,197,200,197,197,197,170,122,5,5,21,8,0,0,14,122,170,170,170,170,170,122,170,170,170,170,170,122,197,197,170,170,170,170,170,122
-2,2,15,5,5,5,122,247:62&9,122,170,122,170,170,189,170,122,170,170,170,170,122,170,170,170,170,122,170,185,183,185,183,185,183,185,170,122,6,6,8,0,0,14,19,122,170,170,199,199$29,199,122,170,170,170,170,170,122,185,185,170,170,201,201@7,201@9@10,122
+2,2,15,5,5,5,122,170:62&9,122,170,122,170,170,189,170,122,170,170,170,170,122,170,170,170,170,122,170,185,183,185,183,185,183,185,170,122,6,6,8,0,0,14,19,122,170,170,199,199$29,199,122,170,170,170,170,170,122,185,185,170,170,201,201@7,201@9@10,122
 2,2,15,5,5,5,122,122,122,125,132!5,122,122,122,125,122,122,122,122,125,122,122,122,122,125,122,170,170,170,170,170,170,170v,170,170,123,0,0,0,0,14,19,5,122,197$28,197,170,170,170,122,199,199,199$26,199,170,122,195,195,170,170,201,201@8,201@11,122
 2,2,15,5,5,5,122,170,123,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,170,207,122,12,12,12,12,19,5,5,122,185,185,170,170,170,122,170,170,170,170,170,122,170,170,170,170,170,170,170,122
 2,2,15,5,5,5,122,170,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,207,122,170,198,184,196$32,170,170,197,197,170,122,5,5,5,5,5,5,5,122,195,195,170,170,170,122,201@61@62,201@5,201,170,170,122,170,170,199,199,199,199,199,122
diff --git a/rsrc/scenarios/stealth/towns/town18.map b/rsrc/scenarios/stealth/towns/town18.map
index 70149a7a..ab6e2ec8 100644
--- a/rsrc/scenarios/stealth/towns/town18.map
+++ b/rsrc/scenarios/stealth/towns/town18.map
@@ -1,7 +1,7 @@
 3,2,15,5,5,5,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,5,5,5,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122
 2,2,15,5,5,5,122,170:22,128,170,122,170,170,189,170,122,170,170,170,170,122,186,170,186,170,122,170,170,170,170,170,170,170,170,170,122,5,5,5,5,5,5,5,122,199,199,199,199$6,199,122,199,199,199,199,199,122,199,199,199,199,199,199,199,122
 4,3,15,5,5,5,122,170,122,170:18,122,194:10,170,170,170,122,170,193,204:9,170,122,195:4,170,195:7,170,122,170,197,197,197,200,197,197,197,170,122,5,5,5,5,5,5,5,122,170,170,170,170,170,122,170,170,170,170,170,122,197,197,170,170,170,170,170,122
-2,2,15,5,5,5,122,247:27&9,122,170,122,170,170,189,170,122,170,170,170,170,122,170,170,170,170,122,170,185,185,185@51,185,185@52,185,185,170,122,5,5,5,5,5,5,5,122,170,170,199$5,199,199,122,170,170,170,170,170,122,185,185,170,170,201@42@43@44,201@7,201@9@10@45,122
+2,2,15,5,5,5,122,170:27&9,122,170,122,170,170,189,170,122,170,170,170,170,122,170,170,170,170,122,170,185,185,185@51,185,185@52,185,185,170,122,5,5,5,5,5,5,5,122,170,170,199$5,199,199,122,170,170,170,170,170,122,185,185,170,170,201@42@43@44,201@7,201@9@10@45,122
 2,2,15,5,5,5,122,122,122,125,132!5,122,122,122,125,122,122,122,122,125,122,122,122,122,125,122,170,170,170,170,170,170,170v,170,170,122,5,5,5,5,5,5,5,122,197,197,170,170,170,122,199,199,199,199,170,122,195,195,170$42,170,201,201@8,201@11,122
 2,2,15,5,5,5,122,170,123,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,170,170,122,5,5,5,5,5,5,5,122,185,185@56,170,170,170,122,170,170,170,170,170,122,170,170,170,170,170,170,170,122
 2,2,15,5,5,5,122,170,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,122,170,198,184@53,196,170,170,197,197,170,122,5,5,5,5,5,5,5,122,195,195,170,170,170,122,201@15@40,201@5@41,201@6,170,170,122,170,170,199,199,199,199,199,122
diff --git a/rsrc/scenarios/stealth/towns/town19.map b/rsrc/scenarios/stealth/towns/town19.map
index 30ac0826..b56cc666 100644
--- a/rsrc/scenarios/stealth/towns/town19.map
+++ b/rsrc/scenarios/stealth/towns/town19.map
@@ -28,5 +28,5 @@
 22,22,22,22,22,22,26,136,83,83,83,83,83,170,170,170,170^,170,170,170,170,170,170,170,170,170,170,122,30,22,22,22
 22,22,22,22,22,22,26,122,83,83,83,83,83,170,170,170,170,170,170,197,197,197,197,170,170,122,170,122,30,22,22,22
 22,22,22,22,22,22,26,122,83,83,83,83,83,170,170,187,170,170,170,185,185,185,185,170,170,122,170,122,30,22,22,22
-22,22,22,22,22,22,26,122,83,83b7,83,83@20,83,170,170,170,170,170,170,195,195,195,195,170,170,122,247:5&9,122,30,22,22,22
+22,22,22,22,22,22,26,122,83,83b7,83,83@20,83,170,170,170,170,170,170,195,195,195,195,170,170,122,170:5&9,122,30,22,22,22
 22,22,22,22,22,22,26,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,30,22,22,22
diff --git a/rsrc/scenarios/stealth/towns/town2.map b/rsrc/scenarios/stealth/towns/town2.map
index 1c7759f6..55baa066 100644
--- a/rsrc/scenarios/stealth/towns/town2.map
+++ b/rsrc/scenarios/stealth/towns/town2.map
@@ -3,7 +3,7 @@
 5,122,180@3,170,170&21,170@5&10&11,170@6@9@10@11&11,170@7@8&10&12,170@13&10&12,122,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,122,180@2,170,170,170&23,170,170,170,122,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,122,180,170,170,179@12,170,179,170,122,122,122,122,122,5,5,5v,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-5,122,180@0,170&21,170,180,170,180@4,170,125:44,170:37,170,247:40&9,122,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+5,122,180@0,170&21,170,180,170,180@4,170,125:44,170:37,170,170:40&9,122,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,122,181,170,170,180,170,180,170,122,122,122,122,122,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,122,170,170,170,180@1&10,170&23,180,170@14,122,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,122,131,122,122,122,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
diff --git a/rsrc/scenarios/stealth/towns/town20.map b/rsrc/scenarios/stealth/towns/town20.map
index d2d315e8..f8c76ce2 100644
--- a/rsrc/scenarios/stealth/towns/town20.map
+++ b/rsrc/scenarios/stealth/towns/town20.map
@@ -58,7 +58,7 @@
 5,5,5,5,5,5,5,5,20,12,12,12,11,0,103,93,103,15,5,5,5,5,139,198,184,196,139,139,139,139,139,139,139,139,139,139,139,144:16,139,5,20,12,12,12,19,5,5,5,139,139,201@36,201@37,201,139,139,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,21,6,6,6,6,18,9,93,103,103,103,15,5,5,5,5,139,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,139,5,5,5,5,5,5,5,5,5,5,139,139,139,139,139,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,21,8,0$15,93,0,0,15,9,103,93,103,93,15,5,5,5,5,139,143,139,139,139,143,139,139,139,143,139,139,139,143,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,5,5
-5,5,21,6,6,8,0,0,0,246:23&9,223,15,9,103,103,103,103,15,5,5,5,5,139,0,0,0&19,139,0,0,0,139,0,0,0,139,0,0,0&10,139,5,5,5,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,8,0,0,0,0:23&9,223,15,9,103,103,103,103,15,5,5,5,5,139,0,0,0&19,139,0,0,0,139,0,0,0,139,0,0,0&10,139,5,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,8,0,0,0:30,0,93,0,0,0,15,9,93,103,93,103,15,5,5,5,5,139,0,0,0,139,0,0,0,139,0,0,105&18,139,0,0,0&10,139,5,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,105v<^>,0,0,14,12,11,0,0,93,14,19,20,11,103,103,93,15,5,5,5,5,139,105$1,0,0,139,0&22,105,0,139,0,0,0,139,0,0&10,105&10$0,139,5,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,19,5,20,12,12,12,19,5,5,20,12,12,12,19,5,5,5,5,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,5,5
diff --git a/rsrc/scenarios/stealth/towns/town6.map b/rsrc/scenarios/stealth/towns/town6.map
index bbf2f4ce..2584eda0 100644
--- a/rsrc/scenarios/stealth/towns/town6.map
+++ b/rsrc/scenarios/stealth/towns/town6.map
@@ -3,15 +3,15 @@
 50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 50,50,50,50,50,50,50,50,50,50,50,50,50,50,62,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,51,59,50,50,50,50,50,50,50,50,50,50,50,50,50,50
 50,50,50,50,50,50,69,50,69,50,69,50,50,50,53,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,57,50,50,50,50,50,50,50,50,50,50,50,50,50,50
-50,50,62,51,51,51,70,51,70,51,70,51,51,51,52,139,210,210,210,210,210,210,210,139,247&9,170,170,189,170,170,189,170,139,58,51,51,51,51,51,51,51,51,51,51,51,51,51,51
-50,62,52,122,122,83,83,83,83,83,83,122,83,83,83,139,210,214,210,215,210,214,210,139,247&9,170,170,170,170,170,170,170,139,122,122,122,122,122,122,122,122,122,122,83,122,122,122,122
-51,52,122,122,83,83,83,83,83,83,83,122,83,83,83,139,210,210,210,210,210,210,210,139,247&9,170,170,170,170,170,170,170,139,170,170,170,170,170,170,170,122,170,122,83,122,199,201@14@15,122
+50,50,62,51,51,51,70,51,70,51,70,51,51,51,52,139,210,210,210,210,210,210,210,139,170&9,170,170,189,170,170,189,170,139,58,51,51,51,51,51,51,51,51,51,51,51,51,51,51
+50,62,52,122,122,83,83,83,83,83,83,122,83,83,83,139,210,214,210,215,210,214,210,139,170&9,170,170,170,170,170,170,170,139,122,122,122,122,122,122,122,122,122,122,83,122,122,122,122
+51,52,122,122,83,83,83,83,83,83,83,122,83,83,83,139,210,210,210,210,210,210,210,139,170&9,170,170,170,170,170,170,170,139,170,170,170,170,170,170,170,122,170,122,83,122,199,201@14@15,122
 122,122,122,83,83,83,83,83,83,83,83,122,83,83,83,139,210,216,210,210,210,216,210,139,139,139,139,139,139,139,142,142,139,255:15,189,170,189,170,189,170,122,170,123:11,83,122,170,170,122
 122,83,83,83,83,83,83,83,83@1@2&11,83,83,122,83,83,83,139,210,210,210,210,210,210,210,139,210,210,210,210,210,139,210,210,139,170,170,170,170,170,170,170,122,122,122,83,126,170,170,122
-122,126,122,122,122,122,83:25,122,122,122,122,122,83,83,83,139,210,216,210,210,210,216,210,139,210,212,248&9,210,210,142,210,210,139,170,170,192,170,192,170,170,122,170,123:11,83,122,122,122,122
+122,126,122,122,122,122,83:25,122,122,122,122,122,83,83,83,139,210,216,210,210,210,216,210,139,210,212,210&9,210,210,142,210,210,139,170,170,192,170,192,170,170,122,170,123:11,83,122,122,122,122
 122,170,170,170,180@19,122,83,122,199,199,201,122,83,83,83,139,210,210,210,210,210,210,210,139,210,210,210,210,210,139,210,210,139,170,170,170,170,170,170,170,122,170,122,83,126,170,201@10@16,122
 122,170,170@24@25&12,170,180@20,122,83,122,170,170,170,122,83,83,83,139,210,216,210,210,210,216,210,139,139,139,139,139,139,139,210,210,139,122,128:14,132!0,122,122,122,122,122,122,122,83,122,170,170,122
-122,170,170@26@27&12,170,180@21,122,83,122,185,170,204,126,83,83,83,139,210,210,210,210,210,210,210,142,210,210,210,210,210,210,210,210,139,83$8,83,83,122,170,170,170,170,247&9,122,83,122,170,170,122
+122,170,170@26@27&12,170,180@21,122,83,122,185,170,204,126,83,83,83,139,210,210,210,210,210,210,210,142,210,210,210,210,210,210,210,210,139,83$8,83,83,122,170,170,170,170,170&9,122,83,122,170,170,122
 122,170,170&11,170,180@23,122,83,122,195,170,170,122,83,83,83,139,210,210,210,210,210,210,210,142,210,210,210,210,210,210,210,210,139,83,83,83,122,170,122,122,122,122,122,83,122,199,199,122
 122,170,170&11,170,181@22,122,83,122,122,122,122,122,83,83,83,139,210,210,139,139,139,139,139,139,139,139,139,139,139,139,210,210,139,83,83,83,122,170,122,170,170,204,126,83,122,122,122,122
 122,170,170,170,170,122,83,122,201@3,170,170,122,83,83,83,139,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,139,83,83,83,122,170,122,192,196,170,122,83,126:9,170,197,122
diff --git a/rsrc/scenarios/stealth/towns/town7.map b/rsrc/scenarios/stealth/towns/town7.map
index c6cdcadd..e3f89dbd 100644
--- a/rsrc/scenarios/stealth/towns/town7.map
+++ b/rsrc/scenarios/stealth/towns/town7.map
@@ -1,11 +1,11 @@
 5,5,5,5,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,5,5,5,5,5
 5,21,6,18,5,122,122,133,0,0,133,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
 21,8,97,17,18,122,170,170,0,170,170,170,170,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170@4,170,170,170,170,170,170,170,170,122,6,6,18,5
-9,0,0,98,17,122,0,0,0,170,170,170,247:15&9,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,122,0,102,17,18
+9,0,0,98,17,122,0,0,0,170,170,170,170:15&9,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,122,0,102,17,18
 9,1,0,0,1,90,90,90,90,170$31,170,170,170,122,170,170,122,125,125,122,122,122,122,122,122v,122,134,122,122,122,122,134,125,125,122,122,122,122,122,122,122,170,1,0,102$3,0,0&22,15
 9,0,0,0,90,90,90,90,90,170,170$12,170,170,122,170,170,122,170,170,122,170,170,170,170,170,122,90,170,170,170,90,122,170,170,122,201@17,201@18,170,201@19,201@21,122,170,170,0,0&22,1$4,0@9,15
 9,97,0,0,90,90,90,90,90,170,170,170,170,133,170,170,122,170,170,122,170,170,203:9,170,170,122,170,170&21,170,170,170&21,122,170,170,122,170,170,170,170,170,122,170,170,0*1,0,0@10,102,15
-9,0,0,0,90,90,90,90,247:14&9,170,170,170$11$23,170,122,170,170,122,170,170,122,170,170,247:4&9$32,170,170,122,170,205,170,205,170&23,122,170,170,122,199@20,199,170,199,199,122,170,170,0@11,0,0&22,0,15
+9,0,0,0,90,90,90,90,170:14&9,170,170,170$11$23,170,122,170,170,122,170,170,122,170,170,170:4&9$32,170,170,122,170,205,170,205,170&23,122,170,170,122,199@20,199,170,199,199,122,170,170,0@11,0,0&22,0,15
 9,0,0,0,0,0,170,170$37,170,170,170,170$38,170,133,170,170,122,170,170,134,170,170,170,170,170,122,170&23,170,170&21,170,170,122,170,170,122,170,170,170,170,170,122,170,170,122,0,85,86,15
 9,0,0,0,0,122,170,170,170,170$34,170,170,170,125,170,170,122,170,170,122,170,187,170,187,170,122,170,170,170,170,170,134,170,170,122,199,199,170,199,199,122,170,170,122,85@8,86,14,19
 9,0@2,0,0,14,122,122,122,122,122,122,122,122,122,170,170,122,170,170,122,170,170,170,170,170,122,170,179,170,179,170&21,122,170,170,122,170,170,170,170,170,122,170,170,122,12,12,19,5
@@ -16,7 +16,7 @@
 5,9,0,17,18,122,170,170,122,170,122,170,170,170,170,170,122,170,170$18,125,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,125,170,170,122,0,0,17,18
 5,9,0,0,15,122,170,170,122,170,122,170$36,197,170,170,170,122,170,170,125,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,125,170,170,134,0,0,102@22@23$5,15
 5,20,11,0,15,122,170,170,122,170,122,198,184,196,170,170,122,170,170,122,122,122,125,122,122,122,122,122,125:3,122,122,122,170,170,122,122,122,122,122,122,122,170,170,122,0,0,0,15
-5,5,9,0,15,122,170,170,122,247:25&9,122,198,184$35,196,170,170,127,170,170,122,174,170,170,170,174,122,170,170,170,170,170,122,170,170,122,197,170,170,170,170,125:2,170,170,122,0,85,86,15
+5,5,9,0,15,122,170,170,122,170:25&9,122,198,184$35,196,170,170,127,170,170,122,174,170,170,170,174,122,170,170,170,170,170,122,170,170,122,197,170,170,170,170,125:2,170,170,122,0,85,86,15
 5,21,8,0,15,122,170,170,122,122,122,122,122,134,134,134,134,170,170,122,170,170,170,170,170,122,170,170,170,170,170,122,170,170,122,170,170,197,170,170,132!1,170,170,122,12,12,12,19
 5,9,0,0,15,122,170,170,122,177,177@24,177,177,177,177,177@26,122,170,170,122,170,170,170,170,170,122,170,197$27,197,197$16,170,122,170,170@3,122,198,170,170,170,170,122,170,170,122,5,5,5,5
 21,8,0,0,15,122,170,170,122,170,170,170,170,170,170,170,122,170,170,122,208:19,170,208:17,170,208:21,134,170,185,185,185,170,136,170,170,122,170,185,185,185,198,122,170,170,122,5,5,5,5
diff --git a/rsrc/scenarios/stealth/towns/town8.map b/rsrc/scenarios/stealth/towns/town8.map
index b0292d67..592ca581 100644
--- a/rsrc/scenarios/stealth/towns/town8.map
+++ b/rsrc/scenarios/stealth/towns/town8.map
@@ -13,7 +13,7 @@
 9,85@18,86@21,85@13,86@23,0,0,94,0,15,5,20,11,98,0,94,96,0,14,12,12,19,9,0,17,8,94,14,19,5,21,8,0,95,0,94,0,0,94,17,6,18,9,98,0,0,0,15
 9,84@15@26,85@22@27,86@24@25,84@17,94,0,0,0,15,5,5,20,12,11,0,98,98,15,5,21,6,8,0,94,0,0,15,5,5,9,94,0,0,0,0,0,98,94,94,0,15,9,0,0,94,98,15
 20,11,85@12,86@20,98,0,98,94,14,19,21,6,6,18,20,12,11,0,17,6,8,0,0,0,14,12,12,19,5,5,9,94,0,98,94,0,96,14,12,11,0,15,20,12,11,0,14,19
-5,20,12,11,0@14,96,84,246:21&9,15,5,9,0,96,17,6,18,9,98,0,0,0,0,14,12,19,21,6,6,6,18,9,0,94,0,0,0,98,15,5,9,0,17,6,6,8,94,15,5
+5,20,12,11,0@14,96,84,0:21&9,15,5,9,0,96,17,6,18,9,98,0,0,0,0,14,12,19,21,6,6,6,18,9,0,94,0,0,0,98,15,5,9,0,17,6,6,8,94,15,5
 21,6,18,20,12,12,12,12,19,5,9,98,0,0,94,15,20,12,12,12,12,12,19,21,6,8,84@5,85,86@6,15,9,0,0,98,0,14,12,19,5,9,0,0,0,0,0,0,15,5
 9,0,15,5,5,5,21,6,6,6,8,0,0,0$17,0,17,6,6,6,6,6,6,6,8,0,0,85,86@2,84@9,15,20,11,95,0,0,17,6,18,5,20,12,12,12,12,12,12,19,5
 9,101,15,5,5,21,8,0,94,0,0,94,0,94,0,94,94,0,0,0:5,0,0,0,0,98,0,0&22,85,86,17,18,20,12,11,0,94,0,17,18,5,21,6,6,6,6,18,5,5
@@ -44,5 +44,5 @@
 9,98,0,0,94,0,15,20,12,12,12,12,12,12,19,21,6,6,6,6,6,8,98,14,12^,12,19,9,0,0,17,8,71,71,71,71,71,71,0,15,9,0,15,20,12,12,19,5
 20,12,11,0,14,12,19,5,5,5,5,21,6,6,6,8,94,0,0,0,98,0,0,15,5,5,5,20,11,0,0,0,0,0,98,14,11,71,0,17,8,0&16,17,6,6,18,5,5
 21,6,8,0,17,6,6,6,6,6,6,8,96,0,0,98,0,14,12,12,12,11,96,15,21,6,6,18,20,12,11,0,0,0,0,17,8,96,0,98&16,0&16,0,98:1,0,0,17,6,18
-9,84,0,0,0,0,0,0,0,94,0,94,94,96,14,12,12,19,5,5,5,9,96,16,10,246:7&9,95,15,5,5,20,12,12,11,0,0,96,0,14,12,12,12,12,11,0,0,0,15
+9,84,0,0,0,0,0,0,0,94,0,94,94,96,14,12,12,19,5,5,5,9,96,16,10,0:7&9,95,15,5,5,20,12,12,11,0,0,96,0,14,12,12,12,12,11,0,0,0,15
 20,12,12,12,12,12,12,12,12,12,12,12,12,12,19,5,5,5,5,5,5,20,12,19,20,12,12,19,5,5,5,5,5,20,12,12,12,12,19,5,5,5,5,20,12,12,12,19
diff --git a/rsrc/scenarios/stealth/towns/town9.map b/rsrc/scenarios/stealth/towns/town9.map
index ad838db4..805d0f77 100644
--- a/rsrc/scenarios/stealth/towns/town9.map
+++ b/rsrc/scenarios/stealth/towns/town9.map
@@ -1,5 +1,5 @@
 122,122,122,122,122,122,122,122,5,5,5,5,5,5,5,5,5,5,5,122,122,122,122,122,122,122,122,122,122,154,154,5,21,6,6,154,154,154,5,9,71,71,15,5,5,21,6,6,6,6,18,5,122,122,122,122,122,122,122,122,122,122,122,122
-122,170&10,170&10,170&10$8,170,170,170,122,5,5,5,5,5,5,5,5,5,5,5,122,170@0&22,122,170&22,122,170&22$0,122,170@6&11,170,180@1&10,154,154,21,8,0,103,0,246:16&9,165,5,9,71,71,15,5,5,9,0,96,96,101@33@34@35@36,17,18,122,170,170,247:45&9,170,122,191@32,191,191,191,191,122
+122,170&10,170&10,170&10$8,170,170,170,122,5,5,5,5,5,5,5,5,5,5,5,122,170@0&22,122,170&22,122,170&22$0,122,170@6&11,170,180@1&10,154,154,21,8,0,103,0,0:16&9,165,5,9,71,71,15,5,5,9,0,96,96,101@33@34@35@36,17,18,122,170,170,170:45&9,170,122,191@32,191,191,191,191,122
 122,170&10$7,170,170,170,170,170,132!6,6,6,6,6,6,6,6,6,6,18,5,122,170,122,170,122,170,122,170@7@8&11,170,180@39,154,154,9,103,102@16@43,0,154,165,154,5,9,71,71,15,5,5,20,11,96,96,96,96,15,122,179@41,170,170,179,122,170,170,170,170,170,122
 122,170,170,170,71b3,72,71b4,71,71,71,71,71,71,71,71,71,71,15,5,122,126,122,126,122,126,122,170,170,181@2&10,154,154,9,0,103,0,164!9,21,6,6,8,71,71,17,6,6,18,9,0$46,0,0$45,93,15,122,181,170,170,181,122,170,170,170,170,170,122
 122,170,170,170,71,71,71,71,71,71,71,71,71,71,71,71,71,15,5,122,170,170,170,170,170,122,170$6,170,179,154,154,9,0v,103,102@15,15,9,0,0,1,73&20,73,93,96,0,15,9,0,0,0,0,15,122,170,170,170,170,122,191,191,170,170,170,122
@@ -10,8 +10,8 @@
 5,5,21,6,6,6,8,0,17,6,8,96,17,8,82,71,71,15,5,122,170,170,170,170,170,170,170,170$2,170&10,154,154,5,5,9,93,15,9,0,0,82,90,90,82,0,0,96,93,0,93,15,9,0,125:44,170,170,170,195,170,195,170,195,170,195,122
 5,5,9,82,82,82,82,82,82,82,82,82,82,82,82,71,71,17,6,132!5,170,170,170,170,170,170,170,170,170$3,154,154,21,6,8,96,15,20,12,11,82,90,90,82,14,12,12,12,12,12,19,20,12,122,122,122,122,122,122,122,122,122,122,122,122
 5,5,9,82,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,170,170,170,170,170&10,122,170&10,154,154,9,0,0,0,15,5,21,8,82:12,90,90,82,15,165,165,154!7!8,6,6,6,18,5,5,5,5,5,21,6,6,6,18,5,5,5
-5,5,9,82,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,170,170,170,170&10,170&10,122,170,154,154,9,0,14,12,19,21,8,1,82,90,90,90,15,154,246:14&9,0,0,0,96,15,5,5,5,5,5,9,82,82,82,17,6,6,6
-5,5,9,82,71,71,82,82,82,73,73,82,82,82,82,82,82,82,82,122,170,170,170,170,170&10,170&10,194:0&10,122,247:4&9,154,154,9,93,15,5,21,8,97,0,82,90,90,90,15,154,165,164!12,12,11,0,17,6,6,18,5,5,9,82,71,71,71,71,71,71
+5,5,9,82,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,170,170,170,170&10,170&10,122,170,154,154,9,0,14,12,19,21,8,1,82,90,90,90,15,154,0:14&9,0,0,0,96,15,5,5,5,5,5,9,82,82,82,17,6,6,6
+5,5,9,82,71,71,82,82,82,73,73,82,82,82,82,82,82,82,82,122,170,170,170,170,170&10,170&10,194:0&10,122,170:4&9,154,154,9,93,15,5,21,8,97,0,82,90,90,90,15,154,165,164!12,12,11,0,17,6,6,18,5,5,9,82,71,71,71,71,71,71
 5,5,9,82,71,71,82,14,11,71,71,82,14,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,9,96,15,21,8,0,0,0,82,90,90,82,15,5,5,21,6,8,0,97,0,93,17,6,18,9,82,71,71,71,71,71,71
 5,5,9,82,71,71,82,15,9,71,71,82,15,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,154,9,0,17,8,93,0,14,11,82,90,90,82,15,5,21,8,96,0,96,0,96,93,0,0,16,10,82,71,71,82,14,12,12
 5,5,9,82&20,71,71,82,15,9,71,71,82,15,154,154,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,96$37,96,0$34,0,14,19,9,82,90,90,82,15,5,9,96,0,0,0,96,97,0,0,98,15,9,82,71,71,82,15,5,5
@@ -24,7 +24,7 @@
 122,170,122,9,71,71,82,15,9,71,71,82,15,154,154,5,122,170,185,185,170,170,205,170,122,122,122,134,134,134,122,9,0,93,0,0,15,5,9,82,90,90,82,14,11,93,93,16,10,93,0,93,0,0,0,0,0,82,14,12,12,12,12,12
 122,130,122,9,71,71,82,15,9,71,71,14,19,154,154,5,122,170$42,196,170,170&22,170,170$40,170,133,170,170,170&22,170,170,122,20,11,0,0,0,17,18,9,82,90,90,82,15,20,11,1,15,20,11,93,0,0,96,0,14,12,12,19,21,6,6,6,18
 122,170,122,9,71,71,82,15,9,71,71,17,18,154,154,5,122,170@18,170,170&17,170,170,170,198,122,170,199&18,199,170,199,134,5,9,0,0$38,0,96,15,9,82,90,90,82,15,5,9,0,17,18,9,0,0,96,93,14,19,5,5,5,9,0,0,101@30@31,15
-122,247&9,122,9,71,71,82,15,9,71,71,82,15,154,154,5,134,170,185,185,170$43,170,170&11,170&22,122,170,170,170,170,170,134,5,9,97,0,0,96,15,9,82,90,90,82,15,5,9,0$30,0,15,9,0,96,0,14,19,5,5,5,5,9,0,14,12,19
+122,170&9,122,9,71,71,82,15,9,71,71,82,15,154,154,5,134,170,185,185,170$43,170,170&11,170&22,122,170,170,170,170,170,134,5,9,97,0,0,96,15,9,82,90,90,82,15,5,9,0$30,0,15,9,0,96,0,14,19,5,5,5,5,9,0,14,12,19
 122,122,122,9,71,71,82,15,9,71,71,82,15,154,154,5,122,196,170,170,170,170,170,170,122,170,170,199,170,170,134,5,9,93,0,93,93,15,9,82,90,90,82,15,21,8,96,0$31,15,20,11,0,0,15,5,21,6,6,6,154,159,154,5,5
 5,5,21,8,71,71,82,15,9,71,71,82,15,154,154,5,122,170,204,170,170&18,197,170,170,125,170,170,170,199,201@21@22@23@24,134,5,9,0,0,96,0,15,9,82,90,90,82,15,9,0,0,96,17,18,9,0,0,15,21,8,96,93,96,106!10,102:24,17,18,5
 5,5,9,82,71,71,82,15,9,71,71,82$53,15,154,154,21,122,125:21,132!4,122,122,122,122,122,122,122,134,134,134,122,122,5,20,11,96,0,14,19,9,82,90,90,82,15,9,0$29,0,0,96,15,20,11,0,17,8,0,0,0,0,96,0,96,17,18
@@ -60,5 +60,5 @@
 9,82$16,71,71,82,17,8,71,71,82,82,82,82,82,82,71,71,83,17,18,5,9,93,0,93,0,1,0,93,96,93,0,0^,15,154,154,189,170,170,170,122,9,71,71,82,17,6,8,82,73,73,82,17,6,6,6,6,6,6,8,71,71,82,15
 20,11,71,71,72,71,71,71,71,71,71,71,71,71,71,71,71,72,71,15,5,20,12,12,11,0,0,1,93,93,0,96,0,15,154,154,170$55,170,170,189,122,9,71,71,72,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,82,15
 5,9,71,71,72,71,71,71,71,71,71,71,71,71,71,71,71,72,71,17,6,6,6,18,9,96,96,93,0,96,0,0,14,19,154,154,170,170,170$56,170,122,9,71,71,72,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,82,15
-5,9,82$17,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,71,71,71,71,71b5,16,10,71,71,96,0,14,12,12,19,5,154,154,247:55&9,170,189,170,122,9,82,82,82,82,82,82,82,82,82,82,82,82:48,82,82,82,82$54,71,71b6,82,82,82,15
+5,9,82$17,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,71,71,71,71,71b5,16,10,71,71,96,0,14,12,12,19,5,154,154,170:55&9,170,189,170,122,9,82,82,82,82,82,82,82,82,82,82,82,82:48,82,82,82,82$54,71,71b6,82,82,82,15
 5,20,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,19,20,12,12,12,12,19,5,5,5,5,154,154,122,122,122,122,122,20,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,19
diff --git a/rsrc/scenarios/valleydy/out/out0~0.map b/rsrc/scenarios/valleydy/out/out0~0.map
index 66c2de13..c9f86802 100644
--- a/rsrc/scenarios/valleydy/out/out0~0.map
+++ b/rsrc/scenarios/valleydy/out/out0~0.map
@@ -2,7 +2,7 @@
 22,22,22,22,22,23,23,23,23,23,23,23,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
 22,22,22,22,23,23,22,23,23,23,23,23,23,23,23,23,23,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
 22,22,22,22,23,22,35,24,32,22,22,22,22,22,22,23,23,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
-22,22,22,22,23,22,26,251&9:7,30,22,22,22,22,23,23,23,23,23,23,22,22,22,22,22,22,23,23,23,23,23,23,23,23,22,23,22,23,23,23,22,22,22,22,22,22,22,22,22
+22,22,22,22,23,22,26,36&9:7,30,22,22,22,22,23,23,23,23,23,23,22,22,22,22,22,22,23,23,23,23,23,23,23,23,22,23,22,23,23,23,22,22,22,22,22,22,22,22,22
 22,22,22,22,23,22,26,36,31,32,22,22,22,22,22,22,23,23,23,23,23,23,23,23,23,23,22,22,22,22,23,22,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23,23
 22,22,22,22,23,22,26,36,36,30,22,35,24,24,24,32,22,22,22,22,22,23,22,22,22,22,22,22,23,23,23,22,22,22,22,22,22,22,22,22,22,23,22,23,23,23,22,22
 22,22,22,22,23,22,34,27,36,30,22,26,36,36,36,31,24,24,32,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
@@ -13,7 +13,7 @@
 22,22,22,22,23,26,48,41,4*0,43,47,29,28,33,34,27,40,2,2,44,30,22,22,22,22,22,26,49,38,46,36,48,42,42,42,47,36,40,2,45,38,39,112,87,112,113,112,2
 22,22,22,22,23,34,27,48,42,47,29,33,22,22,22,26,40,88*2,89,44,30,22,22,35,24,24,25,40,121!0,44,36,29,27,36,36,36,36,40,2,2,114,114,114,87,114,114,112,114
 22,22,22,22,23,22,34,27,36,36,31,24,24,24,24,25,40,88,89,44,31,24,24,25,36,36,37:12,48,42,47,29,33,26,36,49,38,38,39,2,2,2,112,113,113,112,114,113,112
-22,22,22,22,23,22,22,34,27,49,38,38,38,38,46,36,40,2,43,47,36:13,36,36,36,37,36,29,28,27,36,30,22,26,36,40,2,2,2,2,2,3,112,250&9:0,114,112,87,113,114
+22,22,22,22,23,22,22,34,27,49,38,38,38,38,46,36,40,2,43,47,36:13,36,36,36,37,36,29,28,27,36,30,22,26,36,40,2,2,2,2,2,3,112,2&9:0,114,112,87,113,114
 22,22,22,22,23,22,22,22,26,40,4,87,87,3*3,44,36,48,42,47,29,28,27,37,36,29,28,33,35,25,36,30,35,25,49,39,2,2,3,2,2,87,112,113,114,114,115,112,114
 22,22,22,22,23,22,22,22,26,40,2,2,2,87,44,36,36,36,36,30,22,34,28,28,33,35,24,25,36,36,31,25,49,39,2,121!2,2,2,3,2,112,112,112,113,113,113,112,87
 22,22,22,22,23,22,22,22,26,48,42,42,42,42,47,36,36,36,29,33,22,22,22,35,24,25,36,36,36,36,36,36,40,2,2,2,2,2,2,2,2,2,112,113,112,87,2,2
@@ -26,16 +26,16 @@
 22,22,22,22,22,22,23,22,22,22,22,22,22,22,22,26,36,31,24,24,25,49,38,38,39,2,111,44,36,36,36,37,36,37,36,36,37,40,2,3,2,2,2,2,2,2,2,2
 24,24,32,22,22,22,23,22,22,22,22,22,22,22,35,25,49,38,38,38,38,39,3,2,2,2,3,45,38,38,38,46,36,36,36,36,36,40,2,4,2,113,2,4,2,2,4,3
 55,54,31,24,32,22,23,22,22,22,22,22,22,35,25,49,39,2,2,2,2,2,2,113,2,2,2,2,2,111,3,45,38,38,38,38,38,39,2,2,2,2,3,3,2,2,2,2
-50,61,55,54,31,24,23,24,24,24,24,24,24,25,49,39,4,2,2,2,2,2,111,2,2,114,2,2,2,112,2,2,2,2,2,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,2,2,2,2,2
-51,59,50,61,55,55,55,54,45,38,38,38,38,38,39,2,3,2,112,112,111,112,3,2,113,2,2,3,2,112,2,2,2,2,2,80&25,112,2,112,2,2,2,80&25,80&25,80&25,80&25,80&25,2
-28,58,51,51,51,59,50,61,55,55,55,54,2,4,4,2,2,2,2,112,112,3,113,2,114,113,2,2,112,3,2,2,2,121!1,80&25,80&25,2,111,2,2,4,2,113,2,3,113,80&25,80&25
-22,28,28,28,27,58,51,51,51,59,50,61,54,2,2,2,2,3,2,114,2,3,2,2,2,114,113,113,4,56,55,55,54,2,80&25,56,55,54,2,3,2,114,2,2,3,2,112,80&25
+50,61,55,54,31,24,23,24,24,24,24,24,24,25,49,39,4,2,2,2,2,2,111,2,2,114,2,2,2,112,2,2,2,2,2,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2,2,2,2,2
+51,59,50,61,55,55,55,54,45,38,38,38,38,38,39,2,3,2,112,112,111,112,3,2,113,2,2,3,2,112,2,2,2,2,2,2&25,112,2,112,2,2,2,2&25,2&25,2&25,2&25,2&25,2
+28,58,51,51,51,59,50,61,55,55,55,54,2,4,4,2,2,2,2,112,112,3,113,2,114,113,2,2,112,3,2,2,2,121!1,2&25,2&25,2,111,2,2,4,2,113,2,3,113,2&25,2&25
+22,28,28,28,27,58,51,51,51,59,50,61,54,2,2,2,2,3,2,114,2,3,2,2,2,114,113,113,4,56,55,55,54,2,2&25,56,55,54,2,3,2,114,2,2,3,2,112,2&25
 22,22,22,22,34,23,28,28,27,58,59,50,61,55,55,54,114,2,2,114,2,2,2,2,2,2,2,113,56,60,50,50,61,55,68,60,50,61,55,55,55,55,55,54,2,2,2,2
 22,22,22,22,22,23,22,22,26,41,58,59,50,50,50,61,55,55,55,55,55,55,55,55,55,55,55,55,60,50,62,51,51,51,70:16,51,51,51,59,50,50,50,50,61,55,55,54,2
-22,22,22,22,22,23,22,22,26,40,2,58,51,51,51,59,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,2,234@3,80&25,80&25,80&25,80&25,3,58,51,51,51,59,50,50,50,61,55
-22,22,22,22,22,23,22,22,26,40,4,2,2,2,2,58,51,51,51,51,51,51,51,51,51,51,51,51,51,52,2,2,2,112,2,118,80&25,2,2,114,111,111,58,51,51,51,59,50
-22,22,22,22,22,23,22,22,26,48,42,41,114,2,2,2,3,111,112,4,111,111,114,2,2,2,2,2,118,111,87,118,118,118,2,118,80&25,118,111,118,2,2,114,111,3,2,58,51
-22,22,22,22,22,23,22,22,34,28,27,48,42,41,2,114,4,2,3,2,43,42,42,41,2,2,2,2,2,2,2,2,2,2,2,118,80&25,118,2,118,111,2,2,111,2,2,2,2
+22,22,22,22,22,23,22,22,26,40,2,58,51,51,51,59,50,50,50,50,50,50,50,50,50,50,50,50,50,62,52,2,234@3,2&25,2&25,2&25,2&25,3,58,51,51,51,59,50,50,50,61,55
+22,22,22,22,22,23,22,22,26,40,4,2,2,2,2,58,51,51,51,51,51,51,51,51,51,51,51,51,51,52,2,2,2,112,2,118,2&25,2,2,114,111,111,58,51,51,51,59,50
+22,22,22,22,22,23,22,22,26,48,42,41,114,2,2,2,3,111,112,4,111,111,114,2,2,2,2,2,118,111,87,118,118,118,2,118,2&25,118,111,118,2,2,114,111,3,2,58,51
+22,22,22,22,22,23,22,22,34,28,27,48,42,41,2,114,4,2,3,2,43,42,42,41,2,2,2,2,2,2,2,2,2,2,2,118,2&25,118,2,118,111,2,2,111,2,2,2,2
 22,22,22,22,35,23,23,22,22,22,34,28,27,40,2,2,43,42,42,42,47,37,36,40,2,2,114,2,118,118,118,118,87,118,2,118,2,118,111,113,3,113,2,2,114,2,112,111
 22,22,22,22,26,36,23,22,35,24,24,32,26,48,42,42,47,36,36,36,37,37,36,48,42,42,41,2,2,2,2,2,2,2,2,87,2,118,2,118,2,2,3,114,113,113,2,4
 22,22,22,22,34,23,33,35,25,36,36,30:14,26:14,36,36,36,36,36,37,49,38,38,46,37,36,37,40,2,2,4,2,2,2,2,2,2,2,111,2,87,2,113,2,113,111,112,111,2
diff --git a/rsrc/scenarios/valleydy/out/out0~2.map b/rsrc/scenarios/valleydy/out/out0~2.map
index a0e8c9cc..de0fed0c 100644
--- a/rsrc/scenarios/valleydy/out/out0~2.map
+++ b/rsrc/scenarios/valleydy/out/out0~2.map
@@ -2,47 +2,47 @@
 5,5,5,5,5,5,5,5,5,5,5,5,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,79&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,79&25,79&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,79&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,79&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,79&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,79&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,79&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,79&25,79&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,79&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,79&25,79&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,79&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,79&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,79&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,79&25,79&25,79&25,79&25,79&25,79&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,79&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,79&25,79&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,79&25,0,0,0,0,96,96,96,0,79&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,79&25,79&25,0,1,93,0,96,96,0,79&25,79&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,79&25,0,0,0,96,0,96,0,0,79&25,79&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,79&25,96,96,96,96,96,96,84,96,0,79&25,79&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,79&25,84,96,96,84,0,0,96,0,1,91,79&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,79&25,79&25,79&25,96,0,71,71,71,71,71,0,96,1,79&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,79&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,79&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,79&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,79&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,79&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,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,79&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,79&25,244,0,93,1,0,1,93,0,1,244,244,244,244,244:1,244:1,79&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,79&25,244,244,93,93,0,0,0,0,0,0,98,244,0,244,106!2,79&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,79&25,79&25,79&25,96,244,244,0,0,0,0,0,244,244,244,244,1,244,79&25,79&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,79&25,79&25,79&25,106!1,79&25,79&25,79&25,244,244,244,244,244,244,244,244,0,0,79&25,244,79&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,79&25,79&25,97,0,0,0,0,79&25,79&25,79&25*1,79&25,79&25,79&25,79&25,79&25,79&25,79&25,79&25,79&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,79&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,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,246&9:10,15,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
diff --git a/rsrc/scenarios/valleydy/out/out1~0.map b/rsrc/scenarios/valleydy/out/out1~0.map
index 9c73947d..c371eb73 100644
--- a/rsrc/scenarios/valleydy/out/out1~0.map
+++ b/rsrc/scenarios/valleydy/out/out1~0.map
@@ -5,9 +5,9 @@
 23,23,22,22,22,22,22,23,23,23,23,23,22,22,22,22,22,22,22,23,23,23,23,23,23,23,23,22,35,24,24,24,32,23,22,23,26,75,75,30:14,22:14,26:14,75,75,30,22,22,22
 23,22,35,24,24,24,32,22,22,22,22,22,22,22,22,35,240@20,32,22,22,22,22,22,22,23,22,22,22,26,75,75,75,30,22,22,22,34,28:14,28,33,22,34,28,28:14,33,22,22,22
 22,22,26,36,36,36,30,22,22,22,35,24,32,22,35,25,36,30,22,22,22,22,22,22,23,35,24,32,34,28,27,75,30,22,22,22,35,24:14,24,32,22,22,35,24:14,32,22,22,22
-22,22,34,28,28,28,33,35,24,24,25,36,30,22,26,36,36,30,22,22,22,22,22,22,23,26,36,30,22,22,26,42,30,22,22,22,26,37,251&9:15,30,22,22,26,36,30,22,22,22
+22,22,34,28,28,28,33,35,24,24,25,36,30,22,26,36,36,30,22,22,22,22,22,22,23,26,36,30,22,22,26,42,30,22,22,22,26,37,36&9:15,30,22,22,26,36,30,22,22,22
 22,22,22,22,22,22,22,26,36,37,36,29,33,35,25,37,29,33,22,22,22,22,22,22,22,26,36,30,22,22,34,28,33,22,22,22,34,28,28,33,22,22,26,36,30,22,22,22
-24,24,24,24,32,22,22,34,28,28,28,33,22,26,37,37,30,22,22,35,24,24,24,24,24,25,251&9:17,31,24,24,32,22,22,22,22,22,22,22,22,22,22,22,26,36,31,32,22,22
+24,24,24,24,32,22,22,34,28,28,28,33,22,26,37,37,30,22,22,35,24,24,24,24,24,25,36&9:17,31,24,24,32,22,22,22,22,22,22,22,22,22,22,22,26,36,31,32,22,22
 38,38,38,46,31,32,22,22,22,22,22,35,24,25,37,36,31,24,24,25,49,38,38,38,46,36,36,36,36,36,31,24,24,24,24,24,24,24,24,24,24,24,25,36,36,30,22,22
 2,4,110,45,46,31,24,32,22,35,24,25,49,38,38,38,38,38,38,38,39,2,3,4,44,36,36,36,49,38,38,38,38,38,38,38,38,38,38,38,46,36,36,36,36,30,22,22
 2,3,4,3,45,38,46,31,24,25,49,38,39,2,2,2,2,3,2,2,110,3,2,2,44,37,37,36,40,2,2,2,2,2,2,2,2,2,2,2,44,36,36,36,37,31,24,24
@@ -19,30 +19,30 @@
 2,2,2,3,2,4,43,42,42,41,2,2,2,2,2,2,44,29,28,28,27,48,42,42,42,42,42,41,4,43,47,36,36,37,36,36,49,38,46,36,36,40,2,3,2,4,2,2
 2,2,2,2*2,2,2,44,29,27,40,110,2,2,87,3,43,47,30,22,22,34,28,28,27,36,36,36,40,4,44,37,49,38,46,36,36,40,3,45,38,38,39,2,43,42,41,3,2
 3,2,2,2,2,3,44,31,25,48,42,42,42,42,42,47,29,33,22,35,24,32,22,34,28,27,36,40,3,44,36,40,2,45,46,36,40*1,3,3,4,2,3,110,44,36,40,2,3
-2,3,3,2,2,2,45,38,38,38,46,29,28,28,28,28,33,22,22,26,251&9:12,31,24,32,22,26,36,48,42,47,37,40,2,3,44,36,40,2,2,2,4,2,2,45,38,39,2,2
+2,3,3,2,2,2,45,38,38,38,46,29,28,28,28,28,33,22,22,26,36&9:12,31,24,32,22,26,36,48,42,47,37,40,2,3,44,36,40,2,2,2,4,2,2,45,38,39,2,2
 2,3,4,2,3,2,2,2,2,87,44,30,23,23,23,22,22,22,22,26,36,36,36,31,24,25,37,36,29,28,27,40,2,3,44,36,40,2,4,3,4,2,3,4,4,2,2,3
 2,2,2,2,2,2,2,3,112,2,44,30,23,22,23,22,35,24,32,34,28,28,27,36,36,36,36,36,30,22,26,40,2,3,44,36,40,3,2,2,2,43,42,41,2,3,3,3
 2,2,4,2,2,2,2,2,2,4,44,30,23,23,23,22,26,37,30,22,22,22,34,28,28,28,28,28,33,22,26,48,41,4,44,37,48,42,42,41,3,44,36,40,3,2,2,2
 2,2,3,3,2,2,2,2,112,2,44,31,32,22,35,24,25,36,31,24,24,32,22,35,24,24,32,22,22,22,34,27,40,2,45,38,46,36,36,40,4,45,38,39,2,2,2,4
-2,2,2,2,2,2,2,3,2,2,45,46,30,22,26,81&25,81&25,81&25,40&25,80&25,234@2,31,24,25,56,54,30,22,22,22,22,26,48,41,2,3,45,38,38,39,2,2,4,3,2,4,2,4
-2,4,2,2,2,2,112,2,2,2,2,44,31,24,25,81&25,29,27,48,42,42,47,36,40,57,53,30,22,22,22,22,34,27,40,2,3,3,2,3,3,2,2,110,3,2,2,2,2
-2,4,2,114,114,2,2,2,3,2,3,45,46,37,36,81&25,30,34,27,36,36,36,36,40,57,53,30,22,22,22,22,35,25,48,42,41,2,2,2,43,42,42,41,2,2,2,3,3
-2,2,3,114,112,2,114,114,114,2,2,2,44,37,36,81&25,31,24,32,28,27,38,38,39,57,53,30,22,22,35,24,25,36,29,27,40,2,3,2,44,37,36,40,110,2,2,2,2
+2,2,2,2,2,2,2,3,2,2,45,46,30,22,26,36&25,36&25,36&25,40&25,2&25,234@2,31,24,25,56,54,30,22,22,22,22,26,48,41,2,3,45,38,38,39,2,2,4,3,2,4,2,4
+2,4,2,2,2,2,112,2,2,2,2,44,31,24,25,36&25,29,27,48,42,42,47,36,40,57,53,30,22,22,22,22,34,27,40,2,3,3,2,3,3,2,2,110,3,2,2,2,2
+2,4,2,114,114,2,2,2,3,2,3,45,46,37,36,36&25,30,34,27,36,36,36,36,40,57,53,30,22,22,22,22,35,25,48,42,41,2,2,2,43,42,42,41,2,2,2,3,3
+2,2,3,114,112,2,114,114,114,2,2,2,44,37,36,36&25,31,24,32,28,27,38,38,39,57,53,30,22,22,35,24,25,36,29,27,40,2,3,2,44,37,36,40,110,2,2,2,2
 2,2,2,3,113,3,2,2,3,2,2,2,45,38,38,38&25,38,46,30,22,26,56,55,55,60,53,30,35,24,25,36,36,29,33,26,40,2,3,2,45,46,36,40,4,2,2,2,4
-80&25,80&25,80&25,80&25,80&25,2,2,114,2,2,2,2,2,2,4,80&25,2,44,30,35,25,57,62,51,51,52,30,26,36,36,36,37,30,22,26,40,4,2,3,2,44,36,40,2,2,3,2,2
-3,2,2,4,80&25,80&25,80&25,80&25,80&25,80&25,80&25,2,114,80&25,80&25,80&25,2,44,31,25,56,60,53,29,28,28,33,34,28,28,28,28,33,22,26,40,2,2,2,2,45,38,39,87,2,2,2,2
-2,4,2,114,4,2,2,2,2,2,80&25,80&25,3,80&25,2,3,4,45,38,39,57,62,52,30,22,22,22,22,22,22,22,35,24,24,25,40,2,4,4,2,87,2,3,2,2,4,2,2
-55,55,55,54,2,2,2,2,2,2,113,80&25,80&25,80&25,121!0,2,114,2,2,56,60,53,43,31,24,32,22,35,24,24,24,25,49,38,38,39,2,2,2,2,2,3,4,2,2,2,2,2
-50,50,50,61,54,2,56,55,55,54,2,2,2,80&25,4,2,114,56,55,60,62,52,45,38,46,31,24,25,49,38,38,38,39,2,2,2,3,2,4,2,2,87,3,2,2,2,3,2
+2&25,2&25,2&25,2&25,2&25,2,2,114,2,2,2,2,2,2,4,2&25,2,44,30,35,25,57,62,51,51,52,30,26,36,36,36,37,30,22,26,40,4,2,3,2,44,36,40,2,2,3,2,2
+3,2,2,4,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2,114,2&25,2&25,2&25,2,44,31,25,56,60,53,29,28,28,33,34,28,28,28,28,33,22,26,40,2,2,2,2,45,38,39,87,2,2,2,2
+2,4,2,114,4,2,2,2,2,2,2&25,2&25,3,2&25,2,3,4,45,38,39,57,62,52,30,22,22,22,22,22,22,22,35,24,24,25,40,2,4,4,2,87,2,3,2,2,4,2,2
+55,55,55,54,2,2,2,2,2,2,113,2&25,2&25,2&25,121!0,2,114,2,2,56,60,53,43,31,24,32,22,35,24,24,24,25,49,38,38,39,2,2,2,2,2,3,4,2,2,2,2,2
+50,50,50,61,54,2,56,55,55,54,2,2,2,2&25,4,2,114,56,55,60,62,52,45,38,46,31,24,25,49,38,38,38,39,2,2,2,3,2,4,2,2,87,3,2,2,2,3,2
 51,51,59,50,61,55,60,50,50,61,55,55,55,68:0,55,55,55,60,62,51,52,2,2,4,45,38,38,38,39,4,2,2,2,2,2,2,2,2,2,2,2,87,3,2,2,2,3,2
 111,111,58,59,50,62,51,51,59,50,62,51,51,70,51,51,51,51,52,2,2,2,2,4,2,3,2,2,4,2,2,2,2,2,2,2,2,4,110,2,2*0,2,87,2,3,3,2,2
-111,111,250&9:7,57,50,53,3:1,2,57,62,52,2,2,80&25,80&25,80&25,80&25,80&25,80&25,112,2,2,4,2,2,2,3,2,2,3,2,4,2,3,2,110,3,2,2,110,4,3,2,2,3,110,2,3
-111,111,111,57,50,61,55,55,60,53,3,2,2,113,2,2,2,2,80&25,80&25,2,112,2,2,2,2,2,2,4,2,2,3,3,2,4,2,2,2,2,2,2,2,87,2,3,2,2,2
-111,111,111,58,59,50,63,62,51,52,114,4,114,2,114,111,2,2,4,80&25,80&25,80&25,80&25,80&25,80&25,2,2,3,2,2,2,3,2,3,3,4,2,2,2,2,2,4,2,2,3,2,2,3
-2,111,113,111,57,50,62,52,2,2,113,111,3,114,2,4,2,2,112,3,2,112,2,2,80&25,80&25,80&25,80&25,80&25,80&25,80&25,2,2,3,3,2,2,2,2,2,3,2,2,2,3,4,2,3
-113,2,113,113,57,50,53,2,111,3,2,2,2,4*3,2,3,114,114,3,2,2,2,3,2,2,2,2,4,112,2,80&25,80&25,80&25,80&25,80&25,2,3,4,2,3,4,2,3,2,2,3,2,2
-114,113,111,2,57,50,53,2,2,2,2,114,2,4,113,3,2,2,3,3,2,2,2,112,2,2,2,2,3,112,2,3,4,2,80&25,80&25,80&25,3,2,2,2,3,2,2,2,2,2,2
-4,3,112,56,60,50,61,54,4,111,2,2,2,113,2,2,3,2,2,114,2,2,112,114,3,2,2,4,2,2,3,2,2,4,2,2,80&25,80&25,2,2,2,2,2,2,2,3,3,2
-113,2,113,58,51,59,50,61,54,2,2,2,114,2,2,114,2,114,4,2,114,113,2,2,2,2,2,2,112,112,3,2,2,2,4,2,3,80&25,80&25,2,2,2,2,3,2,4,2,2
-114,111,3,114,2,58,59,50,53,2,114,114,114,2,3,2,2,3,3,4,2,2,114,112,2,113,4,2,3,3,3,4,2,2,3,2,2,3,80&25,80&25,2,3,3,2,2,2,2,2
-112,3,2,2,2,2,57,50,53,111,2,2,2,3,2,114,2,2,2,2,3,114,3,2,2,2,114,3,112,3,4,2,2,2,2,2,2,3,4,80&25,2,2,2,2,2,2,2,3
+111,111,2&9:7,57,50,53,3:1,2,57,62,52,2,2,2&25,2&25,2&25,2&25,2&25,2&25,112,2,2,4,2,2,2,3,2,2,3,2,4,2,3,2,110,3,2,2,110,4,3,2,2,3,110,2,3
+111,111,111,57,50,61,55,55,60,53,3,2,2,113,2,2,2,2,2&25,2&25,2,112,2,2,2,2,2,2,4,2,2,3,3,2,4,2,2,2,2,2,2,2,87,2,3,2,2,2
+111,111,111,58,59,50,63,62,51,52,114,4,114,2,114,111,2,2,4,2&25,2&25,2&25,2&25,2&25,2&25,2,2,3,2,2,2,3,2,3,3,4,2,2,2,2,2,4,2,2,3,2,2,3
+2,111,113,111,57,50,62,52,2,2,113,111,3,114,2,4,2,2,112,3,2,112,2,2,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2,2,3,3,2,2,2,2,2,3,2,2,2,3,4,2,3
+113,2,113,113,57,50,53,2,111,3,2,2,2,4*3,2,3,114,114,3,2,2,2,3,2,2,2,2,4,112,2,2&25,2&25,2&25,2&25,2&25,2,3,4,2,3,4,2,3,2,2,3,2,2
+114,113,111,2,57,50,53,2,2,2,2,114,2,4,113,3,2,2,3,3,2,2,2,112,2,2,2,2,3,112,2,3,4,2,2&25,2&25,2&25,3,2,2,2,3,2,2,2,2,2,2
+4,3,112,56,60,50,61,54,4,111,2,2,2,113,2,2,3,2,2,114,2,2,112,114,3,2,2,4,2,2,3,2,2,4,2,2,2&25,2&25,2,2,2,2,2,2,2,3,3,2
+113,2,113,58,51,59,50,61,54,2,2,2,114,2,2,114,2,114,4,2,114,113,2,2,2,2,2,2,112,112,3,2,2,2,4,2,3,2&25,2&25,2,2,2,2,3,2,4,2,2
+114,111,3,114,2,58,59,50,53,2,114,114,114,2,3,2,2,3,3,4,2,2,114,112,2,113,4,2,3,3,3,4,2,2,3,2,2,3,2&25,2&25,2,3,3,2,2,2,2,2
+112,3,2,2,2,2,57,50,53,111,2,2,2,3,2,114,2,2,2,2,3,114,3,2,2,2,114,3,112,3,4,2,2,2,2,2,2,3,4,2&25,2,2,2,2,2,2,2,3
diff --git a/rsrc/scenarios/valleydy/out/out1~1.map b/rsrc/scenarios/valleydy/out/out1~1.map
index f6d0ed03..af2c3207 100644
--- a/rsrc/scenarios/valleydy/out/out1~1.map
+++ b/rsrc/scenarios/valleydy/out/out1~1.map
@@ -1,20 +1,20 @@
-2,4,111,111,2,112,57,50,53,2,2,4,2,4,2,2,2,2,2,2,2,2,2,2,2,2,2,4,2,3,2,114,2,2,2,2,2,3,2,80&25,2,3,114,2,2,2,2,2
-2,2,2,112,2,2,57,50,53,2,2,111,2,2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,114,2,2,2,3,2,2,2,80&25,80&25,2,4,2,2,3,2,2
-2,113,113,2,111,111,57,50,53,3,4,2,2,2,114,2,111,2,4,2,2,2,2,2,4,3,2,2,2,2,2,2,3,2,3,114,3,2,2,2,80&25,2,2,2,4,114,2,2
-2,3,2,2,2,2,57,50,53,111,3,111,2,2,2,2,2,4,4,111,2,2,2,2,2,2,2,2,2,2,114,3,4,3,3,2,114,2,2,2,80&25,80&25,2,2,2,2,3,2
-2,2,2,2,2,2,58,59,53,2,114,2,3,2,2,2,2,2,4,2,2,2,2,2,2,2,2,2,2,2,3,2,3,3,2,2,3,2,2,2,2,80&25,80&25,2,2,2,2,2
-2,3,111,2,113,112,2,57,53,2,2,2,3,2,2,2,2,2,2,2,3,3,2,3,2,2,2,2,3,2,2,3,2,2,3,3,2,2,2,3,2,2,80&25,2,2,2,2,2
-4,2,2,113,2,2,2,57,61,54,2,4,2,112,2,2,2,4,2,3,2,2,2,2,2,2,2,2,3,2,3,2,2,2,3,3,2,2,2,2,2,2,80&25,80&25,2,2,2,2
-2,2,2,2,2,2,2,57,50,53,3,114,112,4,114,2,2,111,2,2,2,3,2,3,2*1,2,3,2,3,2,2,3,2,3,3,2,2,2,2,2,2,4,3,80&25,2,2,2,2
-2,2,2,2,2,3,111,57,50,61,55,54,2,3,2,2,2,2,2,2,2,3,2,2,2,2,2,2,3,3,2,3,2,2,2,2,3,2,2,2,2,2,2,80&25,2,2,2,2
-2,2,2,113,3,2,2,58,59,50,50,61,54,112,3,3,2,3,2,4,2,2,2,2,2,2,2,2,2,2,3,2,2,3,2,3,3,3,2,2,2,80&25,80&25,80&25,2,4,2,2
-2,2,2,2,3,3,3,2,58,51,59,50,61,55,54,2,87,2,2,2,110,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,80&25,80&25,2,80&25,80&25,2,2,2
-3,2,2,3,3,2,3,4,2,113,58,51,59,50,53,113,2,2,110,87,2,2,3,3,2,2,2,2,2,2,2,3,2,2,2,2,2,2,2,80&25,80&25,2,3,2,80&25,2,2,2
-114,2,114,2,4,2,2,2,2,3,2,112,57,50,53,3,2,88,89,110,88,89,110,2,2,2,2,2,3,3,2,2,3,3,2,2,2,80&25,80&25,80&25,2,2,4,2,80&25,80&25,80&25,80&25
-4,2,2,2,114,3,2,2,3,111,2,111,57,50,61,54,111,88,89,87,250&9:21,110,110,2,80&25,80&25,80&25,80&25,2,2,2,4,2,80&25,80&25,80&25,80&25,80&25,2,2,3,2,2,2,2,2,2,4
-4,2,2,3,114,3,2,2,2,3,111,112,58,59,50,53,88,89,88,89,110,87,87,110,2,111,3,80&25,80&25,80&25,80&25,80&25,80&25,80&25,3,3,80&25*0,3,2,2,2,2,2,2,2,2,2,2
-2,3,2,2,2,2,2,2,4,2,2,111,2,57,50,61,55,55,54,88,89,87,87,2,2,2,3,2,2,2,2,3,2,2,2,2,80&25,4,2,3,2,4,2,2,2,2,2,2
-114,2,2,2,3,2,2,2,3,111,2,2,2,58,51,59,50,50,61,54,110,110,88,89,3,2,4,2,2,3,2,2,2,113,88,89,80&25,2,3,2,2,2,2,2,2,2,2,2
+2,4,111,111,2,112,57,50,53,2,2,4,2,4,2,2,2,2,2,2,2,2,2,2,2,2,2,4,2,3,2,114,2,2,2,2,2,3,2,2&25,2,3,114,2,2,2,2,2
+2,2,2,112,2,2,57,50,53,2,2,111,2,2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,114,2,2,2,3,2,2,2,2&25,2&25,2,4,2,2,3,2,2
+2,113,113,2,111,111,57,50,53,3,4,2,2,2,114,2,111,2,4,2,2,2,2,2,4,3,2,2,2,2,2,2,3,2,3,114,3,2,2,2,2&25,2,2,2,4,114,2,2
+2,3,2,2,2,2,57,50,53,111,3,111,2,2,2,2,2,4,4,111,2,2,2,2,2,2,2,2,2,2,114,3,4,3,3,2,114,2,2,2,2&25,2&25,2,2,2,2,3,2
+2,2,2,2,2,2,58,59,53,2,114,2,3,2,2,2,2,2,4,2,2,2,2,2,2,2,2,2,2,2,3,2,3,3,2,2,3,2,2,2,2,2&25,2&25,2,2,2,2,2
+2,3,111,2,113,112,2,57,53,2,2,2,3,2,2,2,2,2,2,2,3,3,2,3,2,2,2,2,3,2,2,3,2,2,3,3,2,2,2,3,2,2,2&25,2,2,2,2,2
+4,2,2,113,2,2,2,57,61,54,2,4,2,112,2,2,2,4,2,3,2,2,2,2,2,2,2,2,3,2,3,2,2,2,3,3,2,2,2,2,2,2,2&25,2&25,2,2,2,2
+2,2,2,2,2,2,2,57,50,53,3,114,112,4,114,2,2,111,2,2,2,3,2,3,2*1,2,3,2,3,2,2,3,2,3,3,2,2,2,2,2,2,4,3,2&25,2,2,2,2
+2,2,2,2,2,3,111,57,50,61,55,54,2,3,2,2,2,2,2,2,2,3,2,2,2,2,2,2,3,3,2,3,2,2,2,2,3,2,2,2,2,2,2,2&25,2,2,2,2
+2,2,2,113,3,2,2,58,59,50,50,61,54,112,3,3,2,3,2,4,2,2,2,2,2,2,2,2,2,2,3,2,2,3,2,3,3,3,2,2,2,2&25,2&25,2&25,2,4,2,2
+2,2,2,2,3,3,3,2,58,51,59,50,61,55,54,2,87,2,2,2,110,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,2,2,2,2&25,2&25,2,2&25,2&25,2,2,2
+3,2,2,3,3,2,3,4,2,113,58,51,59,50,53,113,2,2,110,87,2,2,3,3,2,2,2,2,2,2,2,3,2,2,2,2,2,2,2,2&25,2&25,2,3,2,2&25,2,2,2
+114,2,114,2,4,2,2,2,2,3,2,112,57,50,53,3,2,88,89,110,88,89,110,2,2,2,2,2,3,3,2,2,3,3,2,2,2,2&25,2&25,2&25,2,2,4,2,2&25,2&25,2&25,2&25
+4,2,2,2,114,3,2,2,3,111,2,111,57,50,61,54,111,88,89,87,2&9:21,110,110,2,2&25,2&25,2&25,2&25,2,2,2,4,2,2&25,2&25,2&25,2&25,2&25,2,2,3,2,2,2,2,2,2,4
+4,2,2,3,114,3,2,2,2,3,111,112,58,59,50,53,88,89,88,89,110,87,87,110,2,111,3,2&25,2&25,2&25,2&25,2&25,2&25,2&25,3,3,2&25*0,3,2,2,2,2,2,2,2,2,2,2
+2,3,2,2,2,2,2,2,4,2,2,111,2,57,50,61,55,55,54,88,89,87,87,2,2,2,3,2,2,2,2,3,2,2,2,2,2&25,4,2,3,2,4,2,2,2,2,2,2
+114,2,2,2,3,2,2,2,3,111,2,2,2,58,51,59,50,50,61,54,110,110,88,89,3,2,4,2,2,3,2,2,2,113,88,89,2&25,2,3,2,2,2,2,2,2,2,2,2
 2,2,2,2,111,111,2,4,2,113,2,2,2,2,113,58,51,59,50,61,55,55,55,55,55,55,55,55,54,2,2,2,2,2,2,87,88,89,2,2,2,2,2,2,2,2,2,2
 2,2,3,2,2,2,2,2,3,2,3,111,2,114,2,2,114,58,59,50,50,50,50,50,50,50,50,50,61,54,4,2,2,2,111,2,2,2,2,2,2,2,2,2,2,3,2,2
 2,2,2,3,2,2,2,2,2,2,114,2,2,87,2,2,87,2,58,51,51,51,51,51,51,51,59,50,50,53,2,3,3,111,2,2,2,2,2,3,2,3,111,2,2,3,2,2
@@ -38,7 +38,7 @@
 28,28,27,36,29,33,22,22,22,22,35,240@18,32,35,24,24,24,24,24,24,24,24,24,25,36,36,40,2,2,4,2,3,2,44,36,48,42,42,47,29,28,28,28,28,28,28,28,28
 22,22,34,28,33,22,35,24,24,24,25,36,31,25,49,38,38,38,38,38,38,46,36,36,37,36,40,87,2,43,42,42,42,47,29,28,28,28,28,33,22,22,22,22,22,22,22,22
 24,24,24,24,24,24,25,49,38,38,38,38,38,38,39,4,2,87,2,3,87,44,29,28,28,27,48,42,42,47,29,28,28,28,33,22,22,22,22,22,22,35,24,24,24,24,32,22
-36,36,36,36,36,49,38,39,2,2,110,110,2,2,3,3,43,42,42,42,42,47,30,22,22,34,28,28:0,28,28,33,22,22,22,22,22,22,22,35,24,24,25,36,36,36,251&9:1,30,22
+36,36,36,36,36,49,38,39,2,2,110,110,2,2,3,3,43,42,42,42,42,47,30,22,22,34,28,28:0,28,28,33,22,22,22,22,22,22,22,35,24,24,25,36,36,36,36&9:1,30,22
 36,36,36,36,36,40,2,2,2,2,87,43,42,42,42,42,47,29,28,28,28,28,33,22,22,22,22,35:0,24,24,24,24,24,24,24,24,32,35,25,36,36,36,36,29,28,28,33,22
 36,36,37,36,36,48,42,42,42,42,42,47,29,28,28,28,28,33,22,22,22,22,22,22,22,22,22,26,36,36,36,36,37,36,36,36,31,25,36,29,28,28,28,33,22,22,22,22
 28,28,28,27,36,36,29,28,28,28,28,28,33,22,22,22,35,24,32,22,35,24,32,22,22,22,22,34,28,28,27,36,29,28,28,27,36,36,36,31,32,22,22,22,22,22,22,22
diff --git a/rsrc/scenarios/valleydy/out/out1~2.map b/rsrc/scenarios/valleydy/out/out1~2.map
index 138a323f..a36117c6 100644
--- a/rsrc/scenarios/valleydy/out/out1~2.map
+++ b/rsrc/scenarios/valleydy/out/out1~2.map
@@ -2,46 +2,46 @@
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,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,79&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,79&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,79&25,79&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,79&25,0,15,5,5,5,5,5,5,21,8,0,0,79&25,79&25,79&25,79&25,79&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,79&25,0,15,5,5,5,5,5,21,8,84,79&25,79&25,79&25,0,0,1,79&25,79&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,79&25,0,17,18,5,5,5,5,9,0,79&25,79&25,0,0,14,11,0,0,79&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,79&25*3,0,0,15,5,5,5,5,9,93,79&25,93,0,0,15,9,0,0,79&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,79&25,79&25,97,15,5,5,5,5,9,97,79&25,0,14,12,19,20,11,0,79&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,79&25,0,17,6,18,5,5,9,0,79&25,0,15,5,5,5,9,0,79&25,79&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,79&25,0,84,97,15,5,21,8,0,79&25,0,15,5,5,5,20,11,0,79&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,79&25,79&25,0,0,17,18,9,0,0,79&25,0,15,5,5,5,5,20,11,79&25,79&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,79&25,0,0,0,15,9,0,0,79&25,0,15,5,5,5,5,5,9,0,79&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,79&25,98,0,98,15,9,0,94,79&25,0,15,5,5,5,5,21,8,0,79&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,79&25:3,0:3,97,97,15,20,11,0,79&25,93,15,5,5,5,5,9,0,0,79&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,79&25,0,0,97,15,5,9,0,79&25,79&25,17,18,5,5,5,9,0,79&25,79&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,79&25,0,98,14,19,5,9,0,93,79&25,0,15,5,5,21,8,0,79&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,79&25,0,14,19,5,5,9,0,0,79&25,0,17,6,18,9,90,90,79&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,79&25,79&25,1,15,5,5,5,20,11,0,79&25,0,84,90,17,8,90,90,79&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,79&25,79&25,79&25,79&25,0,1,15,5,5,5,5,9,79&25,79&25,0,0,90,90,90,90,90,79&25,90,90,90,0,14,19,5,5,5,5,5
-5,8,90,90,90,90,90,0,0,0,0,0,79&25,79&25,79&25,79&25,0,0,0,94,14,19,5,5,5,21,8,79&25,0,0,90,90,90,90,90,90,79&25,0,0,0,0,15,5,5,5,5,5,5
-6,90,90,14,12,11,1,0,0,79&25,79&25,79&25,79&25,0,1,0,14,12,12,12,19,5,5,5,21,8,0,79&25,94,0,90,90,90,90,90,0,79&25,0,14,12,12,19,5,5,5,5,5,5
-90,90,14,19,21,8,0,79&25,79&25,79&25,0,0,0,94,14,12,19,5,5,5,5,5,5,21,8,0,79&25,79&25,0,93,90,90,90,14,11,79&25,79&25,0,15,21,6,18,5,21,6,18,5,5
-12,12,19,5,9,0,0,79&25,0,1,14,12,12,12,19,5,5,5,5,5,5,5,5,9,0,0,79&25,0,0,90,90,90,90,17,8,79&25,0,0,16,10,0,17,6,8,246&9:8,15,5,5
-5,5,5,5,9,0,79&25,79&25,1,14,19,5,5,5,5,5,5,5,5,5,5,21,6,8,79&25,79&25,79&25,90,90,90,90,90,0,0,79&25,79&25,0,14,19,9,0,1,0,0,0,15,5,5
-5,5,5,5,9,97,79&25:4,97,0:4,17,18,5,5,5,5,5,5,5,5,5,21,8,0,79&25,79&25,0,90,90,90,90,90,90,0,79&25,79&25,0,14,19,5,20,12,12,12,12,12,19,5,5
-5,5,5,5,9,93,79&25,0,0,84,15,5,5,5,5,5,5,5,21,6,8,0,79&25,79&25,0,90,90,90,90,90,0,0,0,79&25,1,0,15,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,9,0,79&25,79&25,0,14,19,5,5,5,5,5,5,5,9,97,0,79&25,79&25,90,90,90,90,14,12,11,0,0,79&25,79&25,0,0,15,5,5,5,5,5,5,5,5,5,5,5
-5,5,5,5,9,0,0,79&25,0,17,6,6,6,6,18,5,21,6,8,84,0,79&25,90,90,0,0,14,19,21,8,1,79&25,79&25,0,94,14,19,5,21,6,6,6,6,6,6,18,5,5
-5,5,5,5,20,11,93,79&25,79&25,1,0,97,0,0,17,6,8,93,0,79&25,79&25,79&25,0,93,97,14,19,5,9,0,79&25,79&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,79&25,79&25,79&25,79&25,79&25,79&25,0,0,0,0,79&25,79&25,94,0,0,0,0,15,5,21,8,94,79&25,0,0,15,5,5,21,8,0,84,0,79&25,79&25,79&25,79&25,228@16,5,5
-5,5,5,5,5,20,11,0,97,84,0,93,93,79&25,79&25,79&25*2,79&25,79&25,79&25,0,84,0,14,12,12,19,21,8,0,79&25,79&25,0,14,19,5,5,9,0,84,79&25,79&25,79&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,79&25,0,94,15,5,21,6,8,0,79&25,79&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,79&25,0,14,19,5,9,0,0,79&25,79&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,79&25,93,15,5,5,9,0,79&25,79&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,79&25,1,15,5,21,8,0,79&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,79&25,0,15,5,9,94,79&25,79&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,246&9:6,15,5,5,5,20,11,98,79&25,84,15,5,9,0,79&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,79&25,0,17,6,8,0,79&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,79&25,79&25,0,0,0,79&25,79&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,79&25,79&25,79&25*0,79&25,79&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,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,5,5,5,5,5,5,5,5,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/out2~0.map b/rsrc/scenarios/valleydy/out/out2~0.map
index f4ec7846..d6e2ed0b 100644
--- a/rsrc/scenarios/valleydy/out/out2~0.map
+++ b/rsrc/scenarios/valleydy/out/out2~0.map
@@ -2,13 +2,13 @@
 22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,35,25,56,60,50,62,52,30,22,22
 23,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,23,23,23,23,23,23,23,23,23,23,23,23,26,56,60,50,62,52,29,33,22,22
 23,23,23,22,22,22,22,22,22,22,22,22,22,22,23,23,23,23,23,22,22,22,22,22,22,22,23,22,35,24,24,24,32,22,23,22,23,22,26,57,50,62,52,29,33,22,22,22
-22,22,23,23,23,23,23,23,23,22,22,22,22,23,23,22,22,23,23,23,23,23,23,23,23,23,23,22,26,251&9:7,37,36,30,22,22,22,23,23,25,57,50,53,29,33,22,22,22,22
+22,22,23,23,23,23,23,23,23,22,22,22,22,23,23,22,22,23,23,23,23,23,23,23,23,23,23,22,26,36&9:7,37,36,30,22,22,22,23,23,25,57,50,53,29,33,22,22,22,22
 22,22,22,22,22,22,22,22,23,23,23,23,23,23,22,22,22,22,22,22,22,22,22,22,23,23,23,23,34,28,27,36,30,22,22,22,23,23,56,60,62,52,23,23,23,23,22,22
 22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,35,24,32,22,22,35,24,24,24,24,32,26,36,30,22,22,22,26,56,60,50,53,29,33,22,22,23,22,22
-22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,35,25,36,30,22,22,26,251&9:10,36,36,36,31,25,36,31,24,32,22,26,57,50,62,52,30,22,22,22,23,22,22
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,35,25,36,30,22,22,26,36&9:10,36,36,36,31,25,36,31,24,32,22,26,57,50,62,52,30,22,22,22,23,22,22
 22,22,22,22,22,22,22,22,22,35,24,24,24,32,22,22,22,22,26,36,29,33,22,22,34,28,28,28,27,36,37,36,36,36,30,35,25,57,50,53,29,33,22,22,22,23,22,22
 22,22,22,22,22,22,35,24,24,25,49,38,46,31,24,24,24,24,25,37,30,22,35,24,24,32,22,22,26,36,29,28,27,37:5,31,25,56,60,50,53,30,22,22,22,22,23,22,22
-22,22,35,24,24,24,25,36,36,49,39,3,45,38,38,38,38,38,38,46,31,24,25,37,36,31,32,22,26,251&9:13,30,22,34,27,40,56,60,50,62,52,30,22,22,23,23,23,22,22
+22,22,35,24,24,24,25,36,36,49,39,3,45,38,38,38,38,38,38,46,31,24,25,37,36,31,32,22,26,36&9:13,30,22,34,27,40,56,60,50,62,52,30,22,22,23,23,23,22,22
 22,35,25,49,38,38,46,36,37,40,3,2,87,2,115,2,2,3,4,45,38,38,38,38,38,46,31,32,34,28,33,22,35,25,40,57,50,62,52,29,33,22,23,23,23,22,22,22
 24,25,49,39,2,2,44,37,36,40,3,3,2,2,2,115,2,4,2,114,2,88,89,3,2,45,46,31,24,32,35,24,25,49,39,57,64,53,29,33,22,22,23,23,22,22,22,22
 38,38,39,2,43,42,47,37,36,40,2,2,114,114,2,2,2,113,114,113,112,88,89,4,110,2,45,38,46,31,25,49,38,39,56,60,50,53,30,22,22,22,23,23,22,22,22,22
@@ -19,13 +19,13 @@
 2,3,2,4,2,3,2,2,2,2,2,114,2,112,114,113,113,112,114,2,2,3,2,88,89,56,55,55,55,55,60,50,62,52,3,2,45,31,32,22,22,22,22,22,23,23,22,22
 4,2,2,4,2,2,2,2,2,2,113,2,2,4,3,112,113,113,112,112,112,2,2,113,56,60,50,50,50,50,62,51,52,2,2,3,2,44,30,22,22,22,22,22,23,23,23,22
 2,2,3,2,4,2,2,2,2,2,3,114,2,2,2,2,3,2,110,110,113,2,56,55,60,50,62,51,51,51,52,2,3,2,2,114,2,44,31,32,22,22,22,22,22,23,22,22
-3,2,2,2,2,2,3,2,2,2,2,2,4,4,3,112,2,3,3,112,3,2,57,50,63,62,52,250&9:3,113,2,113,2,115,112,2,2,2,45,46,30,22,22,22,22,22,23,22,22
+3,2,2,2,2,2,3,2,2,2,2,2,4,4,3,112,2,3,3,112,3,2,57,50,63,62,52,2&9:3,113,2,113,2,115,112,2,2,2,45,46,30,22,22,22,22,22,23,22,22
 2,87,2,2,2,2,2,2,2,2,114,110,110,2,2,2,2,112,2,56,55,55,60,50,62,52,2,2,87,2,113,112,112,3,114,115,4,114,44,30,22,22,22,22,22,23,22,22
 87,2,111,3,2,111,2*3,2,2,2,2,110,110,114,2,2,2,110,56,60,50,64,62,51,52,2,2,2,3,2,3,87,2,2,114,2,113,3,44,30,22,22,22,22,23,23,22,22
 3,87,2,2,2,3,2,2,2,2,2,2,3,114,2,2,3,56,60,50,62,51,52,3,110,2,2,112,88,89,87,112,2,115,115,113,3,2,44,30,22,22,22,22,23,22,22,22
 2,111,2,2,2,2,2,2,2,2,3,2,2,56,55,55,55,60,50,64,53,3,2,4,114,113,3,113,113,110,2,111,112,112,2,3,114,114,44,30,22,22,22,22,23,22,22,22
 2,2,87,3,3,2,2,2,110,4,87,56,55,60,62,51,51,51,59,50,53,4,2,113,88,89,3,113,114,114,111,110,114,114,2,2,2,114,44,30,22,22,22,22,23,22,22,22
-2,3,2,110,2,2,2,2,111,2,56,60,62,51,52,43,42,41,58,51,52,112,2,114,2,114,3,2,2,110,110,250&9:19,2,115*0,2,110,115,2,44,30,22,22,22,23,23,23,23,22
+2,3,2,110,2,2,2,2,111,2,56,60,62,51,52,43,42,41,58,51,52,112,2,114,2,114,3,2,2,110,110,2&9:19,2,115*0,2,110,115,2,44,30,22,22,22,23,23,23,23,22
 2,2,110,2,3,2,3,2,4,56,60,50,53,29,27,47,29,27,42:21,41,2,2,2,113,3,114,112,4,113,3,2,114,115,2,112,115,3,2,44,30,22,22,22,22,22,22,23,22
 2,4,2,111,110,87,2,2,2,57,50,62,52,30,34,237@5,33,34,27,48,41,87,2,3,110,113,2,110,110,4,2,2,2,2,110,2,2,4,44,30,22,22,22,22,22,23,23,23
 3,2,3,110,2,88,89,111,56,60,50,53,29,33,22,22,22,22,34,27,48,41,3,3,3,111,111,3,110,88,89,2,2,3,3,4,3,4,44,30,22,22,22,22,22,23,23,22
@@ -41,7 +41,7 @@
 4,3,2,3,2,3,111,3,2,58,59,50,53,31,25,36,31,25,40,3,4,2,3,2,45,46,36,36,37,48,41,2,2,2,2,2,44,30,22,26,36,36,30,23,23,22,22,22
 2,2,4,111,2,2,111,3,2:22,2,57,50,53,45,38,38,38,38,39,2,3,4,3,2,2,45*1,38,38,46,36,40,3,2,2,2,2,44,31,32,34,27,36,30,23,23,23,22,22
 2,2,3,2,2,2,2,111,111,2,57,50,53,3,111,2,4,113,2,2,4,2,4,2,87,2,2,3,45,46,48,41,2,2,3,2,45,46,31,32,26,36,30,23,23,23,22,22
-111,3,3,2,111,111,2,111,2,2,57,50,53,250&9:1,111,112,4,2,2,2,3,2,3,43,41,2,2,2,87,44,37,40,2,2,2,4,3,45,46,30:17,26:17,36,30,22,23,23,22,22
+111,3,3,2,111,111,2,111,2,2,57,50,53,2&9:1,111,112,4,2,2,2,3,2,3,43,41,2,2,2,87,44,37,40,2,2,2,4,3,45,46,30:17,26:17,36,30,22,23,23,22,22
 3,2,110,110:20,110,4,111,111,111,3,57,50,53,3,112,3,3,2,111,112,2,2,2,44,40,2,2,2,2,45,38,39,2,2,2,2,3,2,44,30,34,28,33,22,23,22,22,22
 2,3,110,2,110,111,2,2,3,111,57,50,53,111,3,3,4,2,2,3,2,111,2,44,40,2,2,2,3,3,2,3,2,2,2,4,2,2,44,31,32,22,22,23,23,23,22,22
 2,2,110,110,110,2,2,2,2,2,58,59,61,54,111,111,3,112,3,3,2,111,3,45,39,2,2,2,2,4,2,3,3,3,2,4,2,3,45,46,30,22,22,22,22,23,22,22
diff --git a/rsrc/scenarios/valleydy/out/out2~1.map b/rsrc/scenarios/valleydy/out/out2~1.map
index e9ee3c13..1db98661 100644
--- a/rsrc/scenarios/valleydy/out/out2~1.map
+++ b/rsrc/scenarios/valleydy/out/out2~1.map
@@ -10,39 +10,39 @@
 2,3,2,3,2,4,2,2,58,59,50,53,2,2,2,2,2,2,4,3,3,2,4,2,2,2,3,45,38,38,46,36,37,48,42,42,42,47,30,22,22,35,24,32,22,22,23,22
 3,4,2,4,2,3,2,2,3,57,50,53,2,2,3,2,2,2,2,3,2,2,2,2,2,2,4,4,2,3,45,38,38,46,36,36,36,29,33,35,24,25,37:1,30,22,22,23,22
 2,2,3,2,2,2,2,111,2,57,50,53,2,4,111,2,2,2,2,2,2,2,4,3,2,2,2,2,2,3,2,2,2,45,38,38,46,30,22,26,36,36,29,33,22,22,23,22
-80&25,80&25,2,2,4,87,3,2,2,57,50,53,3,2,2,2,3,3,2,2,3,2,2,2,3,3,3,2,2,3,2,3,2,3,2,2,44,30,22,26,36,36,30,22,22,22,23,22
-2,80&25,80&25,3,2,87,3,2,111,57,50,61,54,4,111,2,2,2,3,2,4,2,2,2,4,3,3,2,2,2,2,2,2,3,2,2,44,31,24,25,36,37,30,22,22,22,23,22
-2,3,80&25,80&25,2,4,4,4,2,58,59,50,53,3,4,2,2,3,2,2,2,2,3,3,3,3,2,2,2,3,2,3,2,2,2,2,44,36,36,36,29,28,33,22,22,22,23,22
-4,88,89,80&25,2,2,87,2,4,111,58,59,61,55,54,2,3,2,88,89,2,2,3,118,2,118,2,3,2,2,2,2,2,3,2,2,45,46,29,28,33,22,22,22,22,22,23,22
-2,4,2,80&25,2,2,2,2,2,3,111,57,50,50,61,54,2,2,3,4,2,2,2,118,2,118,2,87,2,3,2,2,2,4,2,2,2,44,31,32,22,35,24,24,32,22,23,22
-2,4,3,80&25,80&25,80&25,80&25,2,2,3,4,58,51,59,50,61,55,54,2,3,2,2,2,111,4,118,3,118,2,3,2,2,3,4,2,3,2,45,46,30,22,26,36,36,30,22,23,22
-2,3,2,4,2,2,80&25,80&25,2,2,2,2,2,58,59,50,50,53,2,2,2,2,2,118,3,118,3,118,4,3,2,3,2,3,4,3,2,2,44,30,22,34,27,37,30,22,23,22
-2,2,2,2,3,2*2,3,80&25,80&25,80&25,80&25,80&25,80&25,4,58,59,50,53,3,2,2,2,2,118,3,2,3,118,3,2,3,2,2,3,4,4,2,2,44,31,32,22,34,28,33,22,23,22
-2,2,3,2,2,3,2,2,2,3,3,3,80&25,80&25,80&25,65,66:7,67,80&25,80&25,80&25,121!0,2,2,2,2,2,118,2,4,3,3,2,2,2,3,3,4,44,37,30,22,22,22,22,22,23,22
-2,2,2,3,3,88,89,88,89,2,2,3,2,2,2,57,50,53,2,2,80&25,2,2,2,4,2,3,2,2,3,2,2,2,3,2,3,3,3,44,29,33,22,22,35,24,32,23,22
-4,3,2,2,2,2,2,88,89,2,2,2,3,87,2,58,59,61,54,2,80&25,234@1,80&25,80&25,80&25,80&25,80&25,3,3,2,3,2,2,2,2,2,2,43,47,30,22,22,35,25,75,30,23,22
-111,2,2,2,2,2,87,2,2,3,2,4,3,2,3,3,57,50,53,2,80&25,80&25,80&25,4,4,2,80&25,80&25,80&25,3,87,2,3,3,2,3,2,44,29,33,22,22,26,75,75:17,30,23,22
-3,56,55,54,111,4,2,2,87,3,2,2,88,89,3,3,57,50,53,3,3,80&25,3,2,118,2,2,3,80&25,2,4,4,2,2,2,2,43,47,30,22,22,22,34,28,28,33,23,22
-55,60,50,53,2,2,111,3,3,3,4,3,3,88,89,2,57,50,53,2,80&25,80&25,4,4,118,3,118,3,80&25,80&25,3,2,2,2,3,2,44,29,33,22,22,22,22,22,22,22,23,22
-50,50,50,61,54,111,111,2,111,87,2,3,3,2,3,56,60,50,53,2,80&25,3,2,2,118,3,118,4,111,80&25,2,118,118,118,2,2,44,30,22,22,35,24,32,22,22,22,23,22
-51,59,50,50,61,55,55,55,54,2,3,3,2,56,55,60,50,62,52,80&25,80&25,2,4,2,3,2,118,2,118,80&25,3,2,3,2,2,2,44,31,32,22,26,37,30,22,22,22,23,22
-3,58,51,51,59,50,50,50,61,55,55,55,55,60,50,62,51,52,4,80&25,4,2,2,3,118,2,118,2,2,80&25,118,111,111,118,118,2,45,46,30,22,26,37,30,22,22,22,23,22
-2,2,111,2,58,51,59,50,50,50,50,50,50,50,62,52,118,2,80&25,80&25,2,3,4,3,87,3,118,2,80&25,80&25,2,2,250&9:3,2,2,2,2,44,30,22,34,28,33,22,22,22,23,22
-2,111,2,2,111,3,58,51,51,51,51,51,51,51,52,2,118,2,80&25,2,2,3,2,3,118,2,87,80&25,80&25,2,3,118,111,118,118,4,2,44,31,32,22,22,22,22,22,22,23,22
-2,4,3,2,2,2,2,88,89,2,2,3,2,3,2,2,118,2,80&25,2,3,2,2,3,2,3,80&25,80&25,118,118,3,3,4,2,2,4,2,45,46,30,22,22,22,22,22,22,23,22
-2,3,2,2,111,3,2,2,118,2,118,2,118,2,3,2,2,2,80&25,2,2,3,2,2,3,80&25,80&25,2,3,3,3,2,56,55,55,54,3,2,44,30,22,22,35,24,24,24,23,22
-2,2,2,4,3,2,2,2,118,2,111,250&9:2,80&25,80&25,80&25,80&25,80&25,80&25,80&25,80&25,2,3,2,3,3,80&25,2,118,111,111,118,2,58,59,50,61,54,2,44,30,22,22,26,36,37,251&9:9,23,22
-2,2,2,4,2,3,2,2,118,3,118,3,118,2,118,118,111,118,2,80&25,80&25,80&25,80&25,80&25,80&25,80&25,2,2,2,4,3,2,2,58,51,51,52,2,44,31,32,35,25,37,29,28,23,22
-2,2,2,2,2,4,2,2,118,3,118,2,118,2,2,2,2,4,3,80&25,3,4,2,3,2,2,118,111,118,118,118,2,2,2,2,2,3,2,45,46,30:0,26:0,36,36,30,22,23,22
-42,42,41,2,3,4,2,3,111,2,118,2,118,2,118,111,118,118,3,80&25,80&25,80&25,2,2,2,3,2,2,2,3,2,2,2,2,2,2,2,3,2,44,30,34,28,28,33,22,23,22
-28,27,40,3,2,2,2,2,2,2,2,2,2,3,4,2,2,2,3,4,2,80&25,2,3,2,2,3,2,2,3,3,2,2,2,3,2,2,3,4,44,31,32,22,22,22,22,23,22
-22,26,40,2,2,2,2,2,2,2,2,2,4,2,4,2,2,2,2,3,2,80&25,3,3,2,2,3,3,3,2,2,2,2,2,2,43,42,42,42,47,37,30,22,22,22,22,23,22
-22,26,48,42,42,42,41,4,4,2,2,2,2,2,4,4,3,3,3,2,2,80&25,80&25,3,2,2,3,2,2,2,2,2,2,3,43,47,36,37,36,36,36,30,22,22,22,22,23,22
-22,34,28,28,28,27,40,3,3,4,2,43,42,41,2,2,2,43,42,42,41,2,80&25,3,3,4,3,2,2,3,3,2,43,42,47,36,49,38,46,37,36,31,32,22,22,22,23,22
-22,22,22,22,22,26,48,41,2,2,2,44,36,48,42,41,2,44,37,36,40,2,80&25,2,2,2,2,3,2,3,3,3,44,36,49,38,39,2,44,36,36,36,30,22,22,22,23,22
-22,22,22,22,22,34,27,48,42,41,4,45,46,36,37,48,42,47,36,49,39,3,80&25,2,3,2,2,3,2,2,3,2,45,38,39,2,88,89,44,36,37,36,30,22,22,22,23,22
-22,22,22,22,22,22,34,28,27,48,41,3,45,38,46,36,37,37*1,49,39,2,2,80&25,3,2,2,2,2,2,2,2,2,2,2,4,88,89*0,2,45,38,38,46,30,22,22,22,23,22
-23,23,23,23,22,22,22,22,34,27,40,2,3,2,44,36,37,36,40,3,2,3,80&25,4,3,2,2,2,4,3,2,2,2,2,88,89,88,89,2,2,2,44,30,22,22,22,23,22
-24,24,32,23,22,22,22,22,22,26,40,3,2,2,44,36,36,36,40,2,2,2,80&25,4,2,2,2,2,2,2,2,2,88,89,3,3,88,89,3,2,2,44,30,22,22,22,23,22
-36,36,30,23,22,22,22,22,22,26,48,41,2,4,44,37,36,49,39,3,2,2,80&25,2,2,3,2,2,2,2,2,2,2,2,4,2,2,2,4,2,2,44,30,22,22,22,23,22
-22,36,30,23,23,22,22,22,22,22,26,40,3,2,44,37,36,40,2,2,3,2,80&25,2,2,2,2,2,2,3,2,2,2,88,89,2,3,2,2,3,2,44,30,22,22,22,23,22
+2&25,2&25,2,2,4,87,3,2,2,57,50,53,3,2,2,2,3,3,2,2,3,2,2,2,3,3,3,2,2,3,2,3,2,3,2,2,44,30,22,26,36,36,30,22,22,22,23,22
+2,2&25,2&25,3,2,87,3,2,111,57,50,61,54,4,111,2,2,2,3,2,4,2,2,2,4,3,3,2,2,2,2,2,2,3,2,2,44,31,24,25,36,37,30,22,22,22,23,22
+2,3,2&25,2&25,2,4,4,4,2,58,59,50,53,3,4,2,2,3,2,2,2,2,3,3,3,3,2,2,2,3,2,3,2,2,2,2,44,36,36,36,29,28,33,22,22,22,23,22
+4,88,89,2&25,2,2,87,2,4,111,58,59,61,55,54,2,3,2,88,89,2,2,3,118,2,118,2,3,2,2,2,2,2,3,2,2,45,46,29,28,33,22,22,22,22,22,23,22
+2,4,2,2&25,2,2,2,2,2,3,111,57,50,50,61,54,2,2,3,4,2,2,2,118,2,118,2,87,2,3,2,2,2,4,2,2,2,44,31,32,22,35,24,24,32,22,23,22
+2,4,3,2&25,2&25,2&25,2&25,2,2,3,4,58,51,59,50,61,55,54,2,3,2,2,2,111,4,118,3,118,2,3,2,2,3,4,2,3,2,45,46,30,22,26,36,36,30,22,23,22
+2,3,2,4,2,2,2&25,2&25,2,2,2,2,2,58,59,50,50,53,2,2,2,2,2,118,3,118,3,118,4,3,2,3,2,3,4,3,2,2,44,30,22,34,27,37,30,22,23,22
+2,2,2,2,3,2*2,3,2&25,2&25,2&25,2&25,2&25,2&25,4,58,59,50,53,3,2,2,2,2,118,3,2,3,118,3,2,3,2,2,3,4,4,2,2,44,31,32,22,34,28,33,22,23,22
+2,2,3,2,2,3,2,2,2,3,3,3,2&25,2&25,2&25,65,66:7,67,2&25,2&25,2&25,121!0,2,2,2,2,2,118,2,4,3,3,2,2,2,3,3,4,44,37,30,22,22,22,22,22,23,22
+2,2,2,3,3,88,89,88,89,2,2,3,2,2,2,57,50,53,2,2,2&25,2,2,2,4,2,3,2,2,3,2,2,2,3,2,3,3,3,44,29,33,22,22,35,24,32,23,22
+4,3,2,2,2,2,2,88,89,2,2,2,3,87,2,58,59,61,54,2,2&25,234@1,2&25,2&25,2&25,2&25,2&25,3,3,2,3,2,2,2,2,2,2,43,47,30,22,22,35,25,75,30,23,22
+111,2,2,2,2,2,87,2,2,3,2,4,3,2,3,3,57,50,53,2,2&25,2&25,2&25,4,4,2,2&25,2&25,2&25,3,87,2,3,3,2,3,2,44,29,33,22,22,26,75,75:17,30,23,22
+3,56,55,54,111,4,2,2,87,3,2,2,88,89,3,3,57,50,53,3,3,2&25,3,2,118,2,2,3,2&25,2,4,4,2,2,2,2,43,47,30,22,22,22,34,28,28,33,23,22
+55,60,50,53,2,2,111,3,3,3,4,3,3,88,89,2,57,50,53,2,2&25,2&25,4,4,118,3,118,3,2&25,2&25,3,2,2,2,3,2,44,29,33,22,22,22,22,22,22,22,23,22
+50,50,50,61,54,111,111,2,111,87,2,3,3,2,3,56,60,50,53,2,2&25,3,2,2,118,3,118,4,111,2&25,2,118,118,118,2,2,44,30,22,22,35,24,32,22,22,22,23,22
+51,59,50,50,61,55,55,55,54,2,3,3,2,56,55,60,50,62,52,2&25,2&25,2,4,2,3,2,118,2,118,2&25,3,2,3,2,2,2,44,31,32,22,26,37,30,22,22,22,23,22
+3,58,51,51,59,50,50,50,61,55,55,55,55,60,50,62,51,52,4,2&25,4,2,2,3,118,2,118,2,2,2&25,118,111,111,118,118,2,45,46,30,22,26,37,30,22,22,22,23,22
+2,2,111,2,58,51,59,50,50,50,50,50,50,50,62,52,118,2,2&25,2&25,2,3,4,3,87,3,118,2,2&25,2&25,2,2,2&9:3,2,2,2,2,44,30,22,34,28,33,22,22,22,23,22
+2,111,2,2,111,3,58,51,51,51,51,51,51,51,52,2,118,2,2&25,2,2,3,2,3,118,2,87,2&25,2&25,2,3,118,111,118,118,4,2,44,31,32,22,22,22,22,22,22,23,22
+2,4,3,2,2,2,2,88,89,2,2,3,2,3,2,2,118,2,2&25,2,3,2,2,3,2,3,2&25,2&25,118,118,3,3,4,2,2,4,2,45,46,30,22,22,22,22,22,22,23,22
+2,3,2,2,111,3,2,2,118,2,118,2,118,2,3,2,2,2,2&25,2,2,3,2,2,3,2&25,2&25,2,3,3,3,2,56,55,55,54,3,2,44,30,22,22,35,24,24,24,23,22
+2,2,2,4,3,2,2,2,118,2,111,2&9:2,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2,3,2,3,3,2&25,2,118,111,111,118,2,58,59,50,61,54,2,44,30,22,22,26,36,37,36&9:9,23,22
+2,2,2,4,2,3,2,2,118,3,118,3,118,2,118,118,111,118,2,2&25,2&25,2&25,2&25,2&25,2&25,2&25,2,2,2,4,3,2,2,58,51,51,52,2,44,31,32,35,25,37,29,28,23,22
+2,2,2,2,2,4,2,2,118,3,118,2,118,2,2,2,2,4,3,2&25,3,4,2,3,2,2,118,111,118,118,118,2,2,2,2,2,3,2,45,46,30:0,26:0,36,36,30,22,23,22
+42,42,41,2,3,4,2,3,111,2,118,2,118,2,118,111,118,118,3,2&25,2&25,2&25,2,2,2,3,2,2,2,3,2,2,2,2,2,2,2,3,2,44,30,34,28,28,33,22,23,22
+28,27,40,3,2,2,2,2,2,2,2,2,2,3,4,2,2,2,3,4,2,2&25,2,3,2,2,3,2,2,3,3,2,2,2,3,2,2,3,4,44,31,32,22,22,22,22,23,22
+22,26,40,2,2,2,2,2,2,2,2,2,4,2,4,2,2,2,2,3,2,2&25,3,3,2,2,3,3,3,2,2,2,2,2,2,43,42,42,42,47,37,30,22,22,22,22,23,22
+22,26,48,42,42,42,41,4,4,2,2,2,2,2,4,4,3,3,3,2,2,2&25,2&25,3,2,2,3,2,2,2,2,2,2,3,43,47,36,37,36,36,36,30,22,22,22,22,23,22
+22,34,28,28,28,27,40,3,3,4,2,43,42,41,2,2,2,43,42,42,41,2,2&25,3,3,4,3,2,2,3,3,2,43,42,47,36,49,38,46,37,36,31,32,22,22,22,23,22
+22,22,22,22,22,26,48,41,2,2,2,44,36,48,42,41,2,44,37,36,40,2,2&25,2,2,2,2,3,2,3,3,3,44,36,49,38,39,2,44,36,36,36,30,22,22,22,23,22
+22,22,22,22,22,34,27,48,42,41,4,45,46,36,37,48,42,47,36,49,39,3,2&25,2,3,2,2,3,2,2,3,2,45,38,39,2,88,89,44,36,37,36,30,22,22,22,23,22
+22,22,22,22,22,22,34,28,27,48,41,3,45,38,46,36,37,37*1,49,39,2,2,2&25,3,2,2,2,2,2,2,2,2,2,2,4,88,89*0,2,45,38,38,46,30,22,22,22,23,22
+23,23,23,23,22,22,22,22,34,27,40,2,3,2,44,36,37,36,40,3,2,3,2&25,4,3,2,2,2,4,3,2,2,2,2,88,89,88,89,2,2,2,44,30,22,22,22,23,22
+24,24,32,23,22,22,22,22,22,26,40,3,2,2,44,36,36,36,40,2,2,2,2&25,4,2,2,2,2,2,2,2,2,88,89,3,3,88,89,3,2,2,44,30,22,22,22,23,22
+36,36,30,23,22,22,22,22,22,26,48,41,2,4,44,37,36,49,39,3,2,2,2&25,2,2,3,2,2,2,2,2,2,2,2,4,2,2,2,4,2,2,44,30,22,22,22,23,22
+22,36,30,23,23,22,22,22,22,22,26,40,3,2,44,37,36,40,2,2,3,2,2&25,2,2,2,2,2,2,3,2,2,2,88,89,2,3,2,2,3,2,44,30,22,22,22,23,22
diff --git a/rsrc/scenarios/valleydy/out/out2~2.map b/rsrc/scenarios/valleydy/out/out2~2.map
index 672142cd..1524911c 100644
--- a/rsrc/scenarios/valleydy/out/out2~2.map
+++ b/rsrc/scenarios/valleydy/out/out2~2.map
@@ -1,42 +1,42 @@
-22,22,22,22,22,22,22,22,22,22,26,40,2,2,44,36,36,40,2,2,87,2,80&25,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,44,30,22,22,22,23,22
-22,22,22,22,22,22,22,22,22,22,26,40,2,2,44,36,36,48,41,87,87,2,80&25,2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,87,2,2,44,30,22,22,23,23,22
-22,22,22,22,22,22,22,22,22,22,26,40,2,2,45,38,46,36,48,41,2,2,80&25,2,2,2,2,3,4,2,2,2,2,3,2,2,4,2,2,3,43,47,30,22,22,23,23,22
-22,22,22,22,22,22,22,22,22,22,26,40,2,2,3,2,44,37,36,40,2,2,80&25,2,2,3,2,2,110,2,2,2,2,2,2,2,88,89,2,4,44,29,33,22,22,23,23,22
-22,22,22,22,22,22,22,22,22,22,26,40,2,2,2,2,44,36,49,39,2,2,80&25,80&25,3,4,2,2,2,2,43,42,42,42,41,2,2,2,2,43,47,30,22,22,23,23,22,22
-22,22,22,22,22,22,22,22,22,35,25,40,110,2,43,42,47,36,40,2,2,2,4,80&25,3,3,4,2,43,42,47,29,28,27,40,2,2,3,2,44,29,33,22,22,23,22,22,22
-22,22,22,22,22,22,22,22,22,26,49,39,3,2,44,29,28,27,40,2,2,2,2,80&25,2,2,2,2,44,29,28,33,22,26,40,2,2,2,2,44,30,22,22,22,23,23,22,22
-22,22,22,22,22,22,22,22,35,25,40,4,2,43,47,30,22,26,40,2,2,2,2,80&25,43,42,42,42,47,30,22,22,35,25,40,2,2,3,2,44,31,32,22,22,23,23,22,22
+22,22,22,22,22,22,22,22,22,22,26,40,2,2,44,36,36,40,2,2,87,2,2&25,4,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,2,2,44,30,22,22,22,23,22
+22,22,22,22,22,22,22,22,22,22,26,40,2,2,44,36,36,48,41,87,87,2,2&25,2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,87,2,2,44,30,22,22,23,23,22
+22,22,22,22,22,22,22,22,22,22,26,40,2,2,45,38,46,36,48,41,2,2,2&25,2,2,2,2,3,4,2,2,2,2,3,2,2,4,2,2,3,43,47,30,22,22,23,23,22
+22,22,22,22,22,22,22,22,22,22,26,40,2,2,3,2,44,37,36,40,2,2,2&25,2,2,3,2,2,110,2,2,2,2,2,2,2,88,89,2,4,44,29,33,22,22,23,23,22
+22,22,22,22,22,22,22,22,22,22,26,40,2,2,2,2,44,36,49,39,2,2,2&25,2&25,3,4,2,2,2,2,43,42,42,42,41,2,2,2,2,43,47,30,22,22,23,23,22,22
+22,22,22,22,22,22,22,22,22,35,25,40,110,2,43,42,47,36,40,2,2,2,4,2&25,3,3,4,2,43,42,47,29,28,27,40,2,2,3,2,44,29,33,22,22,23,22,22,22
+22,22,22,22,22,22,22,22,22,26,49,39,3,2,44,29,28,27,40,2,2,2,2,2&25,2,2,2,2,44,29,28,33,22,26,40,2,2,2,2,44,30,22,22,22,23,23,22,22
+22,22,22,22,22,22,22,22,35,25,40,4,2,43,47,30,22,26,40,2,2,2,2,2&25,43,42,42,42,47,30,22,22,35,25,40,2,2,3,2,44,31,32,22,22,23,23,22,22
 22,22,22,22,22,22,22,22,26,36,40,3,43,47,29,33,22,26,40,2,2,43,42,42&25*2,47,36,36,36,36,30,22,35,25,49,39,2,110,43,42,47,37,30,22,22,23,23,22,22
 22,22,22,22,22,22,22,22,26,36,48,42,47,29,33,22,35,25,40,2,43,47,49,38&25,38,38,38,46,36,30,22,26,49,39,2,3,2,44,29,28,28,33,22,22,23,23,22,22
-22,22,22,22,22,22,22,22,26,36,29,27,36,30,22,22,26,36,48,42,47,37,40,80&25,3,2,2,44,29,33,35,25,40,4,2,2,2,44,30,22,22,22,22,22,23,22,22,22
-22,22,22,22,22,22,22,22,26,36:4,31,25,36:4,30,23,35,25,36,37,36,36,49,39,80&25,3,2,2,44,30,22,26,49,39,2,2,2,43,47,30,22,22,22,23,23,23,23,23,22
-22,22,22,22,22,22,22,35,25,36,36,36,36,30,22,26,49,38,46,36,36,40,2,80&25,2,2,2,44,31,24,25,40,2,2,2,2,44,29,33,22,22,23,23,251&9:2,30,23,23,22
-22,22,22,22,22,22,35,25,36,36,36,36,36,30,22,26,40,2,44,37,36,40,2,80&25,80&25,2,2,44,37,36,36,40,3,2,2,2,44,31,32,35,23,23,36,36,30,23,22,22
-22,22,22,22,22,22,26,36,36,36,37,36,36,30,22,26,40,2,44,36,36,40,2,2,80&25,2,2,44,36,36,36,40,110,2,2*0,2,44,36,30:3,26:3,36,36,36,29,33,23,22,22
-22,22,22,22,22,22,26,36,37,36,36,36,36,30,23,26,40,2,45,46,36,48,41,2,80&25,2,2,44,29,28,27,40,2,2,3,43,47,37,30,34,28,28,28,33,22,23,22,22
-22,22,22,22,22,22,26,36,36,36,36,36,36,30,22,26,40,2,2,45,46,49,39,2,80&25,2,2,44,30,22,26,40,2,2,110,44,36,37,30,22,22,22,22,22,23,22,22,22
-22,22,22,22,22,22,26,37,36,36,36,36,29,33,22,26,40,2,2,2,45,39,2,2,80&25,2,2,44,30,22,26,40,2,2,2,44,36,36,31,32,22,22,22,22,23,22,22,22
+22,22,22,22,22,22,22,22,26,36,29,27,36,30,22,22,26,36,48,42,47,37,40,2&25,3,2,2,44,29,33,35,25,40,4,2,2,2,44,30,22,22,22,22,22,23,22,22,22
+22,22,22,22,22,22,22,22,26,36:4,31,25,36:4,30,23,35,25,36,37,36,36,49,39,2&25,3,2,2,44,30,22,26,49,39,2,2,2,43,47,30,22,22,22,23,23,23,23,23,22
+22,22,22,22,22,22,22,35,25,36,36,36,36,30,22,26,49,38,46,36,36,40,2,2&25,2,2,2,44,31,24,25,40,2,2,2,2,44,29,33,22,22,23,23,36&9:2,30,23,23,22
+22,22,22,22,22,22,35,25,36,36,36,36,36,30,22,26,40,2,44,37,36,40,2,2&25,2&25,2,2,44,37,36,36,40,3,2,2,2,44,31,32,35,23,23,36,36,30,23,22,22
+22,22,22,22,22,22,26,36,36,36,37,36,36,30,22,26,40,2,44,36,36,40,2,2,2&25,2,2,44,36,36,36,40,110,2,2*0,2,44,36,30:3,26:3,36,36,36,29,33,23,22,22
+22,22,22,22,22,22,26,36,37,36,36,36,36,30,23,26,40,2,45,46,36,48,41,2,2&25,2,2,44,29,28,27,40,2,2,3,43,47,37,30,34,28,28,28,33,22,23,22,22
+22,22,22,22,22,22,26,36,36,36,36,36,36,30,22,26,40,2,2,45,46,49,39,2,2&25,2,2,44,30,22,26,40,2,2,110,44,36,37,30,22,22,22,22,22,23,22,22,22
+22,22,22,22,22,22,26,37,36,36,36,36,29,33,22,26,40,2,2,2,45,39,2,2,2&25,2,2,44,30,22,26,40,2,2,2,44,36,36,31,32,22,22,22,22,23,22,22,22
 22,22,22,22,35,24,25,36,36,37,29,28,33,22,35,25,40,4,2,2,2,2,2,43,42&25,42,42,47,30,22,26,40,110,2,43,47,37,36,36,30,22,22,22,22,23,22,22,22
-22,22,22,35,25,36,37,36,36,36,30,22,35,24,25,49,39,2,2,3,2,2,43,47,81&25,36,36,29,33,35,25,40,4,3,44,36,36,36,36,30,22,22,22,23,23,22,22,22
-22,22,22,26,36,36,29,27,37,37,30,22,26,36,49,39,2,2,4,2,2,2,44,36,81&25,36,36,30,22,26,36,40,3,2,45,46,37,36,36,30,22,22,22,23,22,22,22,22
-22,22,22,26,36,29,33,26,37,36,30,22,34,27,40,2,2,2,2,2,43,42,47,36,81&25,36,36,30,22,23,27,40,2,2,2,45,46,36,29,33,22,23,22,23,22,22,22,22
+22,22,22,35,25,36,37,36,36,36,30,22,35,24,25,49,39,2,2,3,2,2,43,47,36&25,36,36,29,33,35,25,40,4,3,44,36,36,36,36,30,22,22,22,23,23,22,22,22
+22,22,22,26,36,36,29,27,37,37,30,22,26,36,49,39,2,2,4,2,2,2,44,36,36&25,36,36,30,22,26,36,40,3,2,45,46,37,36,36,30,22,22,22,23,22,22,22,22
+22,22,22,26,36,29,33,26,37,36,30,22,34,27,40,2,2,2,2,2,43,42,47,36,36&25,36,36,30,22,23,27,40,2,2,2,45,46,36,29,33,22,23,22,23,22,22,22,22
 22,22,22,26,36,239@19,22,26,36,36,31,32,22,26,40,3,88,89,2,3,44,36,49,38,38&25,38,46,31,32,22,26,40,2,2,2,2,44,29,33,22,22,23,22,23,22,22,22,22
-22,22,22,34,28,33,22,26,49,38,46,31,24,25,40,3,2,2,2,43,47,49,39,2,80&25,2,45,46,31,32,26,48,41,2,4,2,44,31,32,22,22,22,23,22,23,22,22,22
-22,22,22,22,22,22,22,26,40,3,45,46,36,36,48,41,2,2,2,44,36,40,2,4,80&25,80&25,2,45,46,30,34,27,48,41,2,2,44,36,30,22,22,22,23,23,23,22,22,22
-22,22,22,22,22,22,35,25,40,4,2,44,29,28,27,48,41,2,43,47,36,40,2,2,2,80&25,2,2,44,30,22,34,27,48,42,42,47,36,31,24,32,22,22,23,23,23,22,22
-22,22,22,22,22,22,26,36,40,2,4,44,30,22,34,27,40,3,44,36,49,39,2,2,3,80&25,2,2,44,31,32,22,34,28,27,36,49,38,38,46,30,22,22,22,23,23,22,22
-22,22,22,22,22,35,25,37,40,87,2,44,31,32,22,26,48,42,47,36,40,2,3,2,2,80&25,2,2,44,36,31,24,32,22,34,27,40,3,2,44,30,22,22,22,22,23,22,22
-22,22,22,22,22,26,36,36,40,2,2,45,46,30,22,26,36,36,37,36,40,2,2,2,3,80&25,3,43,47,36,36,36,30,22,22,26,40,2,2,44,31,32,22,22,22,23,23,22
-22,22,22,22,22,26,36,36,48,41,2,87,44,30,23,26,49,38,38,38,39,2,2,2,2,80&25,2,44,36,37,36,36,30,23,22,26,40,2,2,45,46,30,22,22,22,23,23,22
-22,22,22,22,35,25,36,37,37,40,2,2,44,30,22,26,40,2,3,87,2,2,2,2,80&25,80&25,2,44,36,36,36,36,30,22,35,25,40,110,2,2,44,30,22,22,22,22,23,23
-22,22,22,22,26,36,29,27,49,39,2,87,44,30,22,26,40,2,2,3,2,87,2,87,80&25,121!1,2,44,36,36,36,37,31,32,26,36,40,2,2,2,44,30,22,22,22,22,23,22
-22,22,22,35,25,36,30,26,40,87,2,87,44,30,23,26,40,2,2,2,2,2,2,3,80&25,2,4,45,46,36,36,36,36,30,34,27,48,41,2*1,2,44,30,22,22,22,23,22,22
-22,22,35,25,36,29,33,26,40,88,89*3,2,44,30,22,26,48,41,2,2,87,2,2,2,80&25,4,3,2,44,36,36,36,37,30,22,34,27,40,87,2,44,30,22,22,23,22,22,22
-22,22,26,36,29,33,22,26,40,87,2,87,44,30,22,34,27,40,2,2,2,2,2,2,80&25,4,2,2,45,38,38,38,46,31,32,22,26,48,41,2,44,31,32,22,23,22,22,22
-22,22,26,36,30,22,22,26,48,41,2,3,44,31,32,22,26,40,87,2,2,87,2:6,80&25:6,80&25:6,2,2,2,2,2,2,3,45,46,31,32,34,27,40,2,45,46,30,22,23,22,22,22
-22,22,26,36,30,22,22,34,27,40,2,2,45,46,31,24,25,40,2,2,2,112,2:6,80&25,121!0,2,2,2,2,2,3,2,2,45,46,30,22,26,40,2,2,44,30,22,23,22,22,22
-22,22,34,28,33,22,22,22,26,40,2,2,2,44,36,36,49,39,87,2,43,42,41,80&25,43,42,41,2,2,2,2,2,2,2,44,31,24,25,40,2,3,44,30,22,23,22,22,22
-22,22,22,22,22,22,22,22,26,48,42,42,42,47,37,36,40,2,43,42,47,29,27,80&25,29,27,40,2,2,2,2,110,2,2,45,38,38,38,39,2,43,47,30,22,23,22,22,22
+22,22,22,34,28,33,22,26,49,38,46,31,24,25,40,3,2,2,2,43,47,49,39,2,2&25,2,45,46,31,32,26,48,41,2,4,2,44,31,32,22,22,22,23,22,23,22,22,22
+22,22,22,22,22,22,22,26,40,3,45,46,36,36,48,41,2,2,2,44,36,40,2,4,2&25,2&25,2,45,46,30,34,27,48,41,2,2,44,36,30,22,22,22,23,23,23,22,22,22
+22,22,22,22,22,22,35,25,40,4,2,44,29,28,27,48,41,2,43,47,36,40,2,2,2,2&25,2,2,44,30,22,34,27,48,42,42,47,36,31,24,32,22,22,23,23,23,22,22
+22,22,22,22,22,22,26,36,40,2,4,44,30,22,34,27,40,3,44,36,49,39,2,2,3,2&25,2,2,44,31,32,22,34,28,27,36,49,38,38,46,30,22,22,22,23,23,22,22
+22,22,22,22,22,35,25,37,40,87,2,44,31,32,22,26,48,42,47,36,40,2,3,2,2,2&25,2,2,44,36,31,24,32,22,34,27,40,3,2,44,30,22,22,22,22,23,22,22
+22,22,22,22,22,26,36,36,40,2,2,45,46,30,22,26,36,36,37,36,40,2,2,2,3,2&25,3,43,47,36,36,36,30,22,22,26,40,2,2,44,31,32,22,22,22,23,23,22
+22,22,22,22,22,26,36,36,48,41,2,87,44,30,23,26,49,38,38,38,39,2,2,2,2,2&25,2,44,36,37,36,36,30,23,22,26,40,2,2,45,46,30,22,22,22,23,23,22
+22,22,22,22,35,25,36,37,37,40,2,2,44,30,22,26,40,2,3,87,2,2,2,2,2&25,2&25,2,44,36,36,36,36,30,22,35,25,40,110,2,2,44,30,22,22,22,22,23,23
+22,22,22,22,26,36,29,27,49,39,2,87,44,30,22,26,40,2,2,3,2,87,2,87,2&25,121!1,2,44,36,36,36,37,31,32,26,36,40,2,2,2,44,30,22,22,22,22,23,22
+22,22,22,35,25,36,30,26,40,87,2,87,44,30,23,26,40,2,2,2,2,2,2,3,2&25,2,4,45,46,36,36,36,36,30,34,27,48,41,2*1,2,44,30,22,22,22,23,22,22
+22,22,35,25,36,29,33,26,40,88,89*3,2,44,30,22,26,48,41,2,2,87,2,2,2,2&25,4,3,2,44,36,36,36,37,30,22,34,27,40,87,2,44,30,22,22,23,22,22,22
+22,22,26,36,29,33,22,26,40,87,2,87,44,30,22,34,27,40,2,2,2,2,2,2,2&25,4,2,2,45,38,38,38,46,31,32,22,26,48,41,2,44,31,32,22,23,22,22,22
+22,22,26,36,30,22,22,26,48,41,2,3,44,31,32,22,26,40,87,2,2,87,2:6,2&25:6,2&25:6,2,2,2,2,2,2,3,45,46,31,32,34,27,40,2,45,46,30,22,23,22,22,22
+22,22,26,36,30,22,22,34,27,40,2,2,45,46,31,24,25,40,2,2,2,112,2:6,2&25,121!0,2,2,2,2,2,3,2,2,45,46,30,22,26,40,2,2,44,30,22,23,22,22,22
+22,22,34,28,33,22,22,22,26,40,2,2,2,44,36,36,49,39,87,2,43,42,41,2&25,43,42,41,2,2,2,2,2,2,2,44,31,24,25,40,2,3,44,30,22,23,22,22,22
+22,22,22,22,22,22,22,22,26,48,42,42,42,47,37,36,40,2,43,42,47,29,27,2&25,29,27,40,2,2,2,2,110,2,2,45,38,38,38,39,2,43,47,30,22,23,22,22,22
 22,22,22,22,23,23,22,22,34,27,36,29,28,28,28,27,48,42,47,29,28,33,26,234@0,30,26,48,41,2,3,2,3,2,2,2,2,3,2,2,2,44,29,33,23,23,22,22,22
 22,22,22,23,23,22,22,22,22,34,28,33,22,22,22,34,27,36,36,30,22,22,26,42,30,34,27,48,42,42,42,41,110,2,3,2,4,4,43,42,47,30,22,23,22,22,22,22
 22,22,22,22,23,22,23,22,22,22,22,22,22,22,22,22,34,28,28,33,22,22,26,36,30,22,34,28,28,28,27,48,42,42,42,42,42,42,47,29,28,33,22,23,22,22,22,22
diff --git a/rsrc/scenarios/valleydy/towns/town0.map b/rsrc/scenarios/valleydy/towns/town0.map
index 0962c005..a5ec6a63 100644
--- a/rsrc/scenarios/valleydy/towns/town0.map
+++ b/rsrc/scenarios/valleydy/towns/town0.map
@@ -5,7 +5,7 @@
 22,35,24,24,25,49,38,38:4,31:0,25:0,38,38,39,2,2,2,2,2,4,4,83,83v<>,2$4,115,3,2,2,2,2,2,2,2,2,4,2,2,2,2,2,44,31,32,22,22,22,22,22,22
 22,26,36&22,36,36,40&16,122,122,122,122,122,122,122,122,122,122,122,122,122,122,83,83,2,2,2,2,2@7,2,2,2,2,3,2,2,2,2,2,2,2,45,46,31,32,22,22,22,22,22
 22,26,36$11,36,29,27,122,199,170,170,170,122,188,122,170,178@39,177@40,177@41,177@42,122,83,83,2,2,2,2,2,4,2,2,2,2,2,2,2,2,2,2,2,2,45,46,30,22,22,22,22,22
-22,26,36,36&22$12,30,26,122,201@35@36,247:1&9,170,204,125:3,170,132!3,170,170,170,170,170,122,83,83,2,2,2,2,3,2,2,3,2,3,2,2,2,2,4,2,2,2,2,44,30,22,22,22,22,22
+22,26,36,36&22$12,30,26,122,201@35@36,170:1&9,170,204,125:3,170,132!3,170,170,170,170,170,122,83,83,2,2,2,2,3,2,2,3,2,3,2,2,2,2,4,2,2,2,2,44,30,22,22,22,22,22
 22,26,37$13,36,31,26,122,199,170,198,184@37,122,170,125,170,178@43,177@44,177@45,177@46,122,83,83,2,115,2,2,2,2,2,2,2,2,56,55,54,2,2,2@13,2,114,2,44,30,22,22,22,22,22
 22,34,27,36,37$14,30,122,122,122,122,122,122,170,122,170,170,170,170,170,122,83,83,2,2,2,2,2,2,2,2,2,2,57,50,61,54,2,2,2,2,3,44,30,22,22,22,22,22
 22,22,26,37,36,30,122,199,199,170,170,122,170,122,194@14@15@16@17,178@47,177@48,177@49,177@50,122,83,83,2,2,2,2,2,3,2,3,2,2,58,59,50,61,54,3,2,2,2@12,44,30,22,22,22,22,22
diff --git a/rsrc/scenarios/valleydy/towns/town10.map b/rsrc/scenarios/valleydy/towns/town10.map
index e0922b8d..2d77870f 100644
--- a/rsrc/scenarios/valleydy/towns/town10.map
+++ b/rsrc/scenarios/valleydy/towns/town10.map
@@ -4,7 +4,7 @@
 5,5,5,5,5,5,5,5,5,139,139,170,170,170,170,170,170,170,85,86,84,0,0,0,0,0,0,0,0,149!10,170,170,170,170,170,170,230,139,139,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,139,139,170,170,170,170,170,170,170,170,139,0,0,0,0,0&14,0&14,0&14,0&14,0,0,139,170,170,170,170,170$9,170,230,170,139,139,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,139,139,230,170,229,230,230,230,230,170,170,139,0,0,0&14,82,82,82,82,0&14,0&14,0,139,229,230,229,170,229,170,230,170,230,139,139,5,5,5,5,5,5,5
-5,5,5,5,5,5,139,139,170,230,170,229,170,170,170,170,170,170,139,0,0&14,82,82,82,82,82,82,0&14,0&14,139,170,170,170,170,247:22&9,170,170,170,230,170,139,139,5,5,5,5,5,5
+5,5,5,5,5,5,139,139,170,230,170,229,170,170,170,170,170,170,139,0,0&14,82,82,82,82,82,82,0&14,0&14,139,170,170,170,170,170:22&9,170,170,170,230,170,139,139,5,5,5,5,5,5
 5,5,5,5,5,139,139,170,170,170,170,226,226,229,170,230,230,230,139,0,0&14,82,82,82,82,82,82,0,0,139,170,170,170,170,170,170,170,170,230,170,230,139,139,5,5,5,5,5
 5,5,5,5,5,139,170,230,170,229,226,226,170,170,170,170,170,170,147,0,0,82,82,82,82,82,0,0,0,139,230,170,230,230,170,170,230,170,230,170,230,170,139,5,5,5,5,5
 5,5,5,5,5,139,170,230,170,229,226,226,229,230,230,230,230,170,149!12,0,0,82,82,82,82,0,0,78:25,0,139,170,170,170,170,170,170,170,170,230,170,230,170,139,5,5,5,5,5
diff --git a/rsrc/scenarios/valleydy/towns/town11.map b/rsrc/scenarios/valleydy/towns/town11.map
index 7af50416..cde865f4 100644
--- a/rsrc/scenarios/valleydy/towns/town11.map
+++ b/rsrc/scenarios/valleydy/towns/town11.map
@@ -4,7 +4,7 @@
 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,247: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
+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
 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
@@ -44,5 +44,5 @@
 122,195,170,170,170,122,170,170,170,170,122,170,82&16,82,82&17,170,122,170,170,170,195,122,122,122,122^,122,122,170:17,170:17,122,170:17,170:17,122,170,170&11,170,170,122,179,170,170,170,122,170,170,170,197,122
 122,170,170,170,170,122,170,170,170,170,122,170,82,82&18,82,170,122,170,170,170,170,122,170,170,170,170,122,170,170,122,170,170,122,202,170,170,178,122,180&10,170,170&11,170&11,122,199,199,170,185,122
 122,170,170,170,170,122,170&23,170$33,170$5,170,122,170,82,82&17,82,170,122,175:14,170,170,175:14,122,170,132!12,170,170,122,170,170,122,170,170,122,170,170,170,170,122,180,170&21,170,170,122,170,170,170,195,122
-122,191:15,191,191,191,122,170$18,170@48@49@50&12,170,170&19,122,170,170,170,170,170,122,195,170,170,195,123,170,122,191:16,191@8@43,122,247:23&9,247:23&9,122,247:24&9,247:24&9,122,202,170,170,178&10,122,180,170,170@24&11,170&11&10,122,199,199,170,201@26,122
+122,191:15,191,191,191,122,170$18,170@48@49@50&12,170,170&19,122,170,170,170,170,170,122,195,170,170,195,123,170,122,191:16,191@8@43,122,170:23&9,170:23&9,122,170:24&9,170:24&9,122,202,170,170,178&10,122,180,170,170@24&11,170&11&10,122,199,199,170,201@26,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,122,122,122,122,122
diff --git a/rsrc/scenarios/valleydy/towns/town12.map b/rsrc/scenarios/valleydy/towns/town12.map
index 286ff4b2..3e95aa3e 100644
--- a/rsrc/scenarios/valleydy/towns/town12.map
+++ b/rsrc/scenarios/valleydy/towns/town12.map
@@ -1,5 +1,5 @@
 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,122,122,122,122
-122,247:1&9,247:1&9,122,177@34,177,177@35,122,170,170,170,170,170,170,170,170,133,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,170,170,122,170,170,170,122,71,71,71,133,170,170,175@39@40@41,122
+122,170:1&9,170:1&9,122,177@34,177,177@35,122,170,170,170,170,170,170,170,170,133,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,170,170,122,170,170,170,122,71,71,71,133,170,170,175@39@40@41,122
 122,170,170,122,170,170,170,122,170:0,178,177,85,86$0,170,170$1,170,170,170,170,178,177,177,176,170,170,122,170,170,178,177,177,177,176,170,170,122,170,170,170,132!4,170,71,170,132!3,170,170,195,122
 122,170,170,132!7,170,170,170,122,170,154,85,86,154,154,154,154,154,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,170,170,122,170,170,170,125,170,170,170,127,170,170,170,122
 122,170:2,170:2,122,122,122,125,85,86,154,154,154,154,170,170,170,154,154,154,154,170,170,195,195,170v,122,170,195,195,195,170,195,195,195,170,122,122,122,122,122,170,170,170,122,122,122,122,122
@@ -28,8 +28,8 @@
 122,170,170,170,170,170,170,154,170@12,170,170,170,154,170,170,170,170,170,154,0,0,0&23,0,154,154,154,170,170,0&22,154,170,122,85,86,170,170,170,154,154,170,154,170,170,170,170,170,189,122
 122,154,154,84,170&22,170,170,154,170$27,170,170,170,154,154,154,170,84,154,154,154,0,0,0&22,170,154,170,170,0,154,154,170,122,122,133,170,170,154,154,170,170,154,85,86,170,170,170,170,122
 122,122,122,122,122,122,0,170,170,170,170,170,170,170,170,170,154,154,170,154,170,0,0,170,170,0,0,170,154,170,170,170,170,170,170,154,154,170,170,154,154,154,154,84,170,170,170,122
-122,247:14&9,84,170,170,170,0,154,85,86,170,170$26,170,84,154,154,154,84,170,154,154,0,0,170,154,0,0,154,154,170,170,170,154,154,154,154,84,170,170,170,170,170$16,154,170,170,170,170,122
-122,247:14&9,170,170,0,154,154,154,154,154,154,170,170@13,154,154,84,170,1,170,170,154,154,154,170,154,154,154,154,170,122,170,154,154,84,170,170&22,170,170,154,154,154,170,154,85,86,170,189,122
+122,170:14&9,84,170,170,170,0,154,85,86,170,170$26,170,84,154,154,154,84,170,154,154,0,0,170,154,0,0,154,154,170,170,170,154,154,154,154,84,170,170,170,170,170$16,154,170,170,170,170,122
+122,170:14&9,170,170,0,154,154,154,154,154,154,170,170@13,154,154,84,170,1,170,170,154,154,154,170,154,154,154,154,170,122,170,154,154,84,170,170&22,170,170,154,154,154,170,154,85,86,170,189,122
 122,122,122,122,122,132!1,170,170,84,170,154,154,154,154,85,86,170,1,170,170,170,170,154,170,154,84,85,86,170,122,170,154,170@26,170,170,170,85,86@27,154,170$9,170,170,154,154,170,170,170,122
 122,189,170,170,170,170,170,170,170,170,154,85,86,170,170,170,170,170,170,154,154,154,154,170,154,85,86,170,84,122,170,154,170,170,154,154,154,154,154,170,170,170$8,170,154,84,170,170,122
 122,189,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,154,154,154,170&22,170@8,154,170,154,154,154,170,170,154,154,154,170,154,154,84,170,170,154,170,170&23$7,170,170,154,84,170,170,122
@@ -44,5 +44,5 @@
 122,170,197,197,197,170,197,197,197,170,122,170,197,197,197,170,197,170,197,170,122,170,197,197,197^,170,197,170,197,170,133,170,197,197,197,170,170,197,197,170,122,170,197,197,170,197,170,122
 122,170,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,85,86,0,103,1,84,1,170,170,122
 122,233,170,178,177,177,177,176,170,233,122,233,170,178,177,177,177,176,170,233,122,233,170,178,177,177,177,176,170,233,122,233,170,178,177,177,177,176,170,85,86,103,103,84,84,176,170,122
-122,170,170,170,170,247:8&9,170,170,170,170,122,170,170,170,170,170,170,170,170,170,133,170,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,170,85,86,103,103,1,1,170,170,122
+122,170,170,170,170,170:8&9,170,170,170,170,122,170,170,170,170,170,170,170,170,170,133,170,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,170,85,86,103,103,1,1,170,170,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,122,122,122,122,122
diff --git a/rsrc/scenarios/valleydy/towns/town13.map b/rsrc/scenarios/valleydy/towns/town13.map
index 0756df24..076c7990 100644
--- a/rsrc/scenarios/valleydy/towns/town13.map
+++ b/rsrc/scenarios/valleydy/towns/town13.map
@@ -1,6 +1,6 @@
 139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,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,254,254,254,254,254,170,139,170,170,170,247:3&9,170,170,170,139,170,170,170,139,170,170,170,170,170,170,139,170,170,170,139,191,191,191,191,191,191,191,139,170,170,170,170,170,170,170,139
-139,170,254,254,247:0&9,254,254,170,139,174,170,174,170,174,170,174,139,198,184,196,139,170,189,170,170,189,170,139,198,184,196,139,170,170,170,170,170,170,170,139,170,170,170,174,170,170,170,139
+139,170,254,254,254,254,254,170,139,170,170,170,170:3&9,170,170,170,139,170,170,170,139,170,170,170,170,170,170,139,170,170,170,139,191,191,191,191,191,191,191,139,170,170,170,170,170,170,170,139
+139,170,254,254,170:0&9,254,254,170,139,174,170,174,170,174,170,174,139,198,184,196,139,170,189,170,170,189,170,139,198,184,196,139,170,170,170,170,170,170,170,139,170,170,170,174,170,170,170,139
 139,170,170,170,170,170,170,170,139,170,170,170,170,170,170,170,139,170,170,170,139,170,170,170,170,170,170,139,170,170,170,139,170,170,170,170,170,170,170,139,170,170,170,170,170,170,170,139
 139,170,170,170,170,170,170,170,139,174,170,174,170,174,170,174,139,198,184,196,139,189,170,71,71v,170,189,139,198,184,196,139,170,170,170,170,170,170,170,139,170,170,170,170,170,170,170,139
 139,170,170,170,170,170,170,170,139,170,170,170,170,170,170,170,139,170,170,170,139,170,170,71,71,170,170,139,170,170,170,139,170,170,170,170,170,170,170,139,170,170,170,170,170,170,170,139
@@ -24,16 +24,16 @@
 139,170,170,194:7@11@12@13,139,170,170,170,170,170,139,191,191,191,170,170,170,191,191,191,139,71,71,170,170,71,71,139,191,191,191,170,170,170,191,191,191,139,191,191,191,170,170,170,191,191,191,139
 139,170&14,139,139,139>,139,139,139,139,170&13,139,170,170,170,170,170,170,170,170,170,139,71,71,170,170,71,71,139,170,170,170,170,170,170,170:16,170,170,139,170,170,170,170,170,170<,170,170,170,139
 139,170,170,186,170,186,170,186,139,170,139,191,191,191,170,170,170,191,191,191,139,71,71,170,170,71,71,139,191,191,191,170,170,170,191,191,191,139,191,191,191,170,170,170,191,191,191,139
-139,170$5,170,247:31&9,170,247:35&9,170,247:38&9,139,170,139,170,170,170:14,170,233,170,170,170,170,139,71,71,170,170,71,71,139,170,170,170,170,233,170,170,170,170,139,170,170,170,170,233,170,170,170,170,139
+139,170$5,170,170:31&9,170,170:35&9,170,170:38&9,139,170,139,170,170,170:14,170,233,170,170,170,170,139,71,71,170,170,71,71,139,170,170,170,170,233,170,170,170,170,139,170,170,170,170,233,170,170,170,170,139
 139,170,197,197,197,170,170,170,139,170,139,191,191,191,170,170,170,191,191:9,191,139,71,71,170,170,71,71,139,191,191,191,170,170,170,191,191,191,139,191,191,191,170,170,170,191,191,191,139
 139,170,185@0,185,185,170,170,170,139,170,139,170,170,170,170,170,170,170,170,170,139,71,170,170,170,170,71,139,170,170,170,170,170,170,170,170,170,139,170,170,170,170,170,170,170,170,170,139
 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,247:6&9,247: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,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,246: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,246:45&9,0,85,86,0
+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,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
 122,170,170,122,170,170@9@10&11&10,170,170&10,170$1,170$0,122,170,170,170,170,204,122,71,170,170,170,170,170,170,170,170,170,170,170,170,71,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,122
 122,170,170,122,122,122,122,122,122,129,122,122,122,122,132!4,125,122,71,170,189,170,170,149!0,170,170,149!1,170,170,189,170,71,122,125,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122
@@ -44,5 +44,5 @@
 122,198,184,196,198,184,196,198,184,196,122,198,184,196,198,184,196,198,184@16,196,122,170,198,184,196^,198,184,196,170,122,122,125,122,125,122,122,122,125,122,122,125,122,125,122,122,170,170,122
 122,198,184,196,198,184,196,198,184,196,122,198,184,196,198,184,196,198,184,196,122,170,198,184,196,198,184,196,170,122,170,170,122,170,170,122,170,170,122,170,170,122,170,170,122,170,170,122
 122,198,184,196,198,184@15,196,198,184,196,122,198,184,196,198,184,196,198,184,196,122,170,198,184,196,198,184,196,170,122,197,170,122,170,197,122,197,170,122,197,170,122,170,197,122,170,170,122
-122,170,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,170,122,185,170,122,170,185,122,185,170,122,185@14,170,122,170,185,122,247:46&9,247:46&9,122
+122,170,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,170,122,185,170,122,170,185,122,185,170,122,185@14,170,122,170,185,122,170:46&9,170:46&9,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,122,122,122,122,122
diff --git a/rsrc/scenarios/valleydy/towns/town14.map b/rsrc/scenarios/valleydy/towns/town14.map
index d0527e6b..9eef8c71 100644
--- a/rsrc/scenarios/valleydy/towns/town14.map
+++ b/rsrc/scenarios/valleydy/towns/town14.map
@@ -1,5 +1,5 @@
 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,122,122,122,122
-122,247:6&9,247:6&9,122,170,208:9,170,122,177,177,177@25,176,170,197,122,0,0,0,0,0,0,122,189,170,189,122,0,1,1,244,244,244,122,177,176,170,197,170,178,177,122,170,208:7,170,122,247:5&9,247:5&9,122
+122,170:6&9,170:6&9,122,170,208:9,170,122,177,177,177@25,176,170,197,122,0,0,0,0,0,0,122,189,170,189,122,0,1,1,244,244,244,122,177,176,170,197,170,178,177,122,170,208:7,170,122,170:5&9,170:5&9,122
 122,170,170,122,170,170,170,122,170,170,170,170,170,185,122,98,1,96,97,1,98,122,170,170,170,122,170,122,244,244,244,244,122,170,170,170,185,170,170,170,122,170,170,170,122,170,170,122
 122,170,170,122,170&22,170,170,122,170,170,170,170,170,195,122,96,98,98,0,1,0,122,170,170,170,122,170,122,244,244,0,0,122,170,170,170,195,170,170,170,122,170,170,170,122,170,170,122
 122,170,170,122,170,170,170,125,170,170,197,170,197,170,122,97,1,0,1,0,0,122,170,170,170v,132!0,170,122,122,122,122,0,122,197,170,197,170,197,170,170,125,170,170&11,170&10&12,122,170,170,122
@@ -11,8 +11,8 @@
 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<,246: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,246:25&9,0,1,15
+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,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
diff --git a/rsrc/scenarios/valleydy/towns/town15.map b/rsrc/scenarios/valleydy/towns/town15.map
index f01a73e3..68489e5f 100644
--- a/rsrc/scenarios/valleydy/towns/town15.map
+++ b/rsrc/scenarios/valleydy/towns/town15.map
@@ -37,8 +37,8 @@
 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,246:4&9,0,98,0,0,0,97,97,98,98,98,97,93,94,97,97,94,246: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,246: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
+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,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,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 34ef41ff..a27736d5 100644
--- a/rsrc/scenarios/valleydy/towns/town16.map
+++ b/rsrc/scenarios/valleydy/towns/town16.map
@@ -3,12 +3,12 @@
 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,248: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,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,248: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,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
@@ -35,9 +35,9 @@
 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,248: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,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,248: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,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
diff --git a/rsrc/scenarios/valleydy/towns/town20.map b/rsrc/scenarios/valleydy/towns/town20.map
index ddeceabd..d31e70a3 100644
--- a/rsrc/scenarios/valleydy/towns/town20.map
+++ b/rsrc/scenarios/valleydy/towns/town20.map
@@ -9,7 +9,7 @@
 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,246: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,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
diff --git a/rsrc/scenarios/valleydy/towns/town5.map b/rsrc/scenarios/valleydy/towns/town5.map
index 9a547bda..343cf262 100644
--- a/rsrc/scenarios/valleydy/towns/town5.map
+++ b/rsrc/scenarios/valleydy/towns/town5.map
@@ -12,7 +12,7 @@
 2,2,2,2,2,44,30,26,139,142,139,139,0,0,103,103,139,0,0,0&22,139,210,210,210,210,210,210,210,139,170$23,170$24,170&17,170,170,170&21,170,170,170,170,170,139,30,22,26,40,2,2,2
 2,2,2,2,2,44,30,26,139,0,0,0,0,0,0,0,139,84,99,99,139,210,210,210,210,210,210,210,139,170@20&10,170,170,170,170,170,170,170,170,170@23,170,139,30,22,26,48,41,2,2
 2,2,2,2,2,44,30,26,139,142,139,139,0,0,0,0,0,0,0,0,139,210,216,210,210,210,216,210,139,170$25,178,177&10,177&10,177&10,177,177,177,177,176,170,139,30,22,34,27,48,41,2
-2,2,2,2,43,47,30,26,139,0,0,100,0,0,0$21,0$22,0,0$19,0,0,139,210@7,210,210,248:14&9,210,210,210,139,170,170,170,170,170,170,170,170,170&21,170,170,139,30,22,22,34,27,48,42
+2,2,2,2,43,47,30,26,139,0,0,100,0,0,0$21,0$22,0,0$19,0,0,139,210@7,210,210,210:14&9,210,210,210,139,170,170,170,170,170,170,170,170,170&21,170,170,139,30,22,22,34,27,48,42
 2,2,2,43,47,29,33,26,139,0&22,0,100,0,0$20,0,104,0,0,0,139,139,139,139,139,147,139,139,139,139,139,170,170,170,170,170&22,170,170,170,170,170,139,30,22,22,22,34,27,36
 2,2,43,47,29,33,22,26,139,139,139,139,0,0,0,0$18,0,0,0,148,210,210,210,210,210,210,210,210,210,148&10,170,170,178,177,177,177&10,177,177&10,176,170,139,30,22,22,22,22,26,36
 2,2,44,29,33,22,22,26,139,0,0,0,0,0,0,0,0,0,0,149!1,210,210,210,210,210,210,210,210,210,148&10,170&10,170,170,170,170,170,170,170,170,170&23,139,30,22,22,22,22,26,36
@@ -22,18 +22,18 @@
 2,44,30,22,22,22,22,26,139,210,210,210,210,210,210,139,210,210,210,210,210,210,210,71,71,71,210,210,210,210@5,210,216,210,139,210,210,210,210,210,210,139,30,22,22,22,22,22,22
 2,44,31,24,24,24,32,26,139,210,216,210,210,216,210,139,210,210,210,210,210,210,210,210,71,210,210,210,210,210,210,210,210,139,210,216,210,210,216,210,139,31,24,24,32,22,35,24
 2,44,36,36,36,36,31,25,139,210,210,210,210,210,210,139,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,139,210,210,210,210,210,210,149!8,44,36,36,31,24,25,36
-2,44,36,36,36>,36,36,40,148:0,210,210,210,210,210,248:9&9,147,210@6,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,147,248:17&9,210,210,210,210,210,148:0,44,36,36<,36,36,36,36
+2,44,36,36,36>,36,36,40,148:0,210,210,210,210,210,210:9&9,147,210@6,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,147,210:17&9,210,210,210,210,210,148:0,44,36,36<,36,36,36,36
 2,44,36,36,36,36,36,40,149!6,210,210,210,210,210,210,139,210,210,210,210,210,210,139,210&22,210,210,139,210,210,210,210,210,210,139,210,210,210,210,210,210,139,44,36,36,36,36,36,36
 42,47,36,36,36,36,29,27,139,210,216,210,210,216,210,139,210,210,210,210,210,210,139,210:29,210:29,210:29,139,210,210,210,210,210,210,139,210,216,210,210,216,210,139,29,27,36,36,36,36,36
 36,36,36,36,36,29,33,26,139,210,210,210,210,210,210,139,210,216,210,210,210,210,139,210,210,210,139,210,210,210,210,216,210,139,210,210,210,210,210,210,139,30,34,28,28,28,28,28
 38,46,36,36,36,30,22,26,139,139,139,139,139,139,139,139,210@1,210,210,210,210,210,139,210,210,210,139,210@3,210,210,210,210,210,139,139,139,139,139,139,139,139,30,22,22,22,22,35,24
-2,44,29,28,28,33,22,26,139,198,199$12,199$13,139,189,189,139,139,139,139,149!3,210,210,139,248:33&9,248:33&9,248:33&9,139,210,210,139,148,148,149!4,139,75,75,139,90,90,90,139,30,22,22,22,22,26,36
+2,44,29,28,28,33,22,26,139,198,199$12,199$13,139,189,189,139,139,139,139,149!3,210,210,139,210:33&9,210:33&9,210:33&9,139,210,210,139,148,148,149!4,139,75,75,139,90,90,90,139,30,22,22,22,22,26,36
 2,44,30,22,22,22,22,26,139,170,170,170,139,170,170,170,170,170,170,148,210,210,139,139,139,139,139,210,210,139,0:27,0:27,139,75,75,75,139,90,90,90,139,30,22,22,22,35,25,36
 2,44,30,22,22,22,22,26,139,199$11,170,196,139,170,170,139,139,139,139,139,210,210,210,210,210,210&17,210,210,210,139,0,0,139,75,75,75,139,90,90,90,139,30,22,22,22,26,49,38
 2,44,30,22,22,22,22,26,139,170,170,170,142,170,170,139,170,199$17,170@0,139,210,216,210,210,210,210,210,216,210,139,0,0,139,99,0:28,99,139,99,103,99,139,30,22,22,22,26,40,2
 2,44,31,32,22,22,22,26,139,139,139,139,139,170,170,142,170,170$16,199@24,139,210,210,210,210,210,210,210,210,210@2,139,0,0,139,0,0$1,0,0$4,0,0$3,0,139,30,22,22,22,26,40,2
 2,45,46,30,22,22,22,26,139,170,170,199$15,139,170,170,139,139,139,139,139,139,139,139,139,147,139,139,139,139,139,0,0,139,0$0,0,103,0,0$2,0,0,139,30,22,22,22,26,40,2
-2,2,44,30,22,22,22,26,139,199$14,170,170,139,170,170,170,197,170&17,170,170,139,210,210,210,248:23&9,210,210,210,139,0,0,0,0,0,0,0,0,0,0,103,139,30,22,22,22,26,40,2
+2,2,44,30,22,22,22,26,139,199$14,170,170,139,170,170,170,197,170&17,170,170,139,210,210,210,210:23&9,210,210,210,139,0,0,0,0,0,0,0,0,0,0,103,139,30,22,22,22,26,40,2
 2,2,44,30,22,22,22,26,139,198,170,170,142,170,196$7,170,170$8,170$9,198,170,139,210,216,210,210,210,216,210,139,0,0,0,0,0,103,0,0,0,102@9,0,139,30,22,22,35,25,40,2
 2,2,44,30,22,22,22,26,139,139,139,139,139,170,185&16,185@14,185@16,185&16,185@17,170,139,210,210,210,210,210,210,210,139,103,103,0,103,103,103,103,139,99,0,99,139,30,22,22,26,49,39,2
 2,2,44,30,22,22,22,26,139,201@11@12@13@15,170,170,143,170,170,170$5,196,170$6,195$10,170,139,210,210,210,210,210,210,210,139,103,103,102,103,0,103,0,139,90,90,90,139,30,22,22,26,40,2,2
diff --git a/rsrc/scenarios/valleydy/towns/town6.map b/rsrc/scenarios/valleydy/towns/town6.map
index 66fa2be7..d01dda96 100644
--- a/rsrc/scenarios/valleydy/towns/town6.map
+++ b/rsrc/scenarios/valleydy/towns/town6.map
@@ -10,7 +10,7 @@
 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,247:17&9,247:17&9,122,170,170,170&23,170,125,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
@@ -21,10 +21,10 @@
 122,170,170,199,122,170,170,122,199,199,199,199,122,170,170,170,170,170,170,122,170,170,170,122,170@4,170,170@5,122,170,170,170,122,170,170,122,170,170,170,170,0,0&22,103@17,103@43,0@15,170,122,170,122
 122,170,199,170,122,170,170,122,122,122,122,122,122,170,187,170,170,187,170,122,170,170,170,122,170&22,170,170&22,122,170,170,170,122,170,170,122,170,170,170,170,0,1,103,103$0,103@19,170,122,170,122
 122,170@30,170,170,125,170,170,170,170,170,170,170,170,170,170,170,170,170,170,131&14,170@0,170&22,170,122,170,170,170,122,170,170&22,170@3,131&14,170,170,125,170,170,170,170,84,84,0@14,103@16,103@18,170,122,170,122
-122,123,122,122,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,131&14,170,170,170,122,247:16&9,247:16&9,247:16&9,122,170,170,170,131&14,170,170,122,122,122,133,85,86,1,0&22,1,1,84,122,170,122
+122,123,122,122,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,131&14,170,170,170,122,170:16&9,170:16&9,170:16&9,122,170,170,170,131&14,170,170,122,122,122,133,85,86,1,0&22,1,1,84,122,170,122
 122,170,170,194:8@27@28@29,122>,170,122,122,122,125,122,122,122,170,187,170,170,187,170,139,139,139,139,139,139,139,139,139,139,139,139,139,170,170,125,170,170,170,84,85,86,84,0,0<,0,122,170,122
-122,122,122,122,122,170,122,210,210,210,210,210,122,170,170,170,170,170,170,139,210,248:6&9,210,139,248:12&9,248:12&9,248:12&9,139,210,248:6&9,210,139,170,170,132!10,170,170,170,85,86,84,170,0,0,84,122,170,122
-122,170$9,170,170&19,126,170,122,210,210&19,248:7&9,210,210,122,71,170,170,170,170,71,139,210,210,210$12,139,210,210,210,139,210$14,210,210,139,170,170,122,170,189,170,189,170,189,170,133,170,170,122,170,122
+122,122,122,122,122,170,122,210,210,210,210,210,122,170,170,170,170,170,170,139,210,210:6&9,210,139,210:12&9,210:12&9,210:12&9,139,210,210:6&9,210,139,170,170,132!10,170,170,170,85,86,84,170,0,0,84,122,170,122
+122,170$9,170,170&19,126,170,122,210,210&19,210:7&9,210,210,122,71,170,170,170,170,71,139,210,210,210$12,139,210,210,210,139,210$14,210,210,139,170,170,122,170,189,170,189,170,189,170,133,170,170,122,170,122
 122,170&20,170,170,122,170,122,210,210,212&19,210&19,210,122,71,71,170,170,71,71,139,210,210,210$11,139,210,210,210,139,210$13,210,210,139,170,170,122,170,170,170,170,170,170,170,122,170,170,122,170,122
 122,170,170&20,170$8,122,170,122,210,210,210&19,210,210,122,71,71,189,189,71,71,139,210,210,210,139,210,210,210,139,210,210,210,139,170,170,122,122,122,122,122,133,133,122,122,170,170,122,170,122
 122,122,122,122,122,170,122,122,122,122,122,122,122,122,122,122,122,122,122,139,210,210,210,210,210,210,210,210,210,210,210,139,170,170,170,170,170,170&21,170,170,170,170,170,170,170,122,170,122
@@ -37,12 +37,12 @@
 122,170,170,198$16,184,196$17,170,170,84,85,86,122,93,93,85,86$3,0@40,93,93,139,210,210,210,210,210,210,210,210,210,210,210,139,170,170,170,194,122,122,197,170,175:2,170,122,170,170,122,170,122
 122,197$20,184@42,170,184,170,170,85,86,84,170,122,93,93,95,85,86,170,93,139,210,210,71,71,210,210,210,71,71,210,210,139,194:5,170,170,170,170,252,170,170,170,170,125,170,170,122,170,122
 122,170,184,170,197,170,170,170,85,86,170,133,93,0@41,93,93,104,129,133,139,210,71,71,71,210,210,210,71,71,71,210,139,122,122,122,170,122,122,170,170,170,196,122,170,170,122,170,122
-122,198$19,184,170,170,197$15,170,170,133,170,170,170,0,93,95,0,93,0,170,148&13,248:13&9,71,71,71,210,210,210,71,71,71,210,148&13,170,170,122,252,122,122,122,122,122,122,122,170,170,122,170,122
+122,198$19,184,170,170,197$15,170,170,133,170,170,170,0,93,95,0,93,0,170,148&13,210:13&9,71,71,71,210,210,210,71,71,71,210,148&13,170,170,122,252,122,122,122,122,122,122,122,170,170,122,170,122
 122,170,170,170,170,184,170,170,133,170,170,170,170,170,170,170,170,170,170,148&13,210,210,71,71,210,210,210,71,71,210,210,148&13,170,170,122,170,170,174,170,170,175:2,170,125,170,170,122,170,122
 122,122,122,122,122,122,122,125:9,122,122,122,122,122,122,126,122,122,122,122,139,210,210,210,210,210,210,210,210,210,210,210,139,170,170,122,170,170,170,170,170,170,170,122,170,170,122,170,122
 122,170&11,170,170&12,170,170,170$21,170,122,103,0,0,0,122,170,122,170,0,84,139,210,216,210,210,210,210,210,210,210,216,210,139,170,170,122,191:3,170,196,170,197,170,191:3,122,170,170,122,170,122
 122,170,202,170,170,170$22,170,170,122,0$7,0,0,0,129,170,129,170,0,170,139,210,210,210,210,210^,210,210,210,210,210,210,139,170,170,122,122,122,122,122,122,122,122,122,170,170,122,170,122
-122,170,170,170,170,170,170,170,122,122,122,122,122,122,170,122,122,122,122,139,71,210,210,216,210,248:14&9,210,216,210,210,71,139,170,170,189,170,170,189,170,170,189,170,170,170,189,122,170,122
+122,170,170,170,170,170,170,170,122,122,122,122,122,122,170,122,122,122,122,139,71,210,210,216,210,210:14&9,210,216,210,210,71,139,170,170,189,170,170,189,170,170,189,170,170,170,189,122,170,122
 122,170,170,170,170,170,202,170,122,170,0,0,0,129,170,129,0,170,170$5,139,71,210,210,210,210,215,210,210,210,210,71,139,170,170,170,170,170,170,170,170,170,170,170,170,170,122,170,122
 122,170,178,176,170,170&12,170,170&11,122,0,0,0$2,103,122,170,122,103,0$4,170,139,71,71,71,139,139,139,139,139,71,71,71,139,170,170,189,170,170,189,170,170,189,170,170,170,170,123,170,122
 122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,122,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
diff --git a/rsrc/scenarios/valleydy/towns/town7.map b/rsrc/scenarios/valleydy/towns/town7.map
index 70251b5f..f44ee17e 100644
--- a/rsrc/scenarios/valleydy/towns/town7.map
+++ b/rsrc/scenarios/valleydy/towns/town7.map
@@ -5,7 +5,7 @@
 122,122,122,122,122,170,170,122,134,133,122,122,170,170,166,154,154,154,154,170,199,122,170,170,170v,170,170,170,170,122,170!5,122,170,170,170,170,204,122,170,170,170,170,170,122,170,170,195,122
 122,170,170,170,170&14,170,170,170&14,170,170,170&22,122,170,154,154,170,154,170,157,170,170,122,170,170,170,170,170@1,170,170,122,170,122,122,122,122,122,252,122,122,122,122,132!3,127,122,126,122,122,122
 122,170,170,170,170&14,170,170,170,170,170,170,122,157,154,197$30,197,166,170,154,166,166,122,170,192,170,185@33,170,192,170@2,122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,122
-122,170&22,247:0&9,170,122,170,170,133,170,170@17,170,122,170,170,185,185,166,170,170,197,170,122,170,170@0,170,170,170,170,170,122,122,122,170,170,122,122,122,122,122,122,125:9,122,122,122,125:10,132!2,122,122
+122,170&22,170:0&9,170,122,170,170,133,170,170@17,170,122,170,170,185,185,166,170,170,197,170,122,170,170@0,170,170,170,170,170,122,122,122,170,170,122,122,122,122,122,122,125:9,122,122,122,125:10,132!2,122,122
 122,135,122,122,122,170,170,134,122,122,122,122,170,170,195$28,195$29,166,154,170,185@37,170,122,170,170,170,170,170,170,170,170$4,170,122,170,170,122,170@15&22,170,170,170,170,170,122,176,170,170,170,178,122
 122,170,170,85,86,170,170,170&14,170,170,170,122,170,170,170,170,170,154,170,195,170,122,170&13,122,170,122,170,122,170,122,170,122,170,170,122,170,170&22,170,170&22,170,170,122,170,170,170,170,170,122
 122,102@38@39,85,86,170&14,170,170,170,170,170,170,122,157,154,154,154,154,154,170,170,170,122,0,122,0,122,84,122,0,122,0,122,170,170,122,170&22,170,170,170,170,170&22,122,170,173,173,173,170,122
@@ -40,7 +40,7 @@
 122,170,170,170,173:24,170,170,170,122,170,170,170,173:24,170,170,170,122,166,166,154,170,0,170,154,170,154,166,166,166,154,154,166,170,170,166,154,166,154,85,86,170$12,170,122,122,134,134,133,122
 122,170,170,170,173:24,170,170,170,122,170,170,170,173:24,170,170,170,122,170,170,170,170,197,170,166,170,170,105,0,0,170,154,170,170,170,84,0,0,154,166,166,154,154,154,170,170,170,170,122
 122,122,122,122,122,122,122,170,122,170,122,122,122,122,122,122,122,170,0,0,198,184@29,196,157,170,170,170,170,105@30,170,154,170,192,170,84,0,170,170,170,155,170,170,154,170,170,170,170,122
-122,247:27&9,247:27&9,122,170,170&21,170,170,122,170,170,170,170,122,247:30&9,247:30&9,122,85,86,0,170,154,154,166,199,170,170,170,170,170,154,170,170,170,122,170,170,170,170:28,122,84,154,122,170,170,170,170,122
+122,170:27&9,170:27&9,122,170,170&21,170,170,122,170,170,170,170,122,170:30&9,170:30&9,122,85,86,0,170,154,154,166,199,170,170,170,170,170,154,170,170,170,122,170,170,170,170:28,122,84,154,122,170,170,170,170,122
 122,170,170,122,170,122,122,122,122,122,122,122,170,122,170,170,122,157,154,166,154,166,199@31,166,154^,154,166,154,154,154,166,154,166,154,122,122,122,122,122,122,170,170,122,134,122,134,122,122
 122,170,170,122,170,170,170,180@21,122,180@23,170,170,170,122,170,170,122,170,170,170$24,170,170$16,170,166,170,0,170,166,84,170,170,170,170,84,157,84,170,170,170$18,170,170,170,170&14,170,201@24@25@26,170,199,122
 122,170,170,132!10,170,170,170,180,122,180,170,170,170,132!11,170,170,122,170,170,170,170$21,170,0,166,166,0,0,154,154,166,154,85,86,105,154,166,154,170,170,170$22,170$23,170,170&14,170,170,170,199,122
diff --git a/rsrc/scenarios/valleydy/towns/town8.map b/rsrc/scenarios/valleydy/towns/town8.map
index 6aefb9fa..2f3691db 100644
--- a/rsrc/scenarios/valleydy/towns/town8.map
+++ b/rsrc/scenarios/valleydy/towns/town8.map
@@ -1,10 +1,10 @@
 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,122,122,122,122
-122,170,178,177@18,177,176@20,170,122,180@22@44,170,123,170,178@27,177@28,177@31,177@29,177@30,122,177&10,177,177,177,122,247:22&9,247:22&9,247:22&9,122,2,2,2,4,4,2,3,2,2,2,2,2,2,2,2,4,2,254,254,254,122
-122,170,170,170,170,170,170,122,122,122,122,170,170,170,170,170,170,122,170,170@39$22,170@37$24,170&20$26,122,170,170,170,122,2,2,2,112,2,2,115,2,2,2,4,2,115,2,4,2,122,254,254,247:3&9,122
+122,170,178,177@18,177,176@20,170,122,180@22@44,170,123,170,178@27,177@28,177@31,177@29,177@30,122,177&10,177,177,177,122,170:22&9,170:22&9,170:22&9,122,2,2,2,4,4,2,3,2,2,2,2,2,2,2,2,4,2,254,254,254,122
+122,170,170,170,170,170,170,122,122,122,122,170,170,170,170,170,170,122,170,170@39$22,170@37$24,170&20$26,122,170,170,170,122,2,2,2,112,2,2,115,2,2,2,4,2,115,2,4,2,122,254,254,170:3&9,122
 122,170,178@32,177@21,177@19,176,170,123,170,180@33@45@46,122,170,170,170,170,170,170,122,170,170&20$21,170$23,170$25,122,170,170,170,122,2,112,2,2,2,2,2,2,3,2,2$0,4,2,2,2,2,122,254,170,170,122
 122,170,170,170,170,170,170,122,122,122,122,177@23,177@24,177@25,176@26,170,170,122,170&10,170,170,122,122,170,170v,170,122,2,112,2,2,2,114,56,55,55,54,2,2,2,4,114,2,122,122,122,125,122
 122,170,122,122,122,122,122,122,170$12,170,122,122,122,122,122,122,170&13,122,122,122,170&10,122,170,170,170,170,122,2,2,2,2,56,55,60,50,50,53,2,2,3,2,2,2,2,115,114,2,122
-122,170,170,170,170,252,170$15,170,170,170$13,170,170$14,170,170,170,170,170,170$16,170,170,170,122,247:21&9,170,170,170,122,4,2,115,56,60,50,50,62,51,52,2,4,2,3,114,2,4,4,2,2,122
+122,170,170,170,170,252,170$15,170,170,170$13,170,170$14,170,170,170,170,170,170$16,170,170,170,122,170:21&9,170,170,170,122,4,2,115,56,60,50,50,62,51,52,2,4,2,3,114,2,4,4,2,2,122
 122,122,122,122,122,122,170,122,170,170$11,122,170,122,122,122,122,122,170,122,122,122,122,170,170,170,170,122,2,2,2,57,50,50,62,52,2,2,2,2,2,2$2,112,115,2,2,2,3,122
 122,177,177,176,170,170,170,122,170,170,122,170,178,177,177,177@35,122,170,170&19,170$19,170,122,187,170,170,233,122,2,2,2,58,51,51,52,2,114,2,115,3,2,2,2,2,115,2,2,2,122
 122,170,170,170,170,170,170,122,170&10,170&10,122,170,170,170,170,170,122,170$18,178,177,177,122,170,170,170,170,122,2,2,114,2,2,2,3,4,2,4,2,2,2,2,114,2,114,2,2,2,122
@@ -40,9 +40,9 @@
 122,170,170,139,139,139,0,0,0,0,0,0,93,94,93,93,139,139,139,170,170,122,170,170,170,170,122,122,122,122,122,122,132!9,170,122,122,122,122,170,132!10,122,122,122,122,122,132!11,170,122
 122,170,170,139,139,139,84,0,84,84,1,0,0,71,71,71,139,139,139,173:6,173:6,122,170,233,170,170,122,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,122,170,170,170,170,122
 122,170,170,139,139,150,85,86,85,86,84,94,94,71,71,71,139,139,150,170,170,122,170,122,170:5,170:5,122,191,191,191,191,191,191,170,122,191,191,191,170,191,191,191,122,191,191,191,170,122
-122,170,170,139,139,139,139,139,150,139,139,139,139,139,254,254,139,139,139,170,170,122,247:21&9,122,170,170,122,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,122,170,170,170,170,122
+122,170,170,139,139,139,139,139,150,139,139,139,139,139,254,254,139,139,139,170,170,122,170:21&9,122,170,170,122,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,122,170,170,170,170,122
 122,170,170,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,170,170,122,122,122,170^,170,122,191,191,191,191,191,191,170,122,191,191,191,170,191,191,191,122,191,191,191,170,122
 122,170,170,139,150,139,139,139,139,139,139,139,139,139,139,139,139,139,139,170,170,122,186,122,170,170,122,170,170,170,170,170,170,170,122,170,170,170,170,170,170,170,122,170,170,170,170,122
 122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,122,170:0,122,170,170,122,185,170,191,191:19,191,191,170,122,191,191,191,191,191,191,191,122,191,191,191,170,122
-122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,122,247:26&9,247:26&9,122,195,170,170,170,170,170,170,122,191:15,170,170,170,170,170,170,123,191:13,170,170,170,122
+122,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,122,170:26&9,170:26&9,122,195,170,170,170,170,170,170,122,191:15,170,170,170,170,170,170,123,191:13,170,170,170,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,122,122,122,122,122
diff --git a/rsrc/scenarios/valleydy/towns/town9.map b/rsrc/scenarios/valleydy/towns/town9.map
index 879e0d36..66f85fe1 100644
--- a/rsrc/scenarios/valleydy/towns/town9.map
+++ b/rsrc/scenarios/valleydy/towns/town9.map
@@ -1,8 +1,8 @@
 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,247:8&9,247:8&9,122,5,5,5,5,5,5,5,5,5,122,247:10&9,247: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: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,246:26&9,71,71,71,15
+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
@@ -43,7 +43,7 @@
 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,247: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,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
diff --git a/rsrc/scenarios/zakhazi/out/out0~1.map b/rsrc/scenarios/zakhazi/out/out0~1.map
index 81193978..578373b8 100644
--- a/rsrc/scenarios/zakhazi/out/out0~1.map
+++ b/rsrc/scenarios/zakhazi/out/out0~1.map
@@ -8,7 +8,7 @@
 5,21,6,6,6,8,71,71,71,71,71,74,71,71,71,71,71,71,14,12,12,12,12,12,12,11,71,71,71,74,71,71,71,71,71,71,17,6,18,5,5,5,5,5,5,5,5,5
 6,8,74,71,71,71,71:3,71,71,74,71,71,71,14,12,12,12,12,19,5,5,5,5,5,5,20,12,12,12,12,12,11,71,71,71,71,71,71,15,5,5,5,5,5,5,5,5,5
 71,74,71,74,71,71,14,11,71,71,14,12,12,19,5,5,5,5,5,5,5,5,5,5,5,21,6,6,6,6,18,20,12,12,11,71,71,71,17,18,5,5,5,5,5,5,5,5
-74,74,74,71,14,12,19,20,12,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,246&9:6,0,116,0,15,5,5,5,20,11,71,71,71,15,5,5,5,5,5,5,5,5
+74,74,74,71,14,12,19,20,12,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0&9:6,0,116,0,15,5,5,5,20,11,71,71,71,15,5,5,5,5,5,5,5,5
 12,12,12,12,19,5,5,5,5,5,5,5,5,5,21,6,6,6,6,6,6,6,6,6,18,20,12,12,11,116,17,6,18,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,21,6,6,8,0,1,0,0,0,0,0,0,93,17,6,18,5,9,0,116,0,15,5,5,20,11,71,71,17,6,6,18,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,21,6,8,0,0,0,14,12,12,12,12,12,12,12,11,116,0,17,18,20,12,12,13,19,5,5,5,9,71,71,74,0,91,15,5,5,5,5,5
diff --git a/rsrc/scenarios/zakhazi/out/out0~10.map b/rsrc/scenarios/zakhazi/out/out0~10.map
index d7ebf6e6..7e2c881e 100644
--- a/rsrc/scenarios/zakhazi/out/out0~10.map
+++ b/rsrc/scenarios/zakhazi/out/out0~10.map
@@ -1,6 +1,6 @@
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,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,21,6,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,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,246&9:19,15,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,8,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&9:19,15,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,8,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,15,5,21,6,6,6,6,6,6,6,6,6,6,6,8,97,0,0,0,0,17,18,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,6,6,6,6,18,21,8,0,17,6,8,0,0,0,0,0,98,98,97,0,0,0,0,0,0,0,0,1,98,15,5,5,5
 5,5,5,5,5,5,5,5,5,5,21,6,8,97,0,0,0,0,0,15,9,0,0,0,0,0,0,14,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,15,5,5,5
@@ -14,16 +14,16 @@
 71,71,74,71,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,8,0,17,8,0,15,9,0,98,0,0,71,71,71,71,72:13,71,71,71,71,74,17,6,6,8,71,71
 71,71,71,74,0,0,0,0,0,0,0,1,0,0,0,93,0,0,1,0,0,0,0,0,0,0,17,8,0,0,0,71,71,71,71,71,72:13,71,71,71,74,71,74,71,74,71,71,71
 71,71,74,71,71,0,0,0,0,94*2,0,0,0,94,91,93,0,0,0,0,0,0,0,14,11,0,96,96,0,96,71,71,71,71,71,71,72:13,71,71,71,71,74,71,74,74,71,71,71
-12,11,71,71,71,0,0,1,93,0,94,0,0,0,0,94,91,0,93,1,0,0,96,17,8,96,71,71,71,71,71,71,71,71,71,108,79&25,108,14,12,12,12,12,12,12,12,12,12
-5,20,11,74,71,71,0,1,0,0,1,0,0,93,91,0,1,0,0,94,0,96,96,96,71,71,71,71,71,71,71,14,12,12,11,0,79&25,0,15,5,5,5,5,5,5,5,5,5
-5,5,9,71,71,74,0,0,0,93,0,0,0,0,94,1,0,93,71,71,71,74,71,71,71,71,71,71,71,71,14,19,5,5,9,92,79&25,79&25,17,18,5,5,5,5,5,5,5,5
-5,5,20,11,74,71,93,93,93,0,0,1,0,0,0,94,71,71,74,71,71,71,71,71,71,71,71,71,14,12,19,5,5,5,20,11,0,79&25,0,15,5,5,5,5,5,5,5,5
-5,5,5,9,71,71,0,0,0,93,0,0,0,71,71,71,71,74,71,74,71,71,71,14,11,71,71,71,17,6,18,5,5,5,5,20,11,79&25,0,15,5,5,5,5,5,5,5,5
-5,5,5,9,71,71,0,0,0,0,71,71,71,71,71,71,71,71,0,0,14,12,12,19,9,71,71,71,71,71,15,5,5,5,5,5,9,79&25,0,15,5,5,5,5,5,5,5,5
-5,5,5,9,71,71,71,0,0,74,71,71,71,71,71,71,14,12,12,12,19,5,5,5,20,11,71,71,71,71,17,6,18,5,5,21,8,79&25:18,0:18,15,5,5,5,5,5,5,5,5
-5,5,5,20,11,71,71,71,71,71,71,71,71,71,71,14,19,5,5,5,5,5,5,5,5,20,12,11,93,93,0,98,15,5,21,8,0,79&25,0,17,6,18,5,5,5,5,5,5
-5,5,5,5,20,11,71,71,71,71,71,71,71,14,12,19,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0,97,15,5,9,98,0,79&25,79&25,0,0,15,5,21,6,18,5,5
-5,5,5,5,5,9,71,71:12,71:12,74,14,12,12,19,5,5,5,5,21,6,6,6,18,5,5,5,5,9,98,0,0,0,17,18,9,0,98,0,79&25,79&25,79&25,239@3,5,238@3,0,15,5,5
+12,11,71,71,71,0,0,1,93,0,94,0,0,0,0,94,91,0,93,1,0,0,96,17,8,96,71,71,71,71,71,71,71,71,71,108,0&25,108,14,12,12,12,12,12,12,12,12,12
+5,20,11,74,71,71,0,1,0,0,1,0,0,93,91,0,1,0,0,94,0,96,96,96,71,71,71,71,71,71,71,14,12,12,11,0,0&25,0,15,5,5,5,5,5,5,5,5,5
+5,5,9,71,71,74,0,0,0,93,0,0,0,0,94,1,0,93,71,71,71,74,71,71,71,71,71,71,71,71,14,19,5,5,9,92,0&25,0&25,17,18,5,5,5,5,5,5,5,5
+5,5,20,11,74,71,93,93,93,0,0,1,0,0,0,94,71,71,74,71,71,71,71,71,71,71,71,71,14,12,19,5,5,5,20,11,0,0&25,0,15,5,5,5,5,5,5,5,5
+5,5,5,9,71,71,0,0,0,93,0,0,0,71,71,71,71,74,71,74,71,71,71,14,11,71,71,71,17,6,18,5,5,5,5,20,11,0&25,0,15,5,5,5,5,5,5,5,5
+5,5,5,9,71,71,0,0,0,0,71,71,71,71,71,71,71,71,0,0,14,12,12,19,9,71,71,71,71,71,15,5,5,5,5,5,9,0&25,0,15,5,5,5,5,5,5,5,5
+5,5,5,9,71,71,71,0,0,74,71,71,71,71,71,71,14,12,12,12,19,5,5,5,20,11,71,71,71,71,17,6,18,5,5,21,8,0&25:18,0:18,15,5,5,5,5,5,5,5,5
+5,5,5,20,11,71,71,71,71,71,71,71,71,71,71,14,19,5,5,5,5,5,5,5,5,20,12,11,93,93,0,98,15,5,21,8,0,0&25,0,17,6,18,5,5,5,5,5,5
+5,5,5,5,20,11,71,71,71,71,71,71,71,14,12,19,5,5,5,5,5,5,5,5,5,5,5,9,0,0,0,97,15,5,9,98,0,0&25,0&25,0,0,15,5,21,6,18,5,5
+5,5,5,5,5,9,71,71:12,71:12,74,14,12,12,19,5,5,5,5,21,6,6,6,18,5,5,5,5,9,98,0,0,0,17,18,9,0,98,0,0&25,0&25,0&25,239@3,5,238@3,0,15,5,5
 5,5,5,5,5,20,11,71,71,14,19,5,5,5,5,5,21,6,8,1,1,98,17,6,18,5,5,20,11,98,14,11,0,15,9,97,0,0,93,0,93,15,21,8,0,15,5,5
 5,5,5,5,5,5,9,71,71,15,5,5,5,5,5,21,8,91,0,91,93,0,0,0,17,18,5,5,9,0,17,8,98,15,9,98,0,0,93,93,93,17,8,0,0,15,5,5
 5,5,5,5,5,5,9,71,71,17,18,5,5,5,21,8,0,91,91,0,0,0,0,0,0,17,18,5,9,0,0,0,14,19,9,0,97,0,93*3,0,0,93,93,0,14,19,5,5
@@ -32,7 +32,7 @@
 5,5,5,5,5,5,5,9,71,71,71,15,21,8,0,0,0,0,0,93,0,71,71,71,71,71,71,71,17,6,6,6,18,5,5,5,5,5,21,8,71,71,71,71,15,5,5,5
 5,5,5,5,5,5,5,20,11,71,71,15,9,0,91,92,91,0,93,71,71,71,71,71,71,71,71,71,74,71,71,71,15,5,5,5,5,21,8,71,71,71,71,71,15,5,5,5
 5,5,5,5,5,5,5,5,9,71,71,15,9,91,0,0,0,91,0,71,71,71,71,71,71,71,71,71,71,71,71,71,17,6,18,5,21,8,71,71,71,71,71,14,19,5,5,5
-5,5,5,5,5,5,5,5,20,11,71,15,9,92,0,246&9:0,0,92,71,71,71,71,71,71,71,71,71,71,74,71,74,71,71,71,17,6,8,71,71,71,71,71,71,15,5,5,5,5
+5,5,5,5,5,5,5,5,20,11,71,15,9,92,0,0&9:0,0,92,71,71,71,71,71,71,71,71,71,71,74,71,74,71,71,71,17,6,8,71,71,71,71,71,71,15,5,5,5,5
 5,5,5,5,5,5,5,5,21,8,71,15,9,91,0,0,0,91,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,15,5,5,5,5
 5,5,5,5,5,5,5,5,9,71,71,15,20,11,91,92,91,0,71,71,71,71,71,71,71,71,71,74,71,74,71,71,74,71,71,71,71,71,71,71,71,71,71,15,5,5,5,5
 5,5,5,5,5,5,5,21,8,71,71,15,5,20,11,0,0,92,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,15,5,5,5,5
diff --git a/rsrc/scenarios/zakhazi/out/out0~11.map b/rsrc/scenarios/zakhazi/out/out0~11.map
index a9eeeae0..8b09f641 100644
--- a/rsrc/scenarios/zakhazi/out/out0~11.map
+++ b/rsrc/scenarios/zakhazi/out/out0~11.map
@@ -41,8 +41,8 @@
 5,5,5,5,21,8,98,15,20,12,11,71,93,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,15,9,71,71,71,71,71,94,0,94,14,19,5,5,5
 5,5,5,5,9,98,14,19,5,5,9,93,0,71,71,71,71,71,71,71,14,12,12,11,71,14,12,11,71,71,71,71,71,15,9,71,71,71,71,0,0,14,12,19,5,5,5,5
 5,5,5,5,9,0,15,21,6,6,8,0,14,11,71,71,71,71,71,71,17,6,6,8,71,17,18,9,71,71,71,71,71,15,20,11,71,71,14,11,84,15,21,6,18,5,5,5
-5,5,5,5,9,0,17,8,0,98,0,0,15,20,12,12,12,11,71,71,71,71,71,71,71,71,17,8,71,14,11,71:15,71:15,17,18,20,12,12,19,9,0,15,9,246&9:10,15,5,5,5
+5,5,5,5,9,0,17,8,0,98,0,0,15,20,12,12,12,11,71,71,71,71,71,71,71,71,17,8,71,14,11,71:15,71:15,17,18,20,12,12,19,9,0,15,9,0&9:10,15,5,5,5
 5,5,5,5,9,98,0,0,0,14,12,12,19,5,5,5,5,20,12,12,12,12,12,12,11,71,71,71,71,15,9,71,71,71,17,18,5,21,6,8,0,17,8,84,15,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,20,12,12,12,12,19,9,71,71,71,71,15,5,9,246&9:3,85,86,84,85,86,15,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,20,12,12,12,12,19,9,71,71,71,71,15,5,9,0&9:3,85,86,84,85,86,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,9,71,71,71,71,15,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,9,71,71,71,71,15,5,5,5,5,5,5,5,5,5,5,5,5
diff --git a/rsrc/scenarios/zakhazi/out/out0~12.map b/rsrc/scenarios/zakhazi/out/out0~12.map
index 7ff33bcb..9ae1b9cd 100644
--- a/rsrc/scenarios/zakhazi/out/out0~12.map
+++ b/rsrc/scenarios/zakhazi/out/out0~12.map
@@ -2,7 +2,7 @@
 5,5,5,5,21,6,6,6,6,6,18,5,5,5,5,5,5,5,5,5,5,5,5,5,21,6,6,6,18,21,8,71,71,71,14,19,5,5,5,5,5,5,5,5,5,5,5,5
 5,5,5,5,9,0,108,0,108,0,17,6,6,6,6,6,18,5,5,5,5,5,5,21,8,93,92,1,15,9,71,71,71,14,19,5,5,5,5,5,21,6,18,5,5,5,5,5
 5,5,5,5,9,0,0,0,98,1,0:1,0,0,92,0,92,17,18,5,5,5,5,21,8,94,0,1,92,17,8,71,71,71,15,21,6,18,21,6,6,8,91,17,18,5,5,5,5
-5,5,5,5,9,246&9:2,0,108,14,12,12,11,0,91,91,0,92,17,18,5,5,5,9,93,0,0,0,92,0,0,71,71,71,15,9,246&9:15,16,10,0,0,0,92,0,17,18,5,5,5
+5,5,5,5,9,0&9:2,0,108,14,12,12,11,0,91,91,0,92,17,18,5,5,5,9,93,0,0,0,92,0,0,71,71,71,15,9,0&9:15,16,10,0,0,0,92,0,17,18,5,5,5
 5,5,5,5,20,12,12,12,19,21,6,8,0,92,92,92,0,0,17,18,5,5,20,11,0,0,91,91,92,92,71,71,71,15,20,12,19,9,93,0,0,0,0,0,15,5,5,5
 5,5,5,5,21,6,6,6,6,8,0,0,92,71,71,92,91,0,0,17,6,18,5,9,92,1,0,91,0,91,71,71,71,17,18,5,21,8,0,0,14,11,1,0,15,5,5,5
 5,5,5,21,8,0,0,0,98,0:0,0,91,0,92,92,92,92,1,0*2,1,94,17,18,9,98,92,0,92,92,0,92,71,71,71,15,5,9,0,0*0,0,15,20,11,0,15,5,5,5
diff --git a/rsrc/scenarios/zakhazi/out/out0~13.map b/rsrc/scenarios/zakhazi/out/out0~13.map
index 956d9116..e302d7a0 100644
--- a/rsrc/scenarios/zakhazi/out/out0~13.map
+++ b/rsrc/scenarios/zakhazi/out/out0~13.map
@@ -19,7 +19,7 @@
 5,5,5,5,5,5,5,9,0,0,0,0,0,71,71,71,71,71,91,91,92,71,71,71,71,71,71,71,71,71,71,71,71,71,0,0,1,71,71,71,71,0,0,92,15,5,5,5
 5,5,5,5,5,5,21,8,0,0,1*2,92,0,71,71,71,71,71,91,92,91,71,71,71,71,71,71,71,71,71,71,71,71,92,92,0,91,0,71,71,71,0,92,14,19,5,5,5
 5,5,5,5,5,5,9,91,0,91,92,92,0,71,71,71,71,0,91,92:4,91,0,71,71,71,71,71,71,71,71,71,71,71,0,91,92,0,0,71,71,71,92,14,19,5,5,5,5
-5,5,5,5,5,5,9,0,91,107!1,92,0,71,71,71,71,71,92,91,91,91,91,71,71,71,71,71,71,71,71,71,71,0,91,246&9:8,92*1,93,0,71,71,71,0,15,5,5,5,5,5
+5,5,5,5,5,5,9,0,91,107!1,92,0,71,71,71,71,71,92,91,91,91,91,71,71,71,71,71,71,71,71,71,71,0,91,0&9:8,92*1,93,0,71,71,71,0,15,5,5,5,5,5
 5,5,5,5,5,5,9,92,91,91,92,0,71,71,71,71,71,0,92,92,91,71,71,71,71,71,71,71,71,71,71,71,0,0,93,92,1,91,1,71,71,0,15,5,5,5,5,5
 5,5,5,5,5,5,238@1,92,92,0,92,71,71,71,71,71,71,0,92,0,92,71,71,71,71,71,71,71,71,71,71,71,71,0,0,97,92,0,0,71,71,92,15,5,5,5,5,5
 5,5,5,5,5,5,9,91,92,92,92,71,74,71,71,71,71,71,71,0,0,71,71,71,71,71,71,71,71,71,71,71,71,0,0,0,1,0,0,71,71,14,19,5,5*0,5,5,5
@@ -42,7 +42,7 @@
 5,5,5,5,5,5,20,12,11,0:7,14,12,11,0,0,98,14,12,12,12,11,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,15,5,9,98,97,14,19,5,5,5,5
 5,5,5,5,5,5,5,21,8,0,17,18,9,0,0,14,19,5,5,5,20,12,11,71,71,71,71,74,71,71,71,71,71,71,71,71,71,15,5,20,13,12,19,5,5,5,5,5
 5,5,5,5,5,5,5,9,117,117,117,15,9,0,14,19,5,5,5,5,5,5,20,11,71,71,71,71,71,71,71,71,71,71,71,71,71,15,5,21,7,18,5,5,5,5,5,5
-5,5,5,5,5,5,5,9,117,117,117,15,20,12,19,5,5,5,5,5,5,5,5,20,12,12,12,12,12,12,12,12,11,71,71,71,71,17,18,9,246&9:3,15,5,5,5,5,5,5
+5,5,5,5,5,5,5,9,117,117,117,15,20,12,19,5,5,5,5,5,5,5,5,20,12,12,12,12,12,12,12,12,11,71,71,71,71,17,18,9,0&9:3,15,5,5,5,5,5,5
 5,5,5,5,5,5,5,9,117,117,117,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,11,71,71,71,71,15,20,12,19,5,5,5,5,5,5
 5,5,5,5,5,5,5,20,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,9,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,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
diff --git a/rsrc/scenarios/zakhazi/out/out0~14.map b/rsrc/scenarios/zakhazi/out/out0~14.map
index bdb887b9..cb73d9cf 100644
--- a/rsrc/scenarios/zakhazi/out/out0~14.map
+++ b/rsrc/scenarios/zakhazi/out/out0~14.map
@@ -1,6 +1,6 @@
 5,5,5,5,5,5,5,5,5,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,71,15,5,5,5,5,5,5,5,5,5
 5,5,5,5,5,5,21,6,6,6,6,18,21,6,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,71,71,71,71,17,18,5,5,5,5,5,5,5,5
-5,5,5,5,5,21,8,0,0,116,0,15,9,246&9:4,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,71,71,71,71,71,17,6,6,18,5,5,5,5,5
+5,5,5,5,5,21,8,0,0,116,0,15,9,0&9:4,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,71,71,71,71,71,17,6,6,18,5,5,5,5,5
 5,5,5,5,5,9,0,0,14,11,0,15,9,0,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,11,71,71,71,71,71,0,0,15,5,5,5,5,5
 5,5,5,5,5,9,0,14,19,9,1,17,8,0,15,5,5,5,5,5,5,5,5,5,21,6,6,6,6,6,18,5,5,5,20,11,71,71,71,71,14,12,19,5,5,5,5,5
 5,5,5,5,5,9,1,15,5,9,0,0,116,0,15,5,5,5,5,5,5,5,5,21,8,85,86,0,0,0,15,5,5,5,5,9,71,71,71,71,17,18,5,21,6,18,5,5
@@ -10,7 +10,7 @@
 5,5,5,5,5,20,11,0,1,0,17,8,71,71,71,71,71,71,71,71,71,71,17,18,5,5,5,5,20,12,12,11,0,1,0,0,0,71,71,71,71,15,5,5,5,5,5,5
 5,5,5,5,5,21,8,1,0,0,0,74,71,71,71,71,71,71,71,71,71,71,71,17,6,6,6,18,5,5,5,20,12,11,0,0,71,71,71,71,14,19,5,5,5,5,5,5
 5,5,5,5,5,9,0,0,92,0,71,71,71,71,71,14,12,11,71,71,71,71,71,71,71:6,71,71,17,18,5,5,5,5,20,11,0,71,71,71,71,17,6,18,5,5,5,5,5
-5,5,5,5,5,9,0,92,92,246&9:3,71,71,71,71,14,19,5,9,0,14,11,71,71,71,71:6,71,71,71,15,5,5,5,5,5,20,11,71,71,71,71,0,0,15,5,5,5,5,5
+5,5,5,5,5,9,0,92,92,0&9:3,71,71,71,71,14,19,5,9,0,14,11,71,71,71,71:6,71,71,71,15,5,5,5,5,5,20,11,71,71,71,71,0,0,15,5,5,5,5,5
 5,5,5,5,5,9,92,92,1,71,71,71,14,12,19,5,5,9,0,15,20,11,71,71,14,11,71,14,19,5,5,5,5,5,21,8,71,71,71,71,0,107!0,15,5,5,5,5,5
 5,5,5,5,5,9,0,0,71,71,71,71,15,5,5,21,6,8,0,15,5,20,12,12,19,20,77,19,5,5,5,5,5,5,9,71,71,71,71,71,0,0,15,5,5,5,5,5
 5,5,5,5,5,9,0,0,71,71,71,71,17,6,6,8,0,0,0,15,5,5,5,5,5,9,71,15,5,5,5,5,5,5,9,71,71,71,71,14,12,12,19,5,5,5,5,5
@@ -40,7 +40,7 @@
 71,74,71,71,74,71,71,71,71:0,71,71,71,71,71,71,98,14,11,244@0,245@0,14,12,12,12,12,12,12,12,12,19,5,5,5,5,5,21,6,18,11,71,71,71,15,5,5,5,5,5
 74,71,71,71,71,74,71,71,14,12,12,12,12,12,12,12,19,9,0,1,17,18,5,5,5,5,5,5,5,5,5,5,5,5,21,8,0,17,8,71:8,71:8,74,15,5,5,5,5,5
 12,12,12,12,12,12,12,12,19,5,5,5,5,21,6,6,6,8,1,0,0,17,6,6,18,5,5,5,5,5,5,5,21,6,8,0,94,0,71,71,71,71,15,5,5,5,5,5
-5,5,5,5,5,5,5,5,5,5,5,5,5,9,1,97,0,1,1,0,1,0,92,91,15,5,5,5,5,5,5,5,9,0,1,94,93,246&9:9,71,71,71,14,19,5,5,5,5,5
+5,5,5,5,5,5,5,5,5,5,5,5,5,9,1,97,0,1,1,0,1,0,92,91,15,5,5,5,5,5,5,5,9,0,1,94,93,0&9:9,71,71,71,14,19,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,9,97,98,0,0,98,0,1,0,0,84,15,5,5,5,5,5,5,5,20,11,91,91,94,0,71,71,14,19,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,11,97,98,0,98,0,91,92,14,19,5,5,5,5,5,5,5,5,20,11,0,1,91,14,12,19,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,97,97,97,14,12,12,12,19,5,5,5,5,5,5,5,5,5,5,20,12,12,12,19,5,5,5,5,5,5,5,5,5
diff --git a/rsrc/scenarios/zakhazi/out/out0~2.map b/rsrc/scenarios/zakhazi/out/out0~2.map
index 41310979..f365ed47 100644
--- a/rsrc/scenarios/zakhazi/out/out0~2.map
+++ b/rsrc/scenarios/zakhazi/out/out0~2.map
@@ -21,7 +21,7 @@
 5,5,9,98,0,15,5,5,5,9,71,71,71,71,71,71,71,0,92,91,91,0,71,71,71,71,71,71,71,71,0,0,0,93,91,71,71,71,71,85,86,14,19,5,5,5,5,5
 5,5,20,12,12,19,5,21,6,8,71,71,71,71,71,71,71,91,0,71,71,71,71,71,71,71,71,71,71,71,71,0,84,91,0,71,71,71,71,14,12,19,5,5,5,5,5,5
 5,5,5,5,21,6,6,8,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,15,5,5,21,6,18,5,5,5
-5,5,5,21,8,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,15,5,5,9,246&9:0,15,5,5,5
+5,5,5,21,8,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,15,5,5,9,0&9:0,15,5,5,5
 5,5,5,9,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,14,19,5,5,9,0,15,5,5,5
 5,5,5,9,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,15,5,5,21,8,0,15,5,5,5
 5,5,5,9,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,71,14,19,5,5,9,0,14,19,5,5,5
diff --git a/rsrc/scenarios/zakhazi/out/out0~4.map b/rsrc/scenarios/zakhazi/out/out0~4.map
index b0e4e08d..37899acc 100644
--- a/rsrc/scenarios/zakhazi/out/out0~4.map
+++ b/rsrc/scenarios/zakhazi/out/out0~4.map
@@ -1,7 +1,7 @@
 5,5,5,5,5,5,5,5,5,5,5,5,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,94,94,0,15,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,5,5,21,6,18,5,5,5,5,5,5,5,5,5,5,5,21,6,6,6,6,6,6,6,18,5,9,117,0,0,15,5,5,5,5,5,5,5
 5,5,5,5,5,5,5,5,5,5,21,6,8,0,15,5,5,21,6,18,5,21,6,6,6,6,8,94,117,94,117,117,94,0,17,18,9,117,0,94,17,18,5,5,5,5,5,5
-5,5,5,5,5,21,6,18,5,5,9,0,0,0,15,5,5,9,246&9:15,15,5,9,117,94,117,94,0,117,94,117,117,117,94,94,94,15,20,11,94,1,0,15,5,5,5,5,5,5
+5,5,5,5,5,21,6,18,5,5,9,0,0,0,15,5,5,9,0&9:15,15,5,9,117,94,117,94,0,117,94,117,117,117,94,94,94,15,20,11,94,1,0,15,5,5,5,5,5,5
 5,5,5,5,21,8,242@13,15,5,5,20,12,11,0,15,5,5,9,117,17,6,8,94,117,117,117,1,117,117,94,94,117,94,0,117,17,18,20,11,94,1,15,5,5,5,5,5,5
 5,5,5,21,8,1,0,17,18,5,5,5,9,0,15,5,21,8,94,94,94,117,117,117,1,94,117,117,117,117,94,0,0,117,94,94,15,21,8,0:5,94:5,15,5,5,5,5,5,5
 5,5,5,9,0,75,75,75,17,18,5,5,20,12,19,5,9,0,94,94,94,117,94,117,94,117,117,117,0,94,117,117,94,117,94,1,17,8,117,117,117,17,18,5,5,5,5,5
@@ -40,7 +40,7 @@
 5,5,5,5,9,117,0,117,117,117,94,117,94,117,117,117,117,117,94,0,117,94,0,117,1,0,117,94,94,117,94,0,94,117,1,117,0,0,117:6,117,117,0,15,5,5,5,5,5
 5,5,5,5,9,0,117,0,94,117,94,117,0,1,94,117,0,117,94,0,117,94,94,117,117,117,117,0,0,117,94,117,117,117,94,94,117,14,11,117,94,117,17,18,5,5,5,5
 5,5,5,5,9,94,117,117,94,94,117,117,0,117,117,117,1,117,117,117,117,117,117,94,117,0,94,14,12,11,0,94,0,117,0,14,12,19,20,11,94,0,117,15,5,5,5,5
-5,5,5,5,9,0:1,0:1,14,11,0,94,117,94,0,117,94,0,94,117,0,0,0,117,94,117,94,0,17,6,8,117,94,0,0,117,15,5,5,5,20,11,117,246&9:13,15,5,5,5,5
+5,5,5,5,9,0:1,0:1,14,11,0,94,117,94,0,117,94,0,94,117,0,0,0,117,94,117,94,0,17,6,8,117,94,0,0,117,15,5,5,5,20,11,117,0&9:13,15,5,5,5,5
 5,5,5,5,9,117,94,15,20,11,0,117,117,117,117,94,0,94,117,0,117,0,117,1,117,94,94,117,117,94,94,117,14,12,12,19,5,5,5,5,20,12,12,19,5,5,5,5
 5,5,5,5,9,94,0,15,5,9,117,117,94,117,1,117,117,117,14,12,12,12,12,12,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,9,0:0,117:0,17,18,9,0,94,0,117,14,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
diff --git a/rsrc/scenarios/zakhazi/out/out0~5.map b/rsrc/scenarios/zakhazi/out/out0~5.map
index 3e6d7cbd..a9407a5f 100644
--- a/rsrc/scenarios/zakhazi/out/out0~5.map
+++ b/rsrc/scenarios/zakhazi/out/out0~5.map
@@ -37,7 +37,7 @@
 5,5,5,5,9,0,0,15,9,0,84,0,92,0,84,96,0,0,0,0,92,0,116,0,0,0,84,0,116,84,0,91,0,0,92,0,92,0,0,0,15,9,91,91,98,98,15,5
 5,5,5,5,20,11,90,15,9,0,0,0,84,0,0,0,0,84,0,0,96,0,84,0,96,0,0,0,116,0,0,0,0,0,91,0,0,91,84,0,15,9,95,0,0,0,15,5
 5,5,21,6,6,8,90,15,9,116,0,0,0,0,91,92,92,0,0,0,84,0,84,0,84,0,0,0,84,0,0,0,84,92,0,92,0,0,0,0,15,20,11,0,0,14,19,5
-5,5,9,246&9:15,0,90,90,15,9,0,0,0,84,0,91,84,0,0,0,0,0,84,92,0,0,0,0,0,0,0,0,0,0,92,0,91,0,84,0,84,15,5,20,11,93:1,15,5,5
+5,5,9,0&9:15,0,90,90,15,9,0,0,0,84,0,91,84,0,0,0,0,0,84,92,0,0,0,0,0,0,0,0,0,0,92,0,91,0,84,0,84,15,5,20,11,93:1,15,5,5
 5,5,20,12,12,11,0,15,20,11,1,116,0,0,1,0,116,96,91,0,0,0,0,0,0,0,96,91,0,91,84,0,0,0,0,0,0,91,0,0,15,5,5,9,0,15,5,5
 5,5,5,5,21,8,0,15,5,9,0,1,91,0,96,0,84,116,0,96,0,0,1,84,0,116,0,0,0,0,1,0,96,91,0,84,0,0,92,0,15,5,21,8,0:3,17,18,5
 5,5,5,5,9,0,0,15,21,8,0,91,0,96,0,116,0,84,0,0,92,1,0,0,116,0,96,0,0,84,0,0,0,1,91,91,96,0,84,14,19,21,8,98,0,91,15,5
diff --git a/rsrc/scenarios/zakhazi/out/out0~6.map b/rsrc/scenarios/zakhazi/out/out0~6.map
index 1a015587..ddc1c722 100644
--- a/rsrc/scenarios/zakhazi/out/out0~6.map
+++ b/rsrc/scenarios/zakhazi/out/out0~6.map
@@ -32,7 +32,7 @@
 5,5,5,9,0,0,0,0,85,86,85,86,0,96,71,71,84,0,0,0,0,0,0,0,95,0,84,96,0,96,15,5,21,8,0,16,10,0,0,92,92,98,0,91,98,15,5,5
 5,5,5,9,0,0,0,0,84,0,0,96,71,71,71,71,84,0,0,0,0,84,1,84,92,92,96,92,0,14,19,21,8,116,14,19,9,0,91,0,91,91,98,91,98,15,5,5
 5,5,5,9,0,0,0,0,0,71,71,71,71,71,71,96,0,0,0,84,96,84,84,92,96,0,0,0,14,19,21,8,0,14,19,21,8,91,91,91:6,97,97,0:7,91,84,15,5,5
-5,5,5,9,0,0,0,84,71,71,71,71,71,246&9:3,96,96,0,0,0,84,0,96,116,92,0,241@8,0,92,15,5,9,0,14,19,21,8,97,91,0,0,91,93,0,91,0,15,5,5
+5,5,5,9,0,0,0,84,71,71,71,71,71,0&9:3,96,96,0,0,0,84,0,96,116,92,0,241@8,0,92,15,5,9,0,14,19,21,8,97,91,0,0,91,93,0,91,0,15,5,5
 5,5,5,9,0,0,71,71,71,71,96,92,96,96,96,96,96,0,1,0,0,0,92,0,0,0,0,0,15,21,8,116,15,5,9,84,91,97,0,91,91,94*3,91,91,0,15,5,5
 5,5,5,9,0,0,0,0,84,0,84,96,84,96,96*2,0,96,0,116,0,0,0,84,0,0,0,92,14,19,9,1,14,19,21,8,91,0,97:6,0,0,91,1,91,0,14,19,5,5
 5,5,5,9,0,0,0,96,0,0,0,96,116,96,0,96,96,0,0,0,96,92,0,0,0,0,14,19,21,8,0,15,21,8,0,91,0,91,97,0,0,92:8,91,97,15,5,5,5
diff --git a/rsrc/scenarios/zakhazi/out/out0~7.map b/rsrc/scenarios/zakhazi/out/out0~7.map
index 653fe7b2..f85e8388 100644
--- a/rsrc/scenarios/zakhazi/out/out0~7.map
+++ b/rsrc/scenarios/zakhazi/out/out0~7.map
@@ -11,16 +11,16 @@
 5,5,5,9,0,0,96,0,96,0,0,0,84,0,0,84,85,86,1,0,15,5,21,8,0,0,97,97,91,91,0,91,97,91,91,91,92,97,0,91,91,116,0,97,15,5,5,5
 5,5,5,20,11,96,0,0,0,0,85,86,1,84,96,0,1,97,1,14,19,5,9,0,91,91,1,91,91,91,97,0,97,97,91,91,1,116,91,91,116,14,12,12,19,5,5,5
 5,5,5,5,9,84,0,0,0,0,0,0,0,85,86,0,108,1,14,19,5,5,9,91,91,0,91,91,97,91,91,0,91,0,0,0,97,91,91,97,1,15,21,6,18,5,5,5
-5,5,5,5,9,0,96,1,0,0,96,84,0,0,0,0,96,0,15,5,5,21,8,91,0,97,91,91,92,97,0,97,91,1,91,97,91,91,97,0,0,15,9,246&9:9,15,5,5,5
+5,5,5,5,9,0,96,1,0,0,96,84,0,0,0,0,96,0,15,5,5,21,8,91,0,97,91,91,92,97,0,97,91,1,91,97,91,91,97,0,0,15,9,0&9:9,15,5,5,5
 5,5,5,5,9,96,0,1,95,0,0,0,0,0,84,0,0,0,15,5,5,9,0,0,97,0,97,91,91,0,91,97,97,91,0,92,97,97,97,116,97,15,9,116,15,5,5,5
 5,5,5,21,8,0,85,86,0,0,0,0,0,96,0,96,0,14,19,5,21,8,0,91,91,97,1,0,0,97,91,1,91,97,92,97,91,0,1,91,92,15,9,116,15,5,5,5
 5,5,5,9,96,0,96,0,84,0,0,96,96,96,93,0,0,15,5,5,9,0,91,91,91,92,0,97,97,0,92,91,0,91,97,91,0,97,1,97,91,15,9,116,15,5,5,5
 5,5,5,9,0,84,84,97,0,0,0,0,0,0,84,0,0,15,5,5,9,84,91,97,91,91,1,91,91,0,91,0,91,0,97,0,0,97,92,91,14,19,9,116,15,5,5,5
 5,5,5,9,0,1,0,0,0,0,85,86,0,84,85,86,0,15,5,5,9,92,97,92,97,1,97,91,92,91,0,91,91,98,98,14,12,11,0,14,19,5,9,116,15,5,5,5
-5,5,5,9,0,1,0,96,0,108,0,0,95,0,84,0,1,15,5,5,9,91,92,91,91,0,97,84,14,12,12,12,12,12,12,19,5,9,246&9:6,15,5,5,9,116,15,5,5,5
+5,5,5,9,0,1,0,96,0,108,0,0,95,0,84,0,1,15,5,5,9,91,92,91,91,0,97,84,14,12,12,12,12,12,12,19,5,9,0&9:6,15,5,5,9,116,15,5,5,5
 5,5,5,9,85,86,0,0,84,0,96,96,96,0,97,0,14,19,5,5,20,13,12,11,97,0,14,12,19,5,5,5,5,5,5,5,5,20,12,19,5,5,9,116,15,5,5,5
 5,5,5,9,0,84,0,0,1,0,96,84,96,96,0,0,15,21,6,6,6,7,18,20,12,12,19,5,5,5,5,21,6,6,6,6,6,6,6,6,6,6,8,0:2,15,5,5,5
-5,5,5,9,0,0,0,85,86,0,1,96,96,0,0,0,15,9,246&9:3,0,0,1,15,5,5,5,5,5,5,21,6,8,0,0,116,0,116,0,0,1,116,1,116,0,17,18,5,5
+5,5,5,9,0,0,0,85,86,0,1,96,96,0,0,0,15,9,0&9:3,0,0,1,15,5,5,5,5,5,5,21,6,8,0,0,116,0,116,0,0,1,116,1,116,0,17,18,5,5
 5,5,5,9,84,0,0,1,1,84,0,0,0,0,0,0,15,20,12,12,12,12,19,5,5,5,5,21,6,8,0,0,0,14,12,12,12,12,12,12,12,12,11,1,0,15,5,5
 5,5,5,9,0,0,96,96,84,0,85,86,84,0,0,14,19,21,6,6,18,5,5,5,5,5,5,9,0,0,14,12,12,19,5,21,6,6,6,6,18,5,20,12,12,19,5,5
 5,5,5,9,0,84,0,96,0,1,0,1,0,96,0,15,5,9,0,0,15,5,21,6,6,6,6,8,0,84,17,6,6,6,6,8,0,0,0,0,17,6,6,6,18,5,5,5
diff --git a/rsrc/scenarios/zakhazi/out/out0~8.map b/rsrc/scenarios/zakhazi/out/out0~8.map
index 41b0a809..e5fd0cc5 100644
--- a/rsrc/scenarios/zakhazi/out/out0~8.map
+++ b/rsrc/scenarios/zakhazi/out/out0~8.map
@@ -1,7 +1,7 @@
 5,5,5,5,5,5,9,0,1,0,15,5,5,5,5,5,9,0,15,9,0,15,9,0,15,5,5,5,9,0,0,0,0,15,9,0,0,0,15,5,9,0,15,5,5,5,5,5
 5,5,5,5,5,5,9,0,0,0,15,5,21,6,18,5,9,0,15,20,12,19,9,0,17,6,6,18,20,11,0,0,14,19,20,12,11,0,17,18,20,12,19,5,5,5,5,5
 5,5,5,5,5,5,9,0,0,14,19,5,9,0,17,18,9,84,17,18,5,5,9,0,0,0,0,17,18,20,11,0,17,6,6,18,9,0,116,17,18,21,6,6,18,5,5,5
-5,5,5,5,21,6,8,0,0,15,5,5,9,0,0,15,9,0,0,17,6,6,8,116,14,11,0,0,17,18,20,11,0,1,0,15,20,11,116,0,15,9,246&9:8,0,15,5,5,5
+5,5,5,5,21,6,8,0,0,15,5,5,9,0,0,15,9,0,0,17,6,6,8,116,14,11,0,0,17,18,20,11,0,1,0,15,20,11,116,0,15,9,0&9:8,0,15,5,5,5
 5,5,5,5,9,0,0,0,14,19,5,5,9,0,0,15,9,0*1,0,0,0,84,0,14,19,9,0,0,0,17,18,20,12,12,12,19,5,9,0,0*0,15,20,12,13,19,5,5,5
 5,5,5,5,9,0,0,0,15,21,6,6,8,0,14,19,9,0,0,14,12,12,12,19,21,8,116,14,11,0,15,21,6,6,6,6,6,8,0,0,17,18,21,7,18,5,5,5
 5,5,5,5,20,11,1,1,15,9,0,0,0,0,15,5,9,116,14,19,21,6,6,6,8,0,0,15,9,0,17,8,0,0,0,0,116,0,0,0,0,17,8,0,15,5,5,5
diff --git a/rsrc/scenarios/zakhazi/out/out0~9.map b/rsrc/scenarios/zakhazi/out/out0~9.map
index b5709ff7..b998dc82 100644
--- a/rsrc/scenarios/zakhazi/out/out0~9.map
+++ b/rsrc/scenarios/zakhazi/out/out0~9.map
@@ -17,7 +17,7 @@
 5,5,5,5,9,0,1,0,0,0,1,0,0,1,0,1,94,234,234,0,93,94,94,1,0,98,1,98,0,0,0,0,0,0,0,0,0,0,1,0,235,0,0,15,5,5,5,5
 5,5,5,5,9,97,1,0,0,0,234,94,0,0,0,0,234,95,0,93,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,17,18,5,5,5
 5,5,5,21,8,0,0,0,1,1,0,0,94,0,0,0,0,234,234,93,0,97,98,0,0,1,97,0,0,0,0,0,0,1,0,0,0,0,0,1,235,1,0,0,15,5,5,5
-5,5,5,9,0,235,0,0,0,94,94,246&9:1,94,94,0,0,1,93,1,1,0,14,12,12,12,11,0,0,0,0,0,235,0,0,0,0,1,0,0,93,235,0,0,0,15,5,5,5
+5,5,5,9,0,235,0,0,0,94,94,0&9:1,94,94,0,0,1,93,1,1,0,14,12,12,12,11,0,0,0,0,0,235,0,0,0,0,1,0,0,93,235,0,0,0,15,5,5,5
 5,5,5,9,98,234,235,0,0,0,94,0,0,0,0,0,0,1,0,97,14,19,5,5,5,20,11,97,0,0,0,0,0,0,1,0,0,1,235,235,234,235,235,1,15,5,5,5
 5,5,5,9,97,234,234,234,0,0,0,94,234,0,94,0,1,0,0,0,15,5,5,5,5,5,9,0,0,0,0,0,0,0,0,0,0,0,0,0,235,0,0,98,17,18,5,5
 5,5,5,9,234,0,234,97,0,0,0,0,0,0,0,0,0,0,0,0,17,18,5,5,5,5,9,98,0,0,0,0,0,0,1,0,0,0,0,234,235,0,0,0,98,15,5,5
diff --git a/rsrc/scenarios/zakhazi/towns/town0.map b/rsrc/scenarios/zakhazi/towns/town0.map
index 4876329d..bb7fefa1 100644
--- a/rsrc/scenarios/zakhazi/towns/town0.map
+++ b/rsrc/scenarios/zakhazi/towns/town0.map
@@ -26,7 +26,7 @@
 0,0,122,170,122,170,170,170,194@15,122,170,170,170,170,170,170,170,170,170,197,197*3,170,170,187,170,170,170,170,170,170,122,122,122,125,122,122,122,122,122,122,122,122,122,122,170,122,0,0
 0,0,122,170,122,170,199,199,199,138,207,122,122,122,122,122,122,170,198,185,185,196,187,192,187,198,182,196,170,170,170,170,170,170,170,170,170,170,170,170,170,170,170,125,170,122,0,0
 0,0,122,170,122,170,170,170,204,125,170,122,199,199,199,194,122,206,170,195,195,170,187,192,187,198,182,196,170,170,122,122,122,125,132!1,122,122,170,122,122,122,122,122,122,170,122,0,0
-0,0,122,170,122,199,199,199,201@19,122,170,125,204,170,247:0&9,170,122,170,170,197,197,170,187,192,187,198,182,196,170,207,122,186,196:11,170,170,170,122,170,122,170,170,170,170,125,170,122,0,0
+0,0,122,170,122,199,199,199,201@19,122,170,125,204,170,170:0&9,170,122,170,170,197,197,170,187,192,187,198,182,196,170,207,122,186,196:11,170,170,170,122,170,122,170,170,170,170,125,170,122,0,0
 0,0,122,170,122,122,122,122,122,122,170,122,122,122,122,122,122,170,198,185,185@59,196,187,192,187,198,182,196,170,170,122,191,191,191,191,170,122,170,122,170:3,122,122,122,132!2,170,122,0,0
 0,0,122,170,122,194@20@21,199,194@23,199,122,206,122,197,194@35,204,199,136,206,170,195,195,170,170,187,170,170,195,170,170,170,136,170,170,170,170,170,122,170,122,170,178@17,177@18,177@27,122,170,122,0,0
 0,0,122,170,122,194@26,170,170,170,122,170,125,170,170,170,170,122,170,170,197,197,197,197,197,197,197,197,170$20,170,207,122,175,170,191,191,170,122,170,122,170,170,170,170,122,170,122,0,0
diff --git a/rsrc/scenarios/zakhazi/towns/town10.map b/rsrc/scenarios/zakhazi/towns/town10.map
index 1edebe17..a159c2fc 100644
--- a/rsrc/scenarios/zakhazi/towns/town10.map
+++ b/rsrc/scenarios/zakhazi/towns/town10.map
@@ -1,6 +1,6 @@
 5,5,5,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,5,5,5,5,5,5,21,6,6,6,18,5,5,5,5,5
 5,5,5,5,21,6,6,6,6,6,6,6,18,5,5,5,5,21,6,6,6,18,5,5,5,5,21,8,85$1,86,0@0,17,18,5,5,5,21,6,8,0,84,93,17,6,18,5,5,5
-5,5,5,21,8,1,0,0,0,0,0,0,17,18,5,5,21,8,98,0,0,17,18,5,5,5,9,84,0,0$3,0,0,15,5,5,21,8,0,0,0,93,0,0,246:11&9,17,18,5,5
+5,5,5,21,8,1,0,0,0,0,0,0,17,18,5,5,21,8,98,0,0,17,18,5,5,5,9,84,0,0$3,0,0,15,5,5,21,8,0,0,0,93,0,0,0:11&9,17,18,5,5
 5,5,21,8,0,0,14,12,12,12,11,84,0,17,18,21,8,97,97,0,1,0,17,6,18,21,8,0$4,0,0,84$2,84,15,21,6,8,97,93,0,93,93$7,93,93,0,93,17,18,5
 5,21,8,0,0,14,19,5,5,5,20,11,0,0,15,9,97,98,0,1$33,85,86,0,0,16v,10,0,0,0$0,85,86,0,16,10,0,0,0,0,0,93,84,0,93$6,0,84,93,15,5
 5,9,0,0,0,17,6,6,6,18,5,9,0,0,15,9,97,0,1,84,0,0,84,0,15,20,12,139,139,139,139,139,139,139,139,139,12,11,0,93,84,93,93,0,93$5,84,15,5
@@ -22,7 +22,7 @@
 9,0,15,21,8,0,0,15,9,84,1,0,15,9,0,0,15,5,5,139,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,210,139,5,9,84,15
 9,0,15,9,0,0,0,15,9,0,0,0,17,8,0,0,15,5,5,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,142:5,139,139,139,139,139,139,5,9,0,15
 9,0,15,9,0$25,0,0,15,20,11,0,0,0,84,1,0,15,5,5,5,5,5,5,5,5,5,5,139,214,210,210,213:16&17,210,210,214,139,0,0,15,5,5,5,5,5,5,9,0,15
-9,0,15,9,0>,0,0,17,18,20,12,11,0,0,0,0,17,6,6,18,21,6,6,18,5,5,5,139,210,210,210,248:12&9,210,210,210,142,0,14,19,5,5,5,5,5<,5,9,0,15
+9,0,15,9,0>,0,0,17,18,20,12,11,0,0,0,0,17,6,6,18,21,6,6,18,5,5,5,139,210,210,210,210:12&9,210,210,210,142,0,14,19,5,5,5,5,5<,5,9,0,15
 9,0,15,9,0,0,0,98,15,5,5,20,12,12,11,0,0,0,0,15,9,0,1&16,15,5,5,5,139,210,216,210,210,210,216,210,139,12,19,5,21,6,6,6,18,21,8,0,15
 9,0,15,9,0,0,0,0,15,21,6,18,5,5,20,11,0,14,12,19,9,0,0,17,18,5,5,139,210,210,210,210,210,210,210,139,5,21,6,8,0,0,0,15,9,85,86,15
 9,0,15,9,98,0,0,0,15,9,94,17,18,5,5,9,0,17,18,5,20,11,0,0,15,5,5,139,210,216,210,210,210,216,210,139,21,8,94,94,14,11,0,17,8,84,14,19
diff --git a/rsrc/scenarios/zakhazi/towns/town11.map b/rsrc/scenarios/zakhazi/towns/town11.map
index aaaf60ec..6c3b94d4 100644
--- a/rsrc/scenarios/zakhazi/towns/town11.map
+++ b/rsrc/scenarios/zakhazi/towns/town11.map
@@ -41,7 +41,7 @@
 5,5,154,157,154,154,157,154,154,157,154,154,154,170,154,0,0,154,154,169,159,169,154,154,0,154,170@22&11,170,170,170,170,170,154,0,154,157,154,154,154,157,154,195,170,154,5,5,5,5
 5,5,154,173:6,154,154,204,201@31,154,204,175,191:15,154,170,154,12,12,154,170,170$10,170,170$11,170,154,0,154,170,170,170,170@20&12,170,170,154,0,154,204,170,170,154,170,170,170,170,154,5,5,5,5
 5,5,154,170,170,154,170,170,154,170,195,170,154,170,154,5,5,154,154,154,170,154,154,154,12,154,170,170,170,170,170@18&11,170,154,0,169,170,170,170,154,170,170,170,170,154,5,5,5,5
-5,5,154,170,197,154,170,170,154,170,170,170,154,170,154,6,18,5,5,154,247:16&9,154,5,5,5,154,157,154,154,154,154,154,154,0,154,170,170,170,154,170,170,204,199,154,5,5,5,5
+5,5,154,170,197,154,170,170,154,170,170,170,154,170,154,6,18,5,5,154,170:16&9,154,5,5,5,154,157,154,154,154,154,154,154,0,154,170,170,170,154,170,170,204,199,154,5,5,5,5
 5,5,154,199,175@29,154,199,194,154,199,170,201,154,170,157,0,17,6,6,154,154,154,6,6,6,8,0,15,5,5,5,5,20,12,154,199,170,201,154,193,170,170,201@35,154,5,5,5,5
 5,5,154,154,154,154,154,154,154,154,154,154,154,154,154,0,0,0,0,0,0,0,0,0,0,0,0,15,5,5,5,5,5,5,154,154,154,154,154,154,154,155,154,154,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,12,12,12,12,12,12,19,5,5,5,5,5,5,5,5,5,5,5,5,154,170,194:7@15@19,154,5,5,5,5
diff --git a/rsrc/scenarios/zakhazi/towns/town12.map b/rsrc/scenarios/zakhazi/towns/town12.map
index 0fe5ddb5..75b63283 100644
--- a/rsrc/scenarios/zakhazi/towns/town12.map
+++ b/rsrc/scenarios/zakhazi/towns/town12.map
@@ -1,5 +1,5 @@
 5,5,21,6,6,6,6,6,6,18,5,9,71,15,5,5,5,5,5,5,5,5,5,21,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,9,246:0&9,0,0,0,0,104,15,21,8,71,15,5,5,21,6,6,6,6,6,18,9,0@35,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,9,0:0&9,0,0,0,0,104,15,21,8,71,15,5,5,21,6,6,6,6,6,18,9,0@35,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,20,12,12,12,11,0,14,19,9,71,71,15,5,21,8,0,0,0:18,0,0,15,20,13,19,21,6,18,21,6,6,6,6,6,154,154,154,154,154,154,154,154,154,154,5,5,5
 5,5,5,21,6,6,8,0:1,17,6,8,71,14,19,5,9,75,75,75,14,11,0,17,6,7,6,8,0,16,10,0,0,0,0,0,157,170,170,170,170$29,170&14,194:31@12@13@14@15,170&13,170,154,5,5,5
 5,5,21,8,0,0:2,1,0,0,0,71,71,15,5,5,9,75,75,75,15,9,0,85,86,0v,0,0,0,15,20,12,12,12,12,12,154,170,170,187,170,170&14,170&14,170&14,170,154,5,5,5
@@ -44,5 +44,5 @@
 9,0,0,17,18,5,9,0,0,91,0,91,0,91,0,91,0,0,0,162,0,0,154,184@2,170^,170,170,184@5,154,5,5,9,71,71,14,12,12,19,5,9,0,17,6,18,5,9,0,15
 154,158,154,0,15,5,20,11,0,91,1,91,0,91,0,91,0,92,14,154,12,12,154,184@1,170,170,170,184@4,154,5,21,8,71,14,19,21,6,6,6,8,0,0,0,17,6,8,0,15
 154,170,154,0,15,5,5,20,12,12,11,91,0,91,1,91,14,12,19,5,5,5,154,184@0,170,194@6@7,170,184@3,154,21,8,71,71,15,5,9,0,0@26,0,0,14,12,11,0,85,86,14,19
-154,247:22&9,154,12,19,5,5,5,5,5,20,12,12,12,12,12,19,5,5,5,5,5,154,154,154,154,154,154,154,9,71,71,14,19,5,20,12,12,12,12,19,5,20,12,12,12,19,5
+154,170:22&9,154,12,19,5,5,5,5,5,20,12,12,12,12,12,19,5,5,5,5,5,154,154,154,154,154,154,154,9,71,71,14,19,5,20,12,12,12,12,19,5,20,12,12,12,19,5
 154,154,154,5,5,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,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
diff --git a/rsrc/scenarios/zakhazi/towns/town14.map b/rsrc/scenarios/zakhazi/towns/town14.map
index b29abf78..35446b27 100644
--- a/rsrc/scenarios/zakhazi/towns/town14.map
+++ b/rsrc/scenarios/zakhazi/towns/town14.map
@@ -5,7 +5,7 @@
 71,71,71,71,71,71,71,71,71,71,71,71,71,71,82,71b4,71v,82,71,71,71,71,71,71,71,71,71,71,71,71,71,71
 71,71,71,71,71,71,71,71,71,71,71,71,71,71,82,71,71,82,71,71,71,71,71,71,71,71,71,71,71,71,71,71
 0,0,0,139,139,139,139,139,139,139,139,139,139,82,82,82,82,82,82,139,139,139,139,139,139,139,139,139,139,0,0,0
-0,0,0,139,247:21&9,170,170:4,170,170,170$5,170:2,170,142,82,82,82,82,82,82,142,170,170:2,170,170$1,170,170:2,170,247:22&9,139,0,0,0
+0,0,0,139,170:21&9,170,170:4,170,170,170$5,170:2,170,142,82,82,82,82,82,82,142,170,170:2,170,170$1,170,170:2,170,170:22&9,139,0,0,0
 0,0,0,139,187,170,187,170:7,187,170,187,170:0,139,82,82,82,82,82,82,139,170:0,187,170:6,187,170,187,170:2,187,139,0,0,0
 0,0,0,139,170,170,170,170,170,170,170,170,139,82:10,139,82,82,139,82:10,139,170,170,170,170:6,170,170,170&16,170,139,0,0,0
 0,0,0,139,187,170:15,187,170,170*2,170,187,170$6,139,139,139,153,153,139,139,139,170,170*3,170,187,170:4,187,170:6,187,139,0,0,0
@@ -25,7 +25,7 @@
 0,0,0,139,170,170*1,170,187,170:8,187,170,187,170,187,139,0,0,139,187,170,187,170,187,170,187,170,187,170,139,0,0,0
 0,0,0,139,170$12,170,170,170,170,170:8,170,170:8,170,170&23,139,0,107!2,139,170,170$15,170:4,170,170,170,170:4,170,170,170,139,0,0,0
 0,0,0,139,170,187,170,187,170,187,170,187,170,187,139,0,0,139,187,170,187,170,187,170,187,170:9,187,170:0,139,0,0,0
-0,0,0,139,247:20&9,170:0,170,170,170,170:8,170,170,170$11,170,139,148,148^,139,170$14,170,170,170,170:9,170,170,170,170,247:19&9,139,0,0,0
+0,0,0,139,170:20&9,170:0,170,170,170,170:8,170,170,170$11,170,139,148,148^,139,170$14,170,170,170,170:9,170,170,170,170,170:19&9,139,0,0,0
 0,0,0,139,139,139,139,139,139,139,139,139,139,139,139,0,0,139,139,139,139,139,139,139,139,139,139,139,139,0,0,0
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/rsrc/scenarios/zakhazi/towns/town15.map b/rsrc/scenarios/zakhazi/towns/town15.map
index e5c5084a..2adc1845 100644
--- a/rsrc/scenarios/zakhazi/towns/town15.map
+++ b/rsrc/scenarios/zakhazi/towns/town15.map
@@ -1,6 +1,6 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 0,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,0,0
-0,139,217,217,217,217,217,217,217,139,249:50&9,217,217,139,217,217,217,139,217,217,217,139,217,217,217,217,217,217,217,139,0,0
+0,139,217,217,217,217,217,217,217,139,217:50&9,217,217,139,217,217,217,139,217,217,217,139,217,217,217,217,217,217,217,139,0,0
 0,139,217,231,217,217,217,231,217,139,139,139,217,139,217,224:39,217,139,217,224:42,217,139,217,218,217,217,217,218,217,139,0,0
 0,139,217,217,217,217,217,217,217,139,217,217,217,139,217,217,217v,139,217,217,217,139,217,217,217,217,217,217,217,139,0,0
 0,139,217,217,217,224:3,217,217,217,139,142,139,139,139,142,139,139,139,142,139,139,139,217,217,217,224:4,217,217,217,139,0,0
@@ -8,17 +8,17 @@
 0,139,217,231,217,217,217,231,217,139,217,224:47,217,139,217,224:18,217,139,217,224:7,217,139,217,218,217,217,217,218,217,139,0,0
 0,139,217,217,217,217,217,217,217,142,217$9,217,217$10,142,217,217,217,142,217,217,217,142,217,217,217,217,217,217,217,139,0,0
 0,139,139,139,139,139,139,139,142,139,139,139,139,139,139,139,142,139,139,139,139,139,142,139,139,139,139,139,139,139,0,0
-0,139,217,217,217,139,217,217,217,139,217,217,217,217,217,217,217,217,217,139,249:54&9,139,217$4,217,217$7,142,217,139,249:51&9,139,0,0
+0,139,217,217,217,139,217,217,217,139,217,217,217,217,217,217,217,217,217,139,217:54&9,139,217$4,217,217$7,142,217,139,217:51&9,139,0,0
 0,139,217,224:36,217,139,217,224:7,217,139,217,217,217,217,217,217,217,217,217,139,217,139,217,224:46,217,139,217,139,217,139,0,0
 0,139,217,217,217,142,217,217,217,139,217,217,217,139,139,139,139,139,217,217,217,139,217$5,217,217$6,139,217,217,217,139,0,0
 0,139,139,139,139,139,139,139,142,139,217,217,139,139,217$18,218,217,139,139,217,217,139,142,139,139,139,139,139,139,139,0,0
 0,139,217,217,217,139,217,217,217,142,217,217,139,217$17,217,217,217,217,139,217,217,139,217,217,217,142,217,217,217,139,0,0
-0,139,217,224:30,217,139,217,224:18,217,139,217,217,139,249:53&9,217,217$19,217,217,139,217,217,139,217,224:18,217,139,217,224:20,217,139,0,0
+0,139,217,224:30,217,139,217,224:18,217,139,217,217,139,217:53&9,217,217$19,217,217,139,217,217,139,217,224:18,217,139,217,224:20,217,139,0,0
 0,139,217,217,217>,142,217,217,217,139,217,217,139,217$16,217,217,217,217,139,217,217,142,217,217,217,139,217,217<,217,139,0,0
 0,139,139,139,139,139,139,139,142,139,217,217,139,139,217$15,218,217,139,139,217,217,139,142,139,139,139,139,139,139,139,0,0
 0,139,217,217,217,139,217$12,217,217$14,139,217,217,217,139,139,139,139,139,217,217,217,139,217,217,217,142,217,217,217,139,0,0
 0,139,217,139,217,139,217,224:48,217,139,217,139,217,217,217,217,217,217,217,217,217,139,217,224:7,217,139,217,224:24,217,139,0,0
-0,139,249:49&9,139,217,142,217,217,217$13,139,249:55&9,139,217,217,217,217,217,217,217,217,217,139,217,217,217,139,217,217,217,139,0,0
+0,139,217:49&9,139,217,142,217,217,217$13,139,217:55&9,139,217,217,217,217,217,217,217,217,217,139,217,217,217,139,217,217,217,139,0,0
 0,139,139,139,139,139,139,139,142,139,139,139,139,139,142,139,139,139,139,139,139,139,142,139,139,139,139,139,139,139,0,0
 0,139,217,217,217,217,217,217,217,142,217,217,217,142,217,217,217,142,217$1,217,217$2,142,217,217,217,217,217,217,217,139,0,0
 0,139,217,218,217,217,217,218,217,139,217,224:7,217,139,217,224:18,217,139,217,224:45,217,139,217,231,217,217,217,231,217,139,0,0
@@ -26,7 +26,7 @@
 0,139,217,217,217,224:6,217,217,217,139,139,139,142,139,139,139,142,139,139,139,142,139,217,217,217,224:5,217,217,217,139,0,0
 0,139,217,217,217,217,217,217,217,139,217,217,217,139,217,217,217,139,217,217,217,139,217,217,217,217,217,217,217,139,0,0
 0,139,217,218,217,217,217,218,217,139,217,224:27,217,139,217,224:33,217^,139,217,139,139,139,217,231,217,217,217,231,217,139,0,0
-0,139,217,217,217,217,217,217,217,139,217,217,217,139,217,217,217,139,217,217,249:52&9,139,217,217,217,217,217,217,217,139,0,0
+0,139,217,217,217,217,217,217,217,139,217,217,217,139,217,217,217,139,217,217,217:52&9,139,217,217,217,217,217,217,217,139,0,0
 0,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,139,0,0
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/rsrc/scenarios/zakhazi/towns/town16.map b/rsrc/scenarios/zakhazi/towns/town16.map
index d08236dc..562df4fa 100644
--- a/rsrc/scenarios/zakhazi/towns/town16.map
+++ b/rsrc/scenarios/zakhazi/towns/town16.map
@@ -3,7 +3,7 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 0,0,0,0,139,139,139,139,139,139,139,139,139,139,139,139,139v,139,139,139,139,139,139,139,139,139,139,0,0,0,0,0
-0,0,0,0,139,221:10,217,217,217,217,217,217,217$8,217,217,217,217,217,217$9,217,217,217,217,217,139,249:9&9,139,0,0,0,0,0
+0,0,0,0,139,221:10,217,217,217,217,217,217,217$8,217,217,217,217,217,217$9,217,217,217,217,217,139,217:9&9,139,0,0,0,0,0
 0,0,0,0,139,217,217,217,218,217,217,217,217,217,217,217,217,217,217,217,217,217,218,217,139,217,139,0,0,0,0,0
 0,0,0,0,139,217,217,217,217,217,217,218,217,217,217,71,217,217,217,218,217,217,217,217,217,217,139,0,0,0,0,0
 0,0,0,0,139,217,218,217,217,217,217,217,217,217,71,71,71,217,217,217,217,217,217,217,218,217,139,0,0,0,0,0
@@ -18,13 +18,13 @@
 0,0,0,0,139,217,217,217,71,139,217,217,224,217,217,217,217,217,217,217,217,139,71,217,217,217,139,0,0,0,0,0
 0,0,0,0,139,217,217,217,217,139,217:1,217:1,217,217,217,217,217,231,217,217$6,217,139,217,217,217,217,139,0,0,0,0,0
 0,0,0,0,139,217$14,217,217,217,139,217,139,139,139,217,224,217,217,217,231,217,139,217,217,217,217$11,139,0,0,0,0,0
-0,0,0,0,139,217,217,218,217,139,217,139,249:7&9,139,217,217,217,217,217,217,217,139,217,218,217,217,139,0,0,0,0,0
+0,0,0,0,139,217,217,218,217,139,217,139,217:7&9,139,217,217,217,217,217,217,217,139,217,218,217,217,139,0,0,0,0,0
 0,0,0,0,139,217,217,217,217,139,217,217,217,139,217,217,221@0@1@2@3@4,217,221@5@6@7@8@9,217,221@10@11@12@13,139,217,217,217,217,139,0,0,0,0,0
 0,0,0,0,139,217,217,217,217,139,139,139,139,139,139,139,139,139,139,139,139,139,217,217,217,217,139,0,0,0,0,0
 0,0,0,0,139,217,218,217,217,217,217,217,217,217,71,71,71,217,217,217,217,217,217,217,218,217,139,0,0,0,0,0
 0,0,0,0,139,217,217,217,217,217,217,218,217,217,217,71,217,217,217,218,217,217,217,217,217,217,139,0,0,0,0,0
 0,0,0,0,139,217,139,217,218,217,217,217,217,217,217,217,217,217,217,217,217,217,218,217,217,217,139,0,0,0,0,0
-0,0,0,0,139,249:8&9,139,217,217,217,217,217,217$13,217,217,217,217,217,217$12,217,217,217,217,217,217,221:12,139,0,0,0,0,0
+0,0,0,0,139,217:8&9,139,217,217,217,217,217,217$13,217,217,217,217,217,217$12,217,217,217,217,217,217,221:12,139,0,0,0,0,0
 0,0,0,0,139,139,139,139,139,139,139,139,139,139,139,139,139^,139,139,139,139,139,139,139,139,139,139,0,0,0,0,0
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/rsrc/scenarios/zakhazi/towns/town18.map b/rsrc/scenarios/zakhazi/towns/town18.map
index e11519ba..5e6a2697 100644
--- a/rsrc/scenarios/zakhazi/towns/town18.map
+++ b/rsrc/scenarios/zakhazi/towns/town18.map
@@ -26,7 +26,7 @@
 0,0,0,0,0,0,0,1,0,0,0,132!1,0,0,0,0,0,1,0,0,0,125,204,170,198,138,71,71,71,71,71,122,170,170,195,195,195,195,195,170,170,170,122,170@2&12,170@1&12,170,170@7&11,122
 0,0,0,0,0,0,0,0,0,0,1,122,93,0,0,0,0$37,0,0$7,0,94,122,170,170,198,138,71,71,71,71,71,122,170,170,170,122,122,122,122,122,122,122,122,122,122,122,122,122
 0,0,0,0,122,122,122,122,122,122,122,122,122,122,122,122,125,125,122,122,122,122,122,122,122,122,71,71,71,71,71,122,170,170,170,122,170,187,203:25,187,170,122,175,170,170,204,199,122
-0,0,0,0,122,84,0,103,0,1,85,86,0,122,170@17&11,170,170,170,170@4&11,170,180,170,180,170,170,122,71,71,71,71,71,122,170,170,170,122,170,170,247:22&9,170,170,122,195,170,170,170,170,122
+0,0,0,0,122,84,0,103,0,1,85,86,0,122,170@17&11,170,170,170,170@4&11,170,180,170,180,170,170,122,71,71,71,71,71,122,170,170,170,122,170,170,170:22&9,170,170,122,195,170,170,170,170,122
 0,0,0,0,122,0,0,1,0,84,0,0,0,138,170,170$12,170,170,170,170,180@3&16,170,180,170,170,122,71,71,71,71,71,122,170,170,170,122,170,170,170,170,170,126,170,170,170,170,185,122
 0,0,0,0,122,0&22,0,0&18,0,0,0&23,0,0,126:2,170,170,170,170,170,170,180&16,170,180@0,170,170,125,73,73,73$24,73,73$23,170,170$22,170,170,125,170,192,170,192,170,122,170,170,170,170,196,122
 0,0,0,0,122,0,0,0,0,85,86,0,0,138,170,170,170,170,170*0$9,170,181,170,181,170,170,122,71,71,71,71,71,122,170,170,170,125,170$4,170,170,170,170$5,122,191:21,191,170,191,191,122
diff --git a/rsrc/scenarios/zakhazi/towns/town2.map b/rsrc/scenarios/zakhazi/towns/town2.map
index 2ced7ca0..6c12ea6a 100644
--- a/rsrc/scenarios/zakhazi/towns/town2.map
+++ b/rsrc/scenarios/zakhazi/towns/town2.map
@@ -5,7 +5,7 @@
 5,5,9,90,90,0,0,0,0,0,0,17,8,0,15,9,0,16,10,1,0,0,0,0,0,0v<>,0,0,0,1,0,14,19,5,9,0,0,0,0,1,0,0,0,0,0,17,18,5
 5,5,9,1,0,0,14,12,12,11,0,0,0,0,17,8,0,15,9,0,0,14,12,11,107!2,1,104,14,12,11,0,15,5,5,20,154,157,154,154,154,154,12,12,11,0,0,15,5
 5,5,9,0,0,14,19,5,5,20,12,12,11,0,0,0:12,0,15,9,0,1,17,6,8,0,0,1,17,6,8,0,17,18,5,5,154,210,210,210,214,154,5,5,20,11,0,15,5
-5,5,9,0,0,15,5,154,154,154,154,154,154,0,0,14,12,19,9,104,0,0,0,0,0,0,0,0,0,0,0,104,15,5,5,154,210,210,248:24&9,212,154,5,5,21,8,0,15,5
+5,5,9,0,0,15,5,154,154,154,154,154,154,0,0,14,12,19,9,104,0,0,0,0,0,0,0,0,0,0,0,104,15,5,5,154,210,210,210:24&9,212,154,5,5,21,8,0,15,5
 5,5,20,11,0,15,5,154,186,170,119@20,170,119,0,0,15,5,5,9,0,0,154,154,169,154,157,154,169,154,154,0,0,15,5,5,154,210,210,210,214,154,6,18,9,0,0,15,5
 5,5,21,8,0,15,5,154,195:25,170,170,170,170,0,1,17,18,5,9,0,0,154,170,170,170,170,170,170,170,154,0,0,15,5,5,154,157,154,154,154,154,105,15,9,0,14,19,5
 5,5,9,0,0,15,5,154,170,170,170,170,170,1,0,0,15,5,9,0,0,154,170,192,170,170,170,192,170,154,0,0,15,5,5,9,0,0,0,0,0,0,17,8,0,15,5,5
diff --git a/rsrc/scenarios/zakhazi/towns/town21.map b/rsrc/scenarios/zakhazi/towns/town21.map
index c879242e..f3434dd9 100644
--- a/rsrc/scenarios/zakhazi/towns/town21.map
+++ b/rsrc/scenarios/zakhazi/towns/town21.map
@@ -22,7 +22,7 @@
 5,5,5,5,9,97,0,0,97,122,201@25,170,199,199,199,199,199,170,122,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,0,0,0,0,0,15,9,102,102,102,102,102,15
 5,5,5,5,9,0,0,98,0,122,170,170,170,170,170,170,170,170,122,0,1,0,0,0,0,0,0,0,0,0,0,93,0,0,0,1,0,0,0,0,15,20,12,12,12,12,12,19
 5,5,5,5,9,0,0,98,0,122,201,170,199,199,199,199,199,170,125,0,0,0,0,93,0$18,0,0,93,71,93,0,0,0,1,0,122,122,122,122,122,122,5,5,5,21,6,6,18
-5,5,5,5,9>,0,1,0,0,122,122,122,122,122,122,122,122,122,122,0,0,0,0,1,0,0,71,74,71,71,71,0,0,0,0,122,170,170,170,170@22&12,122,5,21,6<,8,0,246:7&9,15
+5,5,5,5,9>,0,1,0,0,122,122,122,122,122,122,122,122,122,122,0,0,0,0,1,0,0,71,74,71,71,71,0,0,0,0,122,170,170,170,170@22&12,122,5,21,6<,8,0,0:7&9,15
 5,5,21,6,8,98,98,0,0,0,0,0,0,0,0,0,1,0,0,0,1,93,0,0,93,1,71,71,71,71,74,71,0,0,0,132!0,170,187,170,122,122,6,8,0,0&10,0,14,19
 5,5,9,97,98,0,0,0,0,0,0,1,0,0,0,98,98,0,0,0,0,0,0,0,1,0,71,71,71,71,71,71,93,93,0,125,170,170,170,170,0,0,0&10,0,14,12,19,5
 5,5,20,11,0,0,0,0,0,122,122,122,122,122,122,122,122,122,122,0,0,0,0,93,93,0,0,71,71,74,71,93,0,0,0,122,170,187,170,122,122,12,12,12,19,5,5,5
diff --git a/rsrc/scenarios/zakhazi/towns/town22.map b/rsrc/scenarios/zakhazi/towns/town22.map
index ddb9e73b..94935701 100644
--- a/rsrc/scenarios/zakhazi/towns/town22.map
+++ b/rsrc/scenarios/zakhazi/towns/town22.map
@@ -22,7 +22,7 @@
 5,5,5,5,9,0,0,0,0,122,201@25,170,199,199,85$7,86,199,85,86,84,0,0,0,0,85,86,0,0,0,0,93,0,0,0,0,0,0,0,0,0,15,5,5,5,5,5,5,5
 5,5,5,5,9,0,0,98,0,122,170,170,170,170,84,170&21,85,86,84,0&21,0,0,0,0,0&18,85,86,0,0,0,0,93,0,0,0,1,0,0,0,0,15,5,5,5,5,5,5,5
 5,5,5,5,9,0,0,0,0,122,201,170,199,199,199,85,86,170&21,85,86,0,0,0,93,0,0,0,93,71,93,0,0,0,1,0,122,122,122,122,122,122,5,5,5,21,6,6,18
-5,5,5,5,9>,0,1,0,0,122,122,133,122,133,85,86,84,85,86,0,0,0,0,1,0,0,71,71,71,71,71,0,0,0,0,122,170,170,170,170@22&12,122,5,21,6<,8,0,246:3&9,15
+5,5,5,5,9>,0,1,0,0,122,122,133,122,133,85,86,84,85,86,0,0,0,0,1,0,0,71,71,71,71,71,0,0,0,0,122,170,170,170,170@22&12,122,5,21,6<,8,0,0:3&9,15
 5,5,5,21,8,0,0,0,0,0,0,0,0,0,0,0,84,0,0,0,1,93,0,0,93,1,71,71,71,71,71,71,0,0,0,132!0,170,170,170,122,122,6,8,0,0&10,0,14,19
 5,5,5,9,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,71,71,71,71,71,71,93,93,0,125,170,170,170,170$17,0,0,0&10,0,14,12,19,5
 5,5,5,9,0,0,0,0,0,122,122,122,122,122,122,122,122,122,122,0,0,0,0,93,93,0,0,71,71,71,71,93,0,0,0,122,170,170,170,122,122,12,12,12,19,5,5,5
diff --git a/rsrc/scenarios/zakhazi/towns/town3.map b/rsrc/scenarios/zakhazi/towns/town3.map
index c91ee189..4d55e61d 100644
--- a/rsrc/scenarios/zakhazi/towns/town3.map
+++ b/rsrc/scenarios/zakhazi/towns/town3.map
@@ -5,20 +5,20 @@
 5,5,5,9,0,0,0,1,14,12,11,0,1,0,17,6,6,8,0,0,105,104,105,0,105$34,104,105,0,0,105,15,5,20v,12,19,5,5,21,6,8,105$29,0,0,105,104,17,6,6,6,18,5,5,9,0@7,0,0,0@15,0@9,17,18,5,5,5,5
 5,5,5,9,0,0,14,12,19,5,9,107!4,0,0,0,0,0,0,0,0,105,105,105$33,0,105,105,0,0,0,0,17,6,6,6,6,6,6,8,0,0,0,0,0,0,0,0,0,0,1,17,6,6,8,107!0,0@10,0,0@8$26,107!2,0@13,17,18,5,5,5
 5,5,5,9,0,0,15,5,5,5,9,0,0,0,0,0,0,0,0,0,0,0,105,105$32,0,0,105,105,105,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0@14,0,0,0@12,0,0,15,5,5,5
-5,5,5,9,246:41&9,246:41&9,15,5,5,21,8,0:2,0:2,14,12,12,12,12,11,0,0,105@26,104,105,0,0,105,104,105,0,0,0,0,0,0,0,0,0,0,0,0,104,0,0,0,0$31,14,11,0,0,0,0,0,0,0,0,0,0,0,0,15,5,5,5
+5,5,5,9,0:41&9,0:41&9,15,5,5,21,8,0:2,0:2,14,12,12,12,12,11,0,0,105@26,104,105,0,0,105,104,105,0,0,0,0,0,0,0,0,0,0,0,0,104,0,0,0,0$31,14,11,0,0,0,0,0,0,0,0,0,0,0,0,15,5,5,5
 5,5,5,20,12,12,19,5,21,8,0,0,0,17,18,5,5,154,154,154,154,154,154,154,105,0,0,0,105,0,14,12,12,12,12,11,1,0,105,0$30,0,0,0,0,104,105@24,15,20,12,11,0,0,0,0,0,0,0,0,0,0,15,5,5,5
 5,5,5,5,5,5,21,6,8,0,1,0,0,0,15,5,5,154,170,199,199,199,170,154,0,0,0,14,12,12,19,5,5,5,5,20,12,11,104,105@25,0,0,0,0,105,14,19,5,5,20,12,12,11,0,0,0,0,105,0,0,15,5,5,5
 5,5,5,5,21,6,8,85,86,0,0,0,14,12,19,5,5,154,170,170,170,170$35,170,154,0,0,14,19,5,5,5,5,5,5,5,5,5,20,11,0,0,0,0,0,105,15,5,5,5,5,5,5,9,105,0$28,0,105,104,105$27,0,15,5,5,5
 5,5,5,21,8,85,86,0,85,86,0,1,17,6,6,18,5,154,170,170,170,170,170,154,0,0,15,5,5,5,5,5,5,5,5,5,5,5,20,11,0,0,0,14,12,19,5,5,5,5,5,5,9,104,105,0,0,105,0,14,19,5,5,5
 5,5,5,9,0,85,86,107!8,85,86,0,0,0,85,86,15,5,154,204,170,194:12@27@28@29@30,170,204,154,157,157,154,154,154,154,154,154,154,154,5,5,5,5,5,9,0,0,14,19,5,5,5,5,5,5,5,5,9,105,0,0,105,0,0,15,5,5,5,5
 5,5,5,20,11,85,86,0,0,85,86,0,0,107!7,14,19,5,154,157,154,168,154,157,154,210,210,210,210,210,216,71,71,71,154,5,5,5,5,21,168,157,157,168,5,5,5,5,5,21,6,18,5,20,11,0,1,104,105,0,15,5,5,5,5
-5,5,5,5,20,12,11,85,86,0,0,1,0,0,15,5,5,154,170,174@40,203@39,174@41,170,154,210,210,210,210,210,248:3&9,71,71,71,154,5,5,21,6,8,170,170,170,15,5,5,5,5,21,8,103,17,18,21,8,0,0,105,0,105,15,5,5,5,5
-5,5,5,5,21,6,8,0,0,0,0,0,0,14,19,5,5,154,170,170,247:8&9,170,170,157,210,210,210,210,210,216,71,71,71,154,5,21,8,191:13,191:13,170,170,170,17,18,5,5,21,8,103,103$3,102,17,8,0:0,0,0,0,101@49@50@51@52,14,19,5,5,5,5
+5,5,5,5,20,12,11,85,86,0,0,1,0,0,15,5,5,154,170,174@40,203@39,174@41,170,154,210,210,210,210,210,210:3&9,71,71,71,154,5,5,21,6,8,170,170,170,15,5,5,5,5,21,8,103,17,18,21,8,0,0,105,0,105,15,5,5,5,5
+5,5,5,5,21,6,8,0,0,0,0,0,0,14,19,5,5,154,170,170,170:8&9,170,170,157,210,210,210,210,210,216,71,71,71,154,5,21,8,191:13,191:13,170,170,170,17,18,5,5,21,8,103,103$3,102,17,8,0:0,0,0,0,101@49@50@51@52,14,19,5,5,5,5
 5,5,5,21,8,0,85,86,0,0,0,14,12,19,5,5,5,154,170,170,170$9,170,170,157,210,210,210,210,210,210,216,210,216,154,6,8,184,196$41,170,170,170,170,170,15,5,5,9,0,102@48,0,84,84,0&21,0:0,0:0,0:0,14,12,19,5,5,5,5,5
 5,5,5,9,85,86@55,0,85,86,0,0,17,6,18,5,5,5,154,170$10,187,170,187,170$11,154,210,210,210,210,210,210,210,210,210,157,170,170,170,170,170,170,170,170,170,154,6,6,8,84,0,0,0,0,1,104,0,14,19,5,5,5,5,5,5,5
 5,5,5,20,11,85,86,0,0,0,0,85,86@56,17,18,5,5,154,170,170,170,170,170,154,71,71,210,210,210,210,210,210,210,157,170,170,170,170,192,170,170,170,170,157,0,0:0,0,0,0,104,0,84,0,0,0,17,18,5,5,5,5,5,5,5
 5,5,5,5,20,12,11,85,86,0,0,1,107!10,0,17,18,5,154,170,170,170,170,170,154,154,154,154,154,154,154,154,154,154,154,12,11,170,170,170,170$42,170,170,170,157,0,0:0,0,0,0,0,0,0*1,0,0,0,0&19,15,5,5,5,5,5,5,5
-5,5,5,5,21,6,8,0,85,86,0,1,0,0,108,17,18,154,154,170,170,170,154,154,170,247:4&9,170,247:5&9,170,247:6&9,170,247:7&9,207,154,5,9,194@31@32,170,170,197,170,170,14,154,12,11,0,0,1,0,0&19,0,0,0,0,0,17,18,5,5,5,5,5,5
+5,5,5,5,21,6,8,0,85,86,0,1,0,0,108,17,18,154,154,170,170,170,154,154,170,170:4&9,170,170:5&9,170,170:6&9,170,170:7&9,207,154,5,9,194@31@32,170,170,197,170,170,14,154,12,11,0,0,1,0,0&19,0,0,0,0,0,17,18,5,5,5,5,5,5
 5,5,5,21,8,85,86,107!9,85,86,0,0,0,108,0,108,17,154,206,170,170,170,170,170,170,170,170,170,170,170,170,170,170,154,5,20,12,12,11,185,170,170,17,18,5,20,12,11,0,103,0,0,0,104,0$2,103,103,15,5,5,5,5,5,5
 5,5,5,9,0,85@54,86,0,85,86,0,0,0,0,0,0,0:2,170,170,170,170,170,170,170,170,170,170,170,170,170,187,170,170,154,6,6,6,18,20,11,170,170,194@33@38,15,21,6,18,9,102,103,0,103,0,0,103,102,103,15,5,5,5,5,5,5
 5,5,5,9,85,86,0,1,0,0,1,0,84,0,0,0,0:2,170,170,170,170,170,170,170,192,170,170,170,170$12,170,170$13,170,198$14,169,0,0,0,17,18,9,170,170,194@34@35@36@37,15,9,0$48,15,9,103,103,103,102,0,0,103,103,103,15,5,5,5,5,5,5
@@ -33,8 +33,8 @@
 12,12,12,12,11,0:10,97,82,82,82,82,82,82$18,82,82,1,0,0,0,0,0,0,0,0,15,5,20,11,0,0,82&16,82,90,90,90,90,90,82,82,0,1,0,15,9,0,0,0,15,9,0,0,0,0,1,0,0,14,11,0,1<,0,0,0,0
 5,5,5,5,9,0,0,82,82,82,82,82*3,82,82$36,82,0,0,0,0,0,0,0,0,0,15,5,5,9,97,0,82*2,82,82&17,90,90,90,82,82,82,0,0,0,15,20,11,0,0,15,20,11,0,0,0,14,12,12,19,20,12,12,12,12,12,12
 5,5,5,5,9,0,0,82,82,82,82,82,82,82,82,82,82,82,82,0,0,0,0,0,15,21,6,8,82:9,82,82,82,82,82,82,82,82&17,82,0,0,0,98,15,5,9,0,0,15,5,9,0,0,14,19,5,21,6,6,6,18,5,5,5,5
-5,5,5,5,20,11,1,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82*0,0,0,17,8,0,82,82:9,82,82,82,82,82&18,82,82,82,0,0,0,0,0,154,154,154,157,157,154,168,154,157,157,154,5,5,9,0,0,246:42&9,15,5,5,5,5
-5,5,5,5,5,20,11,0,82,82,82,82,82,82,0,0,82,82,82,82,82,82,82,82,82,82,82,82,82:9,0,0,0,0,0,1,0,0,0,0,0,0,0,169,196,170,170,170,170,170,170,170,170,154,5,5,9,0,1,246:42&9,15,5,5,5,5
+5,5,5,5,20,11,1,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82*0,0,0,17,8,0,82,82:9,82,82,82,82,82&18,82,82,82,0,0,0,0,0,154,154,154,157,157,154,168,154,157,157,154,5,5,9,0,0,0:42&9,15,5,5,5,5
+5,5,5,5,5,20,11,0,82,82,82,82,82,82,0,0,82,82,82,82,82,82,82,82,82,82,82,82,82:9,0,0,0,0,0,1,0,0,0,0,0,0,0,169,196,170,170,170,170,170,170,170,170,154,5,5,9,0,1,0:42&9,15,5,5,5,5
 5,5,5,5,5,5,20,11,0,82,82,82,82,0,0,0,0,0,0,0,82,82,82,82,82,82,82,82,97,14,12,12,11,0,97,0,0,0,0,0,0,0,154,170,170,170,170,197,197,197,170,170,154,5,21,8,0,0,14,19,5,5,5,5
 5,5,5,5,5,5,5,20,12,11,0,0,0,0,0,0,0,84,0,0,0,14,12,12,12,12,12,12,12,19,5,5,20,12,12,12,12,154,169,154,169,154,169,196,170,170,170,178,177,176,170,170,154,21,8,0,0,0,15,5,5,5,5,5
 5,5,5,21,6,6,6,6,6,8,0,0,0,0,0,0,0,0,0,0,0,15,21,6,18,21,6,18,5,5,5,5,5,5,5,5,5,154,195$22,195,195$23,195,195,170,170,170,170,195,195,195$24,170,170,164!3,8,0,0,0,14,19,5,5,5,5,5
@@ -53,9 +53,9 @@
 5,5,5,5,5,5,9,0,0,0,0,0,0,0,0,1,0,0,17,18,5,21,6,6,6,6,6,6,18,5,5,5,21,6,6,6,6,18,5,20,11,0,0$53,0,103$54,103,15,9,0$8,1,0,0,0,0,0,0,0,14,12,19,5,5,5,5
 5,5,5,5,5,5,9,0,14,12,12,11,0,0,0,0,0,0,0,154,21,8,0,0,0,0,0,0,17,18,5,21,8,0,0,0,0,17,6,18,20,12,12,12,12,12,19,9,1,0,0,0,0,0,0,1,107!14,15,5,5,5,5,5,5
 5,5,5,5,5,21,8,0,15,21,6,8,0,0,1,0,0,0,0,154,8,0,0,0,0,0,0,0,190,154,6,8,1,0,0,0,0,0,0,17,6,154,6,6,18,21,6,8,0,0,0,0,0,0,0,0,1,15,5,5,5,5,5,5
-5,5,5,5,5,9,0,0,17,8,246:17&9,0,0&17,0,0,0,0,0,0,162,0,0,0,97,99,99,97,0,0:22,162,0,0,0,0,0:29,97,0:29&17,97,0:29,0,0,162,0,0,17,8,0,0,1,0,1,0,0,0,0,0,0,17,18,5,5,5,5,5
+5,5,5,5,5,9,0,0,17,8,0:17&9,0,0&17,0,0,0,0,0,0,162,0,0,0,97,99,99,97,0,0:22,162,0,0,0,0,0:29,97,0:29&17,97,0:29,0,0,162,0,0,17,8,0,0,1,0,1,0,0,0,0,0,0,17,18,5,5,5,5,5
 5,5,5,5,5,9,0,0,0,0,0,0,0,1,0&18,0&19,0,0,0,162,0,0,0,100,0$4,0$6,100,0,0:22,162,0,0,0,0,97,0,0,0,97,0,0,162,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,5,5,5,5,5
-5,5,5,5,5,9,0,1&20,0,0&19,0,0,0,0,0&20,0,0,0,0,154,11,0,0,100,0$7,0$5,100,0,190,154,11,0,0,1,0:29,0,108:25,0,0:29,0,0,154,11,0,0,0,0,0,0,0,170,170,247:31&9,170,170,0,0,0,15,5,5,5,5,5
+5,5,5,5,5,9,0,1&20,0,0&19,0,0,0,0,0&20,0,0,0,0,154,11,0,0,100,0$7,0$5,100,0,190,154,11,0,0,1,0:29,0,108:25,0,0:29,0,0,154,11,0,0,0,0,0,0,0,170,170,170:31&9,170,170,0,0,0,15,5,5,5,5,5
 5,5,5,5,5,20,11,90,90,90,0,0,0,0,0,0,0,0,0,154,9,98,0,97,99,99,97,0,98,15,20,11,0,0,97,0&18,0,1,97,0,0,15,20,12,12,12,11,0,0,0,170,214,170,210,170,0,0,14,19,5,5,5,5,5
 5,5,5,5,5,5,9,90,90,90,0&20,0,0,0,0,0,0,0,14,19,9,0,0,0,0,0,0,0,14,19,5,9,0^,0,0:29,97,0:29,97,0:29&17,0,14,19,5,5,5,5,20,11,0,0,170,170,170,170,170,0,14,19,5,5,5,5,5,5
 5,5,5,5,5,5,20,12,11,0,0,0,0,0,0,14,12,12,19,5,20,11,97,0,0,0,0,0,15,5,5,20,11,1,0,0,0,0,1,14,19,5,5,5,5,5,5,20,12,11,0,0,1,0,0,14,19,5,5,5,5,5,5,5
diff --git a/rsrc/scenarios/zakhazi/towns/town4.map b/rsrc/scenarios/zakhazi/towns/town4.map
index 8daccca7..86f6ae69 100644
--- a/rsrc/scenarios/zakhazi/towns/town4.map
+++ b/rsrc/scenarios/zakhazi/towns/town4.map
@@ -7,8 +7,8 @@
 5,21,8,0,0,0,15,5,5,5,5,9,0,0,14,19,9,92,0,0,17,18,20,11,0,0,15,5,9,0,0,17,18,5,20,12,11,96,0,0,95,0$16,0,0,16,10,0,15
 5,9,0,0,0,14,19,5,5,5,21,8,0,0,15,5,20,11,0,0,0,17,18,9,0,0,17,18,9,93,0,0,17,18,5,5,20,11,84,0,0,0,0,14,19,9,0,15
 5,9,0,0,14,19,21,6,18,21,8,0,0,0,15,5,5,20,11,0,0,92,15,9,0,0,1,15,20,12,11,0,0,17,18,5,5,20,12,11,0,0,14,19,5,9,0,15
-5,9,0,0,15,21,8,97,15,9,0,0,0,14,19,21,6,6,8,0,0&16,0,15,20,11,0,0,17,6,18,9,0,0,93,17,18,5,5,5,9,0,0,15,5,5,9,246:12&9,15
-5,9,246:10&9,246:10&9,15,9,97,0,15,9,0,0,14,19,21,8,97,0,0,0,1,14,19,5,20,11,0,0,0,17,8,0,0,0,84,15,5,5,5,9,0,0,15,5,5,20,12,19
+5,9,0,0,15,21,8,97,15,9,0,0,0,14,19,21,6,6,8,0,0&16,0,15,20,11,0,0,17,6,18,9,0,0,93,17,18,5,5,5,9,0,0,15,5,5,9,0:12&9,15
+5,9,0:10&9,0:10&9,15,9,97,0,15,9,0,0,14,19,21,8,97,0,0,0,1,14,19,5,20,11,0,0,0,17,8,0,0,0,84,15,5,5,5,9,0,0,15,5,5,20,12,19
 5,20,12,12,19,20,11,0,15,9,0,0,17,6,8,0,0,0,0,96,0,17,18,5,5,20,11,0,0,0,0,0,14,12,12,19,21,6,6,8,0,0,17,18,5,5,5,5
 5,5,21,6,6,18,9,0,15,20,11,0,96,0,0,0,96,14,11,0,0,0,17,18,5,5,20,12,11,0,0,14,19,5,21,6,8,0,84,0,0,0,98,15,5,5,5,5
 21,6,8,0,0,17,8,0,17,18,20,11,0$23,0,96,0,96,15,20,11,96,0,0,17,6,6,6,6,8,0,94,15,5,21,8,0,0,0,14,11,84,0,0,15,5,5,5,5
@@ -29,7 +29,7 @@
 21,6,6,6,6,18,9,0,0,0,0,1,0,0,0,0,0,17,18,5,9,0:7,0:7,17,18,5,5,9,0,0,0,0,0,0,17,18,5,5,5,9,0,0,15,9,85,86$9,17,18
 9,0,0,0,0$10,15,9,93,0,0,0,0,14,11,0$20,0,0,0,17,18,9,0,0,0,17,18,21,8,0,0,0,0,0,1,0,15,5,5,5,9,0,1,15,9,0$8,85,86,15
 9,0,14,12,12,19,20,11,1,0$22,0,84,15,20,11,0,96,0,84,15,20,11,0,0,0,17,8,0,0,14,12,12,11,0,84,15,5,5,5,9,0,0,15,9,103,0,0$7,15
-9,0,17,18,5,5,21,8,0,0,84,14,19,21,8,0,1$19,0,96,15,5,20,11,0,0,0,0,0,0,15,5,21,8,0,1,15,5,5,5,9,246:11&9,246:11&9,15,20,11,0,0,15
+9,0,17,18,5,5,21,8,0,0,84,14,19,21,8,0,1$19,0,96,15,5,20,11,0,0,0,0,0,0,15,5,21,8,0,1,15,5,5,5,9,0:11&9,0:11&9,15,20,11,0,0,15
 9,0,0,17,18,21,8,0,0,0,14,19,5,9,0,0,0,14,12,19,5,5,20,12,11,84,0,0,14,19,21,8,0,1,0,15,5,5,5,20,12,12,19,5,9,0,14,19
 20,11,1,0,17,8,0,0,14,12,19,5,5,9,0,1,14,19,5,5,21,6,6,18,20,12,12,12,19,5,9,0,0,0,0,15,5,21,6,6,6,6,6,18,9,0,15,5
 5,20,11,0,1,0,0,0,15,5,5,5,5,9,1,0,15,5,5,5,9,98,0,15,5,5,21,6,6,6,8,0,0,0,14,19,21,8,0,85,86,98,0,17,8,0,17,18
diff --git a/rsrc/scenarios/zakhazi/towns/town7.map b/rsrc/scenarios/zakhazi/towns/town7.map
index bac0785f..c7a29e75 100644
--- a/rsrc/scenarios/zakhazi/towns/town7.map
+++ b/rsrc/scenarios/zakhazi/towns/town7.map
@@ -16,7 +16,7 @@
 5,5,9,118,4,2,56,60,62,52,113,4,2,2,4,2,2,147,2:8,2,3,2,2,2,2,56,139,5,5,5,5,5
 5,5,20,118,2,115,57,62,52,114,113,2,2,3,2,2,3,147,2:8,2,2,2,2,2,2,58,139,5,5,5,5,5
 5,5,5,118,2,113,58,52,115,114,4,3,2,2,2,118,118,118,139,139,139,147,147,139,139,139,139,18,5,5,5,5
-5,5,5,118,113,2,250:11&9,114,114,114,4,4,2,2,112,118,97,118,210,210,210:1,210:1,210:1,210:1,210,210,118,15,5,5,5,5
+5,5,5,118,113,2,2:11&9,114,114,114,4,4,2,2,112,118,97,118,210,210,210:1,210:1,210:1,210:1,210,210,118,15,5,5,5,5
 5,5,5,118,118,2,112,2,114,4,2,2,2,112,118,118,94,118,210,214,210,210,210,210,214,210,118,15,5,5,5,5
 5,5,5,5,118,118,2,3,2,2,2,2,118,118,118,92,0,118,210,210,210,210,210,210,210,210,118,15,5,5,5,5
 5,5,5,5,5,118,118,118,118,118,118,118,118,92,0,0,0,118,118,210,210,210,210,210,210,118,118,15,21,6,6,18