#206 Redrew Bosphorus.

Rich2 · Mar 15, 2023 · fc81f09 · fc81f09
1 parent 967efa0
commit fc81f09
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 22 deletions.
diff --git a/Dev/srcStrat/dless/DLessScen.scala b/Dev/srcStrat/dless/DLessScen.scala
@@ -43,21 +43,25 @@ object DLessScen1 extends DLessScen
   override val terrs: HCenLayer[WTile] = fullTerrsHCenLayerSpawn
   override val sTerrs: HSideOptLayer[WSide] = fullTerrsSideOptLayerSpawn
   override val corners: HCornerLayer = fullTerrsCornerLayerSpawn
-  override val armies: HCenOptLayer[Army] = gridSys.newHCenOptLayer
-  armies.unsafeSetSome(142, 510, Britain.ar(1))
-  armies.unsafeSetSome(144, 508, Britain.ar(2))
-  armies.unsafeSetSome(140, 520, Germany.ar(1))
-  armies.unsafeSetSome(144, 1528, Germany.ar(2))
-  armies.unsafeSetSome(144, 520, Germany.ar(3))
-  armies.unsafeSetSome(142, 1526, Germany.ar(4))
-  armies.unsafeSetSome(138, 514, France.ar(1))
-  armies.unsafeSetSome(142, 1534, Russia.ar(1))
-  armies.unsafeSetSome(148, 1536, Russia.ar(2))
-  armies.unsafeSetSome(134, 526, Italy.ar(1))
-  armies.unsafeSetSome(136, 1528, Austria.ar(1))
-  armies.unsafeSetSome(138, 526, Austria.ar(2))
-  armies.unsafeSetSome(132, 1532, Ottoman.ar(1))
-  armies.unsafeSetSome(132, 508, Spain.ar(1))
+  implicit val nations: RArr[Nation] = RArr(Britain, France, Germany, Austria, Russia, Ottoman, Italy, Spain)
+  override val armies: HCenOptLayer[Army] =
+  { val res = gridSys.newHCenOptLayer[Army]
+    res.unsafeSetSome(142, 510, Britain.ar(1))
+    res.unsafeSetSome(144, 508, Britain.ar(2))
+    res.unsafeSetSome(140, 520, Germany.ar(1))
+    res.unsafeSetSome(144, 1528, Germany.ar(2))
+    res.unsafeSetSome(144, 520, Germany.ar(3))
+    res.unsafeSetSome(142, 1526, Germany.ar(4))
+    res.unsafeSetSome(138, 514, France.ar(1))
+    res.unsafeSetSome(142, 1534, Russia.ar(1))
+    res.unsafeSetSome(148, 1536, Russia.ar(2))
+    res.unsafeSetSome(134, 526, Italy.ar(1))
+    res.unsafeSetSome(136, 1528, Austria.ar(1))
+    res.unsafeSetSome(138, 526, Austria.ar(2))
+    res.unsafeSetSome(132, 1532, Ottoman.ar(1))
+    res.unsafeSetSome(132, 508, Spain.ar(1))
+    res
+  }
 }
 
 /** 2nd scenario for Diceless. Might have some use. */

diff --git a/EGrid/src/eg320/Terr320E30.scala b/EGrid/src/eg320/Terr320E30.scala
@@ -35,8 +35,9 @@ object Terr320E30 extends Long320Terrs
     res.setSomeInts(SCSea, 151,1539,  152,1538,  153,1537,  153,1539,  153,1541,  153,1543,  154,1544,  155,1543)
     res.setSomeInts(SCLake, 149, 1537)
     res.setSomeInts(SCSea, 145,1527,  146,1528,  147,1529,  147,1531, 147,1533,  148,1530,  149,1531,  150,1532,  151,1533,  152,1534)//Baltic
-    res.setSomeInts(SCSea, 133,1525,  133,1535,  134,1524,  135,1523,  136,1522,  136,1542,  137,1541,  137,1543)
-    res.setSomeInts(SCSea,  130,1524,  131,1525,  131,1533,  132,1534,  132,1526,  132,1530)
+    res.setSomeInts(SCSea, 133,1525,  134,1524,  135,1523,  136,1522,  136,1542,  137,1541,  137,1543)
+    res.setSomeInts(SCSea, 130,1524,  131,1525,  132,1526,  132,1530)
+    res.setSomeInts(SCSea, 133,1531,  133,1533,  133,1535)//Boshphorus
     res.setSomeInts(SLSea, 130,1520, 131,1521)//Sicily - Italy
     res
   }
@@ -90,12 +91,11 @@ object Terr320E30 extends Long320Terrs
     res.setVert5In(130, 1526)//Adriatic
     res.setMouth0(128, 1524)//Greece Italy
 
-    res.setMouth3(134, 1530)//Aegean north head
-    res.setMouth0(130, 1530)//Aegean north
 
-    res.setMouth1(130, 1530)//Gallipoli
-    res.setVert2In(132, 1532)//Dardanelles
-    res.setVert5In(132, 1536)//Sea of Marmara
+    res.setMouth0(130, 1530)//Aegean
+    res.setVert5In(132, 1532)//Aegean north
+    res.setVert0In(132, 1532)//Gallipoli
+    res.setVert3In(134, 1534)//Sea of Marmara
     res.setMouth4(134, 1538)//Constantinople
 
     res