Skip to content

Commit

Permalink
#206 Armies can no longer move into the sea.
Browse files Browse the repository at this point in the history
  • Loading branch information
Rich2 committed Feb 26, 2023
1 parent 72ec80d commit ad28bc8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Dev/srcGrand/dless/DLessScen.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ trait DLessScen extends HSysTurnScen

orderList.foreach { pair =>
val optTarget: Option[HCen] = pair.startHC.stepOpt(pair.step)
optTarget.foreach { target => targets.appendAt(target, pair.a1) }
optTarget.foreach { target => if (terrs(target).isLand) targets.appendAt(target, pair.a1) }
}

val armiesNew: HCenOptLayer[Army] = armies.clone
Expand Down
12 changes: 12 additions & 0 deletions Earth/srcPts/WTile.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ trait WSide extends Coloured with ShowSimple
* and other land hexs. */
trait WTile extends Coloured with ShowSimple
{ override def typeStr: String = "WTile"
def isLand: Boolean
def isWater: Boolean
}

object WTile
Expand Down Expand Up @@ -48,6 +50,9 @@ object WTile

/** Currently a common trait for Ocean and Lake. */
trait Water extends WTile
{ override def isLand: Boolean = false
override def isWater: Boolean = true
}

case object Sea extends Water with WSide
{ override def str = "Ocean"
Expand All @@ -62,6 +67,8 @@ case object Lake extends Water with WSide
object TerrainNone extends WTile
{ override def str = "No terrain"
override def colour = Gray
override def isLand: Boolean = false
override def isWater: Boolean = false
}

class Land(val terr: Terrain, val biome: Biome) extends WTile
Expand All @@ -84,6 +91,9 @@ class Land(val terr: Terrain, val biome: Biome) extends WTile
}
case Mountains => Gray
}

override def isLand: Boolean = true
override def isWater: Boolean = false
}

object Land
Expand Down Expand Up @@ -145,6 +155,8 @@ object IceCap extends Biome
object SeaIce extends WTile
{ override def str = "SeaIce"
override def colour = White
override def isLand: Boolean = false
override def isWater: Boolean = false
}

case object Taiga extends Biome
Expand Down

0 comments on commit ad28bc8

Please sign in to comment.