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 e56ef23 commit e09a5c0
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 22 deletions.
6 changes: 3 additions & 3 deletions EGrid/src/eg160/Terr160E0.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ object Terr160E0 extends Long160Terrs
TRow(298, sea * 6, Headland(2, 4, Mountains), mtain, taigaHills * 2),
TRow(296, sea * 6, taigaHills * 2, taiga * 2),
VRow(295, MouthUp(528)),
TRow(294, sea * 2, Island(Hilly), Head3Land(5, Hilly), sea * 3, hills, Head2Land(2, Hilly, Taiga), taiga),
TRow(292, sea * 3, hills, Head2Land(1, Hilly), sea * 4, Headland(4, 5), plain),
TRow(294, sea * 2, Island(Hilly), Headland(3, 5, Hilly), sea * 3, hills, Headland(2, 2, Hilly, Taiga), taiga),
TRow(292, sea * 3, hills, Headland(2, 1, Hilly), sea * 4, Headland(4, 5), plain),
TRow(290, sea * 2, Headland(2, 4, Hilly), hills, sea * 4, plain, Island(), plain),
VRow(289, VertInDL(502)),
TRow(288, sea * 2, plain, Headland(2, 3, Hilly), plain, sea * 4, plain, sea),
TRow(286, sea * 2, plain, Headland(2, 1), plain * 2, sea * 3, plain * 3),
TRow(284, sea, plain * 2, Headland(2, 4, Hilly), plain * 2, sea, plain * 5),
TRow(282, sea * 4, hills, plain, Head3Land(1), plain * 2, hills * 2, plain * 2),
TRow(282, sea * 4, hills, plain, Headland(3, 1), plain * 2, hills * 2, plain * 2),
TRow(280, sea * 4, Headland(4, 2, Hilly), sea * 2, plain, hills * 5),
TRow(278, sea * 4, plain * 5, hills, plain * 2, hills),
TRow(276, sea * 5, plain * 4, hills * 2, mtain * 3),
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 @@ -15,31 +15,31 @@ object Terr220E0 extends Long220Terrs
val help = new WTerrSetter(grid, terrs, sTerrs, corners)
{
override val rowDatas: RArr[RowBase] = RArr(
TRow(178, sea * 4, Head2Land(4, Hilly, Taiga)),
TRow(178, sea * 4, Headland(2, 4, Hilly, Taiga)),
TRow(176, sea * 5, taigaHills),
TRow(174, sea * 5, taigaHills),
TRow(172, sea * 5, taigaHills, taiga),
TRow(170, sea * 4, taigaHills, taiga * 2),
TRow(168, sea * 2, Head3Land(5, Hilly), sea * 2, Head2Land(3, Hilly, Taiga), taiga),
TRow(168, sea * 2, Headland(3, 5, Hilly), sea * 2, Headland(2, 3, Hilly, Taiga), taiga),
VRow(167, VertInDn(522), VertInDL(524)),
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, Headland(4, 2), sea, plain * 2, Head1Land(5), plain, hills, plain),
VRow(159, VertInUp(512), VertInUL(514)),
TRow(158, sea * 2, Headland(4, 2, Hilly), Head3Land(4), plain, hills * 4),
TRow(158, sea * 2, Headland(4, 2, Hilly), Headland(3, 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(150, sea, Headland(3, 4, Hilly), hills * 4, sea * 2, Island(Hilly), hills, sea),
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),
TRow(142, sea * 3, Headland(3, 2, Hilly), sea * 2, hills * 4, Headland(3, 0, Hilly), sea),
TRow(140, sea * 2, Headland(2, 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),
Expand Down
8 changes: 4 additions & 4 deletions EGrid/src/eg220/Terr220E30.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ object Terr220E30 extends Long220Terrs
{ override val rowDatas: RArr[RowBase] = RArr(
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)),
TRow(178, taiga * 4, Headland(3, 5, Plains, Tundra)),
VRow(177, MouthUp(1530), MouthDL(1538), VertInUL(1544)),
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)),
Expand All @@ -30,7 +30,7 @@ object Terr220E30 extends Long220Terrs
TRow(158, hills * 2, plain * 7),
TRow(156, plain * 2, mtain, plain * 6, desert),
VRow(155, MouthUp(1544), MouthUp(1548)),
TRow(154, plain * 2, hills * 2, plain * 3, Head3Land(2), plain * 2),
TRow(154, plain * 2, hills * 2, plain * 3, Headland(3, 2), plain * 2),
VRow(153, MouthUR(1540)),
TRow(152, hills * 2, plain * 2, sea, Headland(3, 3), Headland(3, 1), Headland(2, 3, Hilly), plain * 2),
TRow(150, Head1Land(4, Hilly), hills * 3, sea * 5, Head1Land(4, Mountains), hills),
Expand All @@ -41,9 +41,9 @@ object Terr220E30 extends Long220Terrs
VRow(145, MouthDL(1522), MouthUR(1524)),
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(142, sea * 5, Headland(3, 2, Hilly), sea, Headland(3, 2, Hilly), Head1Land(4, Hilly), desert * 3),
TRow(140, sea * 3, Island(Hilly), sea * 2, Island(Hilly), sea, hills, desert * 3),
TRow(138, sea * 2, Head3Land(5, Plains, Desert), sea * 5, hills, desert * 3),
TRow(138, sea * 2, Headland(3, 5, Plains, Desert), sea * 5, hills, desert * 3),
TRow(136, desert, sea, desert * 4, plain, desertHills, desert * 5),
VRow(135, MouthUp(1540), MouthUp(1544)),
TRow(134, desert * 6, plain, desert, desertHills, desertHills, desert * 3),
Expand Down
4 changes: 2 additions & 2 deletions 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, Headland(4, 4), Head3Land(2, Plains, Forest)),
TRow(146, sea, hills, sea, Headland(4, 4), Headland(3, 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 All @@ -30,7 +30,7 @@ object Terr320E0 extends Long320Terrs
VRow(135, VertInUR(526)),
TRow(134, sea, hills * 3, sea, Island(Hilly), Head1Land(1, Hilly)),
TRow(132, sea, hills, plain * 2, sea, Island(Hilly), sea),
TRow(130, sea, Headland(3, 3), Headland(1, 3, Hilly), Headland(2, 2, Hilly), sea * 2, Head3Land(5, Hilly), Island(Hilly)),
TRow(130, sea, Headland(3, 3), Headland(1, 3, Hilly), Headland(2, 2, Hilly), sea * 2, Headland(3, 5, Hilly), Island(Hilly)),
TRow(128, sea, Headland(2, 5, Hilly), Headland(1, 0, Hilly), hills * 3, Headland(1, 1, Hilly), sea),
TRow(126, sea, Headland(1, 5), mtain, desertHills, desert * 4),
TRow(124, sea, desertHills, hills, desert * 6),
Expand Down
6 changes: 3 additions & 3 deletions EGrid/src/eg320/Terr320E120.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ object Terr320E120 extends Long320Terrs
TRow(136, plain * 7),
TRow(134, plain * 6, sea),
TRow(132, plain * 3, Head2Land(2, Hilly), Head1Land(3, Hilly), hills, sea),
TRow(130, desert, plain * 3, Head3Land(0), Head2Land(4,Hilly), Head2Land(1, Hilly), sea),
TRow(130, desert, plain * 3, Headland(3, 0), Headland(2, 4,Hilly), Headland(2, 1, Hilly), sea),
VRow(131, MouthUL(4606)),
TRow(130, desert, plain * 3, Head3Land(0), Head2Land(4,Hilly), Head2Land(1, Hilly), sea),
TRow(128, plain * 3, Head1Land(2), sea, Head3Land(2, Hilly), sea, hills),
TRow(130, desert, plain * 3, Headland(3, 0), Head2Land(4,Hilly), Head2Land(1, Hilly), sea),
TRow(128, plain * 3, Head1Land(2), sea, Headland(3, 2, Hilly), sea, hills),
TRow(126, mtain, hills, plain * 2, sea * 3, Head1Land(2, Hilly)),
)
}
Expand Down
2 changes: 1 addition & 1 deletion EGrid/src/eg320/Terr320E30.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ object Terr320E30 extends Long320Terrs
TRow(150, Headland(1, 2, Plains, Taiga), taiga * 3),
VRow(149, MouthUL(1536, Lake), MouthDR(1538, Lake)),
VRow(147, MouthUR(1534)),
TRow(148, Headland(1, 2, Plains, Taiga), Head3Land(3, Plains, Taiga), taiga * 3),
TRow(148, Headland(1, 2, Plains, Taiga), Headland(3, 3, Plains, Taiga), taiga * 3),
TRow(146, Headland(2, 5), taiga * 4),
TRow(144, plain * 5),
TRow(142, plain * 6),
Expand Down
3 changes: 0 additions & 3 deletions EGrid/src/egrid/WTile.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@ object Island
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 4 sides. */
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 Head2Land(indentStartIndex: Int, terr: Terrain = Plains, biome: Biome = OpenTerrain, sideTerrs: Water = Sea) extends Coastal with HIndent2

Expand Down

0 comments on commit e09a5c0

Please sign in to comment.