Skip to content

Commit

Permalink
#228 Removed Head2Land.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rich2
Rich2 committed Mar 27, 2023
1 parent e09a5c0 commit 9f2b233
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 31 deletions.
2 changes: 1 addition & 1 deletion EGrid/src/eg120/Terr120E0.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ object Terr120E0 extends Long120Terrs
TRow(330, sea * 5, Island(Hilly), sea * 2, mtain * 4, taigaHills),
TRow(328, sea * 6, sea * 3, mtain, taigaHills * 3),
TRow(326, sea * 5, Island(Hilly), sea * 3, Headland(2, 4, Hilly, Taiga), taigaHills, taiga * 3),
TRow(324, sea * 3, plain, hills, sea * 4, Headland(2, 3, Hilly, Taiga), Head2Land(2, Hilly, Taiga), sea, plain * 2),
TRow(324, sea * 3, plain, hills, sea * 4, Headland(2, 3, Hilly, Taiga), Headland(2, 2, Hilly, Taiga), sea, plain * 2),
TRow(322, sea * 3, hills, hills * 2, sea * 5, plain, sea, plain * 2),
TRow(320, sea * 4, plain * 2, sea * 5, plain * 2, sea, plain),
VRow(319, MouthUp(536), MouthUL(538), MouthDR(540)),
Expand Down
8 changes: 4 additions & 4 deletions EGrid/src/eg160/Terr160E30.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ object Terr160E30 extends Long160Terrs
TRow(278, hills * 3, plain * 10),
TRow(276, plain, hills, plain * 12),
TRow(274, hills * 2, plain, hills * 3, plain * 4, sea, plain * 3),
TRow(272, hills, plain, hills * 2, plain * 2, plain, sea, plain, Head2Land(2), Head2Land(3), plain * 3),
TRow(272, hills, plain, hills * 2, plain * 2, plain, sea, plain, Headland(2, 2), Headland(2, 3), plain * 3),
TRow(270, hills * 3, plain * 4, sea * 5, mtain, hills, plain),
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),
TRow(268, sea, Headland(2, 3, Mountains), hills * 3, plain * 2, sea * 6, plain, mtain),
TRow(266, Headland(2, 0), Headland(2, 4, Mountains), hills * 3, plain * 2, hills * 8),
VRow(265, MouthUp(1510)),
TRow(264, hills, Headland(4, 1), hills * 2, sea, Head2Land(4, Hilly), hills * 9),
TRow(264, hills, Headland(4, 1), hills * 2, sea, Headland(2, 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
2 changes: 1 addition & 1 deletion EGrid/src/eg220/Terr220E0.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ object Terr220E0 extends Long220Terrs
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(162, sea, plain, sea, plain, sea, Headland(2, 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), Headland(3, 4), plain, hills * 4),
Expand Down
14 changes: 7 additions & 7 deletions EGrid/src/eg220/Terr220E30.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ object Terr220E30 extends Long220Terrs

val help = new WTerrSetter(grid, terrs, sTerrs, corners)
{ 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(182, Headland(2, 5, Hilly, Tundra), Headland(2, 0, Hilly, Tundra), sea * 3),
TRow(180, tundraHills, taiga, tundra, Headland(2, 0, Hilly, Tundra), sea),
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),
TRow(176, Headland(1, 2, Plains, Taiga), taiga * 2, Headland(3, 0, Plains, Taiga), Headland(2, 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)),
TRow(172, Head1Land(2, Plains, Taiga), Head1Land(5, Plains, Taiga), taiga * 5),
VRow(171, MouthDL(1536, Lake), MouthUR(1538, Lake), MouthDn(1542, Lake)),
TRow(170, sea, Head2Land(3, Plains, Taiga), Head1Land(3, Plains, Taiga), taiga * 4),
TRow(170, sea, Headland(2, 3, Plains, Taiga), Head1Land(3, Plains, Taiga), taiga * 4),
VRow(169, MouthUR(1536)),
TRow(168, Headland(2, 1), Head2Land(5), Head1Land(0), forest * 2, taiga * 2),
TRow(168, Headland(2, 1), Headland(2, 5), Head1Land(0), forest * 2, taiga * 2),
TRow(166, Headland(2, 2), Head1Land(5), plain * 2, forest * 2, plain, forest),
TRow(164, Headland(1, 5), plain * 7),
TRow(162, plain * 9),
Expand All @@ -35,9 +35,9 @@ object Terr220E30 extends Long220Terrs
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),
VRow(149, MouthDR(1554)),
TRow(148, Head2Land(0, Hilly), Head1Land(4, Hilly), plain, hills * 2, Head1Land(0, Hilly), mtain, hills * 2, Head1Land(0, Mountains), hills),
TRow(148, Headland(2, 0, Hilly), Head1Land(4, Hilly), plain, hills * 2, Head1Land(0, Hilly), mtain, hills * 2, Head1Land(0, Mountains), hills),
VRow(147, MouthUL(1526)),
TRow(146, Head2Land(1, Hilly), Head1Land(4, Hilly), Head2Land(1, Hilly), hills * 2, desertHills * 3, mtain, desertHills * 2),
TRow(146, Headland(2, 1, Hilly), Head1Land(4, Hilly), Headland(2, 1, Hilly), hills * 2, desertHills * 3, mtain, desertHills * 2),
VRow(145, MouthDL(1522), MouthUR(1524)),
TRow(144, Headland(4, 2, Hilly), sea, hills, sea, hills * 4, desertHills, plain, mtain),
VRow(143, MouthUp(1544)),
Expand Down
4 changes: 2 additions & 2 deletions EGrid/src/eg320/Terr320E120.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ object Terr320E120 extends Long320Terrs
TRow(138, desert * 2, plain, hills, plain, taiga * 2),
TRow(136, plain * 7),
TRow(134, plain * 6, sea),
TRow(132, plain * 3, Head2Land(2, Hilly), Head1Land(3, Hilly), hills, sea),
TRow(132, plain * 3, Headland(2, 2, Hilly), Head1Land(3, Hilly), hills, 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, Headland(3, 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),
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
10 changes: 5 additions & 5 deletions EGrid/src/eg320/Terr320E150.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ object Terr320E150 extends Long320Terrs
override val rowDatas: RArr[RowBase] = RArr(
TRow(160, sea * 2),
TRow(158, Headland(3, 5, Plains, Tundra), sea * 2),
TRow(156, tundra * 2, Head2Land(0, Plains, Tundra)),
TRow(156, tundra * 2, Headland(2, 0, Plains, Tundra)),
TRow(154, tundra * 4),
TRow(152, tundra, taiga * 3),
TRow(150, taiga * 4),
TRow(148, taiga * 3, sea, taiga),
TRow(146, sea * 3, taiga, sea),
TRow(144, sea * 3, Head2Land(4, Plains, Taiga), Head2Land(1, Plains, Taiga)),
TRow(144, sea * 3, Headland(2, 4, Plains, Taiga), Headland(2, 1, Plains, Taiga)),
TRow(142, taiga * 2, sea * 2, Headland(3, 2, Plains, Taiga), sea),
TRow(140, taiga, sea * 5),
TRow(138, Headland(2, 2, Plains, Taiga), sea * 6),
TRow(136, sea, Headland(3, 5, Hilly, Forest), sea * 5),
TRow(134, Headland(3, 3, Hilly, Forest), Head2Land(2, Hilly, Forest), sea * 5),
TRow(134, Headland(3, 3, Hilly, Forest), Headland(2, 2, Hilly, Forest), sea * 5),
TRow(132, sea, Headland(3, 0, Hilly), sea * 5),
TRow(130, Head2Land(5, Hilly), Head1Land(2, Hilly), sea * 6),
TRow(128, Head2Land(2, Hilly), sea * 7),
TRow(130, Headland(2, 5, Hilly), Head1Land(2, Hilly), sea * 6),
TRow(128, Headland(2, 2, Hilly), sea * 7),
)
}
help.run
Expand Down
6 changes: 3 additions & 3 deletions EGrid/src/eg320/Terr320E30.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ object Terr320E30 extends Long320Terrs
val help = new WTerrSetter(grid, terrs, sTerrs, corners)
{
override val rowDatas: RArr[RowBase] = RArr(
TRow(156, Head2Land(5, Hilly, Tundra), Head2Land(0, Hilly, Tundra), sea),
TRow(156, Headland(2, 5, Hilly, Tundra), Headland(2, 0, Hilly, Tundra), sea),
VRow(155, MouthDn(1538)),
TRow(154, taigaHills, taiga * 2, Headland(4, 0, Plains, Tundra)),
VRow(153, MouthUp(1534)),
Expand All @@ -29,15 +29,15 @@ object Terr320E30 extends Long320Terrs
VRow(137, MouthUp(1522), MouthUR(1540), VertInDR(1542), MouthUR(1544)),
TRow(136, hills, plain * 2, Headland(1, 2), Headland(3, 3), Headland(2, 3), plain),
VRow(135, VertInUR(1522)),
TRow(134, Head1Land(4, Hilly), hills, hills, sea * 3, mtain),
TRow(134, Headland(1, 4, Hilly), hills, hills, sea * 3, mtain),
VRow(133, MouthUp(1530)),
TRow(132, Headland(2, 1, Hilly), hills, Headland(1, 4, Hilly), hills * 4),
VRow(131, MouthDR(1528)),
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)),
TRow(126, sea, Head2Land(5, Plains, Desert), Head2Land(0, Plains, Desert), sea * 2, Head1Land(5, Hilly), desert * 2),
TRow(126, sea, Headland(2, 5, Plains, Desert), Headland(2, 0, Plains, Desert), sea * 2, Headland(1, 5, Hilly), desert * 2),
VRow(125, MouthDn(1524), MouthDn(1532), MouthDn(1540)),
TRow(124, desert * 4, plain, desert * 4),
)
Expand Down
6 changes: 3 additions & 3 deletions EGrid/src/eg80/Terr80E0.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ object Terr80E0 extends Long80Terrs
TRow(476, sea * 5, hills, plain, Headland(3, 3, Hilly), hills * 2, Headland(1, 1), sea * 7, plain, Headland(1, 1), Headland(3, 2), sea * 2),
TRow(474, sea * 4, Headland(2, 5), plain * 2, Headland(3, 1, Hilly), sea, hills, plain, hills, sea * 7, plain * 2, sea * 3),
VRow(473, MouthUL(492)),
TRow(472, sea * 3, plain * 3, Head2Land(1), sea * 2, plain, hills, Head2Land(1), sea * 6, plain * 6),
TRow(472, sea * 3, plain * 3, Headland(2, 1), sea * 2, plain, hills, Headland(2, 1), sea * 6, plain * 6),
TRow(470, sea * 4, plain * 3, sea, hills * 2, plain * 2, sea * 4, plain * 9),
TRow(468, sea * 4, plain * 3, sea * 2, hills * 2, plain * 3, sea * 2, plain * 9),
TRow(466, sea * 3, Headland(3, 3), plain, Head2Land(2), sea * 2, hills * 2, plain * 3, sea * 2, plain * 4, hills * 2, plain * 4),
TRow(466, sea * 3, Headland(3, 3), plain, Headland(2, 2), sea * 2, hills * 2, plain * 3, sea * 2, plain * 4, hills * 2, plain * 4),
VRow(465, MouthDL(514), MouthDR(502)),
TRow(464, sea * 9, Headland(2, 5), plain * 3, Headland(4, 0), sea, plain * 2, hills * 7, plain, hills),
TRow(462, sea * 8, Headland(2, 5, Hilly), hills, Headland(1, 3, Hilly), Headland(1, 3), Headland(2, 2), sea, Headland(1, 5), plain * 3, hills * 8),
Expand All @@ -62,7 +62,7 @@ object Terr80E0 extends Long80Terrs
TRow(440, sea * 13, plain * 3, hills, mtain, hills * 3, mtain * 2, sea * 2, hills, mtain, hills, sea * 2),
TRow(438, sea * 5, hills * 3, mtain * 3, hills, mtain * 2, hills * 4, sea * 2, forestHills * 2, sea * 4, hills * 3, sea),
TRow(436, sea * 5, hills * 3, plain * 3, desert * 2, hills, mtain * 4, sea * 5, hills, sea * 2, hills * 2, mtain, sea),
TRow(434, sea * 6, hills * 2, plain, desert, desertHills, plain, hills, plain * 2, hills * 3, sea * 6, hills, sea * 2, Head2Land(3, Hilly), hills, mtain, hills),
TRow(434, sea * 6, hills * 2, plain, desert, desertHills, plain, hills, plain * 2, hills * 3, sea * 6, hills, sea * 2, Headland(2, 3, Hilly), hills, mtain, hills),
TRow(432, sea * 6, hills * 3, plain, desert, hills * 3, desert, plain, hills * 2, sea * 7, Headland(3, 5, Hilly), sea * 3, Headland(2, 3, Hilly), hills),
TRow(430, sea * 5, plain, hills * 5, desert, hills, desertHills, mtain, plain, sea * 8, hills, Headland(2, 1, Hilly), sea * 4, hills),
TRow(428, sea * 6, hills * 2, plain * 3, desert * 2, hills * 3, sea * 8, hills * 2, sea * 5),
Expand Down
4 changes: 2 additions & 2 deletions EGrid/src/eg80/Terr80E30.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ object Terr80E30 extends Long80Terrs
TRow(434, Headland(2, 1, Hilly), sea * 3, hills, mtain, hills * 2, mtain, hills * 2, plain, hills, sea * 4, hills * 4, sea * 6, hills, mtain,
hills * 2),

TRow(432, hills, Headland(2, 0), sea * 2, Head2Land(4, Hilly), mtain, hills * 6, plain * 2, hills, hills * 7, plain, hills * 8),
TRow(432, hills, Headland(2, 0), sea * 2, Headland(2, 4, Hilly), mtain, hills * 6, plain * 2, hills, hills * 7, plain, hills * 8),

TRow(430, hills, plain, sea * 2, hills, mtain, hills, plain, hills * 2, sea, hills, sea, hills * 2, mtain * 5, hills * 3, mtain * 4, hills * 3,
mtain),
Expand All @@ -83,7 +83,7 @@ object Terr80E30 extends Long80Terrs

VRow(423, VertInUp(1500)),

TRow(422, Headland(4, 2, Mountains), sea * 4, Island(Hilly), Headland(3, 4, Hilly), Head2Land(0, Mountains), hills * 2, sea * 2, hills * 7, desert,
TRow(422, Headland(4, 2, Mountains), sea * 4, Island(Hilly), Headland(3, 4, Hilly), Headland(2, 0, Mountains), hills * 2, sea * 2, hills * 7, desert,
desertHills, desert, mtain, hills, desertHills, mtain, plain * 2, desertHills, mtain * 2, desertHills),

VRow(421, MouthDn(1504)),
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 3 sides. */
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 Head1Land(indentStartIndex: Int, terr: Terrain = Plains, biome: Biome = OpenTerrain, sideTerrs: Water = Sea) extends Coastal with HIndent1

Expand Down

0 comments on commit 9f2b233

Please sign in to comment.