Merge pull request #11 from fmasa/fix-hardy

Fix Hardy revert for pre-3.3.0 Characters

Author: fmasa

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/effects/EffectFactory.kt

@@ -16,7 +16,7 @@ class EffectFactory {
                 val name = item.talent.name.trim()
 
                 listOfNotNull(
-                    HardyWoundsModification.fromTalentOrNull(name, item.talent.taken.toUInt()),
+                    HardyWoundsModification.fromTalentOrNull(name, item.talent.taken),
                     CharacteristicChange.fromTalentNameOrNull(name),
                 )
             }

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/effects/HardyWoundsModification.kt

@@ -2,7 +2,11 @@ package cz.frantisekmasa.wfrp_master.common.character.effects
 
 import cz.frantisekmasa.wfrp_master.common.core.domain.character.Character
 
-class HardyWoundsModification(private val timesTaken: UInt): CharacterEffect {
+class HardyWoundsModification(private val timesTaken: Int): CharacterEffect {
+    init {
+        require(timesTaken > 0)
+    }
+
     override fun apply(character: Character, otherEffects: List<CharacterEffect>): Character {
         val modifiers = character.woundsModifiers
 
@@ -19,13 +23,13 @@ class HardyWoundsModification(private val timesTaken: UInt): CharacterEffect {
         return character.modifyWounds(
             modifiers.copy(
                 extraToughnessBonusMultiplier = (modifiers.extraToughnessBonusMultiplier - timesTaken)
-                    .coerceAtLeast(0.toUInt()),
+                    .coerceAtLeast(0),
             )
         )
     }
 
     companion object {
-        fun fromTalentOrNull(name: String, timesTaken: UInt): HardyWoundsModification? {
+        fun fromTalentOrNull(name: String, timesTaken: Int): HardyWoundsModification? {
             if (name.equals("hardy", ignoreCase = true)) {
                 return HardyWoundsModification(timesTaken)
             }

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/WoundsModifiers.kt

@@ -10,9 +10,10 @@ import kotlinx.serialization.Serializable
 @Immutable
 data class WoundsModifiers(
     val afterMultiplier: UInt = 1.toUInt(),
-    val extraToughnessBonusMultiplier: UInt = 0.toUInt(),
+    val extraToughnessBonusMultiplier: Int = 0,
 ) : Parcelable {
     init {
+        require(extraToughnessBonusMultiplier >= 0)
         require(afterMultiplier >= 1.toUInt())
     }
 }

common/src/commonTest/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/effects/HardyWoundsModificationTest.kt

@@ -0,0 +1,94 @@
+package cz.frantisekmasa.wfrp_master.common.core.domain.character.effects
+
+import com.benasher44.uuid.uuid4
+import cz.frantisekmasa.wfrp_master.common.character.effects.HardyWoundsModification
+import cz.frantisekmasa.wfrp_master.common.core.domain.Stats
+import cz.frantisekmasa.wfrp_master.common.core.domain.character.Character
+import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterType
+import cz.frantisekmasa.wfrp_master.common.core.domain.character.Points
+import cz.frantisekmasa.wfrp_master.common.core.domain.character.Race
+import cz.frantisekmasa.wfrp_master.common.core.domain.character.SocialStatus
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class HardyWoundsModificationTest {
+
+    @Test
+    fun `applying modification adds current TB to max Wounds`() {
+        val character = character()
+        assertEquals(6, character.wounds.max)
+
+        val updatedCharacter = HardyWoundsModification(1).apply(character, emptyList())
+
+        assertEquals(8, updatedCharacter.wounds.max)
+    }
+
+    @Test
+    fun `applying modification adds current TB multiple times to max Wounds when Hardy is taken multiple times`() {
+        val character = character()
+        assertEquals(6, character.wounds.max)
+
+        val updatedCharacter = HardyWoundsModification(2).apply(character, emptyList())
+
+        assertEquals(10, updatedCharacter.wounds.max)
+    }
+
+    @Test
+    fun `reverting more Hardy bonuses than Character has goes to zero`() {
+        val character = HardyWoundsModification(2).apply(character(), emptyList())
+
+        val updatedCharacter = HardyWoundsModification(3).revert(character, emptyList())
+
+        assertEquals(6, updatedCharacter.wounds.max)
+    }
+
+    @Test
+    fun `reverting Hardy bonus subtracts correct amount of max Wounds`() {
+        val character = HardyWoundsModification(3).apply(character(), emptyList())
+
+        val updatedCharacter = HardyWoundsModification(2).revert(character, emptyList())
+
+        assertEquals(8, updatedCharacter.wounds.max)
+    }
+
+    private fun character(): Character {
+        return Character(
+            id = uuid4().toString(),
+            type = CharacterType.NPC,
+            name = "Bjorn Kveldulfson",
+            userId = null,
+            career = "Watchman",
+            status = SocialStatus(SocialStatus.Tier.BRASS, 1),
+            psychology = "",
+            motivation = "",
+            characteristicsBase = Stats(
+                10,
+                10,
+                10,
+                10,
+                20,
+                10,
+                10,
+                10,
+                10,
+                10,
+            ),
+            characteristicsAdvances = Stats.ZERO,
+            points = Points(
+                corruption = 0,
+                fate = 0,
+                fortune = 0,
+                maxWounds = null,
+                wounds = 0,
+                resilience = 0,
+                resolve = 0,
+                sin = 0,
+                experience = 0,
+                spentExperience = 0,
+                hardyWoundsBonus = 0,
+            ),
+            socialClass = "Warriors",
+            race = Race.HUMAN,
+        )
+    }
+}