Add vision and Fog of War

adam-arold · adam-arold · commit 890c3707b646 · 2019-04-29T22:19:46.000+02:00
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/attributes/Vision.kt b/src/main/kotlin/org/hexworks/cavesofzircon/attributes/Vision.kt
@@ -0,0 +1,5 @@
+package org.hexworks.cavesofzircon.attributes
+
+import org.hexworks.amethyst.api.Attribute
+
+data class Vision(val radius: Int): Attribute
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/attributes/flags/VisionBlocker.kt b/src/main/kotlin/org/hexworks/cavesofzircon/attributes/flags/VisionBlocker.kt
@@ -0,0 +1,5 @@
+package org.hexworks.cavesofzircon.attributes.flags
+
+import org.hexworks.amethyst.api.Attribute
+
+object VisionBlocker : Attribute
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/EntityTypes.kt b/src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/EntityTypes.kt
@@ -16,3 +16,5 @@ object StairsDown : BaseEntityType(
 
 object StairsUp : BaseEntityType(
         name = "stairs up")
+
+object FogOfWarType : BaseEntityType()
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/builders/EntityFactory.kt b/src/main/kotlin/org/hexworks/cavesofzircon/builders/EntityFactory.kt
@@ -8,14 +8,17 @@ import org.hexworks.cavesofzircon.attributes.EntityActions
 import org.hexworks.cavesofzircon.attributes.EntityPosition
 import org.hexworks.cavesofzircon.attributes.EntityTile
 import org.hexworks.cavesofzircon.attributes.FungusSpread
+import org.hexworks.cavesofzircon.attributes.Vision
 import org.hexworks.cavesofzircon.attributes.flags.BlockOccupier
+import org.hexworks.cavesofzircon.attributes.flags.VisionBlocker
 import org.hexworks.cavesofzircon.attributes.types.Fungus
 import org.hexworks.cavesofzircon.attributes.types.Player
 import org.hexworks.cavesofzircon.attributes.types.StairsDown
 import org.hexworks.cavesofzircon.attributes.types.StairsUp
 import org.hexworks.cavesofzircon.attributes.types.Wall
 import org.hexworks.cavesofzircon.commands.Attack
 import org.hexworks.cavesofzircon.commands.Dig
+import org.hexworks.cavesofzircon.entities.FogOfWar
 import org.hexworks.cavesofzircon.systems.Attackable
 import org.hexworks.cavesofzircon.systems.CameraMover
 import org.hexworks.cavesofzircon.systems.Destructible
@@ -25,15 +28,19 @@ import org.hexworks.cavesofzircon.systems.InputReceiver
 import org.hexworks.cavesofzircon.systems.Movable
 import org.hexworks.cavesofzircon.systems.StairClimber
 import org.hexworks.cavesofzircon.systems.StairDescender
+import org.hexworks.cavesofzircon.world.Game
 import org.hexworks.cavesofzircon.world.GameContext
 
 fun <T : EntityType> newGameEntityOfType(type: T, init: EntityBuilder<T, GameContext>.() -> Unit) =
         Entities.newEntityOfType(type, init)
 
 object EntityFactory {
 
+    fun newFogOfWar(game: Game) = FogOfWar(game)
+
     fun newWall() = newGameEntityOfType(Wall) {
         attributes(
+                VisionBlocker,
                 EntityPosition(),
                 BlockOccupier,
                 EntityTile(GameTileRepository.WALL))
@@ -52,6 +59,7 @@ object EntityFactory {
 
     fun newPlayer() = newGameEntityOfType(Player) {
         attributes(
+                Vision(9),
                 EntityPosition(),
                 CombatStats.create(
                         maxHp = 100,
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/builders/GameColors.kt b/src/main/kotlin/org/hexworks/cavesofzircon/builders/GameColors.kt
@@ -12,4 +12,6 @@ object GameColors {
     val FUNGUS_COLOR = TileColors.fromString("#85DD1B")
 
     val ACCENT_COLOR = TileColors.fromString("#FFCD22")
+
+    val UNREVEALED_COLOR = TileColors.fromString("#000000")
 }
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/builders/GameTileRepository.kt b/src/main/kotlin/org/hexworks/cavesofzircon/builders/GameTileRepository.kt
@@ -43,4 +43,9 @@ object GameTileRepository {
             .withBackgroundColor(GameColors.FLOOR_BACKGROUND)
             .withForegroundColor(GameColors.FUNGUS_COLOR)
             .buildCharacterTile()
+
+    val UNREVEALED = Tiles.newBuilder()
+            .withCharacter(' ')
+            .withBackgroundColor(GameColors.UNREVEALED_COLOR)
+            .buildCharacterTile()
 }
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/entities/FogOfWar.kt b/src/main/kotlin/org/hexworks/cavesofzircon/entities/FogOfWar.kt
@@ -0,0 +1,44 @@
+package org.hexworks.cavesofzircon.entities
+
+import org.hexworks.amethyst.api.base.BaseEntity
+import org.hexworks.cavesofzircon.attributes.types.FogOfWarType
+import org.hexworks.cavesofzircon.builders.GameTileRepository
+import org.hexworks.cavesofzircon.extensions.position
+import org.hexworks.cavesofzircon.world.Game
+import org.hexworks.cavesofzircon.world.GameContext
+import org.hexworks.zircon.api.Layers
+import org.hexworks.zircon.api.graphics.Layer
+import java.util.concurrent.ConcurrentHashMap
+
+class FogOfWar(game: Game) : BaseEntity<FogOfWarType, GameContext>(FogOfWarType) {
+
+    private val world = game.world
+    private val player = game.player
+    private val size = game.world.actualSize()
+
+    private val fowPerLevel = ConcurrentHashMap<Int, Layer>().also { fows ->
+        repeat(size.zLength) { level ->
+            val fow = Layers.newBuilder()
+                    .withSize(size.to2DSize())
+                    .build()
+                    .fill(GameTileRepository.UNREVEALED)
+            fows[level] = fow
+            world.pushOverlayAt(fow, level)
+        }
+    }
+
+    init {
+        updateFOW()
+    }
+
+    private fun updateFOW() {
+        world.findVisiblePositionsFor(player).forEach {
+            fowPerLevel[player.position.z]?.setTileAt(it, GameTileRepository.EMPTY)
+        }
+    }
+
+    override fun update(context: GameContext): Boolean {
+        updateFOW()
+        return true
+    }
+}
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/extensions/EntityExtensions.kt b/src/main/kotlin/org/hexworks/cavesofzircon/extensions/EntityExtensions.kt
@@ -8,6 +8,7 @@ import org.hexworks.cavesofzircon.attributes.EntityActions
 import org.hexworks.cavesofzircon.attributes.EntityPosition
 import org.hexworks.cavesofzircon.attributes.EntityTile
 import org.hexworks.cavesofzircon.attributes.flags.BlockOccupier
+import org.hexworks.cavesofzircon.attributes.flags.VisionBlocker
 import org.hexworks.cavesofzircon.attributes.types.Combatant
 import org.hexworks.cavesofzircon.attributes.types.Player
 import org.hexworks.cavesofzircon.attributes.types.combatStats
@@ -34,6 +35,9 @@ val AnyGameEntity.tile: Tile
 val AnyGameEntity.isPlayer: Boolean
     get() = this.type == Player
 
+val AnyGameEntity.blocksVision: Boolean
+    get() = this.findAttribute(VisionBlocker::class).isPresent
+
 fun GameEntity<Combatant>.whenHasNoHealthLeft(fn: () -> Unit) {
     if (combatStats.hp <= 0) {
         fn()
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/world/GameBuilder.kt b/src/main/kotlin/org/hexworks/cavesofzircon/world/GameBuilder.kt
@@ -29,9 +29,13 @@ class GameBuilder(val worldSize: Size3D = WORLD_SIZE) {
         val player = addPlayer()
         addFungi()
 
-        return Game.create(
+        val game = Game.create(
                 player = player,
                 world = world)
+
+        world.addWorldEntity(EntityFactory.newFogOfWar(game))
+
+        return game
     }
 
     private fun prepareWorld() = also {
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/world/World.kt b/src/main/kotlin/org/hexworks/cavesofzircon/world/World.kt
@@ -4,20 +4,25 @@ import org.hexworks.amethyst.api.Engine
 import org.hexworks.amethyst.api.Engines
 import org.hexworks.amethyst.api.entity.Entity
 import org.hexworks.amethyst.api.entity.EntityType
+import org.hexworks.cavesofzircon.attributes.Vision
 import org.hexworks.cavesofzircon.blocks.GameBlock
 import org.hexworks.cavesofzircon.builders.GameBlockFactory
 import org.hexworks.cavesofzircon.extensions.GameEntity
+import org.hexworks.cavesofzircon.extensions.blocksVision
 import org.hexworks.cavesofzircon.extensions.position
 import org.hexworks.cobalt.datatypes.Maybe
 import org.hexworks.cobalt.datatypes.extensions.fold
 import org.hexworks.cobalt.datatypes.extensions.map
 import org.hexworks.zircon.api.Positions
 import org.hexworks.zircon.api.builder.game.GameAreaBuilder
+import org.hexworks.zircon.api.data.Position
 import org.hexworks.zircon.api.data.Tile
 import org.hexworks.zircon.api.data.impl.Position3D
 import org.hexworks.zircon.api.data.impl.Size3D
 import org.hexworks.zircon.api.game.GameArea
 import org.hexworks.zircon.api.screen.Screen
+import org.hexworks.zircon.api.shape.EllipseFactory
+import org.hexworks.zircon.api.shape.LineFactory
 import org.hexworks.zircon.api.uievent.UIEvent
 
 class World(startingBlocks: Map<Position3D, GameBlock>,
@@ -57,6 +62,10 @@ class World(startingBlocks: Map<Position3D, GameBlock>,
         }
     }
 
+    fun addWorldEntity(entity: Entity<EntityType, GameContext>) {
+        engine.addEntity(entity)
+    }
+
     fun moveEntity(entity: GameEntity<EntityType>, position: Position3D): Boolean {
         var success = false
         val oldBlock = fetchBlockAt(entity.position)
@@ -115,6 +124,32 @@ class World(startingBlocks: Map<Position3D, GameBlock>,
         return position
     }
 
+    fun isVisionBlockedAt(pos: Position3D): Boolean {
+        return fetchBlockAt(pos).fold(whenEmpty = { false }, whenPresent = {
+            it.entities.any(GameEntity<EntityType>::blocksVision)
+        })
+    }
+
+    fun findVisiblePositionsFor(entity: GameEntity<EntityType>): Iterable<Position> {
+        val centerPos = entity.position.to2DPosition()
+        return entity.findAttribute(Vision::class).map { (radius) ->
+            EllipseFactory.buildEllipse(
+                    fromPosition = centerPos,
+                    toPosition = centerPos.withRelativeX(radius).withRelativeY(radius))
+                    .positions()
+                    .flatMap { ringPos ->
+                        val result = mutableListOf<Position>()
+                        val iter = LineFactory.buildLine(centerPos, ringPos).iterator()
+                        do {
+                            val next = iter.next()
+                            result.add(next)
+                        } while (iter.hasNext() &&
+                                isVisionBlockedAt(Position3D.from2DPosition(next, entity.position.z)).not())
+                        result
+                    }
+        }.orElse(listOf())
+    }
+
     companion object {
         private val DEFAULT_BLOCK = GameBlockFactory.floor()
     }

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,6 @@ object GameColors {`
`12`	`12`	`val FUNGUS_COLOR = TileColors.fromString("#85DD1B")`
`13`	`13`
`14`	`14`	`val ACCENT_COLOR = TileColors.fromString("#FFCD22")`
	`15`	`+`
	`16`	`+ val UNREVEALED_COLOR = TileColors.fromString("#000000")`
`15`	`17`	`}`