From 334806029f81684611bd0c5d52445b0981cab691 Mon Sep 17 00:00:00 2001 From: teisuru <31881306+teisuru@users.noreply.github.com> Date: Sun, 27 Aug 2023 14:20:15 +0200 Subject: lord seats --- data.js | 71 ++++++++++++++------------- play.js | 36 ++++++++------ tools/gendata.js | 146 ++++++++++++++++++++++++++++--------------------------- tools/layout.svg | 110 +++++++++++++++++++++++++---------------- 4 files changed, 200 insertions(+), 163 deletions(-) diff --git a/data.js b/data.js index a53f261..b8bce82 100644 --- a/data.js +++ b/data.js @@ -323,7 +323,7 @@ favour:[ {"name":"Calais favour","box":{"x":1134,"y":1418,"w":67,"h":79}}, {"name":"France favour","box":{"x":890,"y":1430,"w":109,"h":114}}, {"name":"Scotland favour","box":{"x":450,"y":278,"w":111,"h":118}}, -{"name":"Ireland favour","box":{"x":50,"y":949,"w":110,"h":121}}, +{"name":"Ireland favour","box":{"x":50,"y":947,"w":110,"h":121}}, {"name":"Burgundy favour","box":{"x":996,"y":688,"w":110,"h":121}}, {"name":"Scarborough favour","box":{"x":791,"y":532,"w":78,"h":57}}, {"name":"Ravenspur favour","box":{"x":835,"y":721,"w":72,"h":45}}, @@ -389,41 +389,44 @@ deplete:[ {"name":"Ravenspur deplete","box":{"x":845,"y":711,"w":72,"h":45}}, ], seat:[ -{"name":"Arundel seat","box":{"x":850,"y":1330,"w":54,"h":56}}, -{"name":"Somerset seat","box":{"x":453,"y":1248,"w":54,"h":56}}, -{"name":"Pembroke seat","box":{"x":145,"y":1108,"w":54,"h":56}}, -{"name":"Devon seat","box":{"x":405,"y":1391,"w":54,"h":56}}, -{"name":"Exeter seat","box":{"x":405,"y":1391,"w":54,"h":56}}, -{"name":"Warwick seat","box":{"x":1118,"y":1385,"w":54,"h":56}}, -{"name":"Rutland seat","box":{"x":1113,"y":1181,"w":54,"h":56}}, -{"name":"Oxford seat","box":{"x":771,"y":1092,"w":54,"h":56}}, -{"name":"Jasper_Tudor2 seat","box":{"x":147,"y":1067,"w":54,"h":56}}, -{"name":"Jasper_Tudor1 seat","box":{"x":230,"y":888,"w":54,"h":56}}, -{"name":"March seat","box":{"x":432,"y":947,"w":54,"h":56}}, -{"name":"Northumberland seat","box":{"x":397,"y":405,"w":54,"h":56}}, -{"name":"Clarence seat","box":{"x":654,"y":593,"w":54,"h":56}}, -{"name":"Salisbury seat","box":{"x":653,"y":617,"w":54,"h":56}}, -{"name":"Gloucester seat","box":{"x":620,"y":1061,"w":54,"h":56}}, -{"name":"Richard_III seat","box":{"x":944,"y":1169,"w":54,"h":56}}, -{"name":"Edward_IV seat","box":{"x":944,"y":1169,"w":54,"h":56}}, -{"name":"Henry Tudor seat","box":{"x":944,"y":1144,"w":54,"h":56}}, -{"name":"Margaret seat","box":{"x":944,"y":1144,"w":54,"h":56}}, -{"name":"Henry_VI seat","box":{"x":944,"y":1144,"w":54,"h":56}}, +{"name":"seat lancaster lord_henry_vi","box":{"x":944,"y":1144,"w":54,"h":56}}, +{"name":"seat lancaster lord_margaret","box":{"x":944,"y":1144,"w":54,"h":56}}, +{"name":"seat lancaster lord_henry_tudor","box":{"x":944,"y":1144,"w":54,"h":56}}, +{"name":"seat york lord_edward_iii","box":{"x":944,"y":1169,"w":54,"h":56}}, +{"name":"seat york lord_gloucester_2","box":{"x":944,"y":1169,"w":54,"h":56}}, +{"name":"seat york lord_gloucester_1","box":{"x":620,"y":1061,"w":54,"h":56}}, +{"name":"seat york lord_salisbury","box":{"x":653,"y":617,"w":54,"h":56}}, +{"name":"seat lancaster lord_clarence","box":{"x":654,"y":593,"w":54,"h":56}}, +{"name":"seat lancaster lord_northumberland_l","box":{"x":397,"y":405,"w":54,"h":56}}, +{"name":"seat lancaster lord_buckingham","box":{"x":715,"y":958,"w":54,"h":56}}, +{"name":"seat york lord_march","box":{"x":432,"y":947,"w":54,"h":56}}, +{"name":"seat lancaster lord_jasper_tudor_1","box":{"x":147,"y":1067,"w":54,"h":56}}, +{"name":"seat lancaster lord_jasper_tudor_2","box":{"x":230,"y":888,"w":54,"h":56}}, +{"name":"seat lancaster lord_oxford","box":{"x":771,"y":1092,"w":54,"h":56}}, +{"name":"seat york lord_rutland","box":{"x":1113,"y":1181,"w":54,"h":56}}, +{"name":"seat lancaster lord_warwick_l","box":{"x":1118,"y":1385,"w":54,"h":56}}, +{"name":"seat lancaster lord_exeter_1","box":{"x":405,"y":1391,"w":54,"h":56}}, +{"name":"seat york lord_devon","box":{"x":313,"y":1340,"w":54,"h":56}}, +{"name":"seat york lord_pembroke","box":{"x":145,"y":1108,"w":54,"h":56}}, +{"name":"seat york lord_warwick_y","box":{"x":1118,"y":1385,"w":54,"h":56}}, +{"name":"seat lancaster lord_somerset_1","box":{"x":453,"y":1248,"w":54,"h":56}}, +{"name":"seat york lord_norfolk","box":{"x":850,"y":1330,"w":54,"h":56}}, +{"name":"seat york lord_northumberland_y1","box":{"x":397,"y":405,"w":54,"h":56}}, ], vassalbox:[ -{"name":"Lincoln vassal","box":{"x":726,"y":763,"w":54,"h":56}}, -{"name":"Launceston vassal","box":{"x":146,"y":1359,"w":54,"h":56}}, -{"name":"Exeter vassal","box":{"x":406,"y":1381,"w":54,"h":56}}, -{"name":"Arundel vassal","box":{"x":850,"y":1330,"w":54,"h":56}}, -{"name":"Dover vassal","box":{"x":1094,"y":1279,"w":54,"h":56}}, -{"name":"Ipswich vassal","box":{"x":1156,"y":1020,"w":54,"h":56}}, -{"name":"St Albans vassal","box":{"x":955,"y":1082,"w":54,"h":56}}, -{"name":"Oxford vassal","box":{"x":776,"y":1109,"w":54,"h":56}}, -{"name":"Worcester vassal","box":{"x":616,"y":999,"w":54,"h":56}}, -{"name":"Shrewsbury vassal","box":{"x":453,"y":881,"w":54,"h":56}}, -{"name":"Leicester vassal","box":{"x":704,"y":898,"w":54,"h":56}}, -{"name":"Derby vassal","box":{"x":605,"y":836,"w":54,"h":56}}, -{"name":"Appleby vassal","box":{"x":602,"y":466,"w":54,"h":56}}, +{"name":"vassal vassal_westmorld","box":{"x":602,"y":466,"w":54,"h":56}}, +{"name":"vassal vassal_stanley","box":{"x":605,"y":836,"w":54,"h":56}}, +{"name":"vassal vassal_dudley","box":{"x":704,"y":898,"w":54,"h":56}}, +{"name":"vassal vassal_shrewsbury","box":{"x":453,"y":881,"w":54,"h":56}}, +{"name":"vassal vassal_worcester","box":{"x":616,"y":999,"w":54,"h":56}}, +{"name":"vassal vassal_oxford","box":{"x":776,"y":1109,"w":54,"h":56}}, +{"name":"vassal vassal_essex","box":{"x":955,"y":1082,"w":54,"h":56}}, +{"name":"vassal vassal_suffolk","box":{"x":1156,"y":1020,"w":54,"h":56}}, +{"name":"vassal vassal_fauconberg","box":{"x":1094,"y":1279,"w":54,"h":56}}, +{"name":"vassal vassal_norfolk","box":{"x":850,"y":1330,"w":54,"h":56}}, +{"name":"vassal vassal_exeter","box":{"x":406,"y":1381,"w":54,"h":56}}, +{"name":"vassal vassal_bonville","box":{"x":146,"y":1359,"w":54,"h":56}}, +{"name":"vassal vassal_beaumont","box":{"x":726,"y":763,"w":54,"h":56}}, ], } if (typeof module !== 'undefined') module.exports = data diff --git a/play.js b/play.js index 6dc77f0..85bc07b 100644 --- a/play.js +++ b/play.js @@ -522,6 +522,7 @@ const ui = { cards: [], calendar: [], track: [], + seat: [], plan_panel: document.getElementById("plan_panel"), plan: document.getElementById("plan"), @@ -700,27 +701,30 @@ function build_map() { e.style.border = "2px solid aqua" e.style.backgroundSize = small + "px" document.getElementById("pieces").appendChild(e) - - - /* - if (locale.name == London) { - if {data.lords == - e = ui.locale_markers[ix] = document.createElement("div") - e.className = "locale marker seat " + locale.name // Depleted to be removed - depleted/exhausted to add markers - e.style.top = y+h-small-offsetdeplete + "px" - e.style.left = offsetdeplete+x+ (w-small)/2 + "px" - e.style.width = small + "px" - e.style.height = small + "px" - e.style.border = "2px solid aqua" - e.style.backgroundSize = small + "px" - document.getElementById("pieces").appendChild(e) - } */ }) +// Lord seats + data.seat.forEach((seat, ix) => { + let e = ui.seat[ix] = document.createElement("div") + let { x, y, w, h } = seat.box + let xc = Math.round(x + w / 2) + let yc = Math.round(y + h / 2) + let small = 54 + locale_xy[ix] = [ xc, yc ] - + e.className = seat.name + e.style.position = "absolute" + e.style.top = y + "px" + e.style.left = x + "px" + e.style.width = w + "px" + e.style.height = h + "px" + e.style.border = "1px solid black" + e.style.backgroundSize = small + "px" + e.style.backgroundColor = "red" + document.getElementById("pieces").appendChild(e) + }) data.lords.forEach((lord, ix) => { diff --git a/tools/gendata.js b/tools/gendata.js index ae55965..599ecac 100644 --- a/tools/gendata.js +++ b/tools/gendata.js @@ -172,7 +172,6 @@ const boxes = { "Southampton favour": [677,1371,60,48], "Dorchester favour": [524,1368,58,49], "Exeter favour": [342,1376,64,66], - "Ireland favour": [50,949,110,121], "Launceston favour": [201,1354,68,60], "Truro favour": [142,1445,56,53], "Lichfield favour": [613,906,74,61], @@ -251,40 +250,43 @@ const boxes = { "Shrewsbury deplete": [510,855,78,69], "Harlech deplete": [288,902,67,61], "Plymouth deplete": [263,1407,58,50], - "Appleby vassal": [602,466,54,56], - "Derby vassal": [605,836,54,56], - "Leicester vassal": [704,898,54,56], - "Shrewsbury vassal": [453,881,54,56], - "Worcester vassal": [616,999,54,56], - "Oxford vassal": [776,1109,54,56], - "St Albans vassal": [955,1082,54,56], - "Ipswich vassal": [1156,1020,54,56], - "Dover vassal": [1094,1279,54,56], - "Arundel vassal": [850,1330,54,56], - "Exeter vassal": [406,1381,54,56], - "Launceston vassal": [146,1359,54,56], - "Henry_VI seat": [944,1144,54,56], - "Margaret seat": [944,1144,54,56], - "Henry Tudor seat": [944,1144,54,56], - "Edward_IV seat": [944,1169,54,56], - "Richard_III seat": [944,1169,54,56], - "Gloucester seat": [620,1061,54,56], - "Salisbury seat": [653,617,54,56], - "Clarence seat": [654,593,54,56], - "Northumberland seat": [397,405,54,56], - "Lincoln vassal": [726,763,54,56], - "Buckingham seat": [715,958,54,56], - "March seat": [432,947,54,56], - "Jasper_Tudor1 seat": [230,888,54,56], - "Jasper_Tudor2 seat": [147,1067,54,56], - "Oxford seat": [771,1092,54,56], - "Rutland seat": [1113,1181,54,56], - "Warwick seat": [1118,1385,54,56], - "Exeter seat": [405,1391,54,56], - "Devon seat": [405,1391,54,56], - "Pembroke seat": [145,1108,54,56], - "Somerset seat": [453,1248,54,56], - "Arundel seat": [850,1330,54,56], + "vassal vassal_westmorld": [602,466,54,56], + "vassal vassal_stanley": [605,836,54,56], + "vassal vassal_dudley": [704,898,54,56], + "vassal vassal_shrewsbury": [453,881,54,56], + "vassal vassal_worcester": [616,999,54,56], + "vassal vassal_oxford": [776,1109,54,56], + "vassal vassal_essex": [955,1082,54,56], + "vassal vassal_suffolk": [1156,1020,54,56], + "vassal vassal_fauconberg": [1094,1279,54,56], + "vassal vassal_norfolk": [850,1330,54,56], + "vassal vassal_exeter": [406,1381,54,56], + "vassal vassal_bonville": [146,1359,54,56], + "seat lancaster lord_henry_vi": [944,1144,54,56], + "seat lancaster lord_margaret": [944,1144,54,56], + "seat lancaster lord_henry_tudor": [944,1144,54,56], + "seat york lord_edward_iii": [944,1169,54,56], + "seat york lord_gloucester_2": [944,1169,54,56], + "seat york lord_gloucester_1": [620,1061,54,56], + "seat york lord_salisbury": [653,617,54,56], + "seat lancaster lord_clarence": [654,593,54,56], + "seat lancaster lord_northumberland_l": [397,405,54,56], + "vassal vassal_beaumont": [726,763,54,56], + "seat lancaster lord_buckingham": [715,958,54,56], + "seat york lord_march": [432,947,54,56], + "seat lancaster lord_jasper_tudor_2": [230,888,54,56], + "seat lancaster lord_jasper_tudor_1": [147,1067,54,56], + "seat lancaster lord_oxford": [771,1092,54,56], + "seat york lord_rutland": [1113,1181,54,56], + "seat lancaster lord_warwick_l": [1118,1385,54,56], + "seat lancaster lord_exeter_1": [405,1391,54,56], + "seat york lord_devon": [313,1340,54,56], + "seat york lord_pembroke": [145,1108,54,56], + "seat lancaster lord_somerset_1": [453,1248,54,56], + "seat york lord_norfolk": [850,1330,54,56], + "seat york lord_northumberland_y1": [397,405,54,56], + "seat york lord_warwick_y": [1118,1385,54,56], + "Ireland favour": [50,947,110,121], } @@ -533,15 +535,12 @@ deffavour("Newcastle favour") deffavour("Appleby favour") deffavour("Hexham favour") deffavour("Carlisle favour") - - deffavour("Harlech favour") deffavour("Pembroke favour") deffavour("Cardiff favour") deffavour("Hereford favour") deffavour("Ludlow favour") deffavour("Shrewsbury favour") - deffavour("Salisbury favour") deffavour("Winchester favour") deffavour("Guildford favour") @@ -551,7 +550,6 @@ deffavour("Rochester favour") deffavour("Dover favour") deffavour("Canterbury favour") deffavour("Hastings favour") - deffavour("Dorchester favour") deffavour("Exeter favour") deffavour("Plymouth favour") @@ -593,42 +591,46 @@ deffavour("Ravenspur favour") //LOCALE SEAT -defseat("Arundel seat") -defseat("Somerset seat") -defseat("Pembroke seat") -defseat("Devon seat") -defseat("Exeter seat") -defseat("Warwick seat") -defseat("Rutland seat") -defseat("Oxford seat") -defseat("Jasper_Tudor2 seat") -defseat("Jasper_Tudor1 seat") -defseat("March seat") -defseat("Northumberland seat") -defseat("Clarence seat") -defseat("Salisbury seat") -defseat("Gloucester seat") -defseat("Richard_III seat") -defseat("Edward_IV seat") -defseat("Henry Tudor seat") -defseat("Margaret seat") -defseat("Henry_VI seat") +defseat("seat lancaster lord_henry_vi") +defseat("seat lancaster lord_margaret") +defseat("seat lancaster lord_henry_tudor") +defseat("seat york lord_edward_iii") +defseat("seat york lord_gloucester_2") +defseat("seat york lord_gloucester_1") +defseat("seat york lord_salisbury") +defseat("seat lancaster lord_clarence") +defseat("seat lancaster lord_northumberland_l") +defseat("seat lancaster lord_buckingham") +defseat("seat york lord_march") +defseat("seat lancaster lord_jasper_tudor_1") +defseat("seat lancaster lord_jasper_tudor_2") +defseat("seat lancaster lord_oxford") +defseat("seat york lord_rutland") +defseat("seat lancaster lord_warwick_l") +defseat("seat lancaster lord_exeter_1") +defseat("seat york lord_devon") +defseat("seat york lord_pembroke") +defseat("seat york lord_warwick_y") +defseat("seat lancaster lord_somerset_1") +defseat("seat york lord_norfolk") +defseat("seat york lord_northumberland_y1") + // VASSAL SEAT -defvassal ("Lincoln vassal") -defvassal("Launceston vassal") -defvassal("Exeter vassal") -defvassal("Arundel vassal") -defvassal("Dover vassal") -defvassal("Ipswich vassal") -defvassal("St Albans vassal") -defvassal("Oxford vassal") -defvassal("Worcester vassal") -defvassal("Shrewsbury vassal") -defvassal("Leicester vassal") -defvassal("Derby vassal") -defvassal("Appleby vassal") +defvassal("vassal vassal_westmorld") +defvassal("vassal vassal_stanley") +defvassal("vassal vassal_dudley") +defvassal("vassal vassal_shrewsbury") +defvassal("vassal vassal_worcester") +defvassal("vassal vassal_oxford") +defvassal("vassal vassal_essex") +defvassal("vassal vassal_suffolk") +defvassal("vassal vassal_fauconberg") +defvassal("vassal vassal_norfolk") +defvassal("vassal vassal_exeter") +defvassal("vassal vassal_bonville") +defvassal("vassal vassal_beaumont") //WAYS BETWEEN LOCALES diff --git a/tools/layout.svg b/tools/layout.svg index 74af401..458b216 100644 --- a/tools/layout.svg +++ b/tools/layout.svg @@ -39,12 +39,12 @@ inkscape:deskcolor="#d1d1d1" showgrid="true" inkscape:zoom="0.7681373" - inkscape:cx="586.48369" - inkscape:cy="1208.7683" + inkscape:cx="251.25716" + inkscape:cy="1001.1231" inkscape:window-width="1920" - inkscape:window-height="991" - inkscape:window-x="-9" - inkscape:window-y="-9" + inkscape:window-height="1057" + inkscape:window-x="-8" + inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="g8" inkscape:document-rotation="0" @@ -1995,7 +1995,7 @@ y="465.797" rx="0" ry="0" - inkscape:label="Appleby vassal" /> + inkscape:label="vassal vassal_westmorld" /> + inkscape:label="vassal vassal_stanley" /> + inkscape:label="vassal vassal_dudley" /> + inkscape:label="vassal vassal_shrewsbury" /> + inkscape:label="vassal vassal_worcester" /> + inkscape:label="vassal vassal_oxford" /> + inkscape:label="vassal vassal_essex" /> + inkscape:label="vassal vassal_suffolk" /> + inkscape:label="vassal vassal_fauconberg" /> + inkscape:label="vassal vassal_norfolk" /> + inkscape:label="vassal vassal_exeter" /> + inkscape:label="vassal vassal_bonville" /> + inkscape:label="seat lancaster lord_henry_vi" /> + inkscape:label="seat lancaster lord_margaret" /> + inkscape:label="seat lancaster lord_henry_tudor" /> + inkscape:label="seat york lord_edward_iii" /> + inkscape:label="seat york lord_gloucester_2" /> + inkscape:label="seat york lord_gloucester_1" /> + inkscape:label="seat york lord_salisbury" /> + inkscape:label="seat lancaster lord_clarence" /> + inkscape:label="seat lancaster lord_northumberland_l" /> + inkscape:label="vassal vassal_beaumont" />