Increased AGP version and changed some terminology

This commit is contained in:
Nacho 2025-09-14 00:49:17 +02:00
parent 7160eb792a
commit 630cccefe4
3 changed files with 21 additions and 19 deletions

View File

@ -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
)
}

View File

@ -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?
)

View File

@ -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"