Add the first monster in the game

adam-arold · adam-arold · commit e906f034bf6d · 2019-04-10T20:15:53.000+02:00
diff --git a/README.md b/README.md
@@ -2,3 +2,13 @@
 
 This project is part of the [How to Make a Roguelike](https://hexworks.org/posts/tutorials/2018/11/04/how-to-make-a-roguelike.html)
 tutorial. Check out the article series if you want to make the most ouf of this project.
+
+
+## Improvements
+
+These are the future improvements we'll add to the tutorial based on feedback:
+
+- [x] Explain `also` (and other scoping functions) in #4 (where it is first used) instead of #6
+- [ ] Explain the point of `tryToFindAttribute` instead of using `findAttribute`: we don't need
+  the flexibility and we're using mandatory attributes
+
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/GameConfig.kt b/src/main/kotlin/org/hexworks/cavesofzircon/GameConfig.kt
@@ -22,6 +22,10 @@ object GameConfig {
 
     val WORLD_SIZE = Sizes.create3DSize(WINDOW_WIDTH * 2, WINDOW_HEIGHT * 2 , DUNGEON_LEVELS)
 
+    // entities
+    const val FUNGI_PER_LEVEL = 15
+    const val MAXIMUM_FUNGUS_SPREAD = 20
+
     fun buildAppConfig() = AppConfigs.newConfig()
             .enableBetaFeatures()
             .withDefaultTileset(TILESET)
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/attributes/FungusSpread.kt b/src/main/kotlin/org/hexworks/cavesofzircon/attributes/FungusSpread.kt
@@ -0,0 +1,8 @@
+package org.hexworks.cavesofzircon.attributes
+
+import org.hexworks.amethyst.api.Attribute
+import org.hexworks.cavesofzircon.GameConfig
+
+data class FungusSpread(
+        var spreadCount: Int = 0,
+        val maximumSpread: Int = GameConfig.MAXIMUM_FUNGUS_SPREAD) : 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
@@ -7,3 +7,6 @@ object Player : BaseEntityType(
 
 object Wall : BaseEntityType(
         name = "wall")
+
+object Fungus : BaseEntityType(
+        name = "fungus")
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/builders/EntityFactory.kt b/src/main/kotlin/org/hexworks/cavesofzircon/builders/EntityFactory.kt
@@ -3,18 +3,18 @@ package org.hexworks.cavesofzircon.builders
 import org.hexworks.amethyst.api.Entities
 import org.hexworks.amethyst.api.builder.EntityBuilder
 import org.hexworks.amethyst.api.entity.EntityType
+import org.hexworks.cavesofzircon.attributes.EntityActions
 import org.hexworks.cavesofzircon.attributes.EntityPosition
 import org.hexworks.cavesofzircon.attributes.EntityTile
-import org.hexworks.cavesofzircon.attributes.types.Player
-import org.hexworks.cavesofzircon.systems.CameraMover
-import org.hexworks.cavesofzircon.systems.InputReceiver
-import org.hexworks.cavesofzircon.systems.Movable
-import org.hexworks.cavesofzircon.world.GameContext
+import org.hexworks.cavesofzircon.attributes.FungusSpread
 import org.hexworks.cavesofzircon.attributes.flags.BlockOccupier
+import org.hexworks.cavesofzircon.attributes.types.Fungus
+import org.hexworks.cavesofzircon.attributes.types.Player
 import org.hexworks.cavesofzircon.attributes.types.Wall
-import org.hexworks.cavesofzircon.attributes.EntityActions
+import org.hexworks.cavesofzircon.commands.Attack
 import org.hexworks.cavesofzircon.commands.Dig
-import org.hexworks.cavesofzircon.systems.Diggable
+import org.hexworks.cavesofzircon.systems.*
+import org.hexworks.cavesofzircon.world.GameContext
 
 fun <T : EntityType> newGameEntityOfType(type: T, init: EntityBuilder<T, GameContext>.() -> Unit) =
         Entities.newEntityOfType(type, init)
@@ -25,7 +25,7 @@ object EntityFactory {
         attributes(
                 EntityPosition(),
                 EntityTile(GameTileRepository.PLAYER),
-                EntityActions(Dig::class))
+                EntityActions(Dig::class, Attack::class))
         behaviors(InputReceiver)
         facets(Movable, CameraMover)
     }
@@ -37,5 +37,14 @@ object EntityFactory {
                 EntityTile(GameTileRepository.WALL))
         facets(Diggable)
     }
+
+    fun newFungus(fungusSpread: FungusSpread = FungusSpread()) = newGameEntityOfType(Fungus) {
+        attributes(BlockOccupier,
+                EntityPosition(),
+                EntityTile(GameTileRepository.FUNGUS),
+                fungusSpread)
+        facets(Attackable)
+        behaviors(FungusGrowth)
+    }
 }
 
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/builders/GameColors.kt b/src/main/kotlin/org/hexworks/cavesofzircon/builders/GameColors.kt
@@ -9,5 +9,7 @@ object GameColors {
     val FLOOR_FOREGROUND = TileColors.fromString("#75715E")
     val FLOOR_BACKGROUND = TileColors.fromString("#1e2320")
 
+    val FUNGUS_COLOR = TileColors.fromString("#85DD1B")
+
     val ACCENT_COLOR = TileColors.fromString("#FFCD22")
 }
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/builders/GameTileRepository.kt b/src/main/kotlin/org/hexworks/cavesofzircon/builders/GameTileRepository.kt
@@ -25,4 +25,10 @@ object GameTileRepository {
             .withBackgroundColor(GameColors.FLOOR_BACKGROUND)
             .withForegroundColor(GameColors.ACCENT_COLOR)
             .buildCharacterTile()
+
+    val FUNGUS = Tiles.newBuilder()
+            .withCharacter('f')
+            .withBackgroundColor(GameColors.FLOOR_BACKGROUND)
+            .withForegroundColor(GameColors.FUNGUS_COLOR)
+            .buildCharacterTile()
 }
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/commands/Attack.kt b/src/main/kotlin/org/hexworks/cavesofzircon/commands/Attack.kt
@@ -0,0 +1,9 @@
+package org.hexworks.cavesofzircon.commands
+
+import org.hexworks.amethyst.api.entity.EntityType
+import org.hexworks.cavesofzircon.extensions.GameEntity
+import org.hexworks.cavesofzircon.world.GameContext
+
+data class Attack(override val context: GameContext,
+                  override val source: GameEntity<EntityType>,
+                  override val target: GameEntity<EntityType>) : EntityAction<EntityType, EntityType>
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/systems/Attackable.kt b/src/main/kotlin/org/hexworks/cavesofzircon/systems/Attackable.kt
@@ -0,0 +1,16 @@
+package org.hexworks.cavesofzircon.systems
+
+import org.hexworks.amethyst.api.Consumed
+import org.hexworks.amethyst.api.base.BaseFacet
+import org.hexworks.amethyst.api.entity.EntityType
+import org.hexworks.cavesofzircon.commands.Attack
+import org.hexworks.cavesofzircon.extensions.GameCommand
+import org.hexworks.cavesofzircon.world.GameContext
+
+object Attackable : BaseFacet<GameContext>() {
+
+    override fun executeCommand(command: GameCommand<out EntityType>) = command.responseWhenCommandIs(Attack::class) { (context, attacker, target) ->
+        context.world.removeEntity(target)
+        Consumed
+    }
+}
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/systems/FungusGrowth.kt b/src/main/kotlin/org/hexworks/cavesofzircon/systems/FungusGrowth.kt
@@ -0,0 +1,32 @@
+package org.hexworks.cavesofzircon.systems
+
+import org.hexworks.amethyst.api.base.BaseBehavior
+import org.hexworks.amethyst.api.entity.EntityType
+import org.hexworks.cavesofzircon.attributes.FungusSpread
+import org.hexworks.cavesofzircon.builders.EntityFactory
+import org.hexworks.cavesofzircon.extensions.GameEntity
+import org.hexworks.cavesofzircon.extensions.position
+import org.hexworks.cavesofzircon.extensions.tryToFindAttribute
+import org.hexworks.cavesofzircon.world.GameContext
+import org.hexworks.cobalt.datatypes.extensions.map
+import org.hexworks.zircon.api.Sizes
+
+object FungusGrowth : BaseBehavior<GameContext>(FungusSpread::class) {
+
+    override fun update(entity: GameEntity<out EntityType>, context: GameContext): Boolean {
+        val world = context.world
+        val fungusSpread = entity.tryToFindAttribute(FungusSpread::class)
+        val (spreadCount, maxSpread) = fungusSpread
+        return if (spreadCount < maxSpread && Math.random() < 0.015) {
+            world.findEmptyLocationWithin(
+                    offset = entity.position
+                            .withRelativeX(-1)
+                            .withRelativeY(-1),
+                    size = Sizes.create3DSize(3, 3, 0)).map { emptyLocation ->
+                world.addEntity(EntityFactory.newFungus(fungusSpread), emptyLocation)
+                fungusSpread.spreadCount++
+            }
+            true
+        } else false
+    }
+}
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/world/GameBuilder.kt b/src/main/kotlin/org/hexworks/cavesofzircon/world/GameBuilder.kt
@@ -1,12 +1,14 @@
 package org.hexworks.cavesofzircon.world
 
+import org.hexworks.amethyst.api.entity.EntityType
 import org.hexworks.cavesofzircon.GameConfig
 import org.hexworks.cavesofzircon.GameConfig.WORLD_SIZE
 import org.hexworks.cavesofzircon.attributes.types.Player
 import org.hexworks.cavesofzircon.builders.EntityFactory
 import org.hexworks.cavesofzircon.extensions.GameEntity
 import org.hexworks.zircon.api.Positions
 import org.hexworks.zircon.api.Sizes
+import org.hexworks.zircon.api.data.Size
 import org.hexworks.zircon.api.data.impl.Size3D
 
 class GameBuilder(val worldSize: Size3D = WORLD_SIZE) {
@@ -25,6 +27,7 @@ class GameBuilder(val worldSize: Size3D = WORLD_SIZE) {
         prepareWorld()
 
         val player = addPlayer()
+        addFungi()
 
         return Game.create(
                 player = player,
@@ -36,11 +39,26 @@ class GameBuilder(val worldSize: Size3D = WORLD_SIZE) {
     }
 
     private fun addPlayer(): GameEntity<Player> {
-        val player = EntityFactory.newPlayer()
-        world.addAtEmptyPosition(player,
-                offset = Positions.default3DPosition().withZ(GameConfig.DUNGEON_LEVELS - 1),
-                size = world.visibleSize().copy(zLength = 0))
-        return player
+        return EntityFactory.newPlayer().addToWorld(
+                atLevel = GameConfig.DUNGEON_LEVELS - 1,
+                atArea = world.visibleSize().to2DSize())
+    }
+
+    private fun addFungi() = also {
+        repeat(world.actualSize().zLength) { level ->
+            repeat(GameConfig.FUNGI_PER_LEVEL) {
+                EntityFactory.newFungus().addToWorld(level)
+            }
+        }
+    }
+
+    private fun <T : EntityType> GameEntity<T>.addToWorld(
+            atLevel: Int,
+            atArea: Size = world.actualSize().to2DSize()): GameEntity<T> {
+        world.addAtEmptyPosition(this,
+                offset = Positions.default3DPosition().withZ(atLevel),
+                size = Size3D.from2DSize(atArea))
+        return this
     }
 
     companion object {

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,7 @@ object GameColors {`
`9`	`9`	`val FLOOR_FOREGROUND = TileColors.fromString("#75715E")`
`10`	`10`	`val FLOOR_BACKGROUND = TileColors.fromString("#1e2320")`
`11`	`11`
	`12`	`+ val FUNGUS_COLOR = TileColors.fromString("#85DD1B")`
	`13`	`+`
`12`	`14`	`val ACCENT_COLOR = TileColors.fromString("#FFCD22")`
`13`	`15`	`}`