diff --git a/Dev/Misc/DevSettings.rson b/Dev/Misc/DevSettings.rson index 22ed9278b..44a80d4dc 100644 --- a/Dev/Misc/DevSettings.rson +++ b/Dev/Misc/DevSettings.rson @@ -7,6 +7,7 @@ displayY = 0;//Some operating systems will not allow a positive y value that pus //projPath = "path_to_openstrat"; lessons = A1; dless = { scen = 1; flat = false; 1 = HGView(138, 526; 20); }; +ww2 = { scen = 1; 1 = HGView(140, 1528; 22); 2 = HGView(160, 520; 27); }; ww1 = { scen = 1; flat = false; 1 = HGView(310, 520; 24); 2 = HGView(300, 1536; 20); }; bc305 = { scen = 2; flat = false; 1 = HGView(460, 520; 16); 2 = HGView(460, 520; 16); }; earth = { scale = 12; latitude = 0; longitude = 0; }; @@ -17,7 +18,6 @@ g1Sq = { scen = 1; 1 = SqGridView(4, 5; 80); 2 = SqGridView(9, 11; 40); }; g2Hex = { scen = 1; 1 = HGView(4, 6; 80); 2 = HGView(6, 6; 55); 3 = HGView(6, 6; 50); 4 = HGView(7, 20; 40) }; gThree = { scen = 1; }; zugFuhrer = 1; -//ww2 = { scen = 2; flat = false; 1 = HGView(176, 520; 24); 2 = HGView(156, 524; 23) }; normandy = { scen = 1; 1 = HGView(7, 20; 40); }; civ = 1; chess = {scen = 1 }; diff --git a/Dev/srcStrat/sors/SorsScen.scala b/Dev/srcStrat/sors/SorsScen.scala index 7ca32c7ad..7356b313c 100644 --- a/Dev/srcStrat/sors/SorsScen.scala +++ b/Dev/srcStrat/sors/SorsScen.scala @@ -1,6 +1,6 @@ /* Copyright 2018-23 Richard Oliver. Licensed under Apache Licence version 2.0. */ package ostrat; package sors -import prid._, phex._, egrid._, eg320._ +import prid._, phex._, egrid._, eg220._ trait SorsScen extends HSysTurnScen { def title: String = "DLessScen" @@ -13,8 +13,8 @@ trait SorsScen extends HSysTurnScen object SorsScen1 extends SorsScen { override def turn: Int = 0 - override implicit val gridSys: EGrid320LongMulti = new EGrid320LongMulti { ThisSys => - override val grids: RArr[EGridLongFull] = EGrid320.grids(2, 0, 124) + override implicit val gridSys: EGrid220LongMulti = new EGrid220LongMulti { ThisSys => + override val grids: RArr[EGridLongFull] = EGrid220.grids(2, 0, 140) override def headGridInt: Int = 0