Merge branch 'feat/char-advances' into 'master'

Characteristics advances

Closes #52

See merge request fmasa/pv239-project!93

Author: fmasa

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

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
 }

app/src/main/java/cz/muni/fi/rpg/model/firestore/repositories/FirestoreCharacterRepository.kt

@@ -24,7 +24,7 @@ internal class FirestoreCharacterRepository(
         val data = mapper.toDocumentData(character)
 
         Timber.d("Saving character $data in party $partyId to firestore")
-        characters(partyId).document(character.userId).set(data, SetOptions.merge()).await()
+        characters(partyId).document(character.userId).set(data).await()
     }
 
     override suspend fun get(characterId: CharacterId): Character {

app/src/main/java/cz/muni/fi/rpg/model/utils.kt

@@ -2,10 +2,10 @@ package cz.muni.fi.rpg.model
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.Transformations
 import arrow.core.Either
 import java.util.*
 
-
 fun generateAccessCode(): String {
     // TODO: Replace with better strategy
     return UUID.randomUUID().toString()
@@ -17,4 +17,21 @@ fun <L, R> LiveData<Either<L, R>>.right(): LiveData<R> {
     mediator.addSource(this) { it.map(mediator::setValue) }
 
     return mediator
-}
+}
+
+
+fun <T> LiveData<T?>.notNull(): LiveData<T> {
+    val mediator = MediatorLiveData<T>()
+
+    mediator.addSource(this) {
+        if (it != null) {
+            mediator.value = it
+        }
+    }
+
+    return mediator
+}
+
+fun <X, Y> LiveData<X>.map(mapFunction: (X) -> Y) = Transformations.map(this, mapFunction)
+fun <T> LiveData<T>.distinctUntilChanged() = Transformations.distinctUntilChanged(this)
+fun <X, Y> LiveData<X>.switchMap(mapFunction: (X) -> LiveData<Y>) = Transformations.switchMap(this, mapFunction)

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,19 +41,10 @@ class CharacterStatsFragment : Fragment(R.layout.fragment_character_stats),
     }
 
     private fun bindStats() {
-        Transformations.map(viewModel.character.right()) { character -> character.getStats() }
-            .observe(viewLifecycleOwner) { stats ->
-                weaponSkill.value = stats.weaponSkill
-                ballisticSkill.value = stats.ballisticSkill
-                strength.value = stats.strength
-                toughness.value = stats.toughness
-                agility.value = stats.agility
-                intelligence.value = stats.intelligence
-                willPower.value = stats.willPower
-                fellowship.value = stats.fellowship
-                initiative.value = stats.initiative
-                dexterity.value = stats.dexterity
-            }
+        viewModel.character
+            .right()
+            .map { character -> character.getCharacteristics() }
+            .observe(viewLifecycleOwner) { statsTable.setValue(it) }
     }
 
     private fun bindPoints() {

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,

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

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,

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)
         }
     }
 }

app/src/main/java/cz/muni/fi/rpg/ui/views/StatsTable.kt

@@ -0,0 +1,32 @@
+package cz.muni.fi.rpg.ui.views
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.constraintlayout.widget.ConstraintLayout
+import cz.muni.fi.rpg.R
+import cz.muni.fi.rpg.model.domain.character.Stats
+import kotlinx.android.synthetic.main.view_stats_table.view.*
+
+class StatsTable : ConstraintLayout {
+    constructor(context: Context) : super(context)
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int)
+            : super(context, attrs, defStyleAttr)
+
+    init {
+        inflate(context, R.layout.view_stats_table, this)
+    }
+
+    fun setValue(stats: Stats) {
+        weaponSkill.value = stats.weaponSkill
+        ballisticSkill.value = stats.ballisticSkill
+        strength.value = stats.strength
+        toughness.value = stats.toughness
+        agility.value = stats.agility
+        intelligence.value = stats.intelligence
+        willPower.value = stats.willPower
+        fellowship.value = stats.fellowship
+        initiative.value = stats.initiative
+        dexterity.value = stats.dexterity
+    }
+}