curiosite/DnDApplication
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Speed alteration management.

Browse source
This commit is contained in:
Thomas Andres Gomez 2024-01-05 16:47:08 +01:00
parent c8e7fee2c2
commit a73a352004
4 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/com/pixelized/rplexicon/data/model/Property.kt
View file

@ -5,6 +5,7 @@ enum class Property(val key: String) {
LEVEL("Niveau"), LEVEL("Niveau"),
HIT_POINT("Point de vie"), HIT_POINT("Point de vie"),
ARMOR_CLASS("Classe d'armure"), ARMOR_CLASS("Classe d'armure"),
SPEED("Vitesse"),
INITIATIVE("Initiative"), INITIATIVE("Initiative"),
STRENGTH("Force"), STRENGTH("Force"),
DEXTERITY("Dextérité"), DEXTERITY("Dextérité"),

2
app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/CharacterSheetUioFactory.kt
View file

@ -281,7 +281,7 @@ class CharacterSheetUioFactory @Inject constructor() {
), ),
speed = LabelPointUio( speed = LabelPointUio(
label = R.string.character_sheet_title_speed, label = R.string.character_sheet_title_speed,
value = "${sheet.speed}m", value = "${max(sheet.speed + status[Property.SPEED].sum, 0)}m",
), ),
masteries = MasteriesUio( masteries = MasteriesUio(
martial = sheet.martial, martial = sheet.martial,

2
app/src/main/java/com/pixelized/rplexicon/ui/screens/character/pages/actions/HeaderViewModel.kt
View file

@ -72,7 +72,6 @@ class HeaderViewModel @Inject constructor(
hpMax = sheet.hitPoint + status[Property.HIT_POINT].sum, hpMax = sheet.hitPoint + status[Property.HIT_POINT].sum,
characterClass = sheet.characterClass.firstOrNull(), characterClass = sheet.characterClass.firstOrNull(),
initiative = (sheet.dexterity + status[Property.DEXTERITY].sum).modifier + status[Property.INITIATIVE].sum, initiative = (sheet.dexterity + status[Property.DEXTERITY].sum).modifier + status[Property.INITIATIVE].sum,
speed = sheet.speed,
ca = sheet.armorClass + status[Property.ARMOR_CLASS].sum, ca = sheet.armorClass + status[Property.ARMOR_CLASS].sum,
dc = sheet.dC, dc = sheet.dC,
) )
@ -178,7 +177,6 @@ class HeaderViewModel @Inject constructor(
val hpMax: Int, val hpMax: Int,
val characterClass: CharacterSheet.Class?, val characterClass: CharacterSheet.Class?,
val initiative: Int, val initiative: Int,
val speed: Int,
val ca: Int, val ca: Int,
val dc: Int?, val dc: Int?,
) )

2
app/src/main/java/com/pixelized/rplexicon/ui/screens/summary/pages/statistic/SummaryFactory.kt
View file

@ -208,7 +208,7 @@ class SummaryFactory @Inject constructor(
label = (dexterity.modifier + status[Property.INITIATIVE].sum).toLabel() label = (dexterity.modifier + status[Property.INITIATIVE].sum).toLabel()
) )
val speed = label( val speed = label(
label = "${sheet.speed}m", label = "${max(sheet.speed + status[Property.SPEED].sum, 0)}m",
) )
withContext(Dispatchers.Main) { withContext(Dispatchers.Main) {
attributes.hp.get(sheet)?.value = hitPoint attributes.hp.get(sheet)?.value = hitPoint