Add entity actions

Adam Arold · Adam Arold · commit 9986a6f96fd5 · 2019-04-06T00:06:56.000+02:00
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/attributes/EntityActions.kt b/src/main/kotlin/org/hexworks/cavesofzircon/attributes/EntityActions.kt
@@ -0,0 +1,24 @@
+package org.hexworks.cavesofzircon.attributes
+
+import org.hexworks.amethyst.api.Attribute
+import org.hexworks.amethyst.api.entity.EntityType
+import org.hexworks.cavesofzircon.commands.EntityAction
+import org.hexworks.cavesofzircon.extensions.GameEntity
+import org.hexworks.cavesofzircon.world.GameContext
+import kotlin.reflect.KClass
+
+
+class EntityActions(private vararg val actions: KClass<out EntityAction<out EntityType, out EntityType>>)
+    : Attribute {
+
+    fun createActionsFor(context: GameContext, source: GameEntity<EntityType>, target: GameEntity<EntityType>):
+            Iterable<EntityAction<out EntityType, out EntityType>> {
+        return actions.map {
+            try {
+                it.constructors.first().call(context, source, target)
+            } catch (e: Exception) {
+                throw IllegalArgumentException("Can't create EntityAction. Does it have the proper constructor?")
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/attributes/flags/BlockOccupier.kt b/src/main/kotlin/org/hexworks/cavesofzircon/attributes/flags/BlockOccupier.kt
@@ -0,0 +1,5 @@
+package org.hexworks.cavesofzircon.attributes.flags
+
+import org.hexworks.amethyst.api.Attribute
+
+object BlockOccupier : 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
@@ -4,3 +4,6 @@ import org.hexworks.amethyst.api.base.BaseEntityType
 
 object Player : BaseEntityType(
         name = "player")
+
+object Wall : BaseEntityType(
+        name = "wall")
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/blocks/GameBlock.kt b/src/main/kotlin/org/hexworks/cavesofzircon/blocks/GameBlock.kt
@@ -3,7 +3,9 @@ package org.hexworks.cavesofzircon.blocks
 import org.hexworks.amethyst.api.entity.EntityType
 import org.hexworks.cavesofzircon.builders.GameTileRepository
 import org.hexworks.cavesofzircon.extensions.GameEntity
+import org.hexworks.cavesofzircon.extensions.occupiesBlock
 import org.hexworks.cavesofzircon.extensions.tile
+import org.hexworks.cobalt.datatypes.Maybe
 import org.hexworks.zircon.api.data.BlockSide
 import org.hexworks.zircon.api.data.Tile
 import org.hexworks.zircon.api.data.base.BlockBase
@@ -19,6 +21,12 @@ class GameBlock(private var defaultTile: Tile = GameTileRepository.FLOOR,
     val isWall: Boolean
         get() = defaultTile == GameTileRepository.WALL
 
+    val isOccupied: Boolean
+        get() = occupier.isPresent
+
+    val occupier: Maybe<GameEntity<EntityType>>
+        get() = Maybe.ofNullable(currentEntities.firstOrNull { it.occupiesBlock })
+
     val isEmptyFloor: Boolean
         get() = currentEntities.isEmpty()
 
@@ -47,4 +55,10 @@ class GameBlock(private var defaultTile: Tile = GameTileRepository.FLOOR,
     override fun fetchSide(side: BlockSide): Tile {
         return GameTileRepository.EMPTY
     }
+
+    companion object {
+
+        fun createWith(entity: GameEntity<EntityType>) = GameBlock(
+                currentEntities = mutableListOf(entity))
+    }
 }
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/builders/EntityFactory.kt b/src/main/kotlin/org/hexworks/cavesofzircon/builders/EntityFactory.kt
@@ -10,15 +10,32 @@ 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.flags.BlockOccupier
+import org.hexworks.cavesofzircon.attributes.types.Wall
+import org.hexworks.cavesofzircon.attributes.EntityActions
+import org.hexworks.cavesofzircon.commands.Dig
+import org.hexworks.cavesofzircon.systems.Diggable
 
 fun <T : EntityType> newGameEntityOfType(type: T, init: EntityBuilder<T, GameContext>.() -> Unit) =
         Entities.newEntityOfType(type, init)
 
 object EntityFactory {
 
     fun newPlayer() = newGameEntityOfType(Player) {
-        attributes(EntityPosition(), EntityTile(GameTileRepository.PLAYER))
+        attributes(
+                EntityPosition(),
+                EntityTile(GameTileRepository.PLAYER),
+                EntityActions(Dig::class))
         behaviors(InputReceiver)
         facets(Movable, CameraMover)
     }
+
+    fun newWall() = newGameEntityOfType(Wall) {
+        attributes(
+                EntityPosition(),
+                BlockOccupier,
+                EntityTile(GameTileRepository.WALL))
+        facets(Diggable)
+    }
 }
+
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/builders/GameBlockFactory.kt b/src/main/kotlin/org/hexworks/cavesofzircon/builders/GameBlockFactory.kt
@@ -6,6 +6,6 @@ object GameBlockFactory {
 
     fun floor() = GameBlock(GameTileRepository.FLOOR)
 
-    fun wall() = GameBlock(GameTileRepository.WALL)
+    fun wall() = GameBlock.createWith(EntityFactory.newWall())
 
 }
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/commands/Dig.kt b/src/main/kotlin/org/hexworks/cavesofzircon/commands/Dig.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 Dig(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/commands/EntityAction.kt b/src/main/kotlin/org/hexworks/cavesofzircon/commands/EntityAction.kt
@@ -0,0 +1,14 @@
+package org.hexworks.cavesofzircon.commands
+
+import org.hexworks.amethyst.api.entity.EntityType
+import org.hexworks.cavesofzircon.extensions.GameCommand
+import org.hexworks.cavesofzircon.extensions.GameEntity
+
+interface EntityAction<S : EntityType, T : EntityType> : GameCommand<S> {
+
+    val target: GameEntity<T>
+
+    operator fun component1() = context
+    operator fun component2() = source
+    operator fun component3() = target
+}
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/extensions/EntityExtensions.kt b/src/main/kotlin/org/hexworks/cavesofzircon/extensions/EntityExtensions.kt
@@ -1,8 +1,14 @@
 package org.hexworks.cavesofzircon.extensions
 
 import org.hexworks.amethyst.api.Attribute
+import org.hexworks.amethyst.api.Consumed
+import org.hexworks.amethyst.api.Pass
+import org.hexworks.amethyst.api.Response
+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.world.GameContext
 import org.hexworks.cobalt.datatypes.extensions.map
 import org.hexworks.cobalt.datatypes.extensions.orElseThrow
 import org.hexworks.zircon.api.data.Tile
@@ -16,9 +22,25 @@ var AnyGameEntity.position
         }
     }
 
+val AnyGameEntity.occupiesBlock: Boolean
+    get() = findAttribute(BlockOccupier::class).isPresent
+
 val AnyGameEntity.tile: Tile
     get() = this.tryToFindAttribute(EntityTile::class).tile
 
 fun <T : Attribute> AnyGameEntity.tryToFindAttribute(klass: KClass<T>): T = findAttribute(klass).orElseThrow {
     NoSuchElementException("Entity '$this' has no property with type '${klass.simpleName}'.")
 }
+
+fun AnyGameEntity.tryActionsOn(context: GameContext, target: AnyGameEntity): Response {
+    var result: Response = Pass
+    findAttribute(EntityActions::class).map {
+        it.createActionsFor(context, this, target).forEach { action ->
+            if (target.executeCommand(action) is Consumed) {
+                result = Consumed
+                return@forEach
+            }
+        }
+    }
+    return result
+}
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/systems/Diggable.kt b/src/main/kotlin/org/hexworks/cavesofzircon/systems/Diggable.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.Dig
+import org.hexworks.cavesofzircon.extensions.GameCommand
+import org.hexworks.cavesofzircon.world.GameContext
+
+object Diggable : BaseFacet<GameContext>() {
+
+    override fun executeCommand(command: GameCommand<out EntityType>) = command.responseWhenCommandIs(Dig::class) { (context, _, target) ->
+        context.world.removeEntity(target)
+        Consumed
+    }
+}
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/systems/Movable.kt b/src/main/kotlin/org/hexworks/cavesofzircon/systems/Movable.kt
@@ -11,21 +11,30 @@ import org.hexworks.cavesofzircon.commands.MoveCamera
 import org.hexworks.cavesofzircon.commands.MoveTo
 import org.hexworks.cavesofzircon.extensions.GameCommand
 import org.hexworks.cavesofzircon.extensions.position
+import org.hexworks.cavesofzircon.extensions.tryActionsOn
 import org.hexworks.cavesofzircon.world.GameContext
+import org.hexworks.cobalt.datatypes.extensions.map
 
 object Movable : BaseFacet<GameContext>() {
 
     override fun executeCommand(command: GameCommand<out EntityType>) = command.responseWhenCommandIs(MoveTo::class) { (context, entity, position) ->
         val world = context.world
         val previousPosition = entity.position      // 1
         var result: Response = Pass
-        if (world.moveEntity(entity, position)) {
-            result = if (entity.type == Player) {   // 2
-                CommandResponse(MoveCamera(         // 3
-                        context = context,
-                        source = entity,
-                        previousPosition = previousPosition))
-            } else Consumed
+        world.fetchBlockAt(position).map { block ->
+            if (block.isOccupied) {
+                result = entity.tryActionsOn(context, block.occupier.get())
+            } else {
+                if (world.moveEntity(entity, position)) {
+                    result = Consumed
+                    if (entity.type == Player) {
+                        result = CommandResponse(MoveCamera(
+                                context = context,
+                                source = entity,
+                                previousPosition = previousPosition))
+                    }
+                }
+            }
         }
         result
     }
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/world/World.kt b/src/main/kotlin/org/hexworks/cavesofzircon/world/World.kt
@@ -71,6 +71,14 @@ class World(startingBlocks: Map<Position3D, GameBlock>,
         return success
     }
 
+    fun removeEntity(entity: Entity<EntityType, GameContext>) {
+        fetchBlockAt(entity.position).map {
+            it.removeEntity(entity)
+        }
+        engine.removeEntity(entity)
+        entity.position = Position3D.unknown()
+    }
+
     private fun bothBlocksPresent(oldBlock: Maybe<GameBlock>, newBlock: Maybe<GameBlock>) =
             oldBlock.isPresent && newBlock.isPresent
 
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/world/WorldBuilder.kt b/src/main/kotlin/org/hexworks/cavesofzircon/world/WorldBuilder.kt
@@ -38,7 +38,7 @@ class WorldBuilder(private val worldSize: Size3D) {
                 var rocks = 0
                 pos.sameLevelNeighborsShuffled().plus(pos).forEach { neighbor ->
                     blocks.whenPresent(neighbor) { block ->
-                        if (block.isFloor) {
+                        if (block.isEmptyFloor) {
                             floors++
                         } else rocks++
                     }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,6 @@ object GameBlockFactory {`
`6`	`6`
`7`	`7`	`fun floor() = GameBlock(GameTileRepository.FLOOR)`
`8`	`8`
`9`		`- fun wall() = GameBlock(GameTileRepository.WALL)`
	`9`	`+ fun wall() = GameBlock.createWith(EntityFactory.newWall())`
`10`	`10`
`11`	`11`	`}`