#212, #228 Finished Converting E0 to helper.

Rich2 · Mar 25, 2023 · d3cac65 · d3cac65
1 parent 6af43b9
commit d3cac65
Showing 1 changed file with 17 additions and 58 deletions.
diff --git a/EGrid/src/eg220/Terr220E0.scala b/EGrid/src/eg220/Terr220E0.scala
@@ -7,54 +7,10 @@ import prid._, phex._, egrid._, WTile._
  *  hex is covered by land and we do not want the narrowest gap from England to France to be a whole hex. Given that it is a land hex by geoprhical
  *  area it must be assigned to France. Majorca is still just too small in area at this scale.  */
 object Terr220E0 extends Long220Terrs
-{
-  override implicit val grid: EGrid220LongFull = EGrid220.e0(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(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)
-    wr(150, sea, hills * 5, sea * 2, Island(Hilly), hills, sea)
-    wr(148, sea * 2, plain * 4, sea * 4, hills)
-    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(), 144,534,  151,531,  152,530)//Mediterranean
-    res.setSomeInts(WSideRt(), 151,525)//Corsica north west
-    res.setSomeInts(WSideLt(), 151,527,  150,528)
-
-    res
-  }
-
-  override val corners: HCornerLayer =
-  { val res: HCornerLayer = grid.newHVertOffsetLayer
-
-//    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
-    res.setMouth5(150, 534)//Adriatic
-    res.setMouth2Corner(150, 534)
-
-    res.setMouth3Corner(146, 534)//Sicily - Italy north
-    res.setCorner(144, 532, 2, HVUL)//Sicily - Italy south
-    res.setMouth0Corner(142, 534)//Sicily - Italy south
-
-    res
-  }
+{ override implicit val grid: EGrid220LongFull = EGrid220.e0(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)
   {
@@ -70,17 +26,24 @@ object Terr220E0 extends Long220Terrs
       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),
-
-
+      VRow(159, VertInUp(512), VertInUL(514)),
+      TRow(158, sea * 2, Head4Land(2, Hilly), Head3Land(4), plain, hills * 4),
+      VRow(157, MouthDR(510)),
+      TRow(156, sea * 3, Head1Land(0), plain * 2, hills * 2, plain, hills),
+      TRow(154, sea * 4, plain * 2, hills, mtain * 3),
+      VRow(153, MouthUp(530)),
+      TRow(152, sea * 4, plain, hills, mtain, hills, plain, hills),
+      VRow(151, VertInUR(530), MouthDR(532)),
+      TRow(150, sea, Head3Land(4, Hilly), hills * 4, sea * 2, Island(Hilly), hills, sea),
+      TRow(148, sea * 2, plain * 4, sea * 2, Head4Land(4, Hilly), sea, hills),
+      TRow(146, sea, plain * 4, sea * 3, Head4Land(1, Hilly), sea * 2),
+      TRow(144, sea * 2, plain * 3, sea * 5, hills),
       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
@@ -93,14 +56,10 @@ object BritReg220
   def britCorners: HCornerLayer = britGrid.cornerLayerSpawn(Terr220E0.grid, Terr220E0.corners)
 
   def regScen: EScenBasic = new EScenBasic
-  {  override def title: String = "Regular Britain"
+  { override def title: String = "Regular Britain"
     override implicit val gridSys: EGrid220Long = britGrid
-
     override val terrs: HCenLayer[WTile] = britTerrs
-
     override val sTerrs: HSideLayer[WSide] = britSTerrs
-
-    //override val sTerrsDepr: HSideBoolLayer = britSTerrsDepr
     override val corners: HCornerLayer = britCorners
   }
 }