Merge pull request #99 from fmasa/uia-qualities

New weapon Qualities and Flaws from Up in Arms

Author: fmasa

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/combat/TrappingFeatureList.kt

@@ -44,6 +44,14 @@ fun <T : TrappingFeature> translateFeatures(
 ): List<String> {
     return features.map { (feature, rating) ->
         val name = feature.nameResolver(strings)
-        if (feature.hasRating) "$name $rating" else name
+
+        if (!feature.hasRating) {
+            return@map name
+        }
+
+        val ratingUnit = feature.ratingUnit
+        val formattedRating = if (ratingUnit != null) "($rating$ratingUnit)" else rating.toString()
+
+        "$name $formattedRating"
     }
 }

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/TrappingFeature.kt

@@ -5,4 +5,5 @@ import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable
 
 interface TrappingFeature : NamedEnum, Parcelable {
     val hasRating: Boolean
+    val ratingUnit: String? get() = null
 }

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponFlaw.kt

@@ -15,5 +15,6 @@ enum class WeaponFlaw(
     RELOAD({ it.weapons.flaws.reload }, hasRating = true),
     SLOW({ it.weapons.flaws.slow }),
     TIRING({ it.weapons.flaws.tiring }),
+    UNBALANCED({ it.weapons.flaws.unbalanced }), // Up in Arms
     UNDAMAGING({ it.weapons.flaws.undamaging }),
 }

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponQuality.kt

@@ -9,6 +9,7 @@ import cz.frantisekmasa.wfrp_master.common.localization.Strings
 enum class WeaponQuality(
     override val nameResolver: (strings: Strings) -> String,
     override val hasRating: Boolean = false,
+    override val ratingUnit: String? = null,
 ) : Quality {
     ACCURATE({ it.weapons.qualities.accurate }),
     BLACKPOWDER({ it.weapons.qualities.blackpowder }),
@@ -27,6 +28,9 @@ enum class WeaponQuality(
     PUMMEL({ it.weapons.qualities.pummel }),
     REPEATER({ it.weapons.qualities.repeater }, hasRating = true),
     SHIELD({ it.weapons.qualities.shield }, hasRating = true),
+    SLASH({ it.weapons.qualities.slash }, hasRating = true, ratingUnit = "A"), // Up in Arms
+    SPREAD({ it.weapons.qualities.spread }, hasRating = true), // Up in Arms
+    TRIP({ it.weapons.qualities.trip }), // Up in Arms
     TRAP_BLADE({ it.weapons.qualities.trapBlade }),
     UNBREAKABLE({ it.weapons.qualities.unbreakable }),
     WRAP({ it.weapons.qualities.wrap }),

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/localization/Strings.kt

@@ -668,6 +668,7 @@ data class WeaponFlawStrings(
     val reload: String = "Reload",
     val slow: String = "Slow",
     val tiring: String = "Tiring",
+    val unbalanced: String = "Unbalanced",
     val undamaging: String = "Undamaging",
 )
 
@@ -702,7 +703,10 @@ data class WeaponQualityStrings(
     val pummel: String = "Pummel",
     val repeater: String = "Repeater",
     val shield: String = "Shield",
+    val slash: String = "Slash",
+    val spread: String = "Spread",
     val trapBlade: String = "Trap Blade",
+    val trip: String = "Trip",
     val unbreakable: String = "Unbreakable",
     val wrap: String = "Wrap",
 )