Better layout.

2 files changed, 55 insertions, 55 deletions

diff --git a/tools/boxes.svg b/tools/boxes.svg
index 7e5f781..d5aa730 100644
--- a/tools/boxes.svg
+++ b/tools/boxes.svg
@@ -40,9 +40,9 @@
      inkscape:window-height="480"
      id="namedview6"
      showgrid="true"
-     inkscape:zoom="1.7859922"
-     inkscape:cx="2122.3644"
-     inkscape:cy="944.53822"
+     inkscape:zoom="0.63591382"
+     inkscape:cx="1692.2778"
+     inkscape:cy="1133.1474"
      inkscape:current-layer="svg4"
      inkscape:document-rotation="0">
     <inkscape:grid
@@ -52,11 +52,11 @@
   <image
      sodipodi:absref="/home/tor/src/rally/public/time-of-crisis/map75.png"
      xlink:href="../map75.png"
-     sodipodi:insensitive="true"
-     id="image2"
-     height="1650"
+     style="display:inline;image-rendering:pixelated"
      width="2550"
-     style="display:inline;image-rendering:pixelated" />
+     height="1650"
+     id="image2"
+     sodipodi:insensitive="true" />
   <rect
      style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
      id="rect873"
@@ -283,85 +283,85 @@
      ry="0.610479"
      inkscape:label="Aegyptus Capital" />
   <rect
-     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
+     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:1.35873;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
      id="rect902"
-     width="130"
+     width="60"
      height="60"
-     x="1970"
-     y="620"
+     x="1880"
+     y="580"
      ry="0.610479"
      inkscape:label="Pontus Euxinus XY" />
   <rect
-     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
+     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:1.5492;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
      id="rect900"
-     width="100"
+     width="60"
      height="60"
-     x="1770"
-     y="1170"
+     x="1480"
+     y="1160"
      ry="0.610479"
      inkscape:label="Mare Orientale XY" />
   <rect
-     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
+     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:1.63299;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
      id="rect898"
-     width="90"
+     width="60"
      height="60"
      x="720"
-     y="890"
+     y="900"
      ry="0.610479"
      inkscape:label="Mare Occidentale XY" />
   <rect
-     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
+     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:1.89736;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
      id="rect893"
-     width="80"
-     height="50"
-     x="130"
-     y="495"
-     ry="0.610479"
+     width="60"
+     height="60"
+     x="180"
+     y="500"
+     ry="0.73257476"
      inkscape:label="Oceanus Atlanticus XY" />
   <rect
-     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
+     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:1.8684;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
      id="rect904"
-     width="165"
-     height="25"
-     x="705"
-     y="1495"
-     ry="0.610479"
+     width="60"
+     height="60"
+     x="520"
+     y="1480"
+     ry="1.4651496"
      inkscape:label="Nomads XY" />
   <rect
-     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
+     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:1.74114;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
      id="rect906"
-     width="190"
-     height="25"
-     x="2295"
-     y="980"
-     ry="0.610479"
+     width="60"
+     height="60"
+     x="2440"
+     y="820"
+     ry="1.4651496"
      inkscape:label="Sassanids XY" />
   <rect
-     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
+     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:2.71747;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
      id="rect912"
-     width="130"
-     height="15"
-     x="1840"
-     y="235"
-     ry="0.610479"
+     width="60"
+     height="60"
+     x="2020"
+     y="360"
+     ry="2.441916"
      inkscape:label="Goths XY" />
   <rect
-     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
+     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:2.2188;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
      id="rect910"
-     width="195"
-     height="15"
-     x="1370"
-     y="200"
-     ry="0.610479"
+     width="60"
+     height="60"
+     x="1540"
+     y="280"
+     ry="2.4419162"
      inkscape:label="Alamanni XY" />
   <rect
-     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
+     style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:2.66666;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
      id="rect908"
-     width="135"
-     height="15"
-     x="900"
-     y="200"
-     ry="0.610479"
+     width="60"
+     height="60.000015"
+     x="1160"
+     y="300"
+     ry="2.4419165"
      inkscape:label="Franks XY" />
   <rect
      style="fill:#e60000;fill-opacity:0.325203;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.581301"
diff --git a/tools/genboxes.py b/tools/genboxes.py
index 650f625..eeea2b9 100644
--- a/tools/genboxes.py
+++ b/tools/genboxes.py
@@ -40,7 +40,7 @@ for line in open("tools/boxes.svg").readlines():
 flush()
 
 def print_list():
-	print("const boxes = {")
+	print("const BOXES = {")
 	for (x,y,w,h,c,name) in list:
 		print(f'"{name}": [{x},{y},{w},{h}],')
 	print("}")