Merge pull request #16 from fmasa/combat-improvements

Combat improvements

Author: fmasa

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/combat/ActiveCombatScreen.kt

@@ -402,7 +402,7 @@ class ActiveCombatScreen(
 
         NumberPicker(
             label = LocalStrings.current.combat.labelAdvantage,
-            value = advantage.value.toInt(),
+            value = advantage.value,
             onIncrement = { updateAdvantage(advantage.inc().coerceAtMost(advantageCap)) },
             onDecrement = { updateAdvantage(advantage.dec()) },
         )
@@ -445,10 +445,14 @@ class ActiveCombatScreen(
                     },
                     text = { Text(combatant.name) },
                     trailing = {
-                        val advantage = combatant.combatant.advantage
+                        Column(horizontalAlignment = Alignment.End) {
+                            Text("I: ${combatant.combatant.initiative}")
 
-                        if (advantage > Advantage.ZERO) {
-                            Text("$advantage A", fontWeight = FontWeight.Bold)
+                            val advantage = combatant.combatant.advantage
+
+                            if (advantage > Advantage.ZERO) {
+                                Text("A: $advantage", fontWeight = FontWeight.Bold)
+                            }
                         }
                     }
                 )

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/combat/CombatScreenModel.kt

@@ -134,7 +134,7 @@ class CombatScreenModel(
         val globalEncounterId = EncounterId(partyId, encounterId)
         val combatants =
             characters.map {
-                it.characteristics to Combatant.Character(
+                characteristics(it) to Combatant.Character(
                     id = uuid4(),
                     characterId = it.id,
                     initiative = 1,
@@ -148,17 +148,19 @@ class CombatScreenModel(
                     )
                 } +
                 npcCharacters.flatMap { (character, count) ->
+                    val characteristics = characteristics(character)
+
                     if (count == 1)
                         listOf(
-                            character.characteristics to Combatant.Character(
+                            characteristics to Combatant.Character(
                                 id = uuid4(),
                                 name = character.publicName,
                                 characterId = character.id,
                                 initiative = 1,
                             )
                         )
                     else (1..count).map { index ->
-                        character.characteristics to Combatant.Character(
+                        characteristics to Combatant.Character(
                             id = uuid4(),
                             characterId = character.id,
                             initiative = 1,
@@ -175,6 +177,16 @@ class CombatScreenModel(
         Reporter.recordEvent("combat_started", mapOf("partyId" to partyId.toString()))
     }
 
+    private suspend fun characteristics(character: Character): Stats {
+        val talents = talents.findAllForCharacter(CharacterId(partyId, character.id)).first()
+
+        val initiativeIncrease = talents
+            .filter { it.name.equals("Combat Reflexes", ignoreCase = true) }
+            .sumOf { it.taken } * 10
+
+        return character.characteristics + Stats.ZERO.copy(initiative = initiativeIncrease)
+    }
+
     suspend fun previousTurn() = updateCombat { it.previousTurn() }
 
     suspend fun nextTurn() = updateCombat { it.nextTurn() }

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/StatBlock.kt

@@ -14,6 +14,8 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Divider
+import androidx.compose.material.LocalContentAlpha
+import androidx.compose.material.LocalContentColor
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
@@ -175,7 +177,12 @@ private fun <T : CharacterItem> CharacterItemList(
         }
     }
 
-    ClickableText(text) { offset ->
+    ClickableText(
+        text,
+        style = MaterialTheme.typography.body2.copy(
+            color = LocalContentColor.current.copy(alpha = LocalContentAlpha.current),
+        )
+    ) { offset ->
         text.getStringAnnotations(SkillTag, offset, offset)
             .firstOrNull()
             ?.let { range ->