Replace current/max stats with base/advances characteritistcs

fmasa · fmasa · commit c4ec5e836404 · 2020-08-08T11:32:16.000+02:00
diff --git a/app/src/main/java/cz/muni/fi/rpg/model/domain/character/Character.kt b/app/src/main/java/cz/muni/fi/rpg/model/domain/character/Character.kt
@@ -1,5 +1,6 @@
 package cz.muni.fi.rpg.model.domain.character
 
+import com.fasterxml.jackson.annotation.JsonAlias
 import cz.muni.fi.rpg.model.domain.common.Ambitions
 import cz.muni.fi.rpg.model.domain.common.Money
 import java.lang.IllegalArgumentException
@@ -12,8 +13,9 @@ data class Character(
     private var psychology: String,
     private var motivation: String,
     private var race: Race,
-    private var stats: Stats,
-    private var maxStats: Stats,
+    @JsonAlias("stats") // TODO: Remove alias in 1.10
+    private var characteristicsBase: Stats,
+    private var characteristicsAdvances: Stats = Stats(0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
     private var points: Points,
     private var ambitions: Ambitions = Ambitions("", ""),
     private var mutation: String = "",
@@ -48,8 +50,8 @@ data class Character(
         career: String,
         socialClass: String,
         race: Race,
-        stats: Stats,
-        maxStats: Stats,
+        characteristicsBase: Stats,
+        characteristicsAdvances: Stats,
         maxWounds: Int,
         psychology: String,
         motivation: String,
@@ -60,7 +62,6 @@ data class Character(
         require(name.length <= NAME_MAX_LENGTH) { "Character name is too long" }
         require(career.length <= CAREER_MAX_LENGTH) { "Career is too long" }
         require(socialClass.length <= SOCIAL_CLASS_MAX_LENGTH) { "Social class is too long" }
-        require(stats.allLowerOrEqualTo(maxStats)) { "Stats cannot be larger than max stats" }
         require(psychology.length <= PSYCHOLOGY_MAX_LENGTH) { "Psychology is too long" }
         require(motivation.length <= MOTIVATION_MAX_LENGTH) { "Motivation is too long" }
         require(note.length <= NOTE_MAX_LENGTH) { "Note is too long" }
@@ -70,9 +71,9 @@ data class Character(
         this.career = career
         this.socialClass = socialClass
         this.race = race
-        this.stats = stats
-        this.maxStats = maxStats
-        points = points.withMaxWounds(maxWounds, if (hardyTalent) stats.getToughnessBonus() else 0)
+        this.characteristicsBase = characteristicsBase
+        this.characteristicsAdvances = characteristicsAdvances
+        points = points.withMaxWounds(maxWounds, if (hardyTalent) getCharacteristics().getToughnessBonus() else 0)
         this.psychology = psychology
         this.motivation = motivation
         this.note = note
@@ -107,15 +108,16 @@ data class Character(
     fun updatePoints(newPoints: Points) {
         require(
             (!hardyTalent && newPoints.hardyWoundsBonus == 0) ||
-            (hardyTalent && newPoints.hardyWoundsBonus == stats.getToughnessBonus())
+            (hardyTalent && newPoints.hardyWoundsBonus == getCharacteristics().getToughnessBonus())
         ) { "Hardy talent and wounds bonus are wrong" }
         points = newPoints
     }
 
     fun getPoints(): Points = points
 
-    fun getStats(): Stats = stats
-    fun getMaxStats(): Stats = maxStats
+    fun getCharacteristics(): Stats = characteristicsBase + characteristicsAdvances
+    fun getCharacteristicsBase() = characteristicsBase
+    fun getCharacteristicsAdvances() = characteristicsAdvances
 
     fun updateAmbitions(ambitions: Ambitions) {
         this.ambitions = ambitions
diff --git a/app/src/main/java/cz/muni/fi/rpg/model/domain/character/Stats.kt b/app/src/main/java/cz/muni/fi/rpg/model/domain/character/Stats.kt
@@ -25,22 +25,22 @@ data class Stats(
                 intelligence,
                 willPower,
                 fellowship
-            ).all { it in 0..100 }
+            ).all { it >= 0 }
         )
     }
 
-    fun allLowerOrEqualTo(other: Stats): Boolean {
-        return weaponSkill <= other.weaponSkill
-                && dexterity <= other.dexterity
-                && ballisticSkill <= other.ballisticSkill
-                && strength <= other.strength
-                && toughness <= other.toughness
-                && agility <= other.agility
-                && intelligence <= other.intelligence
-                && initiative <= other.initiative
-                && willPower <= other.willPower
-                && fellowship <= other.fellowship
-    }
+    operator fun plus(other: Stats) = Stats(
+        weaponSkill = weaponSkill + other.weaponSkill,
+        dexterity = dexterity + other.dexterity,
+        ballisticSkill = ballisticSkill + other.ballisticSkill,
+        strength = strength + other.strength,
+        toughness = toughness + other.toughness,
+        agility = agility + other.agility,
+        intelligence = intelligence + other.intelligence,
+        initiative = initiative + other.initiative,
+        willPower = willPower + other.willPower,
+        fellowship = fellowship + other.fellowship
+    )
 
     fun getToughnessBonus() = toughness / 10
 }
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/character/CharacterStatsFragment.kt b/app/src/main/java/cz/muni/fi/rpg/ui/character/CharacterStatsFragment.kt
@@ -9,6 +9,7 @@ import androidx.lifecycle.observe
 import cz.muni.fi.rpg.R
 import cz.muni.fi.rpg.model.domain.character.CharacterId
 import cz.muni.fi.rpg.model.domain.character.Points
+import cz.muni.fi.rpg.model.map
 import cz.muni.fi.rpg.model.right
 import cz.muni.fi.rpg.ui.common.parcelableArgument
 import cz.muni.fi.rpg.ui.views.CharacterPoint
@@ -40,7 +41,9 @@ class CharacterStatsFragment : Fragment(R.layout.fragment_character_stats),
     }
 
     private fun bindStats() {
-        Transformations.map(viewModel.character.right()) { character -> character.getStats() }
+        viewModel.character
+            .right()
+            .map { character -> character.getCharacteristics() }
             .observe(viewLifecycleOwner) { statsTable.setValue(it) }
     }
 
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/character/edit/CharacterEditFragment.kt b/app/src/main/java/cz/muni/fi/rpg/ui/character/edit/CharacterEditFragment.kt
@@ -106,7 +106,7 @@ class CharacterEditFragment(
 
     private suspend fun updateCharacter(
         info: CharacterInfoFormFragment.Data,
-        statsData: CharacterStatsFormFragment.Data,
+        statsData: CharacterStatsFormFragment.CharacteristicsData,
         maxWounds: Int,
         hardyTalent: Boolean
     ) {
@@ -117,8 +117,8 @@ class CharacterEditFragment(
             career = info.career,
             socialClass = info.socialClass,
             race = info.race,
-            stats = statsData.stats,
-            maxStats = statsData.maxStats,
+            characteristicsBase = statsData.base,
+            characteristicsAdvances = statsData.advances,
             maxWounds = maxWounds,
             psychology = info.psychology,
             motivation = info.motivation,
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/character/skills/CharacterSkillsFragment.kt b/app/src/main/java/cz/muni/fi/rpg/ui/character/skills/CharacterSkillsFragment.kt
@@ -53,7 +53,7 @@ class CharacterSkillsFragment : Fragment(R.layout.fragment_character_skills),
         CombinedLiveData(viewModel.skills, characterVm.character.right())
             .observe(viewLifecycleOwner) { pair ->
                 val skills = pair.first
-                val stats = pair.second.getStats()
+                val stats = pair.second.getCharacteristics()
 
                 adapter.submitList(
                     skills
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/characterCreation/CharacterCreationFragment.kt b/app/src/main/java/cz/muni/fi/rpg/ui/characterCreation/CharacterCreationFragment.kt
@@ -46,7 +46,7 @@ class CharacterCreationFragment(
     private var currentFragmentIndex = 0
 
     private var characterInfo: CharacterInfoFormFragment.Data? = null
-    private var characterStatsData: CharacterStatsFormFragment.Data? = null
+    private var characterStatsData: CharacterStatsFormFragment.CharacteristicsData? = null
 
     override fun onStart() {
         super.onStart()
@@ -139,7 +139,7 @@ class CharacterCreationFragment(
 
     private fun saveCharacter(
         info: CharacterInfoFormFragment.Data,
-        statsData: CharacterStatsFormFragment.Data,
+        statsData: CharacterStatsFormFragment.CharacteristicsData,
         points: Points
     ) {
         launch {
@@ -153,8 +153,8 @@ class CharacterCreationFragment(
                     career = info.career,
                     socialClass = info.socialClass,
                     race = info.race,
-                    stats = statsData.stats,
-                    maxStats = statsData.maxStats,
+                    characteristicsBase = statsData.base,
+                    characteristicsAdvances = statsData.advances,
                     points = points,
                     psychology = info.psychology,
                     motivation = info.motivation,
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/characterCreation/CharacterStatsFormFragment.kt b/app/src/main/java/cz/muni/fi/rpg/ui/characterCreation/CharacterStatsFormFragment.kt
@@ -9,11 +9,11 @@ import cz.muni.fi.rpg.ui.common.forms.Form
 import kotlinx.android.synthetic.main.fragment_character_stats_form.*
 
 class CharacterStatsFormFragment :
-    CharacterFormStep<CharacterStatsFormFragment.Data>(R.layout.fragment_character_stats_form) {
+    CharacterFormStep<CharacterStatsFormFragment.CharacteristicsData>(R.layout.fragment_character_stats_form) {
 
-    data class Data(
-        val stats: Stats,
-        val maxStats: Stats
+    data class CharacteristicsData(
+        val base: Stats,
+        val advances: Stats
     )
 
     var character: Character? = null
@@ -53,24 +53,19 @@ class CharacterStatsFormFragment :
                 setShowErrorInEditText()
                 addLiveRule(R.string.error_required) { !it.isNullOrBlank() }
                 addLiveRule(R.string.error_value_over_100) { it.toString().toInt() <= 100 }
-                addLiveRule(R.string.error_value_over_max) {
-                    val maxValue = entry.value.getValue().toIntOrNull()
-
-                    maxValue == null || it.toString().toInt() <= maxValue
-                }
             }
         }
 
         setDefaultValues()
     }
 
-    override fun submit(): Data? {
+    override fun submit(): CharacteristicsData? {
         if (!form.validate()) {
             return null
         }
 
-        return Data(
-            stats = Stats(
+        return CharacteristicsData(
+            base = Stats(
                 agility = agilityInput.getValue().toInt(),
                 ballisticSkill = ballisticSkillInput.getValue().toInt(),
                 dexterity = dexterityInput.getValue().toInt(),
@@ -82,7 +77,7 @@ class CharacterStatsFormFragment :
                 weaponSkill = weaponSkillInput.getValue().toInt(),
                 willPower = willPowerInput.getValue().toInt()
             ),
-            maxStats = Stats(
+            advances = Stats(
                 agility = maxAgilityInput.getValue().toInt(),
                 ballisticSkill = maxBallisticSkillInput.getValue().toInt(),
                 dexterity = maxDexterityInput.getValue().toInt(),
@@ -122,8 +117,8 @@ class CharacterStatsFormFragment :
             val currentInput = entry.key.first
             val maxInput = entry.key.second
 
-            currentInput.setDefaultValue(entry.value(character.getStats()).toString(), force = true)
-            maxInput.setDefaultValue(entry.value(character.getMaxStats()).toString(), force = true)
+            currentInput.setDefaultValue(entry.value(character.getCharacteristicsBase()).toString(), force = true)
+            maxInput.setDefaultValue(entry.value(character.getCharacteristicsAdvances()).toString(), force = true)
         }
     }
 }
diff --git a/app/src/main/res/layout/fragment_character_stats_form.xml b/app/src/main/res/layout/fragment_character_stats_form.xml
@@ -10,19 +10,17 @@
 
     <TextView
         android:id="@+id/currentLabel"
-        style="@style/InputLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/label_current"
+        android:text="@string/label_base"
         app:layout_constraintEnd_toEndOf="@id/weaponSkillInput"
         app:layout_constraintStart_toStartOf="@id/weaponSkillInput"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        style="@style/InputLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/label_max"
+        android:text="@string/label_advances"
         app:layout_constraintEnd_toEndOf="@id/maxWeaponSkillInput"
         app:layout_constraintStart_toStartOf="@id/maxWeaponSkillInput"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -183,8 +183,8 @@
     <string name="title_misc">Misc</string>
     <string name="spell_casting_number_shortcut">CN</string>
     <string name="title_character_creation_points">Point pools</string>
-    <string name="label_current">Current</string>
-    <string name="label_max">Max</string>
+    <string name="label_base">Base</string>
+    <string name="label_advances">Advances</string>
     <string name="label_checkbox_single_player">Create Single-Player Party</string>
 
     <string name="description_character_point_down">Decrease points amount by 1</string>
diff --git a/app/src/test/java/cz/muni/fi/rpg/model/domain/character/CharacterTest.kt b/app/src/test/java/cz/muni/fi/rpg/model/domain/character/CharacterTest.kt
@@ -25,8 +25,8 @@ class CharacterTest {
             getCareer(),
             getSocialClass(),
             Race.DWARF,
-            getStats(),
-            getMaxStats(),
+            getCharacteristicsBase(),
+            getCharacteristicsAdvances(),
             getPoints().maxWounds,
             getPsychology(),
             getMotivation(),
diff --git a/firebase/firestore.rules b/firebase/firestore.rules
@@ -173,6 +173,8 @@ service cloud.firestore {
                             "points",
                             "race",
                             "stats",
+                            "characteristicsBase",
+                            "characteristicsAdvances",
                             "maxStats",
                             "userId",
                             "money",
@@ -192,8 +194,10 @@ service cloud.firestore {
                         && character.socialClass is string && isNotBlank(character.socialClass) && character.socialClass.size() <= 50
                         && character.race is string && character.race in ["HUMAN", "HIGH_ELF", "DWARF", "HALFLING", "WOOD_ELF", "GNOME"]
                         && arePointsValid(character.points)
-                        && areStatsValid(character.stats)
-                        && areStatsValid(character.maxStats)
+                        && ("stats" in character || "characteristicsBase" in character)
+                        && (! ("stats" in character) || areStatsValid(character.stats))
+                        && (! ("characteristicsBase" in character) || areStatsValid(character.characteristicsBase))
+                        && (! ("characteristicsAdvances" in character) || areStatsValid(character.characteristicsAdvances))
                         && areMoneyValid(character.money)
                         && areAmbitionsValid(character.ambitions)
                         && character.note is string && character.note.size() <= 400
diff --git a/firebase/tests/Parties.ts b/firebase/tests/Parties.ts
@@ -3,6 +3,7 @@ import {Suite} from "./Suite";
 import * as firebase from "@firebase/testing";
 import {uuid} from "uuidv4";
 import {withoutField} from "./utils";
+import {Character} from "../api";
 
 @suite
 class Parties extends Suite {
@@ -242,6 +243,10 @@ class Parties extends Suite {
         const data = this.validCharacter(userId);
 
         for (const field of Object.keys(data)) {
+            if (field == "maxStats") {
+                continue;  // maxStats are not used anymore and are there only for BC (TODO: Remove in 1.10)
+            }
+
             const newData = {...data};
 
             delete newData[field];
@@ -391,6 +396,14 @@ class Parties extends Suite {
         await firebase.assertSucceeds(
             document.update("points", {...this.validCharacter(userId).points, hardyWoundsBonus: 3})
         );
+
+        const character = (await document.get()).data() as Character;
+
+        await firebase.assertSucceeds(document.update({
+            characteristicsBase: character.stats,
+            characteristicsAdvances: character.stats,
+            ...withoutField(character, "stats")
+        }));
     }
 
     @test
