summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data.js2
-rw-r--r--play.js11
-rw-r--r--tools/gendata.js2
3 files changed, 13 insertions, 2 deletions
diff --git a/data.js b/data.js
index 25b35e9..384f570 100644
--- a/data.js
+++ b/data.js
@@ -14,7 +14,7 @@ way_exile_2:[14,15,17,19,20,21,22,24,51,52,58],
way_exile_3:[5,6,26,54,59],
way_sea_1:[0,1,14,15,17,19,20,21,22,24,35,37,51,56,57,58,60],
way_sea_2:[0,1,5,6,14,15,17,19,20,21,22,24,26,35,37,51,56,57,58,58,59,60],
-way_sea_3:[14,14,15,15,17,17,19,19,20,20,21,21,22,22,24,24,51,51,58,59],
+way_sea_3:[5,6,14,15,17,19,20,21,22,24,26,51,58,59],
way_port_1:[0,1,35,37,56,57,60],
way_port_2:[14,15,17,19,20,21,22,24,51,58],
way_port_3:[5,6,26,59],
diff --git a/play.js b/play.js
index 89990a7..8989551 100644
--- a/play.js
+++ b/play.js
@@ -1122,10 +1122,21 @@ function update_locale(loc) {
ui.locale_markers[loc].appendChild(get_cached_element("marker circle battle"))
+ if (!set_has(view.pieces.depleted,loc) && !set_has(view.pieces.exhausted,loc)) {
+ let cn
+ cn = "depleted"
+ ui.locale_markers[loc].classList.remove(cn)
+ cn = "exhausted"
+ ui.locale_markers[loc].classList.remove(cn)
+ }
+
if (set_has(view.pieces.depleted, loc)) {
let cn
cn = "depleted"
ui.locale_markers[loc].classList.add(cn)
+ cn = "exhausted"
+ ui.locale_markers[loc].classList.remove(cn)
+
}
if (set_has(view.pieces.exhausted, loc)) {
let cn
diff --git a/tools/gendata.js b/tools/gendata.js
index d673f71..a72fa43 100644
--- a/tools/gendata.js
+++ b/tools/gendata.js
@@ -717,7 +717,7 @@ road("Ravenspur, Lincoln")
let way_sea_1 = ["North Sea", "English Channel", "Bamburgh", "Newcastle", "Scarborough", "Ravenspur", "Lynn", "Ipswich", "Dover", "Hastings", "Calais", "Arundel", "Southampton", "Dorchester", "Exeter", "Plymouth", "Truro"].map(name => locmap[name]).sort(cmpnum)
let way_sea_2 = ["English Channel","North Sea", "Irish Sea", "Bristol","Pembroke","Harlech", "English Channel","Bamburgh", "Newcastle", "Scarborough", "Ravenspur", "Lynn", "Ipswich","Dover", "Hastings", "Calais", "Arundel", "Southampton", "Dorchester", "Exeter", "Plymouth", "Truro" ].map(name => locmap[name]).sort(cmpnum)
-let way_sea_3 = ["English Channel", "Dover", "Hastings", "Calais", "Arundel", "Southampton", "Dorchester", "Exeter", "Plymouth", "Truro", "Dover", "Hastings", "Calais", "Arundel", "Southampton", "Dorchester", "Exeter", "Plymouth", "Truro","Irish Sea"].map(name => locmap[name]).sort(cmpnum)
+let way_sea_3 = ["English Channel", "Bristol","Pembroke","Harlech", "Dover", "Hastings", "Calais", "Arundel", "Southampton", "Dorchester", "Exeter", "Plymouth", "Truro","Irish Sea"].map(name => locmap[name]).sort(cmpnum)
let way_exile_1 = ["Burgundy", "Bamburgh", "Newcastle", "Scarborough", "Ravenspur", "Lynn", "Ipswich", "North Sea"].map(name => locmap[name]).sort(cmpnum)
let way_exile_2 = ["France", "English Channel", "Dover", "Hastings", "Calais", "Arundel", "Southampton", "Dorchester", "Exeter", "Plymouth", "Truro"].map(name => locmap[name]).sort(cmpnum)