#228 Converted 320km E60.

Rich2 · Mar 31, 2023 · da8c39f · da8c39f
1 parent 3063033
commit da8c39f
Showing 1 changed file with 18 additions and 39 deletions.
diff --git a/EGrid/src/eg320/Terr320E60.scala b/EGrid/src/eg320/Terr320E60.scala
@@ -2,46 +2,12 @@
 package ostrat; package eg320
 import prid._, phex._, egrid._, WTile._
 
+/** 320km terrain for 60 east. */
 object Terr320E60 extends Long320Terrs
-{
-  override implicit val grid: EGrid320LongFull = EGrid320.e60(120, 166)
-
-  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(140, plain * 2, desert * 3, plain)
-    wr(138, plain, desert * 6)
-    wr(136, sea, desert * 6)
-    wr(134, sea, desert * 5, mtain)
-    wr(132, mtain, sea, desert * 3, mtain * 2)
-    wr(130, mtain, sea, desert * 4, mtain * 2)
-    wr(128, desertHills, desert * 5, mtain * 2)
-    wr(126, desert, mtain, desert * 5, plain)
-    wr(124, desert, plain, mtain, desert * 4, plain * 2)
-    wr(122, desert, sea, mtain, desert * 3, plain, desert * 2)
-    wr(120, desert * 2, sea, desert, sea * 3, plain, desert)
-    res
-  }
-
-  override val sTerrs: HSideLayer[WSide] =
-  { val res: HSideLayer[WSide] = grid.newSideLayer[WSide](WSideNone)
-    res.setSomeInts(WSideMid(), 137, 2551)
-    res.setSomeInts(WSideMid(), 154,2552, 155,2553)
-    res.setSomeInts(WSideMid(), 121,2555,  121,2557,  123,2547)
-    res
-  }
-
-  override val corners: HCornerLayer =
-  { val res: HCornerLayer = grid.newHVertOffsetLayer
-
-    res.setCorner(154, 2554, 5, HVDR)//White Sea mouth
-    res.setCorner(154, 2554, 4, HVDR)//White Sea mouth
-
-    res.setMouth1(136, 2548)//Caspian Sea north east
-    res.setMouth4(138, 2554)//Caspian Sea north east
-    res
-  }
+{ override implicit val grid: EGrid320LongFull = EGrid320.e60(120, 166)
+  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(
@@ -55,6 +21,19 @@ object Terr320E60 extends Long320Terrs
       TRow(146, forest * 2, taiga * 3),
       TRow(144, forest * 5),
       TRow(142, plain * 6),
+      TRow(140, plain * 2, desert * 3, plain),
+      TRow(138, plain, desert * 6),
+      VRow(137, MouthUR(2552, Lake)),
+      TRow(136, Headland(1, 2, Level, OpenTerrain, Lake), Headland(1, 5, Level, Desert, Lake), desert * 5),
+      TRow(134, Lake, desert * 5, mtain),
+      TRow(132, mtain, Lake, desert * 3, mtain * 2),
+      TRow(130, mtain, Headland(1, 1, Mountains, OpenTerrain, Lake), Headland(1, 5, Level, Desert, Lake), desert * 3, mtain * 2),
+      VRow(129, MouthDn(2552, Lake)),
+      TRow(128, desertHills, desert * 5, mtain * 2),
+      TRow(126, desert, mtain, desert * 5, plain),
+      TRow(124, desert, plain, mtain, desert * 4, plain * 2),
+      TRow(122, desert, sea, mtain, desert * 3, plain, desert * 2),
+      TRow(120, desert * 2, sea, desert, sea * 3, plain, desert),
     )
   }