Fix adjacency.

2 files changed, 22 insertions, 31 deletions

diff --git a/rules.js b/rules.js
index 689c30f..a4a3ef9 100644
--- a/rules.js
+++ b/rules.js
@@ -109,43 +109,34 @@ const ADJACENT = [
 	/* THRACIA */ [ ASIA, MACEDONIA, PANNONIA, ALAMANNI_HOMELAND, GOTHS_HOMELAND, MARE_ORIENTALE, PONTUS_EUXINUS ],
 	/* BRITANNIA */ [ OCEANUS_ATLANTICUS ],
 	/* GALATIA */ [ ASIA, SYRIA, SASSANIDS_HOMELAND, MARE_ORIENTALE, PONTUS_EUXINUS ],
-	/* SYRIA */ [ AEGYPTUS, GALATIA, SASSANIDS_HOMELAND, MARE_ORIENTALE ],
-	/* AEGYPTUS */ [ AFRICA, SYRIA, NOMADS_HOMELAND, MARE_ORIENTALE ],
+	/* SYRIA */ [ GALATIA, AEGYPTUS, SASSANIDS_HOMELAND, MARE_ORIENTALE ],
+	/* AEGYPTUS */ [ SYRIA, AFRICA, NOMADS_HOMELAND, MARE_ORIENTALE ],
 	/* AFRICA */ [ AEGYPTUS, HISPANIA, NOMADS_HOMELAND, MARE_OCCIDENTALE, MARE_ORIENTALE, OCEANUS_ATLANTICUS ],
 	/* HISPANIA */ [ GALLIA, AFRICA, MARE_OCCIDENTALE, OCEANUS_ATLANTICUS ],
 	/* ALAMANNI_HOMELAND */ [ PANNONIA, THRACIA, FRANKS_HOMELAND, GOTHS_HOMELAND ],
-	/* FRANKS_HOMELAND */ [ GALLIA, PANNONIA, ALAMANNI_HOMELAND ],
+	/* FRANKS_HOMELAND */ [ GALLIA, PANNONIA, ALAMANNI_HOMELAND, OCEANUS_ATLANTICUS ],
 	/* GOTHS_HOMELAND */ [ THRACIA, ALAMANNI_HOMELAND, PONTUS_EUXINUS ],
 	/* SASSANIDS_HOMELAND */ [ GALATIA, SYRIA, PONTUS_EUXINUS ],
 	/* NOMADS_HOMELAND */ [ AEGYPTUS, AFRICA, OCEANUS_ATLANTICUS ],
 	/* MARE_OCCIDENTALE */ [ ITALIA, GALLIA, MACEDONIA, PANNONIA, AFRICA, HISPANIA, MARE_ORIENTALE, OCEANUS_ATLANTICUS ],
-	/* MARE_ORIENTALE */ [ ASIA, MACEDONIA, THRACIA, AEGYPTUS, AFRICA, GALATIA, SYRIA, MARE_OCCIDENTALE ],
-	/* OCEANUS_ATLANTICUS */ [ GALLIA, AFRICA, HISPANIA, BRITANNIA, NOMADS_HOMELAND, MARE_OCCIDENTALE ],
+	/* MARE_ORIENTALE */ [ ASIA, MACEDONIA, THRACIA, GALATIA, SYRIA, AEGYPTUS, AFRICA, MARE_OCCIDENTALE ],
+	/* OCEANUS_ATLANTICUS */ [ GALLIA, BRITANNIA, AFRICA, HISPANIA, FRANKS_HOMELAND, NOMADS_HOMELAND, MARE_OCCIDENTALE ],
 	/* PONTUS_EUXINUS */ [ ASIA, THRACIA, GALATIA, GOTHS_HOMELAND, SASSANIDS_HOMELAND ],
 ]
 
 const PRETENDER_ADJACENT = [
-	/* ITALIA */ [ GALLIA, PANNONIA, MARE_OCCIDENTALE ],
-	/* ASIA */ [ THRACIA, GALATIA, MARE_ORIENTALE, PONTUS_EUXINUS ],
-	/* GALLIA */ [ ITALIA, PANNONIA, HISPANIA, BRITANNIA, FRANKS_HOMELAND, MARE_OCCIDENTALE, OCEANUS_ATLANTICUS ],
-	/* MACEDONIA */ [ PANNONIA, THRACIA, MARE_OCCIDENTALE, MARE_ORIENTALE ],
-	/* PANNONIA */ [ ITALIA, GALLIA, MACEDONIA, THRACIA, ALAMANNI_HOMELAND, FRANKS_HOMELAND, MARE_OCCIDENTALE ],
-	/* THRACIA */ [ ASIA, MACEDONIA, PANNONIA, ALAMANNI_HOMELAND, GOTHS_HOMELAND, MARE_ORIENTALE, PONTUS_EUXINUS ],
-	/* BRITANNIA */ [ GALLIA, OCEANUS_ATLANTICUS ],
-	/* GALATIA */ [ ASIA, SYRIA, SASSANIDS_HOMELAND, MARE_ORIENTALE, PONTUS_EUXINUS ],
-	/* SYRIA */ [ AEGYPTUS, GALATIA, SASSANIDS_HOMELAND, MARE_ORIENTALE ],
-	/* AEGYPTUS */ [ AFRICA, SYRIA, NOMADS_HOMELAND, MARE_ORIENTALE ],
-	/* AFRICA */ [ AEGYPTUS, HISPANIA, NOMADS_HOMELAND, MARE_OCCIDENTALE, MARE_ORIENTALE, OCEANUS_ATLANTICUS ],
-	/* HISPANIA */ [ GALLIA, AFRICA, MARE_OCCIDENTALE, OCEANUS_ATLANTICUS ],
-	/* ALAMANNI_HOMELAND */ [ PANNONIA, THRACIA, FRANKS_HOMELAND, GOTHS_HOMELAND ],
-	/* FRANKS_HOMELAND */ [ GALLIA, PANNONIA, ALAMANNI_HOMELAND ],
-	/* GOTHS_HOMELAND */ [ THRACIA, ALAMANNI_HOMELAND, PONTUS_EUXINUS ],
-	/* SASSANIDS_HOMELAND */ [ GALATIA, SYRIA, PONTUS_EUXINUS ],
-	/* NOMADS_HOMELAND */ [ AEGYPTUS, AFRICA, OCEANUS_ATLANTICUS ],
-	/* MARE_OCCIDENTALE */ [ ITALIA, GALLIA, MACEDONIA, PANNONIA, AFRICA, HISPANIA, MARE_ORIENTALE, OCEANUS_ATLANTICUS ],
-	/* MARE_ORIENTALE */ [ ASIA, MACEDONIA, THRACIA, AEGYPTUS, AFRICA, GALATIA, SYRIA, MARE_OCCIDENTALE ],
-	/* OCEANUS_ATLANTICUS */ [ GALLIA, AFRICA, HISPANIA, BRITANNIA, NOMADS_HOMELAND, MARE_OCCIDENTALE ],
-	/* PONTUS_EUXINUS */ [ ASIA, THRACIA, GALATIA, GOTHS_HOMELAND, SASSANIDS_HOMELAND ],
+	/* ITALIA */ [ GALLIA, PANNONIA ],
+	/* ASIA */ [ THRACIA, GALATIA ],
+	/* GALLIA */ [ ITALIA, PANNONIA, HISPANIA, BRITANNIA ],
+	/* MACEDONIA */ [ PANNONIA, THRACIA ],
+	/* PANNONIA */ [ ITALIA, GALLIA, MACEDONIA, THRACIA ],
+	/* THRACIA */ [ ASIA, MACEDONIA, PANNONIA ],
+	/* BRITANNIA */ [ GALLIA ],
+	/* GALATIA */ [ ASIA, SYRIA ],
+	/* SYRIA */ [ AEGYPTUS, GALATIA ],
+	/* AEGYPTUS */ [ AFRICA, SYRIA ],
+	/* AFRICA */ [ AEGYPTUS, HISPANIA ],
+	/* HISPANIA */ [ GALLIA, AFRICA ],
 ]
 
 // BARBARIANS
@@ -2812,7 +2803,7 @@ function gen_move_army() {
 states.move_army_at_sea = {
 	inactive: "Move Army",
 	prompt() {
-		prompt("Move Army at Sea: " + game.mip + " Military.")
+		prompt("Move Army at Sea: " + game.mip + " military.")
 		view.color = MILITARY
 		view.selected_general = game.selected_general
 		gen_move_army()
diff --git a/tools/genmove.js b/tools/genmove.js
index 52a87cd..a4ebae7 100644
--- a/tools/genmove.js
+++ b/tools/genmove.js
@@ -40,8 +40,8 @@ const HISPANIA = 11
 const ALAMANNI_HOMELAND = 12
 const FRANKS_HOMELAND = 13
 const GOTHS_HOMELAND = 14
-const NOMADS_HOMELAND = 15
-const SASSANIDS_HOMELAND = 16
+const SASSANIDS_HOMELAND = 15
+const NOMADS_HOMELAND = 16
 
 const MARE_OCCIDENTALE = 17
 const MARE_ORIENTALE = 18
@@ -64,8 +64,8 @@ const names = [
 	"ALAMANNI_HOMELAND",
 	"FRANKS_HOMELAND",
 	"GOTHS_HOMELAND",
-	"NOMADS_HOMELAND",
 	"SASSANIDS_HOMELAND",
+	"NOMADS_HOMELAND",
 	"MARE_OCCIDENTALE",
 	"MARE_ORIENTALE",
 	"OCEANUS_ATLANTICUS",
@@ -98,7 +98,7 @@ adj(SYRIA, AEGYPTUS, GALATIA, SASSANIDS_HOMELAND, MARE_ORIENTALE)
 adj(THRACIA, PANNONIA, MACEDONIA, ASIA, GOTHS_HOMELAND, PONTUS_EUXINUS, MARE_ORIENTALE)
 
 adj(ALAMANNI_HOMELAND, FRANKS_HOMELAND, PANNONIA, THRACIA, GOTHS_HOMELAND)
-adj(FRANKS_HOMELAND, GALLIA, PANNONIA, ALAMANNI_HOMELAND)
+adj(FRANKS_HOMELAND, GALLIA, PANNONIA, ALAMANNI_HOMELAND, OCEANUS_ATLANTICUS)
 adj(GOTHS_HOMELAND, ALAMANNI_HOMELAND, THRACIA, PONTUS_EUXINUS)
 adj(NOMADS_HOMELAND, OCEANUS_ATLANTICUS, AFRICA, AEGYPTUS)
 adj(SASSANIDS_HOMELAND, PONTUS_EUXINUS, GALATIA, SYRIA)