Tweak layout coordinates.

1 files changed, 64 insertions, 61 deletions

diff --git a/play.js b/play.js
index d9c7ff7..ce42f5c 100644
--- a/play.js
+++ b/play.js
@@ -20,62 +20,62 @@ const faction_flags = [
 // :r !python3 tools/genlayout.py
 // modified
 const LAYOUT = {
-	"Andhra DS": [785, 1014],
-	"Andhra BK": [678, 1060],
-	"Andhra VE": [653, 1165],
-	"Andhra mongols": [748, 1215],
-	"Bengal DS": [1148, 455],
-	"Bengal BK": [1079, 536],
-	"Bengal VE": [1122, 626],
-	"Bengal mongols": [1209, 663],
-	"Gondwana DS": [992, 685],
-	"Gondwana BK": [848, 695],
-	"Gondwana VE": [864, 842],
-	"Gondwana mongols": [990, 743],
-	"Gujarat DS": [362, 611],
-	"Gujarat BK": [250, 601],
-	"Gujarat VE": [386, 723],
-	"Gujarat mongols": [134, 611],
-	"Jaunpur DS": [979, 422],
-	"Jaunpur BK": [788, 526],
-	"Jaunpur VE": [915, 586],
-	"Jaunpur mongols": [867, 385],
-	"Karnataka DS": [551, 1213],
-	"Karnataka BK": [651, 1298],
-	"Karnataka VE": [572, 1390],
-	"Karnataka mongols": [483, 1254],
-	"Madhyadesh DS": [724, 746],
-	"Madhyadesh BK": [571, 868],
-	"Madhyadesh VE": [653, 941],
-	"Madhyadesh mongols": [613, 770],
-	"Maharashtra DS": [465, 907],
-	"Maharashtra BK": [531, 997],
-	"Maharashtra VE": [525, 1084],
-	"Maharashtra mongols": [387, 900],
-	"Malwa DS": [682, 574],
-	"Malwa BK": [515, 623],
-	"Malwa VE": [511, 735],
-	"Malwa mongols": [537, 557],
-	"Orissa DS": [1168, 798],
-	"Orissa BK": [1082, 800],
-	"Orissa VE": [955, 929],
-	"Orissa mongols": [935, 991],
-	"Rajput Kingdoms DS": [427, 367],
-	"Rajput Kingdoms BK": [205, 483],
-	"Rajput Kingdoms VE": [433, 502],
-	"Rajput Kingdoms mongols": [229, 383],
-	"Sindh DS": [110, 327],
-	"Sindh BK": [40, 492],
-	"Sindh VE": [42, 544],
-	"Sindh mongols": [36, 344],
-	"Tamilakam DS": [756, 1338],
-	"Tamilakam BK": [648, 1478],
-	"Tamilakam VE": [657, 1543],
-	"Tamilakam mongols": [752, 1394],
-	"Delhi DS": [718, 326],
-	"Delhi BK": [571, 422],
-	"Delhi VE": [724, 414],
-	"Delhi mongols": [573, 334],
+	"Andhra DS": [835, 1050],
+	"Andhra BK": [660, 1040],
+	"Andhra VE": [680, 1200],
+	"Andhra mongols": [0, 0],
+	"Bengal DS": [1170, 460],
+	"Bengal BK": [1060, 535],
+	"Bengal VE": [1142, 665],
+	"Bengal mongols": [0, 0],
+	"Gondwana DS": [1000, 690],
+	"Gondwana BK": [820, 710],
+	"Gondwana VE": [855, 835],
+	"Gondwana mongols": [0, 0],
+	"Gujarat DS": [320, 630],
+	"Gujarat BK": [140, 620],
+	"Gujarat VE": [380, 760],
+	"Gujarat mongols": [0, 0],
+	"Jaunpur DS": [985, 425],
+	"Jaunpur BK": [795, 545],
+	"Jaunpur VE": [915, 570],
+	"Jaunpur mongols": [0, 0],
+	"Karnataka DS": [625, 1300],
+	"Karnataka BK": [475, 1220],
+	"Karnataka VE": [560, 1400],
+	"Karnataka mongols": [0, 0],
+	"Madhyadesh DS": [670, 745],
+	"Madhyadesh BK": [600, 920],
+	"Madhyadesh VE": [700, 890],
+	"Madhyadesh mongols": [0, 0],
+	"Maharashtra DS": [430, 900],
+	"Maharashtra BK": [510, 990],
+	"Maharashtra VE": [470, 1095],
+	"Maharashtra mongols": [0, 0],
+	"Malwa DS": [685, 585],
+	"Malwa BK": [515, 620],
+	"Malwa VE": [500, 735],
+	"Malwa mongols": [0, 0],
+	"Orissa DS": [1168, 800],
+	"Orissa BK": [1060, 860],
+	"Orissa VE": [905, 970],
+	"Orissa mongols": [0, 0],
+	"Rajput Kingdoms DS": [420, 380],
+	"Rajput Kingdoms BK": [220, 460],
+	"Rajput Kingdoms VE": [380, 480],
+	"Rajput Kingdoms mongols": [0, 0],
+	"Sindh DS": [60, 320],
+	"Sindh BK": [40, 470],
+	"Sindh VE": [20, 530],
+	"Sindh mongols": [0, 0],
+	"Tamilakam DS": [770, 1330],
+	"Tamilakam BK": [700, 1460],
+	"Tamilakam VE": [650, 1540],
+	"Tamilakam mongols": [0, 0],
+	"Delhi BK": [100, 100], // unused
+	"Delhi VE": [100, 100], // unused
+	"Delhi DS": [685, 420],
+	"Delhi mongols": [575, 350],
 	"Mountain Passes DS": [263, 183],
 	"Mountain Passes BK": [236, 110],
 	"Mountain Passes VE": [318, 105],
@@ -795,7 +795,8 @@ function place_piece(p, x, y, z) {
 
 function layout_discs(list, xc, yc, f) {
 	let x_corr = f === DS ? -32 : 32
-	place_piece(list[0], xc - 20 + x_corr, yc - 10, 52)
+	for (let disc of list)
+		place_piece(disc, xc - 20 + x_corr, yc - 10, 52)
 }
 
 function layout_available_bases(list, x0, y0, rows, dx, dy) {
@@ -1074,9 +1075,12 @@ function on_update() {
 	for (let s = 0; s < data.spaces.length; ++s) {
 		let xy
 
+
 		if (s <= last_province) {
+console.log("LAYOUT PROV", data.space_name[s])
 			troops.length = elites.length = discs.length = 0
 			filter_piece_list(discs, s, DS, DISC)
+console.log("  DS DISCS", discs.length)
 			filter_piece_list(elites, s, DS, ELITE)
 			filter_piece_list(troops, s, DS, TROOPS)
 			xy = get_layout_xy(s, "DS")
@@ -1098,15 +1102,14 @@ function on_update() {
 			filter_piece_list(troops, s, MI, TROOPS)
 			xy = get_layout_xy(s, "mongols")
 			layout_pieces(troops, xy[0], xy[1], discs, MI)
-		} else if (s <= S_VE_AVAILABLE) {
-			ui.spaces[s].classList.toggle("action", is_action("space", s))
-		} else if (s <= S_BK_INF_4) {
+
+		} else if (s >= S_BK_INF_2 && s <= S_BK_INF_4) {
 			items.length = discs.length = 0
 			filter_piece_list(items, s, BK, ELITE)
 			xy = get_layout_xy(s)
 			layout_pieces(items, xy[0], xy[1], discs, BK)
 
-		} else if (s <= S_VE_INF_4) {
+		} else if (s >= S_VE_INF_1 && s <= S_VE_INF_4) {
 			items.length = discs.length = 0
 			filter_piece_list(items, s, VE, ELITE)
 			xy = get_layout_xy(s)