Add real combat

adam-arold · adam-arold · commit 34bca7ac673e · 2019-04-14T22:35:28.000+02:00
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/attributes/CombatStats.kt b/src/main/kotlin/org/hexworks/cavesofzircon/attributes/CombatStats.kt
@@ -0,0 +1,25 @@
+package org.hexworks.cavesofzircon.attributes
+
+import org.hexworks.amethyst.api.Attribute
+import org.hexworks.cobalt.databinding.api.createPropertyFrom
+import org.hexworks.cobalt.databinding.api.property.Property
+
+data class CombatStats(val maxHpProperty: Property<Int>,
+                       val hpProperty: Property<Int> = createPropertyFrom(maxHpProperty.value),
+                       val attackValueProperty: Property<Int>,
+                       val defenseValueProperty: Property<Int>) : Attribute {
+    val maxHp: Int by maxHpProperty.asDelegate()
+    var hp: Int by hpProperty.asDelegate()
+    val attackValue: Int by attackValueProperty.asDelegate()
+    val defenseValue: Int by defenseValueProperty.asDelegate()
+
+    companion object {
+
+        fun create(maxHp: Int, hp: Int = maxHp, attackValue: Int, defenseValue: Int) =
+                CombatStats(
+                        maxHpProperty = createPropertyFrom(maxHp),
+                        hpProperty = createPropertyFrom(hp),
+                        attackValueProperty = createPropertyFrom(attackValue),
+                        defenseValueProperty = createPropertyFrom(defenseValue))
+    }
+}
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/Combatant.kt b/src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/Combatant.kt
@@ -0,0 +1,10 @@
+package org.hexworks.cavesofzircon.attributes.types
+
+import org.hexworks.amethyst.api.entity.EntityType
+import org.hexworks.cavesofzircon.attributes.CombatStats
+import org.hexworks.cavesofzircon.extensions.GameEntity
+
+interface Combatant : EntityType
+
+val GameEntity<Combatant>.combatStats: CombatStats
+    get() = findAttribute(CombatStats::class).get()
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/EntityTypes.kt b/src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/EntityTypes.kt
@@ -3,10 +3,10 @@ package org.hexworks.cavesofzircon.attributes.types
 import org.hexworks.amethyst.api.base.BaseEntityType
 
 object Player : BaseEntityType(
-        name = "player")
+        name = "player"), Combatant
 
 object Wall : BaseEntityType(
         name = "wall")
 
 object Fungus : BaseEntityType(
-        name = "fungus")
+        name = "fungus"), Combatant
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/builders/EntityFactory.kt b/src/main/kotlin/org/hexworks/cavesofzircon/builders/EntityFactory.kt
@@ -3,6 +3,7 @@ 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.CombatStats
 import org.hexworks.cavesofzircon.attributes.EntityActions
 import org.hexworks.cavesofzircon.attributes.EntityPosition
 import org.hexworks.cavesofzircon.attributes.EntityTile
@@ -13,37 +14,51 @@ import org.hexworks.cavesofzircon.attributes.types.Player
 import org.hexworks.cavesofzircon.attributes.types.Wall
 import org.hexworks.cavesofzircon.commands.Attack
 import org.hexworks.cavesofzircon.commands.Dig
-import org.hexworks.cavesofzircon.systems.*
+import org.hexworks.cavesofzircon.systems.Attackable
+import org.hexworks.cavesofzircon.systems.CameraMover
+import org.hexworks.cavesofzircon.systems.Destructible
+import org.hexworks.cavesofzircon.systems.Diggable
+import org.hexworks.cavesofzircon.systems.FungusGrowth
+import org.hexworks.cavesofzircon.systems.InputReceiver
+import org.hexworks.cavesofzircon.systems.Movable
 import org.hexworks.cavesofzircon.world.GameContext
 
 fun <T : EntityType> newGameEntityOfType(type: T, init: EntityBuilder<T, GameContext>.() -> Unit) =
         Entities.newEntityOfType(type, init)
 
 object EntityFactory {
 
+    fun newWall() = newGameEntityOfType(Wall) {
+        attributes(
+                EntityPosition(),
+                BlockOccupier,
+                EntityTile(GameTileRepository.WALL))
+        facets(Diggable)
+    }
+
     fun newPlayer() = newGameEntityOfType(Player) {
         attributes(
                 EntityPosition(),
+                CombatStats.create(
+                        maxHp = 100,
+                        attackValue = 10,
+                        defenseValue = 5),
                 EntityTile(GameTileRepository.PLAYER),
                 EntityActions(Dig::class, Attack::class))
         behaviors(InputReceiver)
         facets(Movable, CameraMover)
     }
 
-    fun newWall() = newGameEntityOfType(Wall) {
-        attributes(
-                EntityPosition(),
-                BlockOccupier,
-                EntityTile(GameTileRepository.WALL))
-        facets(Diggable)
-    }
-
     fun newFungus(fungusSpread: FungusSpread = FungusSpread()) = newGameEntityOfType(Fungus) {
         attributes(BlockOccupier,
                 EntityPosition(),
+                CombatStats.create(
+                        maxHp = 10,
+                        attackValue = 0,
+                        defenseValue = 0),
                 EntityTile(GameTileRepository.FUNGUS),
                 fungusSpread)
-        facets(Attackable)
+        facets(Attackable, Destructible)
         behaviors(FungusGrowth)
     }
 }
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/commands/Attack.kt b/src/main/kotlin/org/hexworks/cavesofzircon/commands/Attack.kt
@@ -1,9 +1,9 @@
 package org.hexworks.cavesofzircon.commands
 
-import org.hexworks.amethyst.api.entity.EntityType
+import org.hexworks.cavesofzircon.attributes.types.Combatant
 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>
+                  override val source: GameEntity<Combatant>,
+                  override val target: GameEntity<Combatant>) : EntityAction<Combatant, Combatant>
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/commands/CameraMoveDirection.kt b/src/main/kotlin/org/hexworks/cavesofzircon/commands/CameraMoveDirection.kt
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/commands/Destroy.kt b/src/main/kotlin/org/hexworks/cavesofzircon/commands/Destroy.kt
@@ -0,0 +1,11 @@
+package org.hexworks.cavesofzircon.commands
+
+import org.hexworks.amethyst.api.entity.EntityType
+import org.hexworks.cavesofzircon.extensions.GameCommand
+import org.hexworks.cavesofzircon.extensions.GameEntity
+import org.hexworks.cavesofzircon.world.GameContext
+
+data class Destroy(override val context: GameContext,
+                   override val source: GameEntity<EntityType>,
+                   val target: GameEntity<EntityType>,
+                   val cause: String = "natural causes.") : GameCommand<EntityType>
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/events/GameLogEvent.kt b/src/main/kotlin/org/hexworks/cavesofzircon/events/GameLogEvent.kt
@@ -0,0 +1,5 @@
+package org.hexworks.cavesofzircon.events
+
+import org.hexworks.cobalt.events.api.Event
+
+data class GameLogEvent(val text: String) : Event
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,9 @@ 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.types.Combatant
+import org.hexworks.cavesofzircon.attributes.types.Player
+import org.hexworks.cavesofzircon.attributes.types.combatStats
 import org.hexworks.cavesofzircon.world.GameContext
 import org.hexworks.cobalt.datatypes.extensions.map
 import org.hexworks.cobalt.datatypes.extensions.orElseThrow
@@ -28,6 +31,15 @@ val AnyGameEntity.occupiesBlock: Boolean
 val AnyGameEntity.tile: Tile
     get() = this.tryToFindAttribute(EntityTile::class).tile
 
+val AnyGameEntity.isPlayer: Boolean
+    get() = this.type == Player
+
+fun GameEntity<Combatant>.whenHasNoHealthLeft(fn: () -> Unit) {
+    if (combatStats.hp <= 0) {
+        fn()
+    }
+}
+
 fun <T : Attribute> AnyGameEntity.tryToFindAttribute(klass: KClass<T>): T = findAttribute(klass).orElseThrow {
     NoSuchElementException("Entity '$this' has no property with type '${klass.simpleName}'.")
 }
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/functions/Functions.kt b/src/main/kotlin/org/hexworks/cavesofzircon/functions/Functions.kt
@@ -0,0 +1,8 @@
+package org.hexworks.cavesofzircon.functions
+
+import org.hexworks.cavesofzircon.events.GameLogEvent
+import org.hexworks.zircon.internal.Zircon
+
+fun logGameEvent(text: String) {
+    Zircon.eventBus.publish(GameLogEvent(text))
+}
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/systems/Attackable.kt b/src/main/kotlin/org/hexworks/cavesofzircon/systems/Attackable.kt
@@ -1,16 +1,40 @@
 package org.hexworks.cavesofzircon.systems
 
 import org.hexworks.amethyst.api.Consumed
+import org.hexworks.amethyst.api.Pass
 import org.hexworks.amethyst.api.base.BaseFacet
 import org.hexworks.amethyst.api.entity.EntityType
+import org.hexworks.cavesofzircon.attributes.types.combatStats
 import org.hexworks.cavesofzircon.commands.Attack
+import org.hexworks.cavesofzircon.commands.Destroy
 import org.hexworks.cavesofzircon.extensions.GameCommand
+import org.hexworks.cavesofzircon.extensions.isPlayer
+import org.hexworks.cavesofzircon.extensions.whenHasNoHealthLeft
+import org.hexworks.cavesofzircon.functions.logGameEvent
 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
+
+        if (attacker.isPlayer || target.isPlayer) {
+
+            val damage = Math.max(0, attacker.combatStats.attackValue - target.combatStats.defenseValue)
+            val finalDamage = (Math.random() * damage).toInt() + 1
+            target.combatStats.hp -= finalDamage
+
+            logGameEvent("The $attacker hits the $target for $finalDamage!")
+
+            target.whenHasNoHealthLeft {
+
+                target.executeCommand(Destroy(
+                        context = context,
+                        source = attacker,
+                        target = target,
+                        cause = "a blow to the head"))
+            }
+
+            Consumed
+        } else Pass
     }
 }
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/systems/Destructible.kt b/src/main/kotlin/org/hexworks/cavesofzircon/systems/Destructible.kt
@@ -0,0 +1,19 @@
+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.Destroy
+import org.hexworks.cavesofzircon.extensions.GameCommand
+import org.hexworks.cavesofzircon.functions.logGameEvent
+import org.hexworks.cavesofzircon.world.GameContext
+
+object Destructible : BaseFacet<GameContext>() {
+
+    override fun executeCommand(command: GameCommand<out EntityType>) = command.responseWhenCommandIs(Destroy::class) { (context, attacker, target, cause) ->
+        context.world.removeEntity(target)
+
+        logGameEvent("$target dies after receiving $cause.")
+        Consumed
+    }
+}
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/view/PlayView.kt b/src/main/kotlin/org/hexworks/cavesofzircon/view/PlayView.kt
@@ -2,8 +2,10 @@ package org.hexworks.cavesofzircon.view
 
 import org.hexworks.cavesofzircon.GameConfig
 import org.hexworks.cavesofzircon.blocks.GameBlock
+import org.hexworks.cavesofzircon.events.GameLogEvent
 import org.hexworks.cavesofzircon.world.Game
 import org.hexworks.cavesofzircon.world.GameBuilder
+import org.hexworks.cobalt.events.api.subscribe
 import org.hexworks.zircon.api.Components
 import org.hexworks.zircon.api.GameComponents
 import org.hexworks.zircon.api.component.ComponentAlignment
@@ -13,6 +15,7 @@ import org.hexworks.zircon.api.game.ProjectionMode
 import org.hexworks.zircon.api.mvc.base.BaseView
 import org.hexworks.zircon.api.uievent.KeyboardEventType
 import org.hexworks.zircon.api.uievent.Processed
+import org.hexworks.zircon.internal.Zircon
 
 class PlayView(private val game: Game = GameBuilder.defaultGame()) : BaseView() {
 
@@ -41,6 +44,13 @@ class PlayView(private val game: Game = GameBuilder.defaultGame()) : BaseView()
 
         screen.addComponent(logArea)
 
+        Zircon.eventBus.subscribe<GameLogEvent> { (text) ->
+            logArea.addParagraph(
+                    paragraph = text,
+                    withNewLine = false,
+                    withTypingEffectSpeedInMs = 10)
+        }
+
         val gameComponent = GameComponents.newGameComponentBuilder<Tile, GameBlock>()
                 .withGameArea(game.world)
                 .withVisibleSize(game.world.visibleSize())
