diff options
-rw-r--r-- | Makefile | 7 | ||||
-rw-r--r-- | data.js | 10 | ||||
-rw-r--r-- | tools/layout.json | 10 | ||||
-rw-r--r-- | tools/layout.svg | 42 |
4 files changed, 39 insertions, 30 deletions
diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..46f0fb2 --- /dev/null +++ b/Makefile @@ -0,0 +1,7 @@ +data.js: tools/data.json tools/gendata.js + node tools/gendata.js > data.js +tools/data.json: tools/layout.json tools/process-layout.js + node tools/process-layout.js +tools/layout.json: tools/layout.svg tools/parse-layout.js + node tools/parse-layout.js + @@ -435,14 +435,14 @@ const data = { "name": "Hartford", "type": "winter_quarters", "adjacent": [ - 10, 12, - 17 + 17, + 51 ], "path": [ - 10, 12, - 17 + 17, + 51 ], "wilderness": [], "port": -1, @@ -1231,10 +1231,12 @@ const data = { "name": "New Haven", "type": "regular", "adjacent": [ + 10, 11, 62 ], "path": [ + 10, 11, 62 ], diff --git a/tools/layout.json b/tools/layout.json index 78b8e34..8e0bc12 100644 --- a/tools/layout.json +++ b/tools/layout.json @@ -2160,12 +2160,12 @@ "name2": "Hartford" }, { - "x1": 1167.1178, - "y1": 782.06644, - "x2": 1185.6344, - "y2": 783.0435299999999, + "x1": 1132.8002, + "y1": 777.03962, + "x2": 1219.9042, + "y2": 786.80632, "name": null, - "name1": "Hartford", + "name1": "New Haven", "name2": "Hartford" }, { diff --git a/tools/layout.svg b/tools/layout.svg index 9805857..aded2e6 100644 --- a/tools/layout.svg +++ b/tools/layout.svg @@ -40,10 +40,10 @@ inkscape:window-height="480" id="namedview8" showgrid="false" - inkscape:zoom="0.71155804" - inkscape:cx="871.00863" - inkscape:cy="553.26207" - inkscape:current-layer="svg6" + inkscape:zoom="1.9957644" + inkscape:cx="1218.7481" + inkscape:cy="710.99692" + inkscape:current-layer="g2117" inkscape:snap-center="false" inkscape:snap-others="true" inkscape:snap-object-midpoints="true" @@ -55,27 +55,27 @@ <image sodipodi:absref="/home/tor/src/rally/public/washingtons-war/tools/mapmask.png" xlink:href="mapmask.png" - style="display:inline" - id="image2" - sodipodi:insensitive="true" - image-rendering="pixelated" - height="2550" - width="1650" + x="0" y="0" - x="0" /> + width="1650" + height="2550" + image-rendering="pixelated" + sodipodi:insensitive="true" + id="image2" + style="display:inline" /> <image sodipodi:absref="/home/tor/src/rally/public/washingtons-war/tools/map75.png" xlink:href="map75.png" - sodipodi:insensitive="true" - inkscape:label="texture" - style="display:inline" - id="image4" - opacity="0.535871" - image-rendering="pixelated" - height="2550" - width="1650" + x="0" y="0" - x="0" /> + width="1650" + height="2550" + image-rendering="pixelated" + opacity="0.535871" + id="image4" + style="display:inline" + inkscape:label="texture" + sodipodi:insensitive="true" /> <g id="g2693" inkscape:label="fortified_port" @@ -1365,7 +1365,7 @@ 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 1167.1178,782.06644 18.5166,0.97709" + d="m 1132.8002,777.03962 87.104,9.7667" id="path1978" sodipodi:nodetypes="cc" /> <path |