Skip to content

Commit

Permalink
#228 More Headland replacement.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rich2
Rich2 committed Mar 27, 2023
1 parent 19ce61a commit e56ef23
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 43 deletions.
30 changes: 15 additions & 15 deletions EGrid/src/eg120/Terr120E0.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,35 +42,35 @@ object Terr120E0 extends Long120Terrs
res
}

val help = new WTerrSetter(grid, terrs, sTerrs, corners) {
override val rowDatas: RArr[RowBase] = RArr(
TRow(344, sea * 9, Head2Land(4, Mountains)),
val help = new WTerrSetter(grid, terrs, sTerrs, corners)
{ override val rowDatas: RArr[RowBase] = RArr(
TRow(344, sea * 9, Headland(2, 4, Mountains)),
TRow(342, sea * 10, mtain) ,
TRow(340, sea * 10, mtain),
TRow(338, sea * 9, tundraHills * 2),
TRow(336, sea * 9, taigaHills * 2, taiga),
TRow(334, sea * 8, Head2Land(5, Mountains), taigaHills * 3),
TRow(332, sea * 3, Island(Hilly), sea * 4, Head2Land(4, Mountains), mtain, taigaHills, taiga * 2),
TRow(334, sea * 8, Headland(2, 5, Mountains), taigaHills * 3),
TRow(332, sea * 3, Island(Hilly), sea * 4, Headland(2, 4, Mountains), mtain, taigaHills, taiga * 2),
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, Head2Land(4, Hilly, Taiga), taigaHills, taiga * 3),
TRow(324, sea * 3, plain, hills, sea * 4, Head2Land(3, Hilly, Taiga), Head2Land(2, Hilly, Taiga), sea, plain * 2),
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(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)),
TRow(318, sea * 3, Head3Land(5), Head1Land(4, Hilly), hills, sea * 5, plain, plain, plain, sea),
TRow(318, sea * 3, Headland(3, 5), Headland(1, 4, Hilly), hills, sea * 5, plain, plain, plain, sea),
VRow(317, MouthDn(536)),
TRow(316, sea * 2, Head2Land(5), plain, Head3Land(1), Head2Land(3, Hilly), plain, sea * 5, plain, sea * 3),
TRow(316, sea * 2, Headland(2, 5), plain, Headland(3, 1), Headland(2, 3, Hilly), plain, sea * 5, plain, sea * 3),
VRow(315, MouthUL(498), MouthUR(506)),
TRow(314, sea * 2, Head2Land(4), plain, Head2Land(1), Head3Land(4, Hilly), plain * 2, sea * 3, Head2Land(5), plain * 4),
TRow(312, sea * 2, plain * 2, sea, hills, plain * 2, Head3Land(0), sea, plain * 6),
TRow(310, sea * 2, Headland(4, 2), sea * 2, Head2Land(3, Hilly), plain * 2, Head1Land(2), sea, plain * 3, hills * 2, plain * 2),
TRow(314, sea * 2, Headland(2, 4), plain, Headland(2, 1), Headland(3, 4, Hilly), plain * 2, sea * 3, Headland(2, 5), plain * 4),
TRow(312, sea * 2, plain * 2, sea, hills, plain * 2, Headland(3, 0), sea, plain * 6),
TRow(310, sea * 2, Headland(4, 2), sea * 2, Headland(2, 3, Hilly), plain * 2, Headland(1, 2), sea, plain * 3, hills * 2, plain * 2),
VRow(309, MouthUR(504)),
TRow(308, sea * 5, Head3Land(4, Hilly), Head1Land(3, Hilly), Head1Land(3), Head2Land(2), Head2Land(5), plain * 2, hills * 5),
TRow(306, sea * 8, Head3Land(5), Head1Land(5), plain * 2, hills * 6),
TRow(308, sea * 5, Headland(3, 4, Hilly), Headland(1, 3, Hilly), Headland(1, 3), Headland(2, 2), Headland(2, 5), plain * 2, hills * 5),
TRow(306, sea * 8, Headland(3, 5), Headland(1, 5), plain * 2, hills * 6),
VRow(305, MouthDn(512)),
TRow(304, sea * 6, plain * 5, hills * 4, plain, hills * 2),
TRow(302, sea * 6, Head3Land(3), plain * 4, hills * 2, forestHills, hills * 2, mtain * 2),
TRow(302, sea * 6, Headland(3, 3), plain * 4, hills * 2, forestHills, hills * 2, mtain * 2),
TRow(300, sea * 8, plain * 4, hills * 2, mtain * 4, hills),
)
}
Expand Down
22 changes: 11 additions & 11 deletions EGrid/src/eg160/Terr160E0.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ object Terr160E0 extends Long160Terrs

val help = new WTerrSetter(grid, terrs, sTerrs, corners)
{ override val rowDatas: RArr[RowBase] = RArr(
TRow(310, sea * 6, Head3Land(4, Mountains)),
TRow(310, sea * 6, Headland(3, 4, Mountains)),
TRow(308, sea * 7, mtain),
TRow(306, sea * 7, Head2Land(4, Mountains)),
TRow(306, sea * 7, Headland(2, 4, Mountains)),
TRow(304, sea * 7, mtain),
TRow(302, sea * 6, Head2Land(5, Hilly, Taiga), taigaHills, taiga),
TRow(300, sea * 6, Head1Land(5, Mountains), taigaHills * 2),
TRow(298, sea * 6, Head2Land(4, Mountains), mtain, taigaHills * 2),
TRow(302, sea * 6, Headland(2, 5, Hilly, Taiga), taigaHills, taiga),
TRow(300, sea * 6, Headland(1, 5, Mountains), taigaHills * 2),
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(290, sea * 2, Head2Land(4, Hilly), hills, sea * 4, plain, Island(), plain),
TRow(290, sea * 2, Headland(2, 4, Hilly), hills, sea * 4, plain, Island(), plain),
VRow(289, VertInDL(502)),
TRow(288, sea * 2, plain, Head2Land(3, Hilly), plain, sea * 4, plain, sea),
TRow(286, sea * 2, plain, Head2Land(1), plain * 2, sea * 3, plain * 3),
TRow(284, sea, plain * 2, Head2Land(4, Hilly), plain * 2, sea, plain * 5),
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(280, sea * 4, Headland(4, 2, Hilly), sea * 2, plain, hills * 5),
TRow(278, sea * 4, plain * 5, hills, plain * 2, hills),
Expand All @@ -38,11 +38,11 @@ object Terr160E0 extends Long160Terrs
VRow(273, MouthUp(538)),
TRow(272, sea * 6, plain, hills * 2, mtain, hills, mtain, plain, hills),
VRow(271, VertInUR(538), MouthDR(540)),
TRow(270, sea * 2, Head3Land(4), Head1Land(0, Hilly) * 3, plain * 2, hills * 2, mtain, sea, hills * 2, sea),
TRow(270, sea * 2, Headland(3, 4), Headland(1, 0, Hilly) * 3, plain * 2, hills * 2, mtain, sea, hills * 2, sea),
TRow(268, sea * 3, hills, plain, desertHills * 2, mtain * 2, sea * 3, Island(Hilly), hills * 2),
TRow(266, sea * 2, hills * 2, desert, desertHills * 2, hills, sea * 3, hills, sea * 2, hills),
VRow(265, MouthUp(514)),
TRow(264, sea * 3, hills * 2, desertHills, hills, Head1Land(2, Hilly), sea, Island(Hilly), sea * 2, hills, sea * 2),
TRow(264, sea * 3, hills * 2, desertHills, hills, Headland(1, 2, Hilly), sea, Island(Hilly), sea * 2, hills, sea * 2),
TRow(262, sea * 3, plain * 2, hills * 3)
)
}
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 @@ -22,17 +22,17 @@ object Terr220E30 extends Long220Terrs
VRow(171, MouthDL(1536, Lake), MouthUR(1538, Lake), MouthDn(1542, Lake)),
TRow(170, sea, Head2Land(3, Plains, Taiga), Head1Land(3, Plains, Taiga), taiga * 4),
VRow(169, MouthUR(1536)),
TRow(168, Head2Land(1), Head2Land(5), Head1Land(0), forest * 2, taiga * 2),
TRow(166, Head2Land(2), Head1Land(5), plain * 2, forest * 2, plain, forest),
TRow(164, Head1Land(5), plain * 7),
TRow(168, Headland(2, 1), Head2Land(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),
TRow(160, plain * 3, forest, plain * 5),
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),
VRow(153, MouthUR(1540)),
TRow(152, hills * 2, plain * 2, sea, Head3Land(3), Head3Land(1), Head2Land(3, Hilly), plain * 2),
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),
Expand Down
12 changes: 6 additions & 6 deletions EGrid/src/eg320/Terr320E150.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@ object Terr320E150 extends Long320Terrs
{
override val rowDatas: RArr[RowBase] = RArr(
TRow(160, sea * 2),
TRow(158, Head3Land(5, Plains, Tundra), sea * 2),
TRow(158, Headland(3, 5, Plains, Tundra), sea * 2),
TRow(156, tundra * 2, Head2Land(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(142, taiga * 2, sea * 2, Head3Land(2, Plains, Taiga), sea),
TRow(142, taiga * 2, sea * 2, Headland(3, 2, Plains, Taiga), sea),
TRow(140, taiga, sea * 5),
TRow(138, Head2Land(2, Plains, Taiga), sea * 6),
TRow(136, sea, Head3Land(5, Hilly, Forest), sea * 5),
TRow(134, Head3Land(3, Hilly, Forest), Head2Land(2, Hilly, Forest), sea * 5),
TRow(132, sea, Head3Land(0, Hilly), 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(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),
)
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 @@ -28,7 +28,7 @@ object Terr80E0 extends Long80Terrs
TRow(492, sea * 8, Headland(4, 2, Hilly), sea * 4, taiga * 6),
TRow(490, sea * 14, taiga * 3, taigaHills, taiga * 3),
TRow(488, sea * 7, Headland(3, 5, Hilly), Island(Hilly), sea * 6, taiga * 2, sea, Headland(1, 4), taiga * 2),
TRow(486, sea * 5, Island(Hilly) * 2, mtain, Head2Land(1, Hilly), sea * 7, Headland(3, 2, Hilly, Taiga), sea * 2, Headland(1, 4), plain * 2),
TRow(486, sea * 5, Island(Hilly) * 2, mtain, Headland(2, 1, Hilly), sea * 7, Headland(3, 2, Hilly, Taiga), sea * 2, Headland(1, 4), plain * 2),
VRow(485, MouthDL(502)),
TRow(484, sea * 5, Headland(3, 4, Hilly), mtain, forestHills, hills, sea * 9, Headland(4, 5), Headland(1, 4), plain * 2),
TRow(482, sea * 6, mtain * 2, hills, sea * 8, plain * 2, sea, Headland(1, 4), plain),
Expand All @@ -42,10 +42,10 @@ object Terr80E0 extends Long80Terrs
TRow(472, sea * 3, plain * 3, Head2Land(1), sea * 2, plain, hills, Head2Land(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, Head3Land(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, Head2Land(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), Head1Land(3), Headland(2, 2), sea, Headland(1, 5), plain * 3, hills * 8),
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),
TRow(460, sea * 7, Headland(4, 2, Hilly), sea * 5, Headland(1, 5), plain * 2, hills * 10),
VRow(459, MouthDL(508), MouthDR(512)),
TRow(458, sea * 11, Headland(2, 4), Headland(1, 0), plain * 6, hills * 3, plain, hills * 3, plain),
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 @@ -83,7 +83,7 @@ object Terr80E30 extends Long80Terrs

VRow(423, VertInUp(1500)),

TRow(422, Headland(4, 2, Mountains), sea * 4, Island(Hilly), Head3Land(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), Head2Land(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 All @@ -94,7 +94,7 @@ object Terr80E30 extends Long80Terrs
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, Headland(2, 3, Mountains), Headland(2, 2, Mountains), sea * 2, hills, plain,
TRow(416, sea * 10, sea * 4, Island(Hilly), sea, Headland(3, 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, Headland(4, 5, Hilly), sea, hills * 2, desert * 8, desertHills),
Expand Down
4 changes: 2 additions & 2 deletions EGrid/src/egrid/WTile.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ 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
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
Expand Down

0 comments on commit e56ef23

Please sign in to comment.