#212, #228 Converting E0 and E30 to helper.

Rich2 · Mar 25, 2023 · 6af43b9 · 6af43b9
1 parent 710912f
commit 6af43b9
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 65 deletions.
diff --git a/EGrid/src/eg220/Terr220E0.scala b/EGrid/src/eg220/Terr220E0.scala
@@ -12,16 +12,8 @@ object Terr220E0 extends Long220Terrs
 
   override val terrs: HCenLayer[WTile] =
   { val res: HCenLayer[WTile] = grid.newHCenLayer[WTile](sea)
-    def gs(r: Int, cStart: Int, tileValues: Multiple[WTile]*): Unit = { res.setRowEnd(r, cStart, tileValues :_*); () }
     def wr(r: Int, tileValues: Multiple[WTile]*): Unit = { res.setRow(r, tileValues :_*); () }
 
-
-    wr(168, sea * 2, hills, sea * 2, taigaHills, taiga)
-    wr(166, sea * 2, hills, sea * 3, plain, plain)
-    wr(164, sea, plain, hills, sea * 3, plain, sea)
-    wr(162, sea, plain, sea, plain, sea, plain * 4)
-    wr(160, sea, plain, sea, plain * 2, plain * 2, hills, plain)
-    wr(158, sea * 2, hills, sea, plain, hills * 4)
     wr(156, sea * 3, plain * 3, hills * 2, plain, hills)
     wr(154, sea * 4, plain * 2, hills, mtain * 3)
     wr(152, sea * 4, plain, hills, mtain, hills, plain, hills)
@@ -30,16 +22,12 @@ object Terr220E0 extends Long220Terrs
     wr(146, sea, plain * 4, sea * 3, hills, sea * 2)
     wr(144, sea * 2, plain * 3, sea * 5, hills)
 
-
     res
   }
 
   override val sTerrs: HSideLayer[WSide] =
   { val res: HSideLayer[WSide] = grid.newSideLayer[WSide](WSideNone)
 
-    res.setSomeInts(WSideMid(),  157,507,  159,513,  160,514,  164,506,  165,505)//British Isles
-    res.setSomeInts(WSideMid(), 167,521,  167,523,  166,524,  165,525)//Denmark
-
     res.setSomeInts(WSideMid(), 144,534,  151,531,  152,530)//Mediterranean
     res.setSomeInts(WSideRt(), 151,525)//Corsica north west
     res.setSomeInts(WSideLt(), 151,527,  150,528)
@@ -50,20 +38,11 @@ object Terr220E0 extends Long220Terrs
   override val corners: HCornerLayer =
   { val res: HCornerLayer = grid.newHVertOffsetLayer
 
-    res.setMouth2(166, 502)//Ireland - Scotland north west
-    res.setVert1In(164, 504)//Ireland - Scotland
-    res.setMouth0(162, 506)//Ireland - Scotland south east
-    res.setMouth1(156, 504)//English Channel west
-    res.setMouth4(158, 510)//Devon - Brittany
-    res.setMouth1(158, 510)//Portsmouth Le Havre
-    res.setVert2In(160, 512)//Dover Calais
-    res.setMouth3(162, 514)//English Channel north east
-
-    res.setMouth1(166, 518)//Denmark - Norway west
-    res.setVert0In(166, 522)//Denmark Oslo
-    res.setVert1In(166, 522)//Greaa - Halmstad
-    res.setVert4In(166, 526)//Zealand - Sweden north
-    res.setMouth5(164, 528)//Zealand - Sweden south east
+//    res.setMouth1(156, 504)//English Channel west
+//    res.setMouth4(158, 510)//Devon - Brittany
+//    res.setMouth1(158, 510)//Portsmouth Le Havre
+//    res.setVert2In(160, 512)//Dover Calais
+//    res.setMouth3(162, 514)//English Channel north east
 
     res.setMouth3(154, 530)//Adriatic north
     res.setVert4In(152, 532)//Adriatic
@@ -79,19 +58,29 @@ object Terr220E0 extends Long220Terrs
 
   val help = new WTerrSetter(grid, terrs, sTerrs, corners)
   {
-    override val rowDatas: RArr[TRow] = RArr(
+    override val rowDatas: RArr[RowBase] = RArr(
       TRow(178, sea * 4, Head2Land(4, Hilly, Taiga)),
       TRow(176, sea * 5, taigaHills),
       TRow(174, sea * 5, taigaHills),
       TRow(172, sea * 5, taigaHills, taiga),
       TRow(170, sea * 4, taigaHills, taiga * 2),
+      TRow(168, sea * 2, Head3Land(5, Hilly), sea * 2, Head2Land(3, Hilly, Taiga), taiga),
+      VRow(167, VertInDn(522), VertInDL(524)),
+      TRow(166, sea * 2, hills, Head2Land(1, Hilly), sea * 2, plain, Head2Land(3)),
+      TRow(164, sea, Head4Land(5), hills, sea * 3, plain, sea),
+      TRow(162, sea, plain, sea, plain, sea, Head2Land(5), plain * 3),
+      TRow(160, sea, Head4Land(2), sea, plain * 2, Head1Land(5), plain, hills, plain),
+      VRow(159, VertInUL(514)),
+      TRow(158, sea * 2, Head4Land(2, Hilly), sea, Head1Land(5), hills * 4),
+
 
       TRow(142, sea * 3, Head3Land(2, Hilly), sea * 2, hills * 4, Head3Land(0, Hilly), sea),
       TRow(140, sea * 2, Head2Land(5, Hilly), hills, desertHills * 2, desert * 2, desertHills * 2, sea * 2),
       TRow(138, sea * 2, plain, desert, desertHills, desert * 7),
       TRow(136, sea * 2, mtain * 3, desert * 8),
       TRow(134, sea, desertHills * 2, desert * 10),
       TRow(132, sea, desert * 12)
+
     )
   }
   help.run

diff --git a/EGrid/src/eg220/Terr220E30.scala b/EGrid/src/eg220/Terr220E30.scala
@@ -3,43 +3,10 @@ package ostrat; package eg220
 import prid.phex._, egrid._, WTile._
 
 object Terr220E30 extends Long220Terrs
-{
-  override implicit val grid: EGrid220LongFull = EGrid220.e30(132)
-
-  override val terrs: HCenLayer[WTile] =
-  { val res: HCenLayer[WTile] = grid.newHCenLayer[WTile](sea)
-    def wr(r: Int, tileValues: Multiple[WTile]*): Unit = { res.setRow(r, tileValues :_*); () }
-
-    wr(138, sea * 2, desert, sea * 5, hills, desert * 3)
-    wr(136, desert, sea, desert * 4, plain, desertHills, desert * 5)
-    wr(134, desert * 6, plain, desert, desertHills, desertHills, desert * 3)
-    wr(132, desert * 6, plain, desert, sea, desert * 4)
-
-    res
-  }
-
-  override val sTerrs: HSideLayer[WSide] =
-  { val res: HSideLayer[WSide] = grid.newSideLayer[WSide](WSideNone)
-
-    //res.setSomeInts(WSideMid(), 145,1523,  147,1525,  147,1527,  146,1528,  147,1529,  147,1531,  147,1533)//,  148,1534)//,  152,1546)//Greece / Turkey
-    res.setSomeInts(WSideMid(), 134, 1540,  133,1541,  134,1544)
-    //res.setSomeInts(WSideRt(), 143, 1541)//Cyprus north west
-    //res.setSomeInts(WSideLt(), 143,1543,  142,1544)//Cyprus north east and east.
-    res
-  }
-
-  override val corners: HCornerLayer =
-  { val res = grid.newHVertOffsetLayer
-
-
-    res.setMouth3(136, 1540)//Suez Gulf of Suez north
-    res.setVert4In(134, 1542)//Gulf of Suez
-    res.setMouth5(132, 1544)//Gulf of Suez south
-    res.setMouth0(132, 1544)//Gulf of Arabia south
-    res.setMouth3(136, 1544)//Gulf of Arabia north
-
-    res
-  }
+{ override implicit val grid: EGrid220LongFull = EGrid220.e30(132)
+  override val terrs: HCenLayer[WTile] = grid.newHCenLayer[WTile](sea)
+  override val sTerrs: HSideLayer[WSide] = grid.newSideLayer[WSide](WSideNone)
+  override val corners: HCornerLayer = grid.newHVertOffsetLayer
 
   val help = new WTerrSetter(grid, terrs, sTerrs, corners)
   { override val rowDatas: RArr[RowBase] = RArr(
@@ -74,7 +41,13 @@ object Terr220E30 extends Long220Terrs
       TRow(144, Head4Land(2, Hilly), sea, hills, sea, hills * 4, desertHills, plain, mtain),
       VRow(143, MouthUp(1544)),
       TRow(142, sea * 5, Head3Land(2, Hilly), sea, Head3Land(2, Hilly), Head1Land(4, Hilly), desert * 3),
-      TRow(140, sea * 3, hills, sea * 2, Island(Hilly), sea, hills, desert * 3),
+      TRow(140, sea * 3, Island(Hilly), sea * 2, Island(Hilly), sea, hills, desert * 3),
+      TRow(138, sea * 2, Head3Land(5, Plains, Desert), sea * 5, hills, desert * 3),
+      TRow(136, desert, sea, desert * 4, plain, desertHills, desert * 5),
+      VRow(135, MouthUp(1540), MouthUp(1544)),
+      TRow(134, desert * 6, plain, desert, desertHills, desertHills, desert * 3),
+      VRow(133, VertInUR(1540), MouthDR(1542), MouthDn(1544)),
+      TRow(132, desert * 6, plain, desert, sea, desert * 4),
     )
   }
   help.run