4 files changed, 31 insertions(+), 24 deletions(-)

M app/src/main/java/com/github/nacabaro/vbhelper/components/CharacterEntry.kt
M app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/HomeScreenController.kt
M app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/HomeScreenControllerImpl.kt
M app/src/main/java/com/github/nacabaro/vbhelper/screens/homeScreens/screens/VBDiMHomeScreen.kt

@@ 169,7 169,7 @@ fun SpecialMissionsEntry(
     Card(
         modifier = modifier,
         shape = androidx.compose.material.MaterialTheme.shapes.small,
-        onClick = if (specialMission.status == SpecialMission.Status.COMPLETED) {
+        onClick = if (specialMission.status == SpecialMission.Status.COMPLETED || specialMission.status == SpecialMission.Status.FAILED) {
             onClickCard
         } else {
             {  }

@@ 1,8 1,9 @@
 package com.github.nacabaro.vbhelper.screens.homeScreens
 
+import com.github.cfogrady.vbnfc.vb.SpecialMission
 import com.github.nacabaro.vbhelper.dtos.ItemDtos
 
 interface HomeScreenController {
     fun didAdventureMissionsFinish(onCompletion: (Boolean) -> Unit)
-    fun clearSpecialMission(missionId: Long, onCleared: (ItemDtos.PurchasedItem) -> Unit)
+    fun clearSpecialMission(missionId: Long, missionCompletion: SpecialMission.Status, onCleared: (ItemDtos.PurchasedItem?) -> Unit)
 }=
\ No newline at end of file

@@ 2,6 2,7 @@ package com.github.nacabaro.vbhelper.screens.homeScreens
 
 import androidx.activity.ComponentActivity
 import androidx.lifecycle.lifecycleScope
+import com.github.cfogrady.vbnfc.vb.SpecialMission
 import com.github.nacabaro.vbhelper.di.VBHelper
 import com.github.nacabaro.vbhelper.dtos.ItemDtos
 import kotlinx.coroutines.launch


@@ 30,37 31,42 @@ class HomeScreenControllerImpl(
         }
     }
 
-    override fun clearSpecialMission(missionId: Long, onCleared: (ItemDtos.PurchasedItem) -> Unit) {
+    override fun clearSpecialMission(missionId: Long, missionCompletion: SpecialMission.Status, onCleared: (ItemDtos.PurchasedItem?) -> Unit) {
         componentActivity.lifecycleScope.launch {
             database
                 .specialMissionDao()
                 .clearSpecialMission(missionId)
 
-            val randomItem = database
-                .itemDao()
-                .getAllItems()
-                .random()
+            if (missionCompletion == SpecialMission.Status.COMPLETED) {
+                val randomItem = database
+                    .itemDao()
+                    .getAllItems()
+                    .random()
 
-            val randomItemAmount = (Random.nextFloat() * 5).roundToInt()
+                val randomItemAmount = (Random.nextFloat() * 5).roundToInt()
 
-            database
-                .itemDao()
-                .purchaseItem(
+                database
+                    .itemDao()
+                    .purchaseItem(
+                        itemId = randomItem.id,
+                        itemAmount = randomItemAmount
+                    )
+
+                val purchasedItem = ItemDtos.PurchasedItem(
                     itemId = randomItem.id,
-                    itemAmount = randomItemAmount
+                    itemName = randomItem.name,
+                    itemDescription = randomItem.description,
+                    itemIcon = randomItem.itemIcon,
+                    itemLength = randomItem.itemLength,
+                    itemAmount = randomItemAmount,
+                    itemType = randomItem.itemType
                 )
 
-            val purchasedItem = ItemDtos.PurchasedItem(
-                itemId = randomItem.id,
-                itemName = randomItem.name,
-                itemDescription = randomItem.description,
-                itemIcon = randomItem.itemIcon,
-                itemLength = randomItem.itemLength,
-                itemAmount = randomItemAmount,
-                itemType = randomItem.itemType
-            )
+                onCleared(purchasedItem)
+            } else {
+                onCleared(null)
+            }
 
-            onCleared(purchasedItem)
         }
     }
 }=
\ No newline at end of file

@@ 34,7 34,7 @@ fun VBDiMHomeScreen(
     homeScreenController: HomeScreenControllerImpl,
     transformationHistory: List<CharacterDtos.TransformationHistory>,
     contentPadding: PaddingValues,
-    onClickCollect: (ItemDtos.PurchasedItem) -> Unit
+    onClickCollect: (ItemDtos.PurchasedItem?) -> Unit
 ) {
     Column(
         modifier = Modifier


@@ 181,7 181,7 @@ fun VBDiMHomeScreen(
                         .padding(8.dp),
                 ) {
                     homeScreenController
-                        .clearSpecialMission(mission.id, onClickCollect)
+                        .clearSpecialMission(mission.id, mission.status, onClickCollect)
                 }
             }
         }