#195 Adding terrain down into Italy.

Rich2 · Feb 17, 2023 · d0b9907 · d0b9907
1 parent c96f93a
commit d0b9907
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/EGrid/src/eg80/EGrid80Sys.scala b/EGrid/src/eg80/EGrid80Sys.scala
@@ -25,11 +25,7 @@ object EGrid80
   /** Factory method for creating a main Earth grid centred on 30 degrees east of scale cScale 20Km or hex scale 80km. */
   def e30(rBottomCen: Int, rTopCen: Int = 540): EGrid80LongFull = new EGrid80LongFull(rBottomCen, rTopCen, 1)
 
-  def scen0: EScenBasic =
-  { val grid: EGrid80LongFull = e0(446)
-    EScenBasic(grid, Terr80E0.terrs, Terr80E0.sTerrs, Terr80E0.corners, "80km 0E")
-  }
-
+  def scen0: EScenBasic = EScenBasic(Terr80E0.grid, Terr80E0.terrs, Terr80E0.sTerrs, Terr80E0.corners, "80km 0E")
   def scen1: EScenBasic = EScenBasic(Terr80E30.grid, Terr80E30.terrs, Terr80E30.sTerrs, Terr80E30.corners)
 }
 

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(446)
+  implicit val grid: EGrid80LongFull = EGrid80.e0(440)
 
   override val terrs: HCenLayer[WTile] =
   {
@@ -51,11 +51,14 @@ 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 * 14, sea, plain)
+    wr(442, sea * 12, plain * 11, plain * 4, sea * 2)
+    wr(440, sea * 13, plain * 10, sea * 2, plain * 3, sea * 2)
     res
   }
 
-  override val sTerrs: HSideOptLayer[WSide] = {
-    val res: HSideOptLayer[WSide] = grid.newSideOpts[WSide]
+  override val sTerrs: HSideOptLayer[WSide] =
+  { val res: HSideOptLayer[WSide] = grid.newSideOpts[WSide]
     res.setSomeInts(Sea, 463,517,  465,499,  465,501,  475,547,  476,546,  476,494,  477,493,  487,503)//British Isles
     res.setSomeInts(Sea, 477,545,  477,547,  478,544,  478,548,  478,552,  479,545,  479,551,  485,545,  484,546)
     res