From 076f6bfacf7eaf18fc4a96dc4056293c20880658 Mon Sep 17 00:00:00 2001
From: Christopher O'Grady <cfogrady@gmail.com>
Date: Sat, 5 Apr 2025 20:31:03 -0400
Subject: [PATCH] Fix stage and attribute coming from character instead of
 UserCharacter

---
 .../java/com/github/nacabaro/vbhelper/daos/AdventureDao.kt  | 2 ++
 .../com/github/nacabaro/vbhelper/daos/UserCharacterDao.kt   | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/daos/AdventureDao.kt b/app/src/main/java/com/github/nacabaro/vbhelper/daos/AdventureDao.kt
index ba2f907..b8d0f20 100644
--- a/app/src/main/java/com/github/nacabaro/vbhelper/daos/AdventureDao.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/daos/AdventureDao.kt
@@ -21,6 +21,8 @@ interface AdventureDao {
     @Query("""
         SELECT
             uc.*,
+            c.stage,
+            c.attribute,
             c.sprite1 AS spriteIdle,
             c.spritesWidth AS spriteWidth,
             c.spritesHeight AS spriteHeight,
diff --git a/app/src/main/java/com/github/nacabaro/vbhelper/daos/UserCharacterDao.kt b/app/src/main/java/com/github/nacabaro/vbhelper/daos/UserCharacterDao.kt
index 5d6c9c0..3bfdd6f 100644
--- a/app/src/main/java/com/github/nacabaro/vbhelper/daos/UserCharacterDao.kt
+++ b/app/src/main/java/com/github/nacabaro/vbhelper/daos/UserCharacterDao.kt
@@ -46,6 +46,8 @@ interface UserCharacterDao {
         """
         SELECT
             uc.*,
+            c.stage,
+            c.attribute,
             c.sprite1 AS spriteIdle,
             c.spritesWidth AS spriteWidth,
             c.spritesHeight AS spriteHeight,
@@ -66,6 +68,8 @@ interface UserCharacterDao {
         """
         SELECT
             uc.*,
+            c.stage,
+            c.attribute,
             c.sprite1 AS spriteIdle,
             c.spritesWidth AS spriteWidth,
             c.spritesHeight AS spriteHeight,
@@ -92,6 +96,8 @@ interface UserCharacterDao {
         """
         SELECT
             uc.*,
+            c.stage,
+            c.attribute,
             c.sprite1 AS spriteIdle,
             c.spritesWidth AS spriteWidth,
             c.spritesHeight AS spriteHeight,