style

2 files changed, 67 insertions, 49 deletions

diff --git a/tools/layout.svg b/tools/layout.svg
index 7fe274c..841fb90 100644
--- a/tools/layout.svg
+++ b/tools/layout.svg
@@ -40,10 +40,10 @@
      inkscape:window-height="480"
      id="namedview6"
      showgrid="false"
-     inkscape:zoom="0.42996109"
-     inkscape:cx="1321.8811"
-     inkscape:cy="745.19143"
-     inkscape:current-layer="svg4"
+     inkscape:zoom="8.3661045"
+     inkscape:cx="236.64652"
+     inkscape:cy="1572.9559"
+     inkscape:current-layer="g3013"
      inkscape:document-rotation="0"
      showguides="false">
     <inkscape:grid
@@ -53,45 +53,49 @@
   <image
      sodipodi:absref="/home/tor/src/rally/public/maria/Maria.Gameboard.150.png"
      xlink:href="../Maria.Gameboard.150.png"
-     style="display:none"
-     x="0"
-     y="0"
-     width="2485"
-     height="1654"
-     image-rendering="pixelated"
+     id="image2"
      sodipodi:insensitive="true"
-     id="image2" />
+     image-rendering="pixelated"
+     height="1654"
+     width="2485"
+     y="0"
+     x="0"
+     style="display:inline" />
   <g
      id="g3013"
      inkscape:label="box">
     <rect
-       style="fill:#ffffff;fill-opacity:0.54878"
+       style="fill:#ffffff;fill-opacity:0.54878;stroke-width:1.01529"
        id="rect3008"
-       width="43.831398"
-       height="45.260857"
-       x="1853.6437"
-       y="56.910255" />
+       width="44.419098"
+       height="46.038109"
+       x="1853.1211"
+       y="56.521629"
+       inkscape:label="#EastPrussia" />
     <rect
-       style="fill:#ffffff;fill-opacity:0.54878"
+       style="fill:#ff0000;fill-opacity:0.54878;stroke-width:1.03215"
        id="rect3006"
-       width="43.490704"
-       height="44.500431"
-       x="2260.5447"
-       y="1556.2987" />
+       width="44.758511"
+       height="46.064903"
+       x="2259.615"
+       y="1555.5796"
+       inkscape:label="#ItalyA" />
     <rect
        style="fill:#ffffff;fill-opacity:0.54878"
        id="rect2965"
        width="50.698509"
        height="59.472061"
        x="909.94495"
-       y="78.812782" />
+       y="78.812782"
+       inkscape:label="#England" />
     <rect
-       style="fill:#ffffff;fill-opacity:0.54878"
+       style="display:inline;fill:#ffffff;fill-opacity:0.54878;stroke-width:0.997019"
        id="rect3004"
-       width="44.615875"
-       height="46.146133"
-       x="192.40532"
-       y="1554.2411" />
+       width="44.497803"
+       height="45.993053"
+       x="192.34482"
+       y="1554.1805"
+       inkscape:label="#ItalyF" />
   </g>
   <g
      id="g2467"
@@ -14127,7 +14131,8 @@
   <g
      id="g2869"
      inkscape:label="$HEARTS"
-     style="display:none;fill:#ff2a2a">
+     style="display:none;fill:#ff2a2a"
+     sodipodi:insensitive="true">
     <rect
        style="fill:#ff2a2a;fill-opacity:0.54878"
        id="rect2836"
@@ -14209,7 +14214,8 @@
   <g
      id="g2974"
      inkscape:label="$DIAMONDS"
-     style="display:none">
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="fill:#ffff00;fill-opacity:0.54878"
        id="rect2938"
@@ -14299,7 +14305,8 @@
   <g
      id="g2904"
      inkscape:label="$SPADES"
-     style="display:none">
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="fill:#000080;fill-opacity:0.54878"
        id="rect2871"
@@ -14381,7 +14388,8 @@
   <g
      id="g2936"
      inkscape:label="$CLUBS"
-     style="display:none">
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="fill:#008000;fill-opacity:0.54878"
        id="rect2906"
@@ -14456,7 +14464,8 @@
   <g
      id="g2897"
      inkscape:label="$France"
-     style="display:none">
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="fill:#ff2f2f;fill-opacity:0.54878"
        id="rect2870"
@@ -14524,7 +14533,8 @@
   <g
      id="g3734"
      inkscape:label="$Netherlands"
-     style="display:none">
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="fill:#808080;fill-opacity:0.54878"
        id="rect2899"
@@ -14557,7 +14567,8 @@
   <g
      id="g3754"
      inkscape:label="$Prussia"
-     style="display:none">
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="fill:#0000ff;fill-opacity:0.54878"
        id="rect3736"
@@ -14604,7 +14615,8 @@
   <g
      id="g3777"
      inkscape:label="$Poland"
-     style="display:none">
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="fill:#ffff00;fill-opacity:0.54878"
        id="rect3756"
@@ -14658,7 +14670,8 @@
   <g
      id="g3800"
      inkscape:label="$Silesia"
-     style="display:none">
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="fill:#808000;fill-opacity:0.54878"
        id="rect3781"
@@ -14712,7 +14725,8 @@
   <g
      id="g3847"
      inkscape:label="$Saxony"
-     style="display:none">
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="fill:#008000;fill-opacity:0.54878"
        id="rect3802"
@@ -14822,7 +14836,8 @@
   <g
      id="g3872"
      inkscape:label="$Bavaria"
-     style="display:none">
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="fill:#ff6600;fill-opacity:0.54878"
        id="rect3849"
@@ -14876,7 +14891,8 @@
   <g
      id="g3912"
      inkscape:label="$Austria_E"
-     style="display:none">
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="fill:#ffffff;fill-opacity:0.54878"
        id="rect3937"
@@ -14979,7 +14995,8 @@
   <g
      id="g3931"
      inkscape:label="$Austria_W"
-     style="display:none">
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="fill:#ffffff;fill-opacity:0.54878"
        id="rect3914"
@@ -15025,8 +15042,9 @@
   </g>
   <g
      id="g3974"
-     inkscape:label="$HRE_E"
-     style="display:none">
+     inkscape:label="$Empire_E"
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="fill:#ffff00;fill-opacity:0.54878"
        id="rect2963"
@@ -15128,7 +15146,7 @@
   </g>
   <g
      id="g4011"
-     inkscape:label="$HRE_W"
+     inkscape:label="$Empire_W"
      style="display:none"
      sodipodi:insensitive="true">
     <rect
diff --git a/tools/parse-layout.js b/tools/parse-layout.js
index b389669..9006560 100644
--- a/tools/parse-layout.js
+++ b/tools/parse-layout.js
@@ -221,7 +221,7 @@ const PRUSSIA = "Prussia"
 const SAXONY = "Saxony"
 const AUSTRIA = "Austria"
 const AUSTRIAN_NETHERLANDS = "Austria"
-const HRE = "HRE"
+const EMPIRE = "Empire"
 const NETHERLANDS = "Netherlands"
 const SILESIA = "Silesia"
 const POLAND = "Poland"
@@ -254,13 +254,13 @@ for (let key in points) {
 
 			let map = "UNKNOWN"
 			let country = "UNKNOWN"
-			if (find_enclosing_rect(rects.$HRE_W, x, y)) {
+			if (find_enclosing_rect(rects.$Empire_W, x, y)) {
 				map = FLANDERS
-				country = HRE
+				country = EMPIRE
 			}
-			else if (find_enclosing_rect(rects.$HRE_E, x, y)) {
+			else if (find_enclosing_rect(rects.$Empire_E, x, y)) {
 				map = BOHEMIA
-				country = HRE
+				country = EMPIRE
 			}
 			else if (find_enclosing_rect(rects.$Austria_W, x, y)) {
 				map = FLANDERS
@@ -393,7 +393,7 @@ let sets = {
 		Prussia: [],
 		Saxony: [],
 		Silesia: [],
-		HRE: [],
+		Empire: [],
 		UNKNOWN: [],
 	},
 }