#206 More revsions to E0/E30 terrain.

Rich2 · Mar 21, 2023 · 1c5419d · 1c5419d
1 parent 508f025
commit 1c5419d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/EGrid/src/eg320/Terr320E0.scala b/EGrid/src/eg320/Terr320E0.scala
@@ -19,7 +19,7 @@ object Terr320E0 extends Long320Terrs
     wr(152, sea * 3, taigaHills)
     wr(150, sea * 3, taigaHills)
     wr(148, sea * 3, taigaHills, taiga)
-    wr(146, sea, hills, sea, plain, forest)
+    wr(146, sea, hills, sea, Head4Land(4), forest)
     wr(144, sea, Head4Land(5), plain, sea, plain)
     wr(142, sea, Head4Land(2), Head1Land(5), Head3Land(1), plain * 2)
     wr(140, sea, Head4Land(2, Hilly), Head2Land(5), plain * 3)
@@ -37,9 +37,12 @@ object Terr320E0 extends Long320Terrs
   override val sTerrs: HSideLayer[WSide] =
   { val res: HSideLayer[WSide] = grid.newSideLayer[WSide](WSideNone)
 
-    res.setSomeInts(WSideMid(),  145,521,  145,523,  146,520,  146,524,  147,517,  147,519)//Scandinavia
+    res.setSomeInts(WSideMid(), 146,520,  145,521,  145,523,  146,524)//Scandinavia
+    res.setSomeInts(WSideRt(), 145,517,  146,516,  147,517)//Denmark west
+    res.setSomeInts(WSideLt(), 147,519)//Denmark
+
     res.setSomeInts(WSideRt(), 139,507,  140,506,  141,505,  142,504,  143,505,  144,506,  145,507)//British Isles
-    res.setSomeInts(WSideLt(), 145,509,  144,510)
+    res.setSomeInts(WSideLt(), 145,509,  144,510)//British Isles
 
     res.setSomeInts(WSideBoth(), 129,505, 129,507,  129,509,  129,511)//Alboran Sea
 
@@ -55,9 +58,8 @@ object Terr320E0 extends Long320Terrs
   override val corners: HCornerLayer =
   { val res: HCornerLayer = grid.newHVertOffsetLayer
 
-    res.setMouth1(146, 514)//Skagerrack west
-    res.setVert0In(146, 518)//Oslo
-    res.setVert1In(146, 518)//Gothenberg
+    res.set4CornersIn(146, 518, 4, 7)
+
     res.setVert4In(146, 522)//Copenhagen
     res.setCorner(146, 522, 3, HVUp)//Stralsund - Ystad
     res.setCorner(144, 520, 1, HVDn)//Stralsund - Ystad

diff --git a/EGrid/src/eg320/Terr320E30.scala b/EGrid/src/eg320/Terr320E30.scala
@@ -44,6 +44,8 @@ object Terr320E30 extends Long320Terrs
     res.setSomeInts(WSideMid(), 130,1524,  131,1525,  132,1526,  132,1530)
     res.setSomeInts(WSideMid(), 133,1531,  133,1533,  133,1535)//Boshphorus
     res.setSomeInts(WSideLt(), 130,1520, 131,1521)//Sicily - Italy
+    res.setSomeInts(WSideLt(), 129,1541,  128,1542, 127,1541)//East Cyprus
+    res.setSomeInts(WSideRt(), 129,1539,  128,1538, 127,1539)//West Cyprus
     res
   }
 
@@ -99,7 +101,7 @@ object Terr320E30 extends Long320Terrs
     res.setVert5In(130, 1526)//Adriatic
     res.setMouth0(128, 1524)//Greece Italy
 
-
+    res.set6CornersIn(128, 1540, 7)
     res.setMouth0(130, 1530)//Aegean
     res.setVert5In(132, 1532)//Aegean north
     res.setVert0In(132, 1532)//Gallipoli