diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/daos/CardFusionsDao.kt b/app/src/main/java/com/github/nacabaro/vbhelper/daos/CardFusionsDao.kt index e9f7e34..99233a3 100644 --- a/app/src/main/java/com/github/nacabaro/vbhelper/daos/CardFusionsDao.kt +++ b/app/src/main/java/com/github/nacabaro/vbhelper/daos/CardFusionsDao.kt @@ -5,28 +5,30 @@ import androidx.room.Query @Dao interface CardFusionsDao { - @Query(""" + @Query( + """ INSERT INTO CardFusions ( fromCharaId, - attribute1Fusion, - attribute2Fusion, - attribute3Fusion, - attribute4Fusion + toVirusFusion, + toDataFusion, + toVaccineFusion, + toFreeFusion ) SELECT (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :fromCharaId), - (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :toCharaIdAttr1), - (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :toCharaIdAttr2), - (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :toCharaIdAttr3), - (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :toCharaIdAttr4) - """) + (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :toCharaIdVirus), + (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :toCharaIdData), + (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :toCharaIdVaccine), + (SELECT id FROM CardCharacter WHERE cardId = :cardId AND charaIndex = :toCharaIdFree) + """ + ) suspend fun insertNewFusion( cardId: Long, fromCharaId: Int, - toCharaIdAttr1: Int, - toCharaIdAttr2: Int, - toCharaIdAttr3: Int, - toCharaIdAttr4: Int + toCharaIdVirus: Int, + toCharaIdData: Int, + toCharaIdVaccine: Int, + toCharaIdFree: Int ) } \ No newline at end of file diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/domain/card/CardFusions.kt b/app/src/main/java/com/github/nacabaro/vbhelper/domain/card/CardFusions.kt index 0ced483..9141338 100644 --- a/app/src/main/java/com/github/nacabaro/vbhelper/domain/card/CardFusions.kt +++ b/app/src/main/java/com/github/nacabaro/vbhelper/domain/card/CardFusions.kt @@ -41,8 +41,8 @@ import androidx.room.PrimaryKey data class CardFusions( @PrimaryKey(autoGenerate = true) val id: Long, val fromCharaId: Long, - val attribute1Fusion: Long?, - val attribute2Fusion: Long?, - val attribute3Fusion: Long?, - val attribute4Fusion: Long? + val toVirusFusion: Long?, + val toDataFusion: Long?, + val toVaccineFusion: Long?, + val toFreeFusion: Long? ) \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2754f1b..b227312 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.12.2" +agp = "8.12.3" datastore = "1.1.2" kotlin = "2.0.0" coreKtx = "1.15.0"