✨ Damage note

yhs0602 · Dec 30, 2020 · 4cb3bf4 · 4cb3bf4
1 parent aa60d10
commit 4cb3bf4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/app/src/main/java/com/kyhsgeekcode/dereinfo/model/DereDatabaseHelper.kt b/app/src/main/java/com/kyhsgeekcode/dereinfo/model/DereDatabaseHelper.kt
@@ -175,9 +175,10 @@ class DereDatabaseHelper(context: Context) {
                 //Log.d(TAG, "Skip file")
                 continue
             }
+            var fumenDB: SQLiteDatabase? = null
             try {
                 //Log.d(TAG, "Oh file")
-                val fumenDB =
+                fumenDB =
                     SQLiteDatabase.openDatabase(file!!.path, null, SQLiteDatabase.OPEN_READONLY)
                 cursorFumens = fumenDB.query("blobs", arrayOf("name"), null, null, null, null, null)
                 while (cursorFumens.moveToNext()) {
@@ -192,11 +193,11 @@ class DereDatabaseHelper(context: Context) {
                     musicNumberToFumenFile[musicIndex] = file
                     break
                 }
-                fumenDB.close()
             } catch (e: SQLException) {
                 Log.e(TAG, "indexFumen", e)
                 continue
             } finally {
+                fumenDB?.close()
                 cursorFumens?.close()
             }
         }
@@ -465,6 +466,7 @@ class DereDatabaseHelper(context: Context) {
         5 -> Pair(TWMode.Slide, FlickMode.None)
         6 -> Pair(TWMode.Tap, FlickMode.Left)
         7 -> Pair(TWMode.Tap, FlickMode.Right)
+        8 -> Pair(TWMode.Damage, FlickMode.None)
         else -> Pair(TWMode.fromType(type), FlickMode.fromStatus(status))
     }
 
@@ -508,6 +510,8 @@ class DereDatabaseHelper(context: Context) {
             val notes: List<Note>
             if (twDifficulty == TW5Difficulty.Piano || twDifficulty == TW5Difficulty.Forte)
                 notes = parseDereFumenGrand(fumenStr, info)
+            else if (twDifficulty == TW5Difficulty.Witch)
+                notes = parseDereFumenWitch(fumenStr, info)
             else
                 notes = parseDereFumen(fumenStr, info)
             difficulties[twDifficulty] = OneDifficulty(twDifficulty, notes)
@@ -516,6 +520,10 @@ class DereDatabaseHelper(context: Context) {
         return OneMusic(difficulties, info)
     }
 
+    private fun parseDereFumenWitch(fumenStr: String, info: MusicInfo): List<Note> {
+        return parseDereFumen(fumenStr, info)
+    }
+
     private fun parseDereFumen(
         fumenStr: String,
         musicInfo: MusicInfo

diff --git a/app/src/main/java/com/kyhsgeekcode/dereinfo/model/Note.kt b/app/src/main/java/com/kyhsgeekcode/dereinfo/model/Note.kt
@@ -21,6 +21,7 @@ class Note(
     fun isFlick(): Boolean = flick != FlickMode.None
     fun isLong(): Boolean = twMode == TWMode.Hold
     fun isSlide(): Boolean = twMode == TWMode.Slide
+    fun isDamage(): Boolean = twMode == TWMode.Damage
     fun chaos(): Float = abs(startline - endline)
     fun getBitmap(): String {
         if (isFlick()) {
@@ -32,6 +33,9 @@ class Note(
         if (isLong()) {
             return "Longnote"
         }
+        if (isDamage()) {
+            return "Damagenote"
+        }
         return "Normalnote"
     }
 

diff --git a/app/src/main/res/drawable/damagenote.png b/app/src/main/res/drawable/damagenote.png