tweak seat layouts

4 files changed, 48 insertions, 48 deletions

diff --git a/data.js b/data.js
index 4232912..ef9f00d 100644
--- a/data.js
+++ b/data.js
@@ -276,20 +276,20 @@ cards:[
 seat:[
 {"name":"seat york lord_york","box":{"x":906,"y":937,"w":50,"h":50}},
 {"name":"seat york lord_march","box":{"x":427,"y":969,"w":50,"h":50}},
-{"name":"seat york lord_edward_iv","box":{"x":929,"y":1164,"w":50,"h":50}},
+{"name":"seat york lord_edward_iv","box":{"x":952,"y":1148,"w":50,"h":50}},
 {"name":"seat york lord_salisbury","box":{"x":770,"y":636,"w":50,"h":50}},
 {"name":"seat york lord_rutland","box":{"x":1125,"y":1214,"w":50,"h":50}},
-{"name":"seat york lord_pembroke","box":{"x":132,"y":1095,"w":50,"h":50}},
+{"name":"seat york lord_pembroke","box":{"x":184,"y":1067,"w":50,"h":50}},
 {"name":"seat york lord_devon","box":{"x":359,"y":1318,"w":50,"h":50}},
 {"name":"seat york lord_northumberland_y1","box":{"x":391,"y":431,"w":50,"h":50}},
 {"name":"seat york lord_northumberland_y2","box":{"x":391,"y":431,"w":50,"h":50}},
 {"name":"seat york lord_gloucester_1","box":{"x":609,"y":1074,"w":50,"h":50}},
-{"name":"seat york lord_gloucester_2","box":{"x":930,"y":1165,"w":50,"h":50}},
-{"name":"seat york lord_richard_iii","box":{"x":930,"y":1165,"w":50,"h":50}},
+{"name":"seat york lord_gloucester_2","box":{"x":953,"y":1148,"w":50,"h":50}},
+{"name":"seat york lord_richard_iii","box":{"x":953,"y":1149,"w":50,"h":50}},
 {"name":"seat york lord_norfolk","box":{"x":795,"y":1398,"w":50,"h":50}},
 {"name":"seat york lord_warwick_y","box":{"x":1150,"y":1349,"w":50,"h":50}},
-{"name":"seat lancaster lord_henry_vi","box":{"x":865,"y":1166,"w":50,"h":50}},
-{"name":"seat lancaster lord_margaret","box":{"x":864,"y":1166,"w":50,"h":50}},
+{"name":"seat lancaster lord_henry_vi","box":{"x":834,"y":1169,"w":50,"h":50}},
+{"name":"seat lancaster lord_margaret","box":{"x":833,"y":1170,"w":50,"h":50}},
 {"name":"seat lancaster lord_somerset_1","box":{"x":453,"y":1277,"w":50,"h":50}},
 {"name":"seat lancaster lord_somerset_2","box":{"x":452,"y":1276,"w":50,"h":50}},
 {"name":"seat lancaster lord_exeter_1","box":{"x":300,"y":1333,"w":50,"h":50}},
@@ -297,9 +297,9 @@ seat:[
 {"name":"seat lancaster lord_buckingham","box":{"x":714,"y":975,"w":50,"h":50}},
 {"name":"seat lancaster lord_northumberland_l","box":{"x":392,"y":430,"w":50,"h":50}},
 {"name":"seat lancaster lord_clarence","box":{"x":650,"y":637,"w":50,"h":50}},
-{"name":"seat lancaster lord_jasper_tudor_1","box":{"x":190,"y":1066,"w":50,"h":50}},
+{"name":"seat lancaster lord_jasper_tudor_1","box":{"x":127,"y":1104,"w":50,"h":50}},
 {"name":"seat lancaster lord_jasper_tudor_2","box":{"x":346,"y":921,"w":50,"h":50}},
-{"name":"seat lancaster lord_henry_tudor","box":{"x":864,"y":1166,"w":50,"h":50}},
+{"name":"seat lancaster lord_henry_tudor","box":{"x":834,"y":1170,"w":50,"h":50}},
 {"name":"seat lancaster lord_oxford","box":{"x":678,"y":1078,"w":50,"h":50}},
 {"name":"seat lancaster lord_warwick_l","box":{"x":1150,"y":1350,"w":50,"h":50}},
 ],
diff --git a/play.js b/play.js
index 814725f..17b1230 100644
--- a/play.js
+++ b/play.js
@@ -803,7 +803,7 @@ function layout_calendar() {
 		list = calendar_layout_lanc[loc]
 		for (let i = 0; i < list.length; ++i) {
 			let e = ui.lord_cylinder[list[i]]
-			let x = cx, y = cy, z = 30
+			let x = cx, y = cy, z = 30 + i
 			x += 5
 			y += i * 30 - 2
 			e.style.top = y + "px"
@@ -813,9 +813,9 @@ function layout_calendar() {
 			// cylinder is 44x48, exile marker is 39
 			if (is_lord_in_exile(list[i])) {
 				e = ui.lord_exile[list[i]]
-				e.style.top = y + 5 + "px"
+				e.style.top = y + 7 + "px"
 				e.style.left = x + 3 - 20 + "px"
-				e.style.zIndex = z - 1
+				e.style.zIndex = z + 1
 			}
 		}
 
@@ -823,7 +823,7 @@ function layout_calendar() {
 		for (let i = 0; i < list.length; ++i) {
 			// ui.lord_exile[ix].classList.toggle("hide", !is_lord_in_exile(ix))
 			let e = ui.lord_cylinder[list[i]]
-			let x = cx, y = cy, z = 30
+			let x = cx, y = cy, z = 30 + i
 			x += 50
 			y += i * 30 - 2
 			e.style.top = y + "px"
@@ -833,7 +833,7 @@ function layout_calendar() {
 			// cylinder is 44, exile marker is 39
 			if (is_lord_in_exile(list[i])) {
 				e = ui.lord_exile[list[i]]
-				e.style.top = y + "px"
+				e.style.top = y + 7 + "px"
 				e.style.left = x + 3 + 20 + "px"
 				e.style.zIndex = z - 1
 			}
diff --git a/tools/gendata.js b/tools/gendata.js
index ade9bbf..7f2d41a 100644
--- a/tools/gendata.js
+++ b/tools/gendata.js
@@ -113,32 +113,32 @@ const boxes = {
 	"vassal vassal_devon": [406,1400,27,30],
 	"vassal vassal_bonville": [174,1377,27,30],
 	"vassal vassal_beaumont": [753,787,27,30],
-	"seat lancaster lord_henry_vi": [865,1166,50,50],
-	"seat lancaster lord_margaret": [864,1166,50,50],
-	"seat lancaster lord_henry_tudor": [864,1166,50,50],
+	"seat lancaster lord_henry_vi": [834,1169,50,50],
+	"seat lancaster lord_margaret": [833,1170,50,50],
+	"seat lancaster lord_henry_tudor": [834,1170,50,50],
 	"seat lancaster lord_clarence": [650,637,50,50],
 	"seat lancaster lord_northumberland_l": [392,430,50,50],
 	"seat lancaster lord_buckingham": [714,975,50,50],
 	"seat lancaster lord_jasper_tudor_2": [346,921,50,50],
-	"seat lancaster lord_jasper_tudor_1": [190,1066,50,50],
+	"seat lancaster lord_jasper_tudor_1": [127,1104,50,50],
 	"seat lancaster lord_oxford": [678,1078,50,50],
 	"seat lancaster lord_warwick_l": [1150,1350,50,50],
 	"seat lancaster lord_exeter_1": [300,1333,50,50],
 	"seat lancaster lord_somerset_1": [453,1277,50,50],
-	"seat york lord_edward_iv": [929,1164,50,50],
-	"seat york lord_gloucester_2": [930,1165,50,50],
+	"seat york lord_edward_iv": [952,1148,50,50],
+	"seat york lord_gloucester_2": [953,1148,50,50],
 	"seat york lord_gloucester_1": [609,1074,50,50],
 	"seat york lord_salisbury": [770,636,50,50],
 	"seat york lord_march": [427,969,50,50],
 	"seat york lord_rutland": [1125,1214,50,50],
 	"seat york lord_devon": [359,1318,50,50],
-	"seat york lord_pembroke": [132,1095,50,50],
+	"seat york lord_pembroke": [184,1067,50,50],
 	"seat york lord_norfolk": [795,1398,50,50],
 	"seat york lord_northumberland_y1": [391,431,50,50],
 	"seat york lord_warwick_y": [1150,1349,50,50],
 	"seat york lord_york": [906,937,50,50],
 	"seat york lord_northumberland_y2": [391,431,50,50],
-	"seat york lord_richard_iii": [930,1165,50,50],
+	"seat york lord_richard_iii": [953,1149,50,50],
 	"seat lancaster lord_somerset_2": [452,1276,50,50],
 	"seat lancaster lord_exeter_2": [300,1333,50,50],
 }
diff --git a/tools/layout.svg b/tools/layout.svg
index 8e9ca6b..6daded0 100644
--- a/tools/layout.svg
+++ b/tools/layout.svg
@@ -38,9 +38,9 @@
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
      showgrid="false"
-     inkscape:zoom="2.2194061"
-     inkscape:cx="833.37458"
-     inkscape:cy="1115.5331"
+     inkscape:zoom="1.0912259"
+     inkscape:cx="901.72767"
+     inkscape:cy="1163.015"
      inkscape:window-width="1920"
      inkscape:window-height="991"
      inkscape:window-x="-9"
@@ -65,15 +65,15 @@
   <image
      sodipodi:absref="/home/tor/src/rally/public/plantagenet/map75.png"
      xlink:href="../map75.png"
-     y="0"
-     x="0"
-     width="1275"
-     height="1650"
-     preserveAspectRatio="none"
-     id="image10"
-     sodipodi:insensitive="true"
+     inkscape:svg-dpi="1"
      style="display:inline;image-rendering:pixelated"
-     inkscape:svg-dpi="1" />
+     sodipodi:insensitive="true"
+     id="image10"
+     preserveAspectRatio="none"
+     height="1650"
+     width="1275"
+     x="0"
+     y="0" />
   <rect
      style="fill:#ff00ff;fill-opacity:0.378049;stroke-width:1.5703"
      id="rect1091"
@@ -699,8 +699,8 @@
      id="rect1042"
      width="50"
      height="50"
-     x="864.83679"
-     y="1165.5977"
+     x="834.25964"
+     y="1169.4408"
      rx="0"
      ry="0"
      inkscape:label="seat lancaster lord_henry_vi" />
@@ -709,8 +709,8 @@
      id="rect1044"
      width="50"
      height="50"
-     x="863.80273"
-     y="1165.8037"
+     x="833.22559"
+     y="1169.6469"
      rx="0"
      ry="0"
      inkscape:label="seat lancaster lord_margaret" />
@@ -719,8 +719,8 @@
      id="rect1046"
      width="50"
      height="50"
-     x="864.17682"
-     y="1165.7495"
+     x="833.59967"
+     y="1169.5927"
      rx="0"
      ry="0"
      inkscape:label="seat lancaster lord_henry_tudor" />
@@ -769,8 +769,8 @@
      id="rect1068"
      width="50"
      height="50"
-     x="190.02089"
-     y="1066.2098"
+     x="127.22492"
+     y="1103.8549"
      rx="0"
      ry="0"
      inkscape:label="seat lancaster lord_jasper_tudor_1" />
@@ -819,8 +819,8 @@
      id="rect1048"
      width="50"
      height="50"
-     x="929.32196"
-     y="1164.1428"
+     x="952.42804"
+     y="1147.9575"
      rx="0"
      ry="0"
      inkscape:label="seat york lord_edward_iv" />
@@ -829,8 +829,8 @@
      id="rect1050"
      width="50"
      height="50"
-     x="929.90576"
-     y="1164.5527"
+     x="953.01184"
+     y="1148.3674"
      rx="0"
      ry="0"
      inkscape:label="seat york lord_gloucester_2" />
@@ -889,8 +889,8 @@
      id="rect1080"
      width="50"
      height="50"
-     x="131.73676"
-     y="1095.2217"
+     x="183.59027"
+     y="1067.1355"
      rx="0"
      ry="0"
      inkscape:label="seat york lord_pembroke" />
@@ -949,8 +949,8 @@
      id="rect108"
      width="50"
      height="50"
-     x="929.90576"
-     y="1165.1088"
+     x="953.01184"
+     y="1148.9235"
      rx="0"
      ry="0"
      inkscape:label="seat york lord_richard_iii" />