diff --git a/app/src/main/java/com/pixelized/rplexicon/data/model/Property.kt b/app/src/main/java/com/pixelized/rplexicon/data/model/Property.kt index 8056ddd..d942d38 100644 --- a/app/src/main/java/com/pixelized/rplexicon/data/model/Property.kt +++ b/app/src/main/java/com/pixelized/rplexicon/data/model/Property.kt @@ -5,6 +5,7 @@ enum class Property(val key: String) { LEVEL("Niveau"), HIT_POINT("Point de vie"), ARMOR_CLASS("Classe d'armure"), + SPEED("Vitesse"), INITIATIVE("Initiative"), STRENGTH("Force"), DEXTERITY("Dextérité"), diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/CharacterSheetUioFactory.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/CharacterSheetUioFactory.kt index 870d291..79892bc 100644 --- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/CharacterSheetUioFactory.kt +++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/CharacterSheetUioFactory.kt @@ -281,7 +281,7 @@ class CharacterSheetUioFactory @Inject constructor() { ), speed = LabelPointUio( label = R.string.character_sheet_title_speed, - value = "${sheet.speed}m", + value = "${max(sheet.speed + status[Property.SPEED].sum, 0)}m", ), masteries = MasteriesUio( martial = sheet.martial, diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/pages/actions/HeaderViewModel.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/pages/actions/HeaderViewModel.kt index 2c12bbe..3a3dc94 100644 --- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/pages/actions/HeaderViewModel.kt +++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/pages/actions/HeaderViewModel.kt @@ -72,7 +72,6 @@ class HeaderViewModel @Inject constructor( hpMax = sheet.hitPoint + status[Property.HIT_POINT].sum, characterClass = sheet.characterClass.firstOrNull(), initiative = (sheet.dexterity + status[Property.DEXTERITY].sum).modifier + status[Property.INITIATIVE].sum, - speed = sheet.speed, ca = sheet.armorClass + status[Property.ARMOR_CLASS].sum, dc = sheet.dC, ) @@ -178,7 +177,6 @@ class HeaderViewModel @Inject constructor( val hpMax: Int, val characterClass: CharacterSheet.Class?, val initiative: Int, - val speed: Int, val ca: Int, val dc: Int?, ) diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/pages/statistic/SummaryFactory.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/pages/statistic/SummaryFactory.kt index 12abb08..c69a7bb 100644 --- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/pages/statistic/SummaryFactory.kt +++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/pages/statistic/SummaryFactory.kt @@ -208,7 +208,7 @@ class SummaryFactory @Inject constructor( label = (dexterity.modifier + status[Property.INITIATIVE].sum).toLabel() ) val speed = label( - label = "${sheet.speed}m", + label = "${max(sheet.speed + status[Property.SPEED].sum, 0)}m", ) withContext(Dispatchers.Main) { attributes.hp.get(sheet)?.value = hitPoint