Skip to content

Commit

Permalink
#228 Removed Head4Land.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rich2
Rich2 committed Mar 27, 2023
1 parent a3c093f commit 19ce61a
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 31 deletions.
2 changes: 1 addition & 1 deletion EGrid/src/eg160/Terr160E30.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ object Terr160E30 extends Long160Terrs
TRow(268, sea, Head2Land(3, Mountains), hills * 3, plain * 2, sea * 6, plain, mtain),
TRow(266, Head2Land(0), Head2Land(4, Mountains), hills * 3, plain * 2, hills * 8),
VRow(265, MouthUp(1510)),
TRow(264, hills, Head4Land(1), hills * 2, sea, Head2Land(4, Hilly), hills * 9),
TRow(264, hills, Headland(4, 1), hills * 2, sea, Head2Land(4, Hilly), hills * 9),
TRow(262, hills, sea * 2, hills * 2, sea, hills, hills * 4, hills * 5),
TRow(260, sea * 3, hills, sea * 2, hills * 10),
TRow(258, sea * 11, hills * 5),
Expand Down
12 changes: 6 additions & 6 deletions EGrid/src/eg220/Terr220E0.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@ object Terr220E0 extends Long220Terrs
TRow(170, sea * 4, taigaHills, taiga * 2),
TRow(168, sea * 2, Head3Land(5, Hilly), sea * 2, Head2Land(3, Hilly, Taiga), taiga),
VRow(167, VertInDn(522), VertInDL(524)),
TRow(166, sea * 2, hills, Head2Land(1, Hilly), sea * 2, plain, Head2Land(3)),
TRow(164, sea, Head4Land(5), hills, sea * 3, plain, sea),
TRow(166, sea * 2, hills, Headland(2, 1, Hilly), sea * 2, plain, Headland(2, 3)),
TRow(164, sea, Headland(4, 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),
TRow(160, sea, Headland(4, 2), sea, plain * 2, Head1Land(5), plain, hills, plain),
VRow(159, VertInUp(512), VertInUL(514)),
TRow(158, sea * 2, Head4Land(2, Hilly), Head3Land(4), plain, hills * 4),
TRow(158, sea * 2, Headland(4, 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(148, sea * 2, plain * 4, sea * 2, Headland(4, 4, Hilly), sea, hills),
TRow(146, sea, plain * 4, sea * 3, Headland(4, 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),
Expand Down
6 changes: 3 additions & 3 deletions EGrid/src/eg220/Terr220E30.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ object Terr220E30 extends Long220Terrs

val help = new WTerrSetter(grid, terrs, sTerrs, corners)
{ override val rowDatas: RArr[RowBase] = RArr(
TRow(182, Head2Land(5, Hilly, Tundra), Head2Land(0, Hilly, Tundra), sea * 3),
TRow(182, Headland(2, 5, Hilly, Tundra), Head2Land(0, Hilly, Tundra), sea * 3),
TRow(180, tundraHills, taiga, tundra, Head2Land(0, Hilly, Tundra), sea),
TRow(178, taiga * 4, Head3Land(5, Plains, Tundra)),
VRow(177, MouthUp(1530), MouthDL(1538), VertInUL(1544)),
TRow(176, Head1Land(2, Plains, Taiga), taiga * 2, Head3Land(0, Plains, Taiga), Head2Land(4, Plains, Taiga), taiga),
TRow(176, Headland(1, 2, Plains, Taiga), taiga * 2, Headland(3, 0, Plains, Taiga), Head2Land(4, Plains, Taiga), taiga),
VRow(175, MouthDL(1540), MouthDR(1544)),
TRow(174, Head1Land(2, Plains, Taiga), Head1Land(5, Plains, Taiga), taiga * 4),
VRow(173, MouthUL(1540, Lake), VertInDL(1542, Lake, Lake)),
Expand All @@ -39,7 +39,7 @@ object Terr220E30 extends Long220Terrs
VRow(147, MouthUL(1526)),
TRow(146, Head2Land(1, Hilly), Head1Land(4, Hilly), Head2Land(1, Hilly), hills * 2, desertHills * 3, mtain, desertHills * 2),
VRow(145, MouthDL(1522), MouthUR(1524)),
TRow(144, Head4Land(2, Hilly), sea, hills, sea, hills * 4, desertHills, plain, mtain),
TRow(144, Headland(4, 2, Hilly), sea, hills, sea, hills * 4, desertHills, plain, mtain),
VRow(143, MouthUp(1544)),
TRow(142, sea * 5, Head3Land(2, Hilly), sea, Head3Land(2, Hilly), Head1Land(4, Hilly), desert * 3),
TRow(140, sea * 3, Island(Hilly), sea * 2, Island(Hilly), sea, hills, desert * 3),
Expand Down
2 changes: 1 addition & 1 deletion EGrid/src/eg320/Terr320E0.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ object Terr320E0 extends Long320Terrs
TRow(152, sea * 3, taigaHills),
TRow(150, sea * 3, taigaHills),
TRow(148, sea * 3, taigaHills, taiga),
TRow(146, sea, hills, sea, Head4Land(4), Head3Land(2, Plains, Forest)),
TRow(146, sea, hills, sea, Headland(4, 4), Head3Land(2, Plains, Forest)),
TRow(144, sea, Headland(4, 5), plain, sea, plain),
TRow(142, sea, Headland(4, 2), Headland(1, 5), Headland(3, 1), plain * 2),
TRow(140, sea, Headland(4, 2, Hilly), Headland(2, 5), plain * 3),
Expand Down
4 changes: 2 additions & 2 deletions EGrid/src/eg320/Terr320E30.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ object Terr320E30 extends Long320Terrs
override val rowDatas: RArr[RowBase] = RArr(
TRow(156, Head2Land(5, Hilly, Tundra), Head2Land(0, Hilly, Tundra), sea),
VRow(155, MouthDn(1538)),
TRow(154, taigaHills, taiga * 2, Head4Land(0, Plains, Tundra)),
TRow(154, taigaHills, taiga * 2, Headland(4, 0, Plains, Tundra)),
VRow(153, MouthUp(1534)),
TRow(152, Headland(1, 2, Plains, Taiga), taiga, Headland(2, 1, Plains, Taiga), taiga),
VRow(151, VertInDR(1532), MouthDL(1540)),
Expand All @@ -33,7 +33,7 @@ object Terr320E30 extends Long320Terrs
VRow(133, MouthUp(1530)),
TRow(132, Headland(2, 1, Hilly), hills, Headland(1, 4, Hilly), hills * 4),
VRow(131, MouthDR(1528)),
TRow(130, Head4Land(2, Hilly), Head4Land(3, Hilly), Headland(3, 1, Hilly), Headland(2, 3, Hilly), hills * 4),
TRow(130, Headland(4, 2, Hilly), Headland(4, 3, Hilly), Headland(3, 1, Hilly), Headland(2, 3, Hilly), hills * 4),
VRow(129, MouthUR(1536)),
TRow(128, sea * 2, Island(Hilly), sea, Island(Hilly), hills, desert * 2),
VRow(127, VertInUp(1528)),
Expand Down
8 changes: 4 additions & 4 deletions EGrid/src/eg80/Terr80E30.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ object Terr80E30 extends Long80Terrs
TRow(420, sea * 7, hills * 2, sea * 4, hills, mtain, hills * 2, mtain, hills, plain, desert, hills * 2, mtain, hills * 2, plain * 2, desert * 4,
mtain),

TRow(418, sea * 7, hills, sea * 5, hills * 5, mtain, hills * 2, Head1Land(3) * 2, hills, desert * 2, plain, desert * 3, desertHills * 2, mtain),
TRow(418, sea * 7, hills, sea * 5, hills * 5, mtain, hills * 2, Headland(1, 3) * 2, hills, desert * 2, plain, desert * 3, desertHills * 2, mtain),
VRow(417, MouthUR(1564)),

TRow(416, sea * 10, sea * 4, Island(Hilly), sea, Head3Land(2, Mountains), sea * 2, Head2Land(3, Mountains), Head2Land(2, Mountains), sea * 2, hills, plain,
TRow(416, sea * 10, sea * 4, Island(Hilly), sea, Head3Land(2, Mountains), sea * 2, Headland(2, 3, Mountains), Headland(2, 2, Mountains), sea * 2, hills, plain,
desert * 7, desertHills),

TRow(414, sea * 9, hills, sea * 10, Head4Land(5, Hilly), sea, hills * 2, desert * 8, desertHills),
TRow(414, sea * 9, hills, sea * 10, Headland(4, 5, Hilly), sea, hills * 2, desert * 8, desertHills),
TRow(412, sea * 10, hills * 2, sea * 7, hills, plain, sea * 2, hills, desert * 10),
TRow(410, sea * 11, sea * 12, hills, desertHills, desert * 9), //Checked HCens to here
TRow(410, sea * 11, sea * 12, hills, desertHills, desert * 9),
)
}
help.run
Expand Down
15 changes: 1 addition & 14 deletions EGrid/src/egrid/WTile.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,10 @@ object Island
}
}

/** Headland surrounded by [[Water]] on 1 to 4 sides. */
case class Headland(numIndentedVerts: Int, indentStartIndex: Int, terr: Terrain = Plains, biome: Biome = OpenTerrain, sideTerrs: Water = Sea) extends
Coastal with HIndent5Minus


/** Headland surrounded by [[Water]] on 5 sides. */
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 Head3Land(indentStartIndex: Int, terr: Terrain = Plains, biome: Biome = OpenTerrain, sideTerrs: Water = Sea) extends Coastal with HIndent3

Expand All @@ -133,16 +130,6 @@ case class Head2Land(indentStartIndex: Int, terr: Terrain = Plains, biome: Biome
/** Headland surrounded by [[Water]] on 3 sides. */
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"
override def colour: Colour = DarkBlue
}
class LakeIsland(val terr: Terrain, val biome: Biome) extends Island// with LakeHas
{ override def str: String = "SeaIsland"
override def colour: Colour = Blue
}*/

trait Terrain
{ def str: String
def colour: Colour
Expand Down

0 comments on commit 19ce61a

Please sign in to comment.