stuff

1 files changed, 187 insertions, 156 deletions

diff --git a/tools/layout.svg b/tools/layout.svg
index 506d903..9805857 100644
--- a/tools/layout.svg
+++ b/tools/layout.svg
@@ -40,9 +40,9 @@
      inkscape:window-height="480"
      id="namedview8"
      showgrid="false"
-     inkscape:zoom="0.5"
-     inkscape:cx="1894.5029"
-     inkscape:cy="1424.4221"
+     inkscape:zoom="0.71155804"
+     inkscape:cx="871.00863"
+     inkscape:cy="553.26207"
      inkscape:current-layer="svg6"
      inkscape:snap-center="false"
      inkscape:snap-others="true"
@@ -55,31 +55,32 @@
   <image
      sodipodi:absref="/home/tor/src/rally/public/washingtons-war/tools/mapmask.png"
      xlink:href="mapmask.png"
-     x="0"
-     y="0"
-     width="1650"
-     height="2550"
-     image-rendering="pixelated"
-     sodipodi:insensitive="true"
+     style="display:inline"
      id="image2"
-     style="display:inline" />
+     sodipodi:insensitive="true"
+     image-rendering="pixelated"
+     height="2550"
+     width="1650"
+     y="0"
+     x="0" />
   <image
      sodipodi:absref="/home/tor/src/rally/public/washingtons-war/tools/map75.png"
      xlink:href="map75.png"
-     x="0"
-     y="0"
-     width="1650"
-     height="2550"
-     image-rendering="pixelated"
-     opacity="0.535871"
-     id="image4"
-     style="display:inline"
+     sodipodi:insensitive="true"
      inkscape:label="texture"
-     sodipodi:insensitive="true" />
+     style="display:inline"
+     id="image4"
+     opacity="0.535871"
+     image-rendering="pixelated"
+     height="2550"
+     width="1650"
+     y="0"
+     x="0" />
   <g
      id="g2693"
-     inkscape:label="fortress"
-     style="display:none">
+     inkscape:label="fortified_port"
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
        id="rect887"
@@ -112,7 +113,8 @@
   <g
      id="g2712"
      inkscape:label="winter_quarters"
-     style="display:none">
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
        id="rect845"
@@ -235,8 +237,9 @@
   </g>
   <g
      id="g2687"
-     inkscape:label="space"
-     style="display:none">
+     inkscape:label="regular"
+     style="display:none"
+     sodipodi:insensitive="true">
     <circle
        style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
        id="circle910"
@@ -587,7 +590,8 @@
   <g
      id="g2555"
      inkscape:label="sea"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <rect
        style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
        id="rect1000"
@@ -641,7 +645,8 @@
   <g
      id="g2546"
      inkscape:label="colony"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <rect
        style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
        id="rect1016"
@@ -744,85 +749,83 @@
   <g
      id="g2584"
      inkscape:label="box"
-     style="display:inline"
-     sodipodi:insensitive="true">
+     style="display:inline">
+    <rect
+       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:2.99946"
+       id="rect1092"
+       width="214"
+       height="206"
+       x="1358"
+       y="1673"
+       inkscape:label="British Reinforcement Box" />
+    <rect
+       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3.00286"
+       id="rect1096"
+       width="214"
+       height="206"
+       x="294"
+       y="258"
+       inkscape:label="American Leader Reinforcements" />
+    <rect
+       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3.08098"
+       id="rect1098"
+       width="214"
+       height="207"
+       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" />
+       y="332"
+       inkscape:label="Continental Congress Dispersed" />
     <rect
-       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
-       id="rect1044"
-       width="64"
-       height="71"
-       x="905"
-       y="2241" />
-    <rect
-       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
-       id="rect1046"
-       width="64"
-       height="71"
-       x="971"
-       y="2241" />
-    <rect
-       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
-       id="rect1048"
-       width="64"
-       height="71"
-       x="1037"
-       y="2241" />
-    <rect
-       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
-       id="rect1050"
-       width="64"
-       height="71"
-       x="1103"
-       y="2241" />
-    <rect
-       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
-       id="rect1052"
-       width="65"
-       height="71"
-       x="1169"
-       y="2241" />
-    <rect
-       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
-       id="rect1054"
-       width="64"
-       height="71"
-       x="1236"
-       y="2241" />
+       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3.23342"
+       id="rect1094"
+       width="205"
+       height="136"
+       x="1400"
+       y="46"
+       inkscape:label="Captured Generals" />
+  </g>
+  <g
+     id="g607"
+     inkscape:label="Card Boxes">
     <rect
        style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
-       id="rect1056"
-       width="64"
-       height="71"
-       x="1302"
-       y="2241" />
+       id="rect1084"
+       width="199"
+       height="277"
+       x="904"
+       y="1915" />
     <rect
        style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
-       id="rect1058"
-       width="64"
-       height="71"
-       x="1368"
-       y="2241" />
+       id="rect1086"
+       width="199"
+       height="277"
+       x="1137"
+       y="1915" />
     <rect
-       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
-       id="rect1060"
-       width="65"
-       height="71"
-       x="1434"
-       y="2241" />
+       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:2.97641"
+       id="rect1088"
+       width="199.00003"
+       height="277"
+       x="1370"
+       y="1915" />
     <rect
-       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
-       id="rect1062"
-       width="63"
-       height="71"
-       x="1501"
-       y="2241" />
+       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3.0365"
+       id="rect1090"
+       width="278"
+       height="198.99998"
+       x="1027"
+       y="1679" />
+  </g>
+  <g
+     id="g580"
+     inkscape:label="Game Turn">
     <rect
        style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
        id="rect1066"
@@ -886,62 +889,80 @@
        height="72"
        x="1433"
        y="2368" />
+  </g>
+  <g
+     id="g569"
+     inkscape:label="French Alliance Track">
     <rect
        style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
-       id="rect1084"
-       width="199"
-       height="277"
-       x="904"
-       y="1915" />
+       id="rect1044"
+       width="64"
+       height="71"
+       x="905"
+       y="2241" />
     <rect
        style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
-       id="rect1086"
-       width="199"
-       height="277"
-       x="1137"
-       y="1915" />
+       id="rect1046"
+       width="64"
+       height="71"
+       x="971"
+       y="2241" />
     <rect
-       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:2.97641"
-       id="rect1088"
-       width="199.00003"
-       height="277"
-       x="1370"
-       y="1915" />
+       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
+       id="rect1048"
+       width="64"
+       height="71"
+       x="1037"
+       y="2241" />
     <rect
-       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3.0365"
-       id="rect1090"
-       width="278"
-       height="198.99998"
-       x="1027"
-       y="1679" />
+       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
+       id="rect1050"
+       width="64"
+       height="71"
+       x="1103"
+       y="2241" />
     <rect
-       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:2.99946"
-       id="rect1092"
-       width="214"
-       height="206"
-       x="1358"
-       y="1673" />
+       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
+       id="rect1052"
+       width="65"
+       height="71"
+       x="1169"
+       y="2241" />
     <rect
-       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3.23342"
-       id="rect1094"
-       width="205"
-       height="136"
-       x="1400"
-       y="46" />
+       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
+       id="rect1054"
+       width="64"
+       height="71"
+       x="1236"
+       y="2241" />
     <rect
-       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3.00286"
-       id="rect1096"
-       width="214"
-       height="206"
-       x="294"
-       y="258" />
+       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
+       id="rect1056"
+       width="64"
+       height="71"
+       x="1302"
+       y="2241" />
     <rect
-       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3.08098"
-       id="rect1098"
-       width="214"
-       height="207"
-       x="63"
-       y="258" />
+       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
+       id="rect1058"
+       width="64"
+       height="71"
+       x="1368"
+       y="2241" />
+    <rect
+       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
+       id="rect1060"
+       width="65"
+       height="71"
+       x="1434"
+       y="2241" />
+    <rect
+       style="opacity:0.99;fill:#ff0000;fill-opacity:0.46748;stroke:none;stroke-width:3"
+       id="rect1062"
+       width="63"
+       height="71"
+       x="1501"
+       y="2241" />
   </g>
   <g
      id="g2117"
@@ -1202,36 +1223,43 @@
        sodipodi:nodetypes="cc" />
     <path
        style="opacity:1;fill:none;fill-opacity:0.46748;stroke:#000000;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 759.31202,949.84833 92.08074,31.1658"
-       id="path1918" />
+       d="m 759.31202,949.84833 90.94423,35.42773"
+       id="path1918"
+       sodipodi:nodetypes="cc" />
     <path
        style="opacity:1;fill:none;fill-opacity:0.46748;stroke:#000000;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 905.22459,1026.3462 1.41662,2.8332 13.45796,48.8737"
-       id="path1920" />
+       d="m 908.63011,1030.8842 11.46906,47.1689"
+       id="path1920"
+       sodipodi:nodetypes="cc" />
     <path
        style="opacity:1;fill:none;fill-opacity:0.46748;stroke:#000000;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 845.72626,1138.2597 46.74868,-9.9164"
-       id="path1922" />
+       d="m 849.98819,1137.6914 36.80418,-8.4957"
+       id="path1922"
+       sodipodi:nodetypes="cc" />
     <path
        style="opacity:1;fill:none;fill-opacity:0.46748;stroke:#000000;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 913.01603,1019.9714 96.33067,71.5396"
-       id="path1924" />
+       d="m 920.40337,1023.0968 83.54493,65.0047"
+       id="path1924"
+       sodipodi:nodetypes="cc" />
     <path
        style="opacity:1;fill:none;fill-opacity:0.46748;stroke:#000000;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1017.8464,1017.1381 17.7079,58.0817"
-       id="path1926" />
+       d="m 1017.8464,1017.1381 16.0031,53.2515"
+       id="path1926"
+       sodipodi:nodetypes="cc" />
     <path
        style="opacity:1;fill:none;fill-opacity:0.46748;stroke:#000000;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 920.09917,990.93051 39.66555,-9.20807"
-       id="path1928" />
+       d="m 924.64522,988.37335 35.1195,-6.65091"
+       id="path1928"
+       sodipodi:nodetypes="cc" />
     <path
        style="opacity:1;fill:none;fill-opacity:0.46748;stroke:#000000;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 930.01556,893.89157 48.16531,49.58194"
        id="path1930" />
     <path
        style="opacity:1;fill:none;fill-opacity:0.46748;stroke:#000000;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 1027.7628,947.01508 17.7078,-33.99905"
-       id="path1932" />
+       d="m 1023.785,945.87857 21.6856,-32.86254"
+       id="path1932"
+       sodipodi:nodetypes="cc" />
     <path
        style="opacity:1;fill:none;fill-opacity:0.46748;stroke:#000000;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 1104.2595,880.08247 43.9117,12.0353"
@@ -1451,7 +1479,8 @@
        style="opacity:1;fill:none;fill-opacity:0.46748;stroke:#000000;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:5, 5;stroke-dashoffset:0;stroke-opacity:1"
        d="m 1196,127 c 74.0155,102.10344 61.3742,165.34334 150.2935,291.71331"
        id="path2123"
-       sodipodi:nodetypes="cc" />
+       sodipodi:nodetypes="cc"
+       inkscape:label="Quebec-Falmouth" />
   </g>
   <g
      id="g2298"
@@ -1542,7 +1571,8 @@
   <g
      id="g2530"
      inkscape:label="colony"
-     style="display:none">
+     style="display:none"
+     sodipodi:insensitive="true">
     <path
        style="opacity:1;fill:none;fill-opacity:1;stroke:#f50000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1"
        d="m 1250.8815,498.65267 252.1596,543.98473"
@@ -1816,7 +1846,8 @@
   <g
      id="g1810"
      inkscape:label="labels"
-     style="display:none">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <text
        xml:space="preserve"
        style="font-size:14px;font-family:sans-serif;-inkscape-font-specification:sans-serif;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:12, 6, 3, 6;stroke-dashoffset:0;stroke-opacity:1"
@@ -2406,7 +2437,7 @@
          sodipodi:role="line"
          id="tspan1376"
          x="909.04865"
-         y="1123.4138">Wilmington</tspan></text>
+         y="1123.4138">Wilmington DE</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:14px;font-family:sans-serif;-inkscape-font-specification:sans-serif;opacity:1;fill:#000000;fill-opacity:0.46748;stroke:none;stroke-width:3"