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

Change the behavior of the dice

Browse source
This commit is contained in:
Thomas Andres Gomez 2023-12-17 15:25:26 +01:00
parent bb0e10c1ad
commit 2c6fc19a2c
6 changed files with 61 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

47
app/src/main/java/com/pixelized/rplexicon/business/DiceThrowUseCase.kt
View file

@ -613,25 +613,25 @@ class DiceThrowUseCase @Inject constructor(
)
} ?: emptyList()
// compute the final roll result
val rollResult = when (result.value) {
1, 20 -> "${result.value}"
else -> "${allValue.sum()}"
}
// build the result.
return DiceThrowResult(
dice = RollDiceUio(
isCriticalSuccess = result.value == 20,
isCriticalFailure = result.value == 1,
result = "${result.value}",
result = rollResult,
),
card = ThrowsCardUio(
title = abilityTitleString.uppercase(),
highlight = abilityLabelString.uppercase(),
dice = R.drawable.ic_d20_24,
roll = allValue.toLabel(),
result = "${
when (result.value) {
20 -> 20
1 -> 1
else -> allValue.sum()
}
}",
result = rollResult,
isCriticalSuccess = result.value == 20,
isCriticalFailure = result.value == 1,
details = listOf(
@ -718,13 +718,20 @@ class DiceThrowUseCase @Inject constructor(
)
} ?: emptyList()
// compute the final roll result
val rollResult = when {
canMakeCriticalRoll && result.value == 20 -> "20"
canMakeCriticalRoll && result.value == 1 -> "1"
else -> "${allValue.sum()}"
}
// build the result.
return DiceThrowResult(
dice = RollDiceUio(
icon = diceThrow?.faces?.icon ?: R.drawable.ic_d20_24,
isCriticalSuccess = canMakeCriticalRoll && result.value == 20,
isCriticalFailure = canMakeCriticalRoll && result.value == 1,
result = "${result.value}",
result = rollResult,
),
card = ThrowsCardUio(
title = titleString.uppercase(),
@ -733,13 +740,7 @@ class DiceThrowUseCase @Inject constructor(
isCriticalSuccess = canMakeCriticalRoll && result.value == 20,
isCriticalFailure = canMakeCriticalRoll && result.value == 1,
roll = allValue.toLabel(),
result = "${
when {
canMakeCriticalRoll && result.value == 20 -> 20
canMakeCriticalRoll && result.value == 1 -> 1
else -> allValue.sum()
}
}",
result = rollResult,
details = listOf(
ThrowsCardUio.Detail(
title = action,
@ -799,18 +800,21 @@ class DiceThrowUseCase @Inject constructor(
// fetch and build the associated characteristic
val relatedStatBonus = spell?.effect.statBonus(name = spellName)
// compute the final roll result
val rollResult = "${allValue.sum()}"
// build the result.
return DiceThrowResult(
dice = RollDiceUio(
icon = (spell?.effect?.faces ?: 4).icon,
result = "${result.value}",
result = rollResult,
),
card = ThrowsCardUio(
title = titleString.uppercase(),
highlight = spellName,
dice = (spell?.effect?.faces ?: 4).icon,
roll = allValue.toLabel(),
result = "${allValue.sum()}",
result = rollResult,
details = listOf(
ThrowsCardUio.Detail(
title = spellName,
@ -852,18 +856,21 @@ class DiceThrowUseCase @Inject constructor(
// fetch and build the associated characteristic, proficiency or level
val relatedStatBonus = skill?.effect.statBonus(name = skill?.name)
// compute the final roll result
val rollResult = "${allValue.sum()}"
// build the result.
return DiceThrowResult(
dice = RollDiceUio(
icon = (skill?.effect?.faces ?: 4).icon,
result = "${result.value}",
result = rollResult,
),
card = ThrowsCardUio(
title = titleString.uppercase(),
highlight = spellName,
dice = (skill?.effect?.faces ?: 4).icon,
roll = allValue.toLabel(),
result = "${allValue.sum()}",
result = rollResult,
details = listOf(
ThrowsCardUio.Detail(
title = spellName,