Merge branch 'feat/cn-0' into 'master'

Allow filling in CN 0 in Spell forms

See merge request fmasa/wfrp-master!252

Author: fmasa

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/spells/dialog/NonCompendiumSpellForm.kt

@@ -122,7 +122,7 @@ private class NonCompendiumSpellFormData(
             duration = inputValue(item?.duration ?: ""),
             castingNumber = inputValue(
                 item?.castingNumber?.toString() ?: "",
-                Rules.PositiveInteger(),
+                Rules.NonNegativeInteger(),
             ),
             effect = inputValue(item?.effect ?: ""),
         )
@@ -135,7 +135,7 @@ private class NonCompendiumSpellFormData(
         range = range.value,
         target = target.value,
         duration = duration.value,
-        castingNumber = castingNumber.value.toInt(),
+        castingNumber = castingNumber.value.toUInt(),
         effect = effect.value,
     )
 

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Spell.kt

@@ -17,7 +17,7 @@ data class Spell(
     val range: String,
     val target: String,
     val duration: String,
-    val castingNumber: Int,
+    val castingNumber: UInt,
     val effect: String,
     val lore: String,
 ) : CompendiumItem<Spell>() {

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/grammars/SpellListGrammar.kt

@@ -33,7 +33,7 @@ class SpellListGrammar(private val loreName: String) : Grammar<List<Spell>>() {
         Spell(
             id = UUID.randomUUID(),
             name = cleanupName(parts[0]),
-            castingNumber = parts[1].toInt(),
+            castingNumber = parts[1].toUInt(),
             range = extractTextValue(range),
             target = extractTextValue(target),
             duration = extractTextValue(duration),

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/tabs/SpellCompendiumTab.kt

@@ -79,7 +79,10 @@ private data class SpellFormData(
             range = inputValue(item?.range ?: ""),
             target = inputValue(item?.target ?: ""),
             duration = inputValue(item?.duration ?: ""),
-            castingNumber = inputValue(item?.castingNumber?.toString() ?: "0", Rules.PositiveInteger()),
+            castingNumber = inputValue(
+                item?.castingNumber?.toString() ?: "0",
+                Rules.NonNegativeInteger(),
+            ),
             effect = inputValue(item?.effect ?: ""),
         )
     }
@@ -91,7 +94,7 @@ private data class SpellFormData(
         range = range.value,
         target = target.value,
         duration = duration.value,
-        castingNumber = castingNumber.value.toInt(),
+        castingNumber = castingNumber.value.toUInt(),
         effect = effect.value,
     )
 

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/spells/Spell.kt

@@ -20,13 +20,15 @@ data class Spell(
     val range: String,
     val target: String,
     val duration: String,
-    val castingNumber: Int,
+    val castingNumber: UInt,
     val effect: String,
     val memorized: Boolean = true, // TODO: Remove default value and migrate stored data
 ) : CharacterItem {
 
 
-    val effectiveCastingNumber: Int get() = if (memorized) castingNumber else castingNumber * 2
+    val effectiveCastingNumber: UInt get() = if (memorized)
+        castingNumber
+    else castingNumber * 2.toUInt()
 
     init {
         require(name.isNotBlank()) { "Name must not be blank" }

common/src/commonTest/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/grammars/SpellListGrammarTest.kt

@@ -56,7 +56,7 @@ class SpellListGrammarTest {
                 Spell(
                     id = result[0].id,
                     name = "Push ’em",
-                    castingNumber = 6,
+                    castingNumber = 6.toUInt(),
                     range = "You",
                     target = "You",
                     duration = "Instant",
@@ -73,7 +73,7 @@ class SpellListGrammarTest {
                 Spell(
                     id = result[1].id,
                     name = "Teleport",
-                    castingNumber = 5,
+                    castingNumber = 5.toUInt(),
                     range = "You",
                     target = "You",
                     duration = "Instant",
@@ -88,7 +88,7 @@ class SpellListGrammarTest {
                 Spell(
                     id = result[2].id,
                     name = "Terrifying",
-                    castingNumber = 7,
+                    castingNumber = 7.toUInt(),
                     range = "You",
                     target = "You",
                     duration = "Willpower Bonus Rounds",
@@ -98,7 +98,7 @@ class SpellListGrammarTest {
                 Spell(
                     id = result[3].id,
                     name = "Ward",
-                    castingNumber = 5,
+                    castingNumber = 5.toUInt(),
                     range = "You",
                     target = "You",
                     duration = "Willpower Bonus Rounds",