From f325e1673fa843d06e47ef1ce558ea6606b3c92b Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ccxvii.net>
Date: Thu, 22 Aug 2024 10:50:56 +0200
Subject: Space ordering.

---
 tools/layout.json       | 24 ++++++++++++------------
 tools/layout.svg        | 16 ++++++++--------
 tools/process-layout.js |  2 ++
 3 files changed, 22 insertions(+), 20 deletions(-)

(limited to 'tools')

diff --git a/tools/layout.json b/tools/layout.json
index 8e0bc12..e2c4c2d 100644
--- a/tools/layout.json
+++ b/tools/layout.json
@@ -641,19 +641,19 @@
                 "h": 207,
                 "name": "French Reinforcements"
             },
-            {
-                "x": 542,
-                "y": 332,
-                "w": 88,
-                "h": 104,
-                "name": "Continental Congress Dispersed"
-            },
             {
                 "x": 1400,
                 "y": 46,
                 "w": 205,
                 "h": 136,
                 "name": "Captured Generals"
+            },
+            {
+                "x": 542,
+                "y": 332,
+                "w": 88,
+                "h": 104,
+                "name": "Continental Congress Dispersed"
             }
         ],
         "Card Boxes": [
@@ -1286,15 +1286,15 @@
                 "y": 361.5,
                 "name": "French Reinforcements"
             },
-            {
-                "x": 586,
-                "y": 384,
-                "name": "Continental Congress Dispersed"
-            },
             {
                 "x": 1502.5,
                 "y": 114,
                 "name": "Captured Generals"
+            },
+            {
+                "x": 586,
+                "y": 384,
+                "name": "Continental Congress Dispersed"
             }
         ],
         "Card Boxes": [
diff --git a/tools/layout.svg b/tools/layout.svg
index aded2e6..629e3c4 100644
--- a/tools/layout.svg
+++ b/tools/layout.svg
@@ -774,14 +774,6 @@
        x="63"
        y="258"
        inkscape:label="French Reinforcements" />
-    <rect
-       style="opacity:1;fill:#000000;fill-opacity:0.46748;stroke:none;stroke-width:3"
-       id="rect1606"
-       width="88"
-       height="104"
-       x="542"
-       y="332"
-       inkscape:label="Continental Congress Dispersed" />
     <rect
        style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3.23342"
        id="rect1094"
@@ -790,6 +782,14 @@
        x="1400"
        y="46"
        inkscape:label="Captured Generals" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:0.46748;stroke:none;stroke-width:3"
+       id="rect1606"
+       width="88"
+       height="104"
+       x="542"
+       y="332"
+       inkscape:label="Continental Congress Dispersed" />
   </g>
   <g
      id="g607"
diff --git a/tools/process-layout.js b/tools/process-layout.js
index 6de0844..2d19c04 100644
--- a/tools/process-layout.js
+++ b/tools/process-layout.js
@@ -95,6 +95,8 @@ for (let item of layout.points.box)
 const TYPE_SORT = [ "fortified_port", "winter_quarters", "regular", "box" ]
 
 spaces.sort((a,b) => {
+	if (a.type === "box" && b.type === "box")
+		return 0
 	let at = TYPE_SORT.indexOf(a.type)
 	let bt = TYPE_SORT.indexOf(b.type)
 	if (at < bt) return -1
-- 
cgit v1.2.3