#224, #206 Adjusted E0 map.

Dev/srcStrat/pCiv/CivScen.scala

@@ -38,9 +38,9 @@ object Civ2 extends CivScenStart
   override implicit val gridSys: HGrid = HGridReg(2, 14, 4, 42)
   val terrs: HCenLayer[VTile] = gridSys.newHCenLayer[VTile](Sea)
 
-  terrs.setRow(10, Land(), Head3Land(5), Sea * 4, Island() * 2, Sea * 2)
-  terrs.setRow(8, Land(Plain) * 4, Head5Land(5), Sea * 3, Land(), Sea)
-  terrs.setRow(6, Land(Plain) * 3, Sea * 2, Head4Land(4, Mountain), Sea, Head2Land(4), Land() * 2)
+  terrs.setRow(10, Land(), Head2Land(5), Sea * 4, Island() * 2, Sea * 2)
+  terrs.setRow(8, Land(Plain) * 4, Head4Land(5), Sea * 3, Land(), Sea)
+  terrs.setRow(6, Land(Plain) * 3, Sea * 2, Head3Land(4, Mountain), Sea, Head1Land(4), Land() * 2)
   terrs.setRowEndUnchecked(4, Land(Mountain) * 3, Land(Plain) * 2)
   terrs.setRowSame(2, Land())
 

Dev/srcStrat/pCiv/VTile.scala

@@ -31,10 +31,10 @@ trait LandInner extends LandLike
 
 case class Island(terr: LandTerr = Plain, sideTerrs: VSTerr = Sea) extends LandInner with HIndent6
 
-case class Head5Land(indentStartIndex: Int, terr: LandTerr = Plain, sideTerrs: VSTerr = Sea) extends LandInner with HIndent4
-case class Head4Land(indentStartIndex: Int, terr: LandTerr = Plain, sideTerrs: VSTerr = Sea) extends LandInner with HIndent3
-case class Head3Land(indentStartIndex: Int, terr: LandTerr = Plain, sideTerrs: VSTerr = Sea) extends LandInner with HIndent2
-case class Head2Land(indentStartIndex: Int, terr: LandTerr = Plain, sideTerrs: VSTerr = Sea) extends LandInner with HIndent1
+case class Head4Land(indentStartIndex: Int, terr: LandTerr = Plain, sideTerrs: VSTerr = Sea) extends LandInner with HIndent4
+case class Head3Land(indentStartIndex: Int, terr: LandTerr = Plain, sideTerrs: VSTerr = Sea) extends LandInner with HIndent3
+case class Head2Land(indentStartIndex: Int, terr: LandTerr = Plain, sideTerrs: VSTerr = Sea) extends LandInner with HIndent2
+case class Head1Land(indentStartIndex: Int, terr: LandTerr = Plain, sideTerrs: VSTerr = Sea) extends LandInner with HIndent1
 
 object Plain extends LandTerr
 { override def colour: Colour = LightGreen

EGrid/src/eg320/Terr320E0.scala

@@ -20,9 +20,9 @@ object Terr320E0 extends Long320Terrs
     wr(150, sea * 3, taigaHills)
     wr(148, sea * 3, taigaHills, taiga)
     wr(146, sea, hills, sea, plain, forest)
-    wr(144, sea, plain, sea * 2, plain)
-    wr(142, sea, plain, plain, Head5Land(0), plain * 2)
-    wr(140, sea, Head5Land(2, Hilly), Head3Land(5), plain * 3)
+    wr(144, sea, Head4Land(5), plain, sea, plain)
+    wr(142, sea, Head4Land(2), Head1Land(5), Head3Land(1), plain * 2)
+    wr(140, sea, Head4Land(2, Hilly), Head2Land(5), plain * 3)
     wr(138, sea * 2, plain * 2, hills, mtain * 2)
     wr(136, sea * 3, plain, hills, mtain, plain)
     wr(134, sea, hills * 3, sea, Island(Hilly), hills)
@@ -60,19 +60,15 @@ object Terr320E0 extends Long320Terrs
     res.setCorner(146, 522, 2, HVUL)
     res.setCorner(146, 522, 1, HVUL)
 
-    //res.setMouth1(140, 504)// St Georges Chanel
-    res.setVert2In(142, 506)//Bristol
-    res.setVert1In(142, 506)//Anglesey
-    res.setMouth2(144, 504)//Scotland Northern Ireland
+    res.set4CornersIn(144, 508, 5, 7)//Northern Ireland
+    res.set4CornersIn(142, 506, 2, 7)//Southern Ireland
+    res.setCornerIn(142, 510, 5)//Wales
+
 
     res.set4CornersIn(140, 508, 2, 7)//Devon and Cornwall
-    res.set4CornersIn(142, 514, 0, 7)
+    res.set3CornersIn(142, 514, 1, 7)//South east England
     res.set2CornersIn(140, 512, 5, 7)//Normandy
 
-//    res.setVert3In(142, 514)//Dover - Calais
-//    res.setVert2In(142, 514)//Margate - Antwerp
-//    res.setMouth3(144, 516)//English Channel north east
-
     res.set6CornersIn(132, 520, 7)//Sardinia
     res.set6CornersIn(134, 522, 7)//Corsica
 

EGrid/src/egrid/ExpWorldGui.scala

@@ -43,21 +43,8 @@ class ExpWorldGui(val canv: CanvasPlatform, scenIn: EScenBasic, viewIn: HGView,
       }
     }
 
-    /*def tileFills2: RArr[PolygonFill] = proj.hCensMap { hc =>
-      corners.tilePoly(hc).map { hvo => hvo.toPt2(proj.transCoord(_)) }.fill(terrs(hc).colour)
-    }*/
-
     def tileFills2: RArr[PolygonFill] = polys.pairMap{ (hc, poly) => poly.fill(terrs(hc)(gridSys).colour) }
 
-    val islands: GraphicElems = terrs.hcOptMap{ (tile, hc) => tile match
-      {  case island: Island =>
-        { val poly = hc.vertsIn(7).map(hv => hv.toPt2(proj.transCoord))
-          Some(poly.fill(island.colour))
-        }
-        case _ => None
-      }
-    }
-
     def tileActives: RArr[PolygonActive] = polys.pairMap{ (hc, poly) => poly.active(hc) }
 
     def sides1: GraphicElems = proj.sidesOptMap { (hs: HSide) =>

EGrid/src/egrid/WTile.scala

@@ -93,7 +93,6 @@ class Land(val terr: Terrain, val biome: Biome) extends LandLike
     case t => t.str
   }
 
-  //override def colour: Colour = landColour
   override def hasLand: Boolean = true
 }
 
@@ -105,15 +104,10 @@ object Land
 trait Coastal extends LandLike
 { override def hasLand: Boolean = true
   def sideTerrs: Water
-
-  /** The most basic Show method, paralleling the strT method on ShowT type class instances. */
   override def str: String = "Coastal"
 }
 
 case class Island(terr: Terrain, biome: Biome = OpenTerrain, sideTerrs: Water = Sea) extends Coastal with HIndent6
-{
-
-}
 
 object Island
 {
@@ -124,16 +118,16 @@ object Island
 }
 
 /** Headland surrounded by [[Water]] on 5 sides. */
-case class Head5Land(indentStartIndex: Int, terr: Terrain = Plains, biome: Biome = OpenTerrain, sideTerrs: Water = Sea) extends Coastal with HIndent4
+case class Head4Land(indentStartIndex: Int, terr: Terrain = Plains, biome: Biome = OpenTerrain, sideTerrs: Water = Sea) extends Coastal with HIndent4
 
 /** Headland surrounded by [[Water]] on 4 sides. */
-case class Head4Land(indentStartIndex: Int, terr: Terrain = Plains, biome: Biome = OpenTerrain, sideTerrs: Water = Sea) extends Coastal with HIndent3
+case class Head3Land(indentStartIndex: Int, terr: Terrain = Plains, biome: Biome = OpenTerrain, sideTerrs: Water = Sea) extends Coastal with HIndent3
 
 /** Headland surrounded by [[Water]] on 3 sides. */
-case class Head3Land(indentStartIndex: Int, terr: Terrain = Plains, biome: Biome = OpenTerrain, sideTerrs: Water = Sea) extends Coastal with HIndent2
+case class Head2Land(indentStartIndex: Int, terr: Terrain = Plains, biome: Biome = OpenTerrain, sideTerrs: Water = Sea) extends Coastal with HIndent2
 
 /** Headland surrounded by [[Water]] on 3 sides. */
-case class Head2Land(indentStartIndex: Int, terr: Terrain = Plains, biome: Biome = OpenTerrain, sideTerrs: Water = Sea) extends Coastal with HIndent1
+case class Head1Land(indentStartIndex: Int, terr: Terrain = Plains, biome: Biome = OpenTerrain, sideTerrs: Water = Sea) extends Coastal with HIndent1
 
 /*case class SeaIsland(terr: Terrain, biome: Biome) extends Island// with SeaHas
 { override def str: String = "SeaIsland"