Add food and hunger

Adam Arold · Adam Arold · commit 7e169225628d · 2019-05-25T00:35:38.000+02:00
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/attributes/EnergyLevel.kt b/src/main/kotlin/org/hexworks/cavesofzircon/attributes/EnergyLevel.kt
@@ -0,0 +1,17 @@
+package org.hexworks.cavesofzircon.attributes
+
+import org.hexworks.amethyst.api.Attribute
+import org.hexworks.cobalt.databinding.api.createPropertyFrom
+
+class EnergyLevel(initialEnergy: Int,
+                  val maxEnergy: Int) : Attribute {
+
+    var currentEnergy: Int
+        get() = currentValueProperty.value
+        set(value) {
+            currentValueProperty.value = Math.min(value, maxEnergy)
+        }
+
+    private val currentValueProperty = createPropertyFrom(initialEnergy)
+
+}
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/attributes/NutritionalValue.kt b/src/main/kotlin/org/hexworks/cavesofzircon/attributes/NutritionalValue.kt
@@ -0,0 +1,5 @@
+package org.hexworks.cavesofzircon.attributes
+
+import org.hexworks.amethyst.api.Attribute
+
+data class NutritionalValue(val energy: Int) : Attribute
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/EnergyUser.kt b/src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/EnergyUser.kt
@@ -0,0 +1,10 @@
+package org.hexworks.cavesofzircon.attributes.types
+
+import org.hexworks.amethyst.api.entity.EntityType
+import org.hexworks.cavesofzircon.attributes.EnergyLevel
+import org.hexworks.cavesofzircon.extensions.GameEntity
+
+interface EnergyUser : EntityType
+
+val GameEntity<EnergyUser>.energyLevel: EnergyLevel
+    get() = findAttribute(EnergyLevel::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,7 +3,7 @@ package org.hexworks.cavesofzircon.attributes.types
 import org.hexworks.amethyst.api.base.BaseEntityType
 
 object Player : BaseEntityType(
-        name = "player"), Combatant, ItemHolder
+        name = "player"), Combatant, ItemHolder, EnergyUser
 
 object Wall : BaseEntityType(
         name = "wall")
@@ -12,7 +12,11 @@ object Fungus : BaseEntityType(
         name = "fungus"), Combatant
 
 object Bat : BaseEntityType(
-        name = "bat"), Combatant
+        name = "bat"), Combatant, ItemHolder
+
+object BatMeat : BaseEntityType(
+        name = "Bat meat",
+        description = "Stringy bat meat. It is edible, but not tasty."), Food
 
 object StairsDown : BaseEntityType(
         name = "stairs down")
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/Food.kt b/src/main/kotlin/org/hexworks/cavesofzircon/attributes/types/Food.kt
@@ -0,0 +1,10 @@
+package org.hexworks.cavesofzircon.attributes.types
+
+import org.hexworks.cavesofzircon.attributes.NutritionalValue
+import org.hexworks.cavesofzircon.extensions.GameEntity
+import org.hexworks.cavesofzircon.extensions.tryToFindAttribute
+
+interface Food : Item
+
+val GameEntity<Food>.energy: Int
+    get() = tryToFindAttribute(NutritionalValue::class).energy
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/builders/EntityFactory.kt b/src/main/kotlin/org/hexworks/cavesofzircon/builders/EntityFactory.kt
@@ -4,16 +4,19 @@ 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.EnergyLevel
 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.Inventory
 import org.hexworks.cavesofzircon.attributes.ItemIcon
+import org.hexworks.cavesofzircon.attributes.NutritionalValue
 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.Bat
+import org.hexworks.cavesofzircon.attributes.types.BatMeat
 import org.hexworks.cavesofzircon.attributes.types.Fungus
 import org.hexworks.cavesofzircon.attributes.types.Player
 import org.hexworks.cavesofzircon.attributes.types.StairsDown
@@ -26,12 +29,15 @@ import org.hexworks.cavesofzircon.entities.FogOfWar
 import org.hexworks.cavesofzircon.systems.Attackable
 import org.hexworks.cavesofzircon.systems.CameraMover
 import org.hexworks.cavesofzircon.systems.Destructible
+import org.hexworks.cavesofzircon.systems.DigestiveSystem
 import org.hexworks.cavesofzircon.systems.Diggable
+import org.hexworks.cavesofzircon.systems.EnergyExpender
 import org.hexworks.cavesofzircon.systems.FungusGrowth
 import org.hexworks.cavesofzircon.systems.InputReceiver
 import org.hexworks.cavesofzircon.systems.InventoryInspector
 import org.hexworks.cavesofzircon.systems.ItemDropper
 import org.hexworks.cavesofzircon.systems.ItemPicker
+import org.hexworks.cavesofzircon.systems.LootDropper
 import org.hexworks.cavesofzircon.systems.Movable
 import org.hexworks.cavesofzircon.systems.StairClimber
 import org.hexworks.cavesofzircon.systems.StairDescender
@@ -78,10 +84,11 @@ object EntityFactory {
                         defenseValue = 5),
                 EntityTile(GameTileRepository.PLAYER),
                 EntityActions(Dig::class, Attack::class),
-                Inventory(10))
-        behaviors(InputReceiver)
-        facets(Movable, CameraMover, StairClimber, StairDescender, Attackable, Destructible, ItemPicker,
-                InventoryInspector, ItemDropper)
+                Inventory(10),
+                EnergyLevel(1000, 1000))
+        behaviors(InputReceiver, EnergyExpender)
+        facets(Movable, CameraMover, StairClimber, StairDescender, Attackable, Destructible,
+                ItemPicker, InventoryInspector, ItemDropper, EnergyExpender, DigestiveSystem)
     }
 
     fun newFungus(fungusSpread: FungusSpread = FungusSpread()) = newGameEntityOfType(Fungus) {
@@ -105,11 +112,24 @@ object EntityFactory {
                         maxHp = 5,
                         attackValue = 2,
                         defenseValue = 1),
-                EntityActions(Attack::class))
-        facets(Movable, Attackable, Destructible)
+                EntityActions(Attack::class),
+                Inventory(1).apply {
+                    addItem(newBatMeat())
+                })
+        facets(Movable, Attackable, ItemDropper, LootDropper, Destructible)
         behaviors(Wanderer)
     }
 
+    fun newBatMeat() = newGameEntityOfType(BatMeat) {
+        attributes(ItemIcon(Tiles.newBuilder()
+                .withName("Meatball")
+                .withTileset(GraphicalTilesetResources.nethack16x16())
+                .buildGraphicTile()),
+                NutritionalValue(750),
+                EntityPosition(),
+                EntityTile(GameTileRepository.BAT_MEAT))
+    }
+
     fun newZircon() = newGameEntityOfType(Zircon) {
         attributes(ItemIcon(Tiles.newBuilder()
                 .withName("white gem")
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/builders/GameColors.kt b/src/main/kotlin/org/hexworks/cavesofzircon/builders/GameColors.kt
@@ -14,6 +14,7 @@ object GameColors {
 
     val ACCENT_COLOR = TileColors.fromString("#FFCD22")
     val ZIRCON_COLOR = TileColors.fromString("#dddddd")
+    val BAT_MEAT_COLOR = TileColors.fromString("#EA4861")
 
     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
@@ -50,6 +50,12 @@ object GameTileRepository {
             .withForegroundColor(GameColors.BAT_COLOR)
             .buildCharacterTile()
 
+    val BAT_MEAT = Tiles.newBuilder()
+            .withCharacter('m')
+            .withBackgroundColor(GameColors.FLOOR_BACKGROUND)
+            .withForegroundColor(GameColors.BAT_MEAT_COLOR)
+            .buildCharacterTile()
+
     val ZIRCON  = Tiles.newBuilder()
             .withCharacter(',')
             .withBackgroundColor(GameColors.FLOOR_BACKGROUND)
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/commands/Eat.kt b/src/main/kotlin/org/hexworks/cavesofzircon/commands/Eat.kt
@@ -0,0 +1,10 @@
+package org.hexworks.cavesofzircon.commands
+
+import org.hexworks.cavesofzircon.attributes.types.Food
+import org.hexworks.cavesofzircon.attributes.types.EnergyUser
+import org.hexworks.cavesofzircon.extensions.GameEntity
+import org.hexworks.cavesofzircon.world.GameContext
+
+data class Eat(override val context: GameContext,
+               override val source: GameEntity<EnergyUser>,
+               override val target: GameEntity<Food>) : EntityAction<EnergyUser, Food>
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/commands/Expend.kt b/src/main/kotlin/org/hexworks/cavesofzircon/commands/Expend.kt
@@ -0,0 +1,11 @@
+package org.hexworks.cavesofzircon.commands
+
+import org.hexworks.amethyst.api.entity.EntityType
+import org.hexworks.cavesofzircon.attributes.types.EnergyUser
+import org.hexworks.cavesofzircon.extensions.GameCommand
+import org.hexworks.cavesofzircon.extensions.GameEntity
+import org.hexworks.cavesofzircon.world.GameContext
+
+data class Expend(override val context: GameContext,
+                  override val source: GameEntity<EnergyUser>,
+                  val energy: Int) : GameCommand<EntityType>
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/extensions/EntityExtensions.kt b/src/main/kotlin/org/hexworks/cavesofzircon/extensions/EntityExtensions.kt
@@ -14,7 +14,6 @@ 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.Item
 import org.hexworks.cavesofzircon.attributes.types.Player
 import org.hexworks.cavesofzircon.attributes.types.combatStats
 import org.hexworks.cavesofzircon.world.GameContext
@@ -45,6 +44,12 @@ inline fun <reified T : EntityType> Iterable<AnyGameEntity>.filterType(): List<E
     return filter { T::class.isSuperclassOf(it.type::class) }.toList() as List<Entity<T, GameContext>>
 }
 
+inline fun <reified T : EntityType> AnyGameEntity.whenTypeIs(fn: (Entity<T, GameContext>) -> Unit) {
+    if (T::class.isSuperclassOf(this.type::class)) {
+        fn(this as Entity<T, GameContext>)
+    }
+}
+
 val AnyGameEntity.blocksVision: Boolean
     get() = this.findAttribute(VisionBlocker::class).isPresent
 
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/systems/Attackable.kt b/src/main/kotlin/org/hexworks/cavesofzircon/systems/Attackable.kt
@@ -31,7 +31,7 @@ object Attackable : BaseFacet<GameContext>() {
                         context = context,
                         source = attacker,
                         target = target,
-                        cause = "a blow to the head"))
+                        cause = "after receiving a blow to the head"))
             }
 
             Consumed
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/systems/Destructible.kt b/src/main/kotlin/org/hexworks/cavesofzircon/systems/Destructible.kt
@@ -13,7 +13,7 @@ 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.")
+        logGameEvent("$target dies $cause.")
         Consumed
     }
 }
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/systems/DigestiveSystem.kt b/src/main/kotlin/org/hexworks/cavesofzircon/systems/DigestiveSystem.kt
@@ -0,0 +1,25 @@
+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.attributes.EnergyLevel
+import org.hexworks.cavesofzircon.attributes.types.energy
+import org.hexworks.cavesofzircon.attributes.types.energyLevel
+import org.hexworks.cavesofzircon.commands.Eat
+import org.hexworks.cavesofzircon.extensions.GameCommand
+import org.hexworks.cavesofzircon.extensions.isPlayer
+import org.hexworks.cavesofzircon.functions.logGameEvent
+import org.hexworks.cavesofzircon.world.GameContext
+
+object DigestiveSystem : BaseFacet<GameContext>(EnergyLevel::class) {
+
+    override fun executeCommand(command: GameCommand<out EntityType>) = command.responseWhenCommandIs(Eat::class) { (_, entity, food) ->
+        entity.energyLevel.currentEnergy += food.energy
+        val verb = if (entity.isPlayer) {
+            "You eat"
+        } else "The $entity eats"
+        logGameEvent("$verb the $food.")
+        Consumed
+    }
+}
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/systems/EnergyExpender.kt b/src/main/kotlin/org/hexworks/cavesofzircon/systems/EnergyExpender.kt
@@ -0,0 +1,48 @@
+package org.hexworks.cavesofzircon.systems
+
+import org.hexworks.amethyst.api.Consumed
+import org.hexworks.amethyst.api.Response
+import org.hexworks.amethyst.api.base.BaseActor
+import org.hexworks.amethyst.api.entity.EntityType
+import org.hexworks.cavesofzircon.attributes.EnergyLevel
+import org.hexworks.cavesofzircon.attributes.types.EnergyUser
+import org.hexworks.cavesofzircon.attributes.types.energyLevel
+import org.hexworks.cavesofzircon.commands.Destroy
+import org.hexworks.cavesofzircon.commands.Expend
+import org.hexworks.cavesofzircon.extensions.GameCommand
+import org.hexworks.cavesofzircon.extensions.GameEntity
+import org.hexworks.cavesofzircon.extensions.whenTypeIs
+import org.hexworks.cavesofzircon.world.GameContext
+
+object EnergyExpender : BaseActor<GameContext>(EnergyLevel::class) {
+
+    override fun executeCommand(command: GameCommand<out EntityType>): Response {
+        return command.responseWhenCommandIs(Expend::class) { (context, entity, energy) ->
+            entity.energyLevel.currentEnergy -= energy
+            checkStarvation(context, entity, entity.energyLevel)
+            Consumed
+        }
+    }
+
+    override fun update(entity: GameEntity<EntityType>, context: GameContext): Boolean {
+        entity.whenTypeIs<EnergyUser> {
+            entity.executeCommand(Expend(
+                    context = context,
+                    source = it,
+                    energy = 2))
+        }
+        return true
+    }
+
+    private fun checkStarvation(context: GameContext,
+                                entity: GameEntity<EntityType>,
+                                energyLevel: EnergyLevel) {
+        if (energyLevel.currentEnergy <= 0) {
+            entity.executeCommand(Destroy(
+                    context = context,
+                    source = entity,
+                    target = entity,
+                    cause = "because of starvation"))
+        }
+    }
+}
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/systems/InventoryInspector.kt b/src/main/kotlin/org/hexworks/cavesofzircon/systems/InventoryInspector.kt
@@ -4,10 +4,15 @@ import org.hexworks.amethyst.api.Consumed
 import org.hexworks.amethyst.api.base.BaseFacet
 import org.hexworks.amethyst.api.entity.EntityType
 import org.hexworks.cavesofzircon.GameConfig
+import org.hexworks.cavesofzircon.attributes.types.EnergyUser
+import org.hexworks.cavesofzircon.attributes.types.Food
+import org.hexworks.cavesofzircon.attributes.types.ItemHolder
 import org.hexworks.cavesofzircon.attributes.types.inventory
 import org.hexworks.cavesofzircon.commands.DropItem
+import org.hexworks.cavesofzircon.commands.Eat
 import org.hexworks.cavesofzircon.commands.InspectInventory
 import org.hexworks.cavesofzircon.extensions.GameCommand
+import org.hexworks.cavesofzircon.extensions.whenTypeIs
 import org.hexworks.cavesofzircon.view.fragment.InventoryFragment
 import org.hexworks.cavesofzircon.world.GameContext
 import org.hexworks.zircon.api.Components
@@ -28,9 +33,20 @@ object InventoryInspector : BaseFacet<GameContext>() {
 
                 val screen = context.screen
 
-                val fragment = InventoryFragment(itemHolder.inventory, DIALOG_SIZE.width - 3) { item ->
-                    itemHolder.executeCommand(DropItem(context, itemHolder, item, position))
-                }
+                val fragment = InventoryFragment(
+                        inventory = itemHolder.inventory,
+                        width = DIALOG_SIZE.width - 3,
+                        onDrop = { item ->
+                            itemHolder.executeCommand(DropItem(context, itemHolder, item, position))
+                        },
+                        onEat = { item ->
+                            itemHolder.whenTypeIs<EnergyUser> { eater ->
+                                item.whenTypeIs<Food> { food ->
+                                    itemHolder.inventory.removeItem(food)
+                                    itemHolder.executeCommand(Eat(context, eater, food))
+                                }
+                            }
+                        })
 
                 val panel = Components.panel()
                         .withSize(DIALOG_SIZE)
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/systems/LootDropper.kt b/src/main/kotlin/org/hexworks/cavesofzircon/systems/LootDropper.kt
@@ -0,0 +1,26 @@
+package org.hexworks.cavesofzircon.systems
+
+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.ItemHolder
+import org.hexworks.cavesofzircon.attributes.types.inventory
+import org.hexworks.cavesofzircon.commands.Destroy
+import org.hexworks.cavesofzircon.commands.DropItem
+import org.hexworks.cavesofzircon.extensions.GameCommand
+import org.hexworks.cavesofzircon.extensions.position
+import org.hexworks.cavesofzircon.extensions.whenTypeIs
+import org.hexworks.cavesofzircon.world.GameContext
+
+object LootDropper : BaseFacet<GameContext>() {
+
+    override fun executeCommand(command: GameCommand<out EntityType>) = command
+            .responseWhenCommandIs(Destroy::class) { (context, _, target) ->
+                target.whenTypeIs<ItemHolder> { entity ->
+                    entity.inventory.items.forEach { item ->
+                        entity.executeCommand(DropItem(context, entity, item, entity.position))
+                    }
+                }
+                Pass
+            }
+}
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/view/StartView.kt b/src/main/kotlin/org/hexworks/cavesofzircon/view/StartView.kt
@@ -1,8 +1,5 @@
 package org.hexworks.cavesofzircon.view
 
-import org.hexworks.cavesofzircon.attributes.Inventory
-import org.hexworks.cavesofzircon.builders.EntityFactory
-import org.hexworks.cavesofzircon.view.fragment.InventoryFragment
 import org.hexworks.zircon.api.ColorThemes
 import org.hexworks.zircon.api.Components
 import org.hexworks.zircon.api.component.ComponentAlignment
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/view/fragment/InventoryFragment.kt b/src/main/kotlin/org/hexworks/cavesofzircon/view/fragment/InventoryFragment.kt
diff --git a/src/main/kotlin/org/hexworks/cavesofzircon/view/fragment/InventoryRowFragment.kt b/src/main/kotlin/org/hexworks/cavesofzircon/view/fragment/InventoryRowFragment.kt

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ object GameColors {`
`14`	`14`
`15`	`15`	`val ACCENT_COLOR = TileColors.fromString("#FFCD22")`
`16`	`16`	`val ZIRCON_COLOR = TileColors.fromString("#dddddd")`
	`17`	`+ val BAT_MEAT_COLOR = TileColors.fromString("#EA4861")`
`17`	`18`
`18`	`19`	`val UNREVEALED_COLOR = TileColors.fromString("#000000")`
`19`	`20`	`}`