Increase maximum Encumbrance from Strong Back and Sturdy talents

Author: fmasa

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

@@ -0,0 +1,40 @@
+package cz.frantisekmasa.wfrp_master.common.character.effects
+
+import cz.frantisekmasa.wfrp_master.common.core.domain.character.Character
+import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.Encumbrance
+import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.sum
+
+class AdditionalEncumbrance(
+    private val bonus: Encumbrance,
+) : CharacterEffect {
+
+    override fun apply(character: Character, otherEffects: List<CharacterEffect>): Character {
+        return character.modifyEncumbranceBonus(
+            bonus + otherEffects.filterIsInstance<AdditionalEncumbrance>()
+                .map { it.bonus }
+                .sum()
+        )
+    }
+
+    override fun revert(character: Character, otherEffects: List<CharacterEffect>): Character {
+        return character.modifyEncumbranceBonus(
+            otherEffects.filterIsInstance<AdditionalEncumbrance>()
+                .map { it.bonus }
+                .sum()
+        )
+    }
+
+    companion object {
+        fun fromTalentOrNull(name: String, timesTaken: Int): AdditionalEncumbrance? {
+            if (name.equals("strong back", ignoreCase = true)) {
+                return AdditionalEncumbrance(Encumbrance(timesTaken.toDouble()))
+            }
+
+            if (name.equals("sturdy", ignoreCase = true)) {
+                return AdditionalEncumbrance(Encumbrance((timesTaken * 2).toDouble()))
+            }
+
+            return null
+        }
+    }
+}

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

@@ -19,6 +19,7 @@ class EffectFactory {
                 listOfNotNull(
                     HardyWoundsModification.fromTalentOrNull(name, item.talent.taken),
                     CharacteristicChange.fromTalentNameOrNull(name),
+                    AdditionalEncumbrance.fromTalentOrNull(name, item.talent.taken),
                 )
             }
         }

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/trappings/TrappingsScreenModel.kt

@@ -55,7 +55,7 @@ class TrappingsScreenModel(
         .distinctUntilChanged()
 
     val maxEncumbrance: Flow<Encumbrance> = character
-        .map { Encumbrance.maximumForCharacter(it.characteristics) }
+        .map { it.maxEncumbrance }
         .distinctUntilChanged()
 
     val totalEncumbrance: Flow<Encumbrance?> =

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

@@ -7,6 +7,7 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.Ambitions
 import cz.frantisekmasa.wfrp_master.common.core.domain.Money
 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.domain.trappings.Encumbrance
 import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable
 import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize
 import cz.frantisekmasa.wfrp_master.common.encounters.domain.Wounds
@@ -40,6 +41,7 @@ data class Character(
     val note: String = "",
     @SerialName("hardyTalent") val hasHardyTalent: Boolean = false,
     val woundsModifiers: WoundsModifiers = WoundsModifiers(),
+    val encumbranceBonus: Encumbrance = Encumbrance.Zero,
     @SerialName("archived") val isArchived: Boolean = false,
     val avatarUrl: String? = null,
     val money: Money = Money.zero(),
@@ -53,6 +55,9 @@ data class Character(
         calculateMaxWounds(size ?: race?.size, points, hasHardyTalent, woundsModifiers, characteristics),
     )
 
+    val maxEncumbrance: Encumbrance
+        get() = Encumbrance.maximumForCharacter(characteristics) + encumbranceBonus
+
     init {
         require(userId == null || type == CharacterType.PLAYER_CHARACTER) {
             "Only Player Characters can have associated user"
@@ -141,6 +146,10 @@ data class Character(
         )
     }
 
+    fun modifyEncumbranceBonus(bonus: Encumbrance): Character {
+        return copy(encumbranceBonus = bonus)
+    }
+
     fun updateCareer(
         careerName: String,
         socialClass: String,

firebase/firestore.rules

@@ -438,7 +438,8 @@ service cloud.firestore {
                             "avatarUrl",
                             "archived",
                             "woundsModifiers",
-                            "compendiumCareer"
+                            "compendiumCareer",
+                            "encumbranceBonus"
                         ].hasAll(character.keys())
                         && character.id == characterId
                         && (
@@ -511,7 +512,10 @@ service cloud.firestore {
                             character.compendiumCareer.keys().toSet() == ["careerId", "levelId"].toSet() &&
                             character.compendiumCareer.careerId is string && isValidUuid(character.compendiumCareer.careerId) &&
                             character.compendiumCareer.levelId is string && isValidUuid(character.compendiumCareer.levelId)
-                        ));
+                        ))
+                        && (! ("encumbranceBonus" in character) ||
+                            (character.encumbranceBonus is number && character.encumbranceBonus >= 0)
+                    );
                 }
             }