Reorgansied 120km Scenarios.

Rich2 · Mar 27, 2023 · 7cabab4 · 7cabab4
1 parent fd8ed6f
commit 7cabab4
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/Dev/Misc/eGrid.rson b/Dev/Misc/eGrid.rson
@@ -48,8 +48,11 @@ exp = false;
 
 60 = HGView(338, 512; 25);//120km 0E
 61 = HGView(285, 1536; 25);//120km 30E
+62 = HGView(308, 2560; 25);//120km 60E
 
-72 = HGView(354, 1524; 24);//120km 0E - 30E
+72 = HGView(308, 1524; 24);//120km 0E - 30E
+73 = HGView(308, 1580; 24);//120km 0E - 60E
+74 = HGView(354, 1524; 24);/120km 0E - 30E north
 
 80 = HGView(458, 524; 22);//80km 0E
 81 = HGView(480, 1538; 25);//80km 30E

diff --git a/EGrid/src/eg120/Multi120Systems.scala b/EGrid/src/eg120/Multi120Systems.scala
@@ -1,9 +1,26 @@
 /* Copyright 2018-23 Richard Oliver. Licensed under Apache Licence version 2.0. */
 package ostrat; package eg120
-import prid._, phex._, egrid._, pEarth._
-
+import prid._, phex._, egrid._
 
 /** 2 Grid system for 0E and 30E */
+object Grids120S0E1 extends EGrid120LongMulti
+{ ThisSys =>
+  override val grids: RArr[EGridLongFull] =  EGrid120.grids(2, 0, 300, 314)
+  override def headGridInt: Int = 0
+  override def gridsXSpacing: Double = 55
+  override val gridMans: RArr[EGridLongMan] = iToMap(1)(EGridLongMan(_, ThisSys))
+}
+
+/** Scenario for 23 Grid system for 0E, 30E and 60E */
+object Scen120S0E1 extends EScenLongMulti
+{ override val title: String = "120km 0E - 30E"
+  override implicit val gridSys: EGrid120LongMulti = Grids120S0E1
+  override val terrs: HCenLayer[WTile] = fullTerrsHCenLayerSpawn
+  override val sTerrs: HSideLayer[WSide] = fullTerrsSideLayerSpawn
+  override val corners: HCornerLayer = fullTerrsCornerLayerSpawn
+}
+
+/** 2 Grid system for 0E, 30E and 60E */
 object Grids120S0E2 extends EGrid120LongMulti
 { ThisSys =>
   override val grids: RArr[EGridLongFull] =  EGrid120.grids(3, 0, 300, 314)
@@ -22,7 +39,7 @@ object Scen120S0E2 extends EScenLongMulti
 }
 
 /** 2 Grid system for 0E and 30E */
-object Grids120S0E1 extends EGrid120LongMulti
+object Grids120S0E1North extends EGrid120LongMulti
 { ThisSys =>
   override val grids: RArr[EGridLongFull] =  EGrid120.grids(2, 0, 348)
   override def headGridInt: Int = 0
@@ -31,9 +48,9 @@ object Grids120S0E1 extends EGrid120LongMulti
 }
 
 /** Scenario for 2 Grid system for 0E and 30E */
-object Scen120S0E1 extends EScenLongMulti
+object Scen120S0E1North extends EScenLongMulti
 { override val title: String = "120km 0E - 30E"
-  override implicit val gridSys: EGrid120LongMulti = Grids120S0E1
+  override implicit val gridSys: EGrid120LongMulti = Grids120S0E1North
   override val terrs: HCenLayer[WTile] = fullTerrsHCenLayerSpawn
   override val sTerrs: HSideLayer[WSide] = fullTerrsSideLayerSpawn
   override val corners: HCornerLayer = fullTerrsCornerLayerSpawn

diff --git a/EGrid/src/eg120/Terr120E30.scala b/EGrid/src/eg120/Terr120E30.scala
@@ -16,6 +16,7 @@ object Terr120E30 extends Long120Terrs
       TRow(346, mtain),
 
       TRow(314, plain * 10, plain * 6),
+      TRow(312, plain * 10, plain * 6),
 
       TRow(286, hills, plain, hills * 3, sea, hills * 2, hills * 13),
       TRow(284, hills, sea * 2, hills * 3, sea * 2, hills * 13),

diff --git a/EGrid/src/egrid/EGridLaunch.scala b/EGrid/src/egrid/EGridLaunch.scala
@@ -66,8 +66,9 @@ object EGridLaunch extends GuiLaunchMore
       case 61 => EGrid120.scen1
       case 62 => EGrid120.scen2
 
-      case 72 => Scen120S0E2
-      case 73 => Scen120S0E1
+      case 72 => Scen120S0E1
+      case 73 => Scen120S0E2
+      case 74 => Scen120S0E1North
 
       case 80 => EGrid80.scen0
       case 81 => EGrid80.scen1