Merge pull request #33 from fmasa/construct

Use SB instead off WPB when determining max Wounds for Construct
fmasa · Nov 5, 2022 · d7ec703 · d7ec703
2 parents 88fa7da + cfd9b6f
commit d7ec703
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 11 deletions.
diff --git a/...tlin/cz/frantisekmasa/wfrp_master/common/character/effects/ConstructWoundsModification.kt b/...tlin/cz/frantisekmasa/wfrp_master/common/character/effects/ConstructWoundsModification.kt
@@ -0,0 +1,35 @@
+package cz.frantisekmasa.wfrp_master.common.character.effects
+
+import cz.frantisekmasa.wfrp_master.common.core.domain.character.Character
+
+class ConstructWoundsModification : CharacterEffect {
+    override fun apply(character: Character, otherEffects: List<CharacterEffect>): Character {
+        if (otherEffects.any { it is ConstructWoundsModification }) {
+            return character // This effect does not stack
+        }
+
+        return character.modifyWounds(
+            character.woundsModifiers.copy(isConstruct = true)
+        )
+    }
+
+    override fun revert(character: Character, otherEffects: List<CharacterEffect>): Character {
+        if (otherEffects.any { it is ConstructWoundsModification }) {
+            return character // This effect does not stack
+        }
+
+        return character.modifyWounds(
+            character.woundsModifiers.copy(isConstruct = false)
+        )
+    }
+
+    companion object {
+        fun fromTraitNameOrNull(name: String): ConstructWoundsModification? {
+            if (name.equals("construct", ignoreCase = true)) {
+                return ConstructWoundsModification()
+            }
+
+            return null
+        }
+    }
+}
diff --git a/.../commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/effects/EffectFactory.kt b/.../commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/effects/EffectFactory.kt
@@ -10,6 +10,7 @@ class EffectFactory {
                     SizeChange.fromTraitNameOrNull(name),
                     CharacteristicChange.fromTraitNameOrNull(name),
                     SwarmWoundsModification.fromTraitNameOrNull(name),
+                    ConstructWoundsModification.fromTraitNameOrNull(name),
                 )
             }
             is EffectSource.Talent -> {

diff --git a/.../commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/Character.kt b/.../commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/Character.kt
@@ -244,24 +244,31 @@ data class Character(
             characteristics: Stats,
         ): Int {
             val manualMaxWounds = points.maxWounds
-            val tb = characteristics.toughnessBonus
+            val toughnessBonus = characteristics.toughnessBonus
 
             if (manualMaxWounds != null) {
                 // TODO: Remove support for hasHardyTalent flag
                 if (hasHardyTalent) {
-                    return manualMaxWounds + tb
+                    return manualMaxWounds + toughnessBonus
                 }
 
                 return manualMaxWounds
             }
 
-            val baseWounds = Wounds.calculateMax(size ?: Size.AVERAGE, characteristics)
+            val baseWounds = Wounds.calculateMax(
+                size = size ?: Size.AVERAGE,
+                toughnessBonus = toughnessBonus,
+                strengthBonus = characteristics.strengthBonus,
+                willPowerBonus = if (modifiers.isConstruct)
+                    characteristics.strengthBonus
+                else characteristics.willPowerBonus
+            )
             return (
                 baseWounds +
-                    modifiers.extraToughnessBonusMultiplier.toInt() * tb +
-                    (if (hasHardyTalent) tb else 0)
+                    modifiers.extraToughnessBonusMultiplier * toughnessBonus +
+                    (if (hasHardyTalent) toughnessBonus else 0)
                 ) *
-                modifiers.afterMultiplier.toInt()
+                modifiers.afterMultiplier
         }
     }
 }
diff --git a/...nMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/WoundsModifiers.kt b/...nMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/WoundsModifiers.kt
@@ -11,6 +11,7 @@ import kotlinx.serialization.Serializable
 data class WoundsModifiers(
     val afterMultiplier: Int = 1,
     val extraToughnessBonusMultiplier: Int = 0,
+    val isConstruct: Boolean = false,
 ) : Parcelable {
     init {
         require(extraToughnessBonusMultiplier >= 0)

diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/domain/Wounds.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/domain/Wounds.kt
@@ -2,7 +2,6 @@ package cz.frantisekmasa.wfrp_master.common.encounters.domain
 
 import androidx.compose.runtime.Immutable
 import cz.frantisekmasa.wfrp_master.common.core.domain.Size
-import cz.frantisekmasa.wfrp_master.common.core.domain.Stats
 import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable
 import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize
 import kotlinx.serialization.Serializable
@@ -23,8 +22,13 @@ data class Wounds(
         fun fromMax(max: Int) = Wounds(max, max)
 
         // See rulebook page 341
-        fun calculateMax(size: Size, characteristics: Stats): Int = with(characteristics) {
-            when (size) {
+        fun calculateMax(
+            size: Size,
+            toughnessBonus: Int,
+            strengthBonus: Int,
+            willPowerBonus: Int,
+        ): Int {
+            return when (size) {
                 Size.TINY -> 1
                 Size.LITTLE -> toughnessBonus
                 Size.SMALL -> (2 * toughnessBonus) + willPowerBonus

diff --git a/firebase/firestore.rules b/firebase/firestore.rules
@@ -497,9 +497,14 @@ service cloud.firestore {
                         )
                         && ! ("woundsModifiers" in character) || (
                             character.woundsModifiers is map &&
-                            character.woundsModifiers.keys().toSet() == ["afterMultiplier", "extraToughnessBonusMultiplier"].toSet() &&
+                            [
+                                "afterMultiplier",
+                                "extraToughnessBonusMultiplier",
+                                "isConstruct"
+                            ].hasAll(character.woundsModifiers.keys()) &&
                             character.woundsModifiers.afterMultiplier is int &&
-                            character.woundsModifiers.extraToughnessBonusMultiplier is int
+                            character.woundsModifiers.extraToughnessBonusMultiplier is int &&
+                            (! ("isConstruct" in character.woundsModifiers) || character.woundsModifiers.isConstruct is bool)
                         )
                         && (! ("compendiumCareer" in character) || character.compendiumCareer == null || (
                             character.compendiumCareer is map &&