arundel is not a port

4 files changed, 14 insertions, 14 deletions

diff --git a/data.js b/data.js
index 71fd056..c8b8549 100644
--- a/data.js
+++ b/data.js
@@ -7,18 +7,18 @@ sea_1:60,
 sea_2:58,
 sea_3:59,
 port_1:[0,1,2,3,4],
-port_2:[5,6,7,8,9,10,11,12,13],
+port_2:[5,6,7,8,9,11,12,13],
 port_3:[14,15,16],
-all_ports:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16],
+all_ports:[0,1,2,3,4,5,6,7,8,9,11,12,13,14,15,16],
 sail_exile_1:[60,0,1,2,3,4],
-sail_exile_2:[58,5,6,7,8,9,10,11,12,13],
+sail_exile_2:[58,5,6,7,8,9,11,12,13],
 sail_exile_3:[59,14,15,16],
 sail_exile_4:[60,0,1,2,3,4],
-sail_sea_1:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,58],
-sail_sea_2:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,59,60],
-sail_sea_3:[5,6,7,8,9,10,11,12,13,14,15,16,58],
+sail_sea_1:[0,1,2,3,4,5,6,7,8,9,11,12,13,58],
+sail_sea_2:[0,1,2,3,4,5,6,7,8,9,11,12,13,14,15,16,59,60],
+sail_sea_3:[5,6,7,8,9,11,12,13,14,15,16,58],
 sail_port_1:[60,0,1,2,3,4],
-sail_port_2:[58,5,6,7,8,9,10,11,12,13],
+sail_port_2:[58,5,6,7,8,9,11,12,13],
 sail_port_3:[59,14,15,16],
 locales:[
 {"name":"Lynn","type":"fortress","region":"England","adjacent":[19,24],"highways":[],"roads":[19,24],"paths":[],"not_paths":[19,24],"box":{"x":968,"y":898,"w":40,"h":30}},
diff --git a/rules.js b/rules.js
index 15854dd..6a1957d 100644
--- a/rules.js
+++ b/rules.js
@@ -190,12 +190,12 @@ function get_lord_influence(lord) {
     return data.lords[lord].influence;
 }
 // from !node tools/gendata.js
-function is_seaport(x) { return (x >= 0 && x <= 16); }
+function is_seaport(x) { return (x >= 0 && x <= 9) || (x >= 11 && x <= 16); }
 function is_port_1(x) { return (x >= 0 && x <= 4); }
-function is_port_2(x) { return (x >= 5 && x <= 13); }
+function is_port_2(x) { return (x >= 5 && x <= 9) || (x >= 11 && x <= 13); }
 function is_port_3(x) { return (x >= 14 && x <= 16); }
 function is_adjacent_north_sea(x) { return (x >= 0 && x <= 4); }
-function is_adjacent_english_channel(x) { return (x >= 5 && x <= 13); }
+function is_adjacent_english_channel(x) { return (x >= 5 && x <= 9) || (x >= 11 && x <= 13); }
 function is_adjacent_irish_sea(x) { return (x >= 14 && x <= 16); }
 function is_stronghold(x) { return (x >= 0 && x <= 53); }
 function is_fortress(x) { return (x >= 0 && x <= 1) || x === 15 || x === 42 || x === 53; }
diff --git a/rules.ts b/rules.ts
index 7da03f1..6209241 100644
--- a/rules.ts
+++ b/rules.ts
@@ -501,12 +501,12 @@ function get_lord_influence(lord: Lord): number {
 }
 
 // from !node tools/gendata.js
-function is_seaport(x: Locale) { return (x >= 0 && x <= 16) }
+function is_seaport(x: Locale) { return (x >= 0 && x <= 9) || (x >= 11 && x <= 16) }
 function is_port_1(x: Locale) { return (x >= 0 && x <= 4) }
-function is_port_2(x: Locale) { return (x >= 5 && x <= 13) }
+function is_port_2(x: Locale) { return (x >= 5 && x <= 9) || (x >= 11 && x <= 13) }
 function is_port_3(x: Locale) { return (x >= 14 && x <= 16) }
 function is_adjacent_north_sea(x: Locale) { return (x >= 0 && x <= 4) }
-function is_adjacent_english_channel(x: Locale) { return (x >= 5 && x <= 13) }
+function is_adjacent_english_channel(x: Locale) { return (x >= 5 && x <= 9) || (x >= 11 && x <= 13) }
 function is_adjacent_irish_sea(x: Locale) { return (x >= 14 && x <= 16) }
 function is_stronghold(x: Locale) { return (x >= 0 && x <= 53) }
 function is_fortress(x: Locale) { return (x >= 0 && x <= 1) || x === 15 || x === 42 || x === 53 }
diff --git a/tools/gendata.js b/tools/gendata.js
index 5d45c45..78cf893 100644
--- a/tools/gendata.js
+++ b/tools/gendata.js
@@ -358,7 +358,7 @@ let sea_2 = locmap["English Channel"]
 let sea_3 = locmap["Irish Sea"]
 
 let port_1 = ["Newcastle", "Scarborough", "Ravenspur", "Lynn", "Ipswich"].map(name => locmap[name]).sort(cmpnum)
-let port_2 = ["Dover", "Hastings", "Calais", "Arundel", "Southampton", "Dorchester", "Exeter", "Plymouth", "Truro"].map(name => locmap[name]).sort(cmpnum)
+let port_2 = ["Dover", "Hastings", "Calais", "Southampton", "Dorchester", "Exeter", "Plymouth", "Truro"].map(name => locmap[name]).sort(cmpnum)
 let port_3 = ["Bristol","Pembroke","Harlech"].map(name => locmap[name]).sort(cmpnum)
 let all_ports = [ ...port_1, ...port_2, ...port_3 ].sort(cmpnum)