Compare commits

..
2 Commits
Author SHA1 Message Date
Nacho fb09004d13 Version up, again 2025-08-06 01:32:10 +02:00
Nacho dd1a62d184 Made a mistake
Accidentally locked BE watch items to only BEm characters. I have modified it to also include DiM characters in the BE.
2025-08-06 01:31:18 +02:00
4 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -15,7 +15,7 @@ android {
minSdk = 28 minSdk = 28
targetSdk = 35 targetSdk = 35
versionCode = 1 versionCode = 1
versionName = "Alpha 0.4" versionName = "Alpha 0.4.1"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
} }
@@ -193,10 +193,10 @@ interface UserCharacterDao {
JOIN Card d ON d.id = c.dimId JOIN Card d ON d.id = c.dimId
JOIN Sprite s ON s.id = c.spriteId JOIN Sprite s ON s.id = c.spriteId
LEFT JOIN Adventure a ON a.characterId = uc.id LEFT JOIN Adventure a ON a.characterId = uc.id
WHERE d.isBEm = 1 WHERE uc.characterType = "BEDevice"
""" """
) )
suspend fun getBEBemCharacters(): List<CharacterDtos.CharacterWithSprites> suspend fun getBECharacters(): List<CharacterDtos.CharacterWithSprites>
@Query( @Query(
""" """
@@ -48,7 +48,7 @@ fun ChooseCharacterScreen(
selectedItem = storageRepository.getItem(itemId) selectedItem = storageRepository.getItem(itemId)
when (selectedItem?.itemType) { when (selectedItem?.itemType) {
ItemType.BEITEM -> { ItemType.BEITEM -> {
characterList.value = storageRepository.getBEBEmCharacters() characterList.value = storageRepository.getBECharacters()
} }
ItemType.VBITEM -> { ItemType.VBITEM -> {
characterList.value = storageRepository.getVBCharacters() characterList.value = storageRepository.getVBCharacters()
@@ -50,8 +50,8 @@ class StorageRepository (
return db.adventureDao().getAdventureCharacters() return db.adventureDao().getAdventureCharacters()
} }
suspend fun getBEBEmCharacters(): List<CharacterDtos.CharacterWithSprites> { suspend fun getBECharacters(): List<CharacterDtos.CharacterWithSprites> {
return db.userCharacterDao().getBEBemCharacters() return db.userCharacterDao().getBECharacters()
} }
suspend fun getVBCharacters(): List<CharacterDtos.CharacterWithSprites> { suspend fun getVBCharacters(): List<CharacterDtos.CharacterWithSprites> {