#195 Added row 426 to TerrE0.

Rich2 · Feb 21, 2023 · ac1b01e · ac1b01e
1 parent e0e68c5
commit ac1b01e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/EGrid/src/eg320/Terr320E0.scala b/EGrid/src/eg320/Terr320E0.scala
@@ -12,22 +12,22 @@ object Terr320E0 extends Long320Terrs
 
   override val terrs: HCenLayer[WTile] =
   { val res: HCenLayer[WTile] = grid.newHCenLayer[WTile](sea)
-    def gs(r: Int, cStart: Int, tileValues: Multiple[WTile]*): Unit = { res.toEndRow(r, cStart, tileValues :_*); () }
     def wr(r: Int, tileValues: Multiple[WTile]*): Unit = { res.completeRow(r, tileValues :_*); () }
+
     wr(156, sea * 3)
     wr(154, sea * 4)
     wr(152,  sea * 3, taigaHill)
     wr(150, sea * 3, taigaHill)
     wr(148, sea * 3, taigaHill, taiga)
-    wr(146, sea, forHill, sea, plain * 2)
+    wr(146, sea, hills, sea, plain, forest)
     wr(144, sea, plain, sea * 2, plain)
-    gs(142, 506, plain, plain * 2, plain * 2)
+    wr(142, sea, plain, plain * 2, plain * 2)
     wr(140, sea, hills, plain * 4)
-    gs(138, 460 + 50, plain * 2, hills, mtain * 2)
-    gs(136, 512, plain, hills, mtain, plain)
-    gs(134, 506, hills * 3, sea, hills * 2)
-    gs(132, 504, hills, plain * 2, sea, hills, sea)
-    gs(130, 506, plain, hills, sea * 3, hills)
+    wr(138, sea * 2, plain * 2, hills, mtain * 2)
+    wr(136, sea * 3, plain, hills, mtain, plain)
+    wr(134, sea, hills * 3, sea, hills * 2)
+    wr(132, sea, hills, plain * 2, sea, hills, sea)
+    wr(130, sea, plain, hills * 2, sea * 3, hills)
     wr(128, sea * 2, hills * 5, sea)
     wr(126, sea * 2, mtain, desHill, desert * 4)
     wr(124, sea * 2, hills, desert * 6)

diff --git a/EGrid/src/eg80/Grids80s0e1.scala b/EGrid/src/eg80/Grids80s0e1.scala
@@ -6,7 +6,7 @@ object Grids80s0e1 extends EGrid80LongMulti
 { ThisSys =>
 
   override def gridsXSpacing: Double = 40
-  override val grids: RArr[EGridLongFull] = EGrid80.grids(2, 0, 430)
+  override val grids: RArr[EGridLongFull] = EGrid80.grids(2, 0, 426)
   override def headGridInt: Int = 0
   override val gridMans: RArr[EGridLongMan] = iToMap(1)(EGridLongMan(_, ThisSys))
 

diff --git a/EGrid/src/eg80/Terr80E0.scala b/EGrid/src/eg80/Terr80E0.scala
@@ -6,7 +6,7 @@ import pEarth._,prid._, phex._, WTile._, egrid._
  *  in base 32. The c offset for North East Europe will be 1536 or 1G0 in base 32. Current y offset is 300 for the equator. The Old c offset was 200 so a diff of 312 */
 object Terr80E0 extends Long80Terrs
 {
-  implicit val grid: EGrid80LongFull = EGrid80.e0(428)
+  implicit val grid: EGrid80LongFull = EGrid80.e0(426)
 
   override val terrs: HCenLayer[WTile] =
   {
@@ -51,15 +51,16 @@ object Terr80E0 extends Long80Terrs
     gs(450, 506, plain * 7, hills, mtain * 8)
     gs(448, 508, plain * 4, hills * 2, plain, mtain * 9)
     gs(446, 510, plain * 2, hills * 4, mtain * 3, plain * 2, mtain, plain * 2, hills * 2)
-    wr(444, sea * 13, plain * 2, hills * 5, mtain * 2, hills * 2, plain * 3, sea, plain)
-    wr(442, sea * 12, plain * 2, hills * 3, mtain, hills, mtain * 2, hills, mtain * 3, hills, plain, sea * 2)
+    wr(444, sea * 13, forest, plain, hills * 5, mtain * 2, hills * 2, plain * 3, sea, plain)
+    wr(442, sea * 12, plain, forest, hills * 3, mtain, hills, mtain * 2, hills, mtain * 3, hills, plain, sea * 2)
     wr(440, sea * 13, plain * 3, hills, mtain, hills * 3, mtain * 2, sea * 2, hills, mtain, hills, sea * 2)
-    wr(438, sea * 5, hills * 3, mtain * 3, hills, mtain * 2, hills * 4, sea * 2, hills * 2, sea * 4, hills * 3, sea)
+    wr(438, sea * 5, hills * 3, mtain * 3, hills, mtain * 2, hills * 4, sea * 2, forHill * 2, sea * 4, hills * 3, sea)
     wr(436, sea * 5, hills * 3, plain * 3, desert * 2, hills, mtain * 4, sea * 5, hills, sea * 2, hills * 2, mtain, hills)
     wr(434, sea * 6, hills * 2, plain, desert, desHill, plain, hills, plain * 2, hills * 3, sea * 6, hills, sea * 2, hills * 2, mtain, hills)
     wr(432, sea * 6, hills * 3, plain, desert, hills * 3, desert, plain, hills * 2, sea * 7, hills, sea * 3, hills * 2)
     wr(430, sea * 5, plain, hills * 5, desert, hills, desHill, mtain, plain, sea * 8, hills * 2, sea * 4, hills)
     wr(428, sea * 6, hills * 2, plain * 3, desert * 2, hills * 3, sea * 8, hills * 2, sea * 5)
+    wr(426, sea * 6, hills, plain * 3, hills * 2, desert * 2, hills, plain, sea * 3, plain, sea * 5, hills, sea * 6)
     res
   }