Add cave generation and game component

Author: Adam Arold

src/main/kotlin/org/hexworks/cavesofzircon/GameConfig.kt

@@ -7,6 +7,9 @@ import org.hexworks.zircon.api.Sizes
 
 object GameConfig {
 
+    // game
+    const val DUNGEON_LEVELS = 2
+
     // look & feel
     val TILESET = CP437TilesetResources.rogueYun16x16()
     val THEME = ColorThemes.zenburnVanilla()
@@ -17,6 +20,8 @@ object GameConfig {
     const val WINDOW_WIDTH = 80
     const val WINDOW_HEIGHT = 50
 
+    val WORLD_SIZE = Sizes.create3DSize(WINDOW_WIDTH - SIDEBAR_WIDTH, WINDOW_HEIGHT - LOG_AREA_HEIGHT, DUNGEON_LEVELS)
+
     fun buildAppConfig() = AppConfigs.newConfig()
             .enableBetaFeatures()
             .withDefaultTileset(TILESET)

src/main/kotlin/org/hexworks/cavesofzircon/blocks/GameBlock.kt

@@ -5,9 +5,17 @@ import org.hexworks.zircon.api.data.BlockSide
 import org.hexworks.zircon.api.data.Tile
 import org.hexworks.zircon.api.data.base.BlockBase
 
-class GameBlock(private var defaultTile: Tile = GameTileRepository.floor())
+class GameBlock(private var defaultTile: Tile = GameTileRepository.FLOOR)
     : BlockBase<Tile>() {
 
+    val isFloor: Boolean
+        get() = defaultTile == GameTileRepository.FLOOR
+
+
+    val isWall: Boolean
+        get() = defaultTile == GameTileRepository.WALL
+
+
     override val layers
         get() = mutableListOf(defaultTile)
 

src/main/kotlin/org/hexworks/cavesofzircon/builders/GameBlockFactory.kt

@@ -1,12 +1,11 @@
 package org.hexworks.cavesofzircon.builders
 
 import org.hexworks.cavesofzircon.blocks.GameBlock
-import org.hexworks.zircon.api.data.impl.Position3D
 
 object GameBlockFactory {
 
-    fun floor() = GameBlock(GameTileRepository.floor())
+    fun floor() = GameBlock(GameTileRepository.FLOOR)
 
-    fun wall() = GameBlock(GameTileRepository.wall())
+    fun wall() = GameBlock(GameTileRepository.WALL)
 
 }

src/main/kotlin/org/hexworks/cavesofzircon/builders/GameTileRepository.kt

@@ -8,15 +8,13 @@ object GameTileRepository {
 
     val EMPTY: CharacterTile = Tiles.empty()
 
-    fun floor(): CharacterTile {
-        return Tiles.newBuilder()
-                .withCharacter(Symbols.INTERPUNCT)
-                .withForegroundColor(GameColors.FLOOR_FOREGROUND)
-                .withBackgroundColor(GameColors.FLOOR_BACKGROUND)
-                .buildCharacterTile()
-    }
+    val FLOOR: CharacterTile = Tiles.newBuilder()
+            .withCharacter(Symbols.INTERPUNCT)
+            .withForegroundColor(GameColors.FLOOR_FOREGROUND)
+            .withBackgroundColor(GameColors.FLOOR_BACKGROUND)
+            .buildCharacterTile()
 
-    fun wall() = Tiles.newBuilder()
+    val WALL: CharacterTile = Tiles.newBuilder()
             .withCharacter('#')
             .withForegroundColor(GameColors.WALL_FOREGROUND)
             .withBackgroundColor(GameColors.WALL_BACKGROUND)

src/main/kotlin/org/hexworks/cavesofzircon/extensions/PositionExtensions.kt

@@ -0,0 +1,11 @@
+package org.hexworks.cavesofzircon.extensions
+
+import org.hexworks.zircon.api.data.impl.Position3D
+
+fun Position3D.sameLevelNeighborsShuffled(): List<Position3D> {
+    return (-1..1).flatMap { x ->
+        (-1..1).map { y ->
+            withRelativeX(x).withRelativeY(y)
+        }
+    }.minus(this).shuffled()
+}

src/main/kotlin/org/hexworks/cavesofzircon/view/PlayView.kt

@@ -3,18 +3,16 @@ package org.hexworks.cavesofzircon.view
 import org.hexworks.cavesofzircon.GameConfig
 import org.hexworks.cavesofzircon.blocks.GameBlock
 import org.hexworks.cavesofzircon.world.Game
-import org.hexworks.zircon.api.ColorThemes
 import org.hexworks.zircon.api.Components
 import org.hexworks.zircon.api.GameComponents
 import org.hexworks.zircon.api.component.ComponentAlignment
 import org.hexworks.zircon.api.data.Tile
 import org.hexworks.zircon.api.game.ProjectionMode
 import org.hexworks.zircon.api.mvc.base.BaseView
 
-// TODO
-class PlayView(private val game: Game) : BaseView() {
+class PlayView(private val game: Game = Game.create()) : BaseView() {
 
-    override val theme = ColorThemes.arc()
+    override val theme = GameConfig.THEME
 
     override fun onDock() {
 
@@ -34,12 +32,13 @@ class PlayView(private val game: Game) : BaseView() {
 
         screen.addComponent(logArea)
 
-        // TODO
         val gameComponent = GameComponents.newGameComponentBuilder<Tile, GameBlock>()
                 .withGameArea(game.world)
-                .withVisibleSize(game.visibleSize)
+                .withVisibleSize(game.world.visibleSize())
                 .withProjectionMode(ProjectionMode.TOP_DOWN)
                 .withAlignmentWithin(screen, ComponentAlignment.TOP_RIGHT)
                 .build()
+
+        screen.addComponent(gameComponent)
     }
 }

src/main/kotlin/org/hexworks/cavesofzircon/view/StartView.kt

@@ -1,5 +1,6 @@
 package org.hexworks.cavesofzircon.view
 
+import org.hexworks.cavesofzircon.world.Game
 import org.hexworks.zircon.api.ColorThemes
 import org.hexworks.zircon.api.Components
 import org.hexworks.zircon.api.component.ComponentAlignment
@@ -27,10 +28,10 @@ class StartView : BaseView() {
                 .wrapWithShadow()
                 .wrapWithBox()
                 .build()
-startButton.onMouseReleased {
-    replaceWith(PlayView())
-    close()
-}
+        startButton.onMouseReleased {
+            replaceWith(PlayView())
+            close()
+        }
         screen.addComponent(header)
         screen.addComponent(startButton)
     }

src/main/kotlin/org/hexworks/cavesofzircon/world/Game.kt

@@ -1,7 +1,15 @@
 package org.hexworks.cavesofzircon.world
 
+import org.hexworks.cavesofzircon.GameConfig
 import org.hexworks.zircon.api.data.impl.Size3D
 
-class Game(val world: World,
-           val worldSize: Size3D = world.actualSize(),
-           val visibleSize: Size3D = world.visibleSize())
+class Game(val world: World) {
+
+    companion object {
+
+        fun create(worldSize: Size3D = GameConfig.WORLD_SIZE,
+                   visibleSize: Size3D = GameConfig.WORLD_SIZE) = Game(WorldBuilder(worldSize)
+                .makeCaves()
+                .build(visibleSize))
+    }
+}

src/main/kotlin/org/hexworks/cavesofzircon/world/World.kt

@@ -2,21 +2,19 @@ package org.hexworks.cavesofzircon.world
 
 import org.hexworks.cavesofzircon.blocks.GameBlock
 import org.hexworks.cavesofzircon.builders.GameBlockFactory
-import org.hexworks.cobalt.datatypes.extensions.map
 import org.hexworks.zircon.api.builder.game.GameAreaBuilder
 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
 
-
 class World(startingBlocks: Map<Position3D, GameBlock>,
             visibleSize: Size3D,
             actualSize: Size3D) : GameArea<Tile, GameBlock> by GameAreaBuilder.newBuilder<Tile, GameBlock>()
         .withVisibleSize(visibleSize)
         .withActualSize(actualSize)
         .withDefaultBlock(DEFAULT_BLOCK)
-        .withLayersPerBlock(2)
+        .withLayersPerBlock(1)
         .build() {
 
     init {
@@ -25,10 +23,6 @@ class World(startingBlocks: Map<Position3D, GameBlock>,
         }
     }
 
-    fun withBlockAt(position: Position3D, fn: (GameBlock) -> Unit) {
-        fetchBlockAt(position).map(fn)
-    }
-
     companion object {
         private val DEFAULT_BLOCK = GameBlockFactory.floor()
     }

src/main/kotlin/org/hexworks/cavesofzircon/world/WorldBuilder.kt

@@ -0,0 +1,60 @@
+package org.hexworks.cavesofzircon.world
+
+import org.hexworks.cavesofzircon.blocks.GameBlock
+import org.hexworks.cavesofzircon.builders.GameBlockFactory
+import org.hexworks.cavesofzircon.extensions.sameLevelNeighborsShuffled
+import org.hexworks.zircon.api.Positions
+import org.hexworks.zircon.api.data.impl.Position3D
+import org.hexworks.zircon.api.data.impl.Size3D
+
+class WorldBuilder(private val worldSize: Size3D) {
+
+    private val width = worldSize.xLength
+    private val height = worldSize.zLength
+    private var blocks: MutableMap<Position3D, GameBlock> = mutableMapOf()
+
+    fun makeCaves(): WorldBuilder {
+        return randomizeTiles()
+                .smooth(8)
+    }
+
+    fun build(visibleSize: Size3D): World = World(blocks, visibleSize, worldSize)
+
+    private fun randomizeTiles(): WorldBuilder {
+        forAllPositions { pos ->
+            blocks[pos] = if (Math.random() < 0.5) {
+                GameBlockFactory.floor()
+            } else GameBlockFactory.wall()
+        }
+        return this
+    }
+
+    private fun smooth(iterations: Int): WorldBuilder {
+        val newBlocks = mutableMapOf<Position3D, GameBlock>()
+        repeat(iterations) {
+            forAllPositions { pos ->
+                val (x, y, z) = pos
+                var floors = 0
+                var rocks = 0
+                pos.sameLevelNeighborsShuffled().plus(pos).forEach { neighbor ->
+                    blocks.whenPresent(neighbor) { block ->
+                        if (block.isFloor) {
+                            floors++
+                        } else rocks++
+                    }
+                }
+                newBlocks[Positions.create3DPosition(x, y, z)] = if (floors >= rocks) GameBlockFactory.floor() else GameBlockFactory.wall()
+            }
+            blocks = newBlocks
+        }
+        return this
+    }
+
+    private fun forAllPositions(fn: (Position3D) -> Unit) {
+        worldSize.fetchPositions().forEach(fn)
+    }
+
+    private fun MutableMap<Position3D, GameBlock>.whenPresent(pos: Position3D, fn: (GameBlock) -> Unit) {
+        this[pos]?.let(fn)
+    }
+}