Add Object / Spell alterations.

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

@@ -426,8 +426,8 @@ class DiceThrowUseCase @Inject constructor(
                         action = diceThrow.item,
                         diceThrow = action?.effect,
                         title = { getString(R.string.dice_roll_use_object, it) },
-                        alterations = emptyList(),
+                        alterations = alterations,
-                        ability = null,
+                        ability = Property.OBJECT_EFFECT,
                     )
                 }
 
@@ -702,10 +702,10 @@ class DiceThrowUseCase @Inject constructor(
                 }
             } else {
                 diceThrow?.amount
-            } ?: 1
+            }
             // main roll
             val result = roll(
-                amount = amount,
+                amount = amount ?: 1,
                 faces = diceThrow?.faces ?: 20,
                 advantage = advantage,
                 disadvantage = disadvantage,
@@ -785,10 +785,16 @@ class DiceThrowUseCase @Inject constructor(
             val spellName = spell?.spell?.name ?: ""
             val titleString = application.getString(R.string.dice_roll_spell_cast, spellName)
 
+            val advantage = status[Property.SPELL_EFFECT].advantage
+            val disadvantage = status[Property.SPELL_EFFECT].disadvantage
             // main roll
             val result = roll(
                 amount = spell?.effect?.amount ?: 1,
                 faces = spell?.effect?.faces ?: 4,
+                advantage = advantage,
+                disadvantage = disadvantage,
+                fail = status[Property.SPELL_EFFECT].fail,
+                critical = status[Property.SPELL_EFFECT].critical,
             )
 
             // fetch and build a list of additionnal level effect.
@@ -797,12 +803,18 @@ class DiceThrowUseCase @Inject constructor(
                     val localRoll = roll(
                         amount = spell.level.amount,
                         faces = spell.level.faces,
+                        advantage = advantage,
+                        disadvantage = disadvantage,
+                        fail = status[Property.SPELL_EFFECT].fail,
+                        critical = status[Property.SPELL_EFFECT].critical,
                     )
                     ThrowsCardUio.Detail(
                         title = application.getString(R.string.spell_level_chooser_label, "$it"),
                         throws = ThrowsCardUio.Throw(
                             dice = spell.level.faces.icon,
                             roll = "${spell.level.amount}d${spell.level.faces}",
+                            advantage = advantage,
+                            disadvantage = disadvantage,
                             result = localRoll.label,
                         ),
                         result = "${localRoll.value}",
@@ -836,6 +848,8 @@ class DiceThrowUseCase @Inject constructor(
                             throws = ThrowsCardUio.Throw(
                                 dice = (spell?.effect?.faces ?: 4).icon,
                                 roll = "${spell?.effect?.amount ?: 1}d${spell?.effect?.faces ?: 4}",
+                                advantage = advantage,
+                                disadvantage = disadvantage,
                                 result = result.label,
                             ),
                             result = "${result.value}",
@@ -856,10 +870,16 @@ class DiceThrowUseCase @Inject constructor(
             val spellName = skill?.name
             val titleString = application.getString(R.string.dice_roll_spell_cast, spellName)
 
+            val advantage = status[Property.SKILL].advantage
+            val disadvantage = status[Property.SKILL].disadvantage
             // main roll
             val result = roll(
                 amount = skill?.effect?.amount ?: 1,
                 faces = skill?.effect?.faces ?: 4,
+                advantage = advantage,
+                disadvantage = disadvantage,
+                fail = status[Property.SKILL].fail,
+                critical = status[Property.SKILL].critical,
             )
 
             // fetch and build a list of dice roll base on alterations.
@@ -892,6 +912,8 @@ class DiceThrowUseCase @Inject constructor(
                             throws = ThrowsCardUio.Throw(
                                 dice = (skill?.effect?.faces ?: 4).icon,
                                 roll = "${skill?.effect?.amount ?: 1}d${skill?.effect?.faces ?: 4}",
+                                advantage = advantage,
+                                disadvantage = disadvantage,
                                 result = result.label,
                             ),
                             result = "${result.value}",

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

@@ -50,4 +50,6 @@ enum class Property(val key: String) {
     PHYSICAL_RANGE_DAMAGE("Dommage physique à distance"),
     SPELL_ATTACK("Attaque sortilège"),
     SPELL_DAMAGE("Dommage sortilège"),
+    SPELL_EFFECT("Effet des objects"),
+    OBJECT_EFFECT("Effet des sortilège")
 }

app/src/main/java/com/pixelized/rplexicon/ui/screens/rolls/composable/ThrowsCard.kt

@@ -225,8 +225,8 @@ private fun ThrowsRollDetail(
                     .align(alignment = Alignment.Bottom)
                     .padding(bottom = 2.dp),
                 tint = when {
-                    it.advantage -> MaterialTheme.colorScheme.primary
+                    it.advantage && !it.disadvantage -> MaterialTheme.colorScheme.primary
-                    it.disadvantage -> Color.Red
+                    it.disadvantage && !it.advantage -> Color.Red
                     else -> MaterialTheme.colorScheme.onSurface
                 },
                 painter = painterResource(id = it.dice),

app/src/main/java/com/pixelized/rplexicon/ui/screens/rolls/factory/AlterationFactory.kt

@@ -117,7 +117,7 @@ class AlterationFactory @Inject constructor(
                     character = diceThrow.character,
                     spell = diceThrow.spell,
                 )
-                spell?.effect?.modifier ?: emptyList()
+                listOf(Property.SPELL_EFFECT) + (spell?.effect?.modifier ?: emptyList())
             }
 
             is DiceThrow.Skill -> {
@@ -128,7 +128,7 @@ class AlterationFactory @Inject constructor(
                 listOf(Property.SKILL) + (skill?.effect?.modifier ?: emptyList())
             }
 
-            is DiceThrow.Object -> emptyList()
+            is DiceThrow.Object -> listOf(Property.OBJECT_EFFECT)
         }
 
         return alterationRepository