Add displaying stats

Author: adam-arold

src/main/kotlin/org/hexworks/cavesofzircon/attributes/CombatStats.kt

@@ -1,18 +1,52 @@
 package org.hexworks.cavesofzircon.attributes
 
-import org.hexworks.amethyst.api.Attribute
+import org.hexworks.cavesofzircon.extensions.toStringProperty
 import org.hexworks.cobalt.databinding.api.createPropertyFrom
+import org.hexworks.cobalt.databinding.api.expression.concat
 import org.hexworks.cobalt.databinding.api.property.Property
+import org.hexworks.zircon.api.Components
 
 data class CombatStats(val maxHpProperty: Property<Int>,
                        val hpProperty: Property<Int> = createPropertyFrom(maxHpProperty.value),
                        val attackValueProperty: Property<Int>,
-                       val defenseValueProperty: Property<Int>) : Attribute {
+                       val defenseValueProperty: Property<Int>) : DisplayableAttribute {
     val maxHp: Int by maxHpProperty.asDelegate()
     var hp: Int by hpProperty.asDelegate()
     val attackValue: Int by attackValueProperty.asDelegate()
     val defenseValue: Int by defenseValueProperty.asDelegate()
 
+    override fun toComponent(width: Int) = Components.vbox()
+            .withSize(width, 5)
+            .build().apply {
+                val hpLabel = Components.label()
+                        .withSize(width, 1)
+                        .build()
+                val attackLabel = Components.label()
+                        .withSize(width, 1)
+                        .build()
+                val defenseLabel = Components.label()
+                        .withSize(width, 1)
+                        .build()
+
+                hpLabel.textProperty.updateFrom(createPropertyFrom("HP:  ")
+                        .concat(hpProperty.toStringProperty())
+                        .concat("/").concat(maxHpProperty))
+
+                attackLabel.textProperty.updateFrom(createPropertyFrom("Att: ")
+                        .concat(attackValueProperty.toStringProperty()))
+
+                defenseLabel.textProperty.updateFrom(createPropertyFrom("Def: ")
+                        .concat(defenseValueProperty.toStringProperty()))
+
+                addComponent(Components.textBox()
+                        .withContentWidth(width)
+                        .addHeader("Combat Stats"))
+                addComponent(hpLabel)
+                addComponent(attackLabel)
+                addComponent(defenseLabel)
+
+            }
+
     companion object {
 
         fun create(maxHp: Int, hp: Int = maxHp, attackValue: Int, defenseValue: Int) =

src/main/kotlin/org/hexworks/cavesofzircon/attributes/DisplayableAttribute.kt

@@ -0,0 +1,10 @@
+package org.hexworks.cavesofzircon.attributes
+
+import org.hexworks.amethyst.api.Attribute
+import org.hexworks.zircon.api.component.Component
+
+interface DisplayableAttribute : Attribute {
+
+    fun toComponent(width: Int): Component
+
+}

src/main/kotlin/org/hexworks/cavesofzircon/attributes/EnergyLevel.kt

@@ -1,10 +1,12 @@
 package org.hexworks.cavesofzircon.attributes
 
-import org.hexworks.amethyst.api.Attribute
+import org.hexworks.cavesofzircon.extensions.toStringProperty
 import org.hexworks.cobalt.databinding.api.createPropertyFrom
+import org.hexworks.cobalt.databinding.api.expression.concat
+import org.hexworks.zircon.api.Components
 
 class EnergyLevel(initialEnergy: Int,
-                  val maxEnergy: Int) : Attribute {
+                  val maxEnergy: Int) : DisplayableAttribute {
 
     var currentEnergy: Int
         get() = currentValueProperty.value
@@ -14,4 +16,20 @@ class EnergyLevel(initialEnergy: Int,
 
     private val currentValueProperty = createPropertyFrom(initialEnergy)
 
+    override fun toComponent(width: Int) = Components.vbox()
+            .withSize(width, 5)
+            .build().apply {
+                val hungerLabel = Components.label()
+                        .withSize(width, 1)
+                        .build()
+
+                hungerLabel.textProperty.updateFrom(currentValueProperty.toStringProperty()
+                        .concat("/").concat(maxEnergy))
+
+                addComponent(Components.textBox()
+                        .withContentWidth(width)
+                        .addHeader("Hunger"))
+                addComponent(hungerLabel)
+
+            }
 }

src/main/kotlin/org/hexworks/cavesofzircon/attributes/Vision.kt

@@ -2,4 +2,4 @@ package org.hexworks.cavesofzircon.attributes
 
 import org.hexworks.amethyst.api.Attribute
 
-data class Vision(val radius: Int): Attribute
+data class Vision(val radius: Int) : Attribute

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

@@ -0,0 +1,13 @@
+package org.hexworks.cavesofzircon.extensions
+
+import org.hexworks.cobalt.databinding.api.createPropertyFrom
+import org.hexworks.cobalt.databinding.api.property.Property
+
+fun Property<Int>.toStringProperty(): Property<String> {
+    val intProp = this
+    return createPropertyFrom("").apply {
+        this.updateFrom(intProp) {
+            it.toString()
+        }
+    }
+}

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

@@ -3,6 +3,7 @@ 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.view.fragment.PlayerStatsFragment
 import org.hexworks.cavesofzircon.world.Game
 import org.hexworks.cavesofzircon.world.GameBuilder
 import org.hexworks.cobalt.events.api.subscribe
@@ -33,6 +34,10 @@ class PlayView(private val game: Game = GameBuilder.defaultGame()) : BaseView()
                 .wrapWithBox()
                 .build()
 
+        sidebar.addFragment(PlayerStatsFragment(
+                width = sidebar.contentSize.width,
+                player = game.player))
+
         screen.addComponent(sidebar)
 
         val logArea = Components.logArea()

src/main/kotlin/org/hexworks/cavesofzircon/view/fragment/PlayerStatsFragment.kt

@@ -0,0 +1,23 @@
+package org.hexworks.cavesofzircon.view.fragment
+
+import org.hexworks.cavesofzircon.attributes.DisplayableAttribute
+import org.hexworks.cavesofzircon.attributes.types.Player
+import org.hexworks.cavesofzircon.extensions.GameEntity
+import org.hexworks.zircon.api.Components
+import org.hexworks.zircon.api.component.Fragment
+
+class PlayerStatsFragment(
+        width: Int,
+        player: GameEntity<Player>) : Fragment {
+
+    override val root = Components.vbox()
+            .withSize(width, 30)
+            .withSpacing(1)
+            .build().apply {
+                addComponent(Components.header().withText("Player"))
+                player.attributes.toList().filterIsInstance<DisplayableAttribute>()
+                        .forEach {
+                            addComponent(it.toComponent(width))
+                        }
+            }
+}