diff --git a/src/main/kotlin/net/taehui/twilight/Twilight.kt b/src/main/kotlin/net/taehui/twilight/Twilight.kt index 59d2bb0..bb35e69 100644 --- a/src/main/kotlin/net/taehui/twilight/Twilight.kt +++ b/src/main/kotlin/net/taehui/twilight/Twilight.kt @@ -44,7 +44,7 @@ AnsiConsole.systemInstall() Configure.loadConfigure() DB.loadDB() - AbilityClassSystem.loadAbilityClasses() + AbilityClassSystem.loadAbilityClass() AbilitySystem.loadAbility() BannedIP.loadBannedIP() BannedNote.loadBannedNote() diff --git a/src/main/kotlin/net/taehui/twilight/TwilightComponent.kt b/src/main/kotlin/net/taehui/twilight/TwilightComponent.kt index 0533fd9..0ad481f 100644 --- a/src/main/kotlin/net/taehui/twilight/TwilightComponent.kt +++ b/src/main/kotlin/net/taehui/twilight/TwilightComponent.kt @@ -15,6 +15,7 @@ val LEVEL_ENTRY_PATH: Path = SYSTEM_ENTRY_PATH.resolve("Level") val VOTE_ENTRY_PATH: Path = SYSTEM_ENTRY_PATH.resolve("Vote") val ABILITY_ENTRY_PATH: Path = SYSTEM_ENTRY_PATH.resolve("Ability") + val ABILITY_CLASS_ENTRY_PATH: Path = SYSTEM_ENTRY_PATH.resolve("Ability Class") val EDGE_ENTRY_PATH: Path = SYSTEM_ENTRY_PATH.resolve("Edge") val AWILIGHT_FILE_PATH: Path = SYSTEM_ENTRY_PATH.resolve("Awilight.py") diff --git a/src/main/kotlin/net/taehui/twilight/system/AbilityClassSystem.kt b/src/main/kotlin/net/taehui/twilight/system/AbilityClassSystem.kt index aac4d79..fe43c10 100644 --- a/src/main/kotlin/net/taehui/twilight/system/AbilityClassSystem.kt +++ b/src/main/kotlin/net/taehui/twilight/system/AbilityClassSystem.kt @@ -1,9 +1,12 @@ package net.taehui.twilight.system import com.fasterxml.jackson.annotation.JsonValue +import com.fasterxml.jackson.core.type.TypeReference +import com.fasterxml.jackson.databind.ObjectMapper import net.taehui.twilight.Logger -import java.nio.file.Path -import kotlin.io.path.pathString +import net.taehui.twilight.TwilightComponent +import java.io.IOException +import java.nio.file.Files object AbilityClassSystem : Logger { enum class AbilityClassVariety(@JvmField val value: Int) { @@ -16,94 +19,95 @@ } private var abilityClasses = - arrayOf(emptyArray>(), emptyArray>(), emptyArray>()) + arrayOf(emptyArray(), emptyArray(), emptyArray()) + private var abilityClassStore = emptyArray>() + var isLoading = false fun getAbilityClass(abilityClassVariety: AbilityClassVariety, abilityClass: Double): ByteArray { val abilityClasses = abilityClasses[abilityClassVariety.value] - - return when (abilityClass) { - -1.0, -2.0, -3.0 -> abilityClasses[0][0] - -4.0, -5.0, -6.0, -7.0, -8.0, -9.0, -10.0 -> abilityClasses[1][0] - else -> { - if (0 <= abilityClass && abilityClass < 2) { - abilityClasses[2][(5 * abilityClass / 2).toInt()] - } else if (2 <= abilityClass && abilityClass < 13) { - abilityClasses[3][(5 * (abilityClass - 2) / 11).toInt()] - } else if (13 <= abilityClass && abilityClass < 33) { - abilityClasses[4][(5 * (abilityClass - 13) / 20).toInt()] - } else if (33 <= abilityClass && abilityClass < 62) { - abilityClasses[5][(5 * (abilityClass - 33) / 29).toInt()] - } else if (62 <= abilityClass && abilityClass < 100) { - abilityClasses[6][(5 * (abilityClass - 62) / 38).toInt()] - } else { - abilityClasses[7][0] - } + val abilityClassStore = abilityClassStore[abilityClassVariety.value] + for (i in 0..abilityClassStore.size - 2) { + if (abilityClass >= abilityClassStore[i]) { + return abilityClasses[i] } } + return abilityClasses[0] } - fun loadAbilityClasses() { - fun loadAbilityClass(abilityClassVariety: AbilityClassVariety) { - fun loadDrawing(path: String): ByteArray { - return AbilityClassSystem::class.java.classLoader.getResourceAsStream( - Path.of( - when (abilityClassVariety) { - AbilityClassVariety.ETC -> "" - AbilityClassVariety.INPUT_MODE_5K -> "abilityClass5K" - AbilityClassVariety.INPUT_MODE_7K -> "abilityClass7K" - AbilityClassVariety.INPUT_MODE_9K -> "abilityClass9K" - }, - path - ).pathString - ) - .use { it!!.readAllBytes() } - } + fun loadAbilityClass() { + isLoading = true + try { + val jm = ObjectMapper() + abilityClassStore = jm.readValue( + TwilightComponent.ABILITY_CLASS_ENTRY_PATH.resolve("Default.json").toFile(), + object : TypeReference>>() {}) - abilityClasses[abilityClassVariety.value] = arrayOf( - arrayOf( - loadDrawing("S+.png") - ), arrayOf( - loadDrawing("S.png") - ), arrayOf( + fun loadAbilityClass(abilityClassVariety: AbilityClassVariety) { + fun loadDrawing(fileName: String): ByteArray { + return Files.readAllBytes(TwilightComponent.ABILITY_CLASS_ENTRY_PATH.resolve(when (abilityClassVariety) { + AbilityClassVariety.ETC -> "" + AbilityClassVariety.INPUT_MODE_5K -> "5K" + AbilityClassVariety.INPUT_MODE_7K -> "7K" + AbilityClassVariety.INPUT_MODE_9K -> "9K" + }).resolve(fileName)) + } + + abilityClasses[abilityClassVariety.value] = arrayOf( + loadDrawing("S+1.png"), + loadDrawing("S+2.png"), + loadDrawing("S+3.png"), + loadDrawing("S+4.png"), + loadDrawing("S+5.png"), + loadDrawing("S1.png"), + loadDrawing("S2.png"), + loadDrawing("S3.png"), + loadDrawing("S4.png"), + loadDrawing("S5.png"), loadDrawing("A+1.png"), loadDrawing("A+2.png"), loadDrawing("A+3.png"), loadDrawing("A+4.png"), - loadDrawing("A+5.png") - ), arrayOf( + loadDrawing("A+5.png"), loadDrawing("A1.png"), loadDrawing("A2.png"), loadDrawing("A3.png"), loadDrawing("A4.png"), - loadDrawing("A5.png") - ), arrayOf( + loadDrawing("A5.png"), loadDrawing("B1.png"), loadDrawing("B2.png"), loadDrawing("B3.png"), loadDrawing("B4.png"), - loadDrawing("B5.png") - ), arrayOf( + loadDrawing("B5.png"), loadDrawing("C1.png"), loadDrawing("C2.png"), loadDrawing("C3.png"), loadDrawing("C4.png"), - loadDrawing("C5.png") - ), arrayOf( + loadDrawing("C5.png"), loadDrawing("D1.png"), loadDrawing("D2.png"), loadDrawing("D3.png"), loadDrawing("D4.png"), - loadDrawing("D5.png") - ), arrayOf( + loadDrawing("D5.png"), loadDrawing("F.png") ) - ) + } + + loadAbilityClass(AbilityClassVariety.INPUT_MODE_5K) + loadAbilityClass(AbilityClassVariety.INPUT_MODE_7K) + loadAbilityClass(AbilityClassVariety.INPUT_MODE_9K) + + logInfo("Loaded Ability Class") + + jm.writerWithDefaultPrettyPrinter() + .writeValue( + TwilightComponent.ABILITY_CLASS_ENTRY_PATH.resolve("Default.json").toFile(), + abilityClassStore + ) + logInfo("Saved Ability Class") + } catch (e: IOException) { + logFault(e) + } finally { + isLoading = false } - - loadAbilityClass(AbilityClassVariety.INPUT_MODE_5K) - loadAbilityClass(AbilityClassVariety.INPUT_MODE_7K) - loadAbilityClass(AbilityClassVariety.INPUT_MODE_9K) - - logInfo("Loaded Ability Class") } } \ No newline at end of file diff --git a/src/main/kotlin/net/taehui/twilight/system/AutoSystem.kt b/src/main/kotlin/net/taehui/twilight/system/AutoSystem.kt index 893edd6..9ccb78b 100644 --- a/src/main/kotlin/net/taehui/twilight/system/AutoSystem.kt +++ b/src/main/kotlin/net/taehui/twilight/system/AutoSystem.kt @@ -22,6 +22,7 @@ private var futureTitle: ScheduledFuture<*>? = null private var futureLevel: ScheduledFuture<*>? = null private var futureAbility: ScheduledFuture<*>? = null + private var futureAbilityClass: ScheduledFuture<*>? = null private var futureEdge: ScheduledFuture<*>? = null fun dispose() { @@ -39,6 +40,7 @@ TwilightComponent.LEVEL_ENTRY_PATH.register(ws, StandardWatchEventKinds.ENTRY_MODIFY) TwilightComponent.VOTE_ENTRY_PATH.register(ws, StandardWatchEventKinds.ENTRY_MODIFY) TwilightComponent.ABILITY_ENTRY_PATH.register(ws, StandardWatchEventKinds.ENTRY_MODIFY) + TwilightComponent.ABILITY_CLASS_ENTRY_PATH.register(ws, StandardWatchEventKinds.ENTRY_MODIFY) TwilightComponent.EDGE_ENTRY_PATH.register(ws, StandardWatchEventKinds.ENTRY_MODIFY) var isAvailable = true while (isAvailable) { @@ -88,7 +90,7 @@ } "Level" -> { - if (FilenameUtils.isExtension(fileName, "json") && !LevelSystem.isLoading) { + if (!LevelSystem.isLoading) { futureLevel?.cancel(true) futureLevel = ses.schedule( { LevelSystem.loadLevel() }, @@ -109,8 +111,19 @@ } } + "Ability Class" -> { + if (!AbilityClassSystem.isLoading) { + futureAbilityClass?.cancel(true) + futureAbilityClass = ses.schedule( + { AbilityClassSystem.loadAbilityClass() }, + 1, + TimeUnit.SECONDS + ) + } + } + "Edge" -> { - if (FilenameUtils.isExtension(fileName, "json") && !EdgeSystem.isLoading) { + if (!EdgeSystem.isLoading) { futureEdge?.cancel(true) futureEdge = ses.schedule( { EdgeSystem.loadEdge() }, diff --git a/src/main/kotlin/net/taehui/twilight/system/DB.kt b/src/main/kotlin/net/taehui/twilight/system/DB.kt index 8cac414..3162e74 100644 --- a/src/main/kotlin/net/taehui/twilight/system/DB.kt +++ b/src/main/kotlin/net/taehui/twilight/system/DB.kt @@ -2677,15 +2677,12 @@ var wwwLevelIDCount = 0 var avatarLevels = intArrayOf() var avatarAbility5K = 0.0 - var avatarAbility5KClass = 0.0 var avatarAbility5KPlace = 0 var avatarAbility5KCount = 0 var avatarAbility7K = 0.0 - var avatarAbility7KClass = 0.0 var avatarAbility7KPlace = 0 var avatarAbility7KCount = 0 var avatarAbility9K = 0.0 - var avatarAbility9KClass = 0.0 var avatarAbility9KPlace = 0 var avatarAbility9KCount = 0 val dateSet = mutableListOf() @@ -2859,16 +2856,6 @@ avatarAbility5K = targetAbility5K.second.first avatarAbility5KPlace = validAbilities5K.indexOf(targetAbility5K) avatarAbility5KCount = validAbilities5K.size - avatarAbility5KClass = if (avatarAbility5KPlace != -1) { - val absTargetAbilityPlace = 10.0 - if (avatarAbility5KPlace < absTargetAbilityPlace) { - -(avatarAbility5KPlace + 1).toDouble() - } else { - (avatarAbility5KPlace - absTargetAbilityPlace) / (avatarAbility5KCount - absTargetAbilityPlace) - } - } else { - 1.0 - } }, logFuture { val rawAbilities7K = getAbilities7K() val targetAbilities7K = getAbilities(rawAbilities7K).toList() @@ -2880,16 +2867,6 @@ avatarAbility7K = targetAbility7K.second.first avatarAbility7KPlace = validAbilities7K.indexOf(targetAbility7K) avatarAbility7KCount = validAbilities7K.size - avatarAbility7KClass = if (avatarAbility7KPlace != -1) { - val absTargetAbilityPlace = 10.0 - if (avatarAbility7KPlace < absTargetAbilityPlace) { - -(avatarAbility7KPlace + 1).toDouble() - } else { - (avatarAbility7KPlace - absTargetAbilityPlace) / (avatarAbility7KCount - absTargetAbilityPlace) - } - } else { - 1.0 - } }, logFuture { val rawAbilities9K = getAbilities9K() val targetAbilities9K = getAbilities(rawAbilities9K).toList() @@ -2901,16 +2878,6 @@ avatarAbility9K = targetAbility9K.second.first avatarAbility9KPlace = validAbilities9K.indexOf(targetAbility9K) avatarAbility9KCount = validAbilities9K.size - avatarAbility9KClass = if (avatarAbility9KPlace != -1) { - val absTargetAbilityPlace = 10.0 - if (avatarAbility9KPlace < absTargetAbilityPlace) { - -(avatarAbility9KPlace + 1).toDouble() - } else { - (avatarAbility9KPlace - absTargetAbilityPlace) / (avatarAbility9KCount - absTargetAbilityPlace) - } - } else { - 1.0 - } }) futures.join() @@ -2926,15 +2893,12 @@ val wwwLevelIDCount = wwwLevelIDCount val avatarLevels = avatarLevels val avatarAbility5K = avatarAbility5K - val avatarAbility5KClass = avatarAbility5KClass val avatarAbility5KPlace = avatarAbility5KPlace + 1 val avatarAbility5KCount = avatarAbility5KCount val avatarAbility7K = avatarAbility7K - val avatarAbility7KClass = avatarAbility7KClass val avatarAbility7KPlace = avatarAbility7KPlace + 1 val avatarAbility7KCount = avatarAbility7KCount val avatarAbility9K = avatarAbility9K - val avatarAbility9KClass = avatarAbility9KClass val avatarAbility9KPlace = avatarAbility9KPlace + 1 val avatarAbility9KCount = avatarAbility9KCount val levelNames = arrayOf("*").plus(AbilitySystem.getAbilityNames()) diff --git a/src/main/kotlin/net/taehui/twilight/www/WwwAvatar.kt b/src/main/kotlin/net/taehui/twilight/www/WwwAvatar.kt index c80f3ca..dd662ea 100644 --- a/src/main/kotlin/net/taehui/twilight/www/WwwAvatar.kt +++ b/src/main/kotlin/net/taehui/twilight/www/WwwAvatar.kt @@ -501,9 +501,9 @@ "/qwilight/www/drawing" -> { val drawingVariety = params.getOrDefault("drawingVariety", "") - val abilityClass5K = params.getOrDefault("abilityClass5K", "") - val abilityClass7K = params.getOrDefault("abilityClass7K", "") - val abilityClass9K = params.getOrDefault("abilityClass9K", "") + val abilityClass5K = params.getOrDefault("System/Ability Class/abilityClass5K", "") + val abilityClass7K = params.getOrDefault("System/Ability Class/abilityClass7K", "") + val abilityClass9K = params.getOrDefault("System/Ability Class/abilityClass9K", "") val levelID = params.getOrDefault("levelID", "") if (drawingVariety.isNotEmpty()) { when (drawingVariety) { diff --git a/src/main/resources/abilityClass5K/A+1.png b/src/main/resources/abilityClass5K/A+1.png deleted file mode 100644 index 8e1da68..0000000 --- a/src/main/resources/abilityClass5K/A+1.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/A+2.png b/src/main/resources/abilityClass5K/A+2.png deleted file mode 100644 index 110174c..0000000 --- a/src/main/resources/abilityClass5K/A+2.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/A+3.png b/src/main/resources/abilityClass5K/A+3.png deleted file mode 100644 index 6fc4e3d..0000000 --- a/src/main/resources/abilityClass5K/A+3.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/A+4.png b/src/main/resources/abilityClass5K/A+4.png deleted file mode 100644 index a3ff07d..0000000 --- a/src/main/resources/abilityClass5K/A+4.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/A+5.png b/src/main/resources/abilityClass5K/A+5.png deleted file mode 100644 index ebefba3..0000000 --- a/src/main/resources/abilityClass5K/A+5.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/A1.png b/src/main/resources/abilityClass5K/A1.png deleted file mode 100644 index a566142..0000000 --- a/src/main/resources/abilityClass5K/A1.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/A2.png b/src/main/resources/abilityClass5K/A2.png deleted file mode 100644 index cd5addf..0000000 --- a/src/main/resources/abilityClass5K/A2.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/A3.png b/src/main/resources/abilityClass5K/A3.png deleted file mode 100644 index 93655d4..0000000 --- a/src/main/resources/abilityClass5K/A3.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/A4.png b/src/main/resources/abilityClass5K/A4.png deleted file mode 100644 index 6a3e787..0000000 --- a/src/main/resources/abilityClass5K/A4.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/A5.png b/src/main/resources/abilityClass5K/A5.png deleted file mode 100644 index 5cb288b..0000000 --- a/src/main/resources/abilityClass5K/A5.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/B1.png b/src/main/resources/abilityClass5K/B1.png deleted file mode 100644 index 522216d..0000000 --- a/src/main/resources/abilityClass5K/B1.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/B2.png b/src/main/resources/abilityClass5K/B2.png deleted file mode 100644 index a412478..0000000 --- a/src/main/resources/abilityClass5K/B2.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/B3.png b/src/main/resources/abilityClass5K/B3.png deleted file mode 100644 index fc7ae4b..0000000 --- a/src/main/resources/abilityClass5K/B3.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/B4.png b/src/main/resources/abilityClass5K/B4.png deleted file mode 100644 index 0b0e6ce..0000000 --- a/src/main/resources/abilityClass5K/B4.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/B5.png b/src/main/resources/abilityClass5K/B5.png deleted file mode 100644 index 071bef9..0000000 --- a/src/main/resources/abilityClass5K/B5.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/C1.png b/src/main/resources/abilityClass5K/C1.png deleted file mode 100644 index a94505c..0000000 --- a/src/main/resources/abilityClass5K/C1.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/C2.png b/src/main/resources/abilityClass5K/C2.png deleted file mode 100644 index 0bb52fe..0000000 --- a/src/main/resources/abilityClass5K/C2.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/C3.png b/src/main/resources/abilityClass5K/C3.png deleted file mode 100644 index 2a445e3..0000000 --- a/src/main/resources/abilityClass5K/C3.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/C4.png b/src/main/resources/abilityClass5K/C4.png deleted file mode 100644 index 718a208..0000000 --- a/src/main/resources/abilityClass5K/C4.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/C5.png b/src/main/resources/abilityClass5K/C5.png deleted file mode 100644 index 583a62f..0000000 --- a/src/main/resources/abilityClass5K/C5.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/D1.png b/src/main/resources/abilityClass5K/D1.png deleted file mode 100644 index 4d68105..0000000 --- a/src/main/resources/abilityClass5K/D1.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/D2.png b/src/main/resources/abilityClass5K/D2.png deleted file mode 100644 index 437f9d7..0000000 --- a/src/main/resources/abilityClass5K/D2.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/D3.png b/src/main/resources/abilityClass5K/D3.png deleted file mode 100644 index c08dbc4..0000000 --- a/src/main/resources/abilityClass5K/D3.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/D4.png b/src/main/resources/abilityClass5K/D4.png deleted file mode 100644 index 4c58112..0000000 --- a/src/main/resources/abilityClass5K/D4.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/D5.png b/src/main/resources/abilityClass5K/D5.png deleted file mode 100644 index 97a9320..0000000 --- a/src/main/resources/abilityClass5K/D5.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/F.png b/src/main/resources/abilityClass5K/F.png deleted file mode 100644 index 7ac5a3e..0000000 --- a/src/main/resources/abilityClass5K/F.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/S+.png b/src/main/resources/abilityClass5K/S+.png deleted file mode 100644 index a4ce2f3..0000000 --- a/src/main/resources/abilityClass5K/S+.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass5K/S.png b/src/main/resources/abilityClass5K/S.png deleted file mode 100644 index c51ee68..0000000 --- a/src/main/resources/abilityClass5K/S.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/A+1.png b/src/main/resources/abilityClass7K/A+1.png deleted file mode 100644 index 60709fe..0000000 --- a/src/main/resources/abilityClass7K/A+1.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/A+2.png b/src/main/resources/abilityClass7K/A+2.png deleted file mode 100644 index 3d3395b..0000000 --- a/src/main/resources/abilityClass7K/A+2.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/A+3.png b/src/main/resources/abilityClass7K/A+3.png deleted file mode 100644 index ef25008..0000000 --- a/src/main/resources/abilityClass7K/A+3.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/A+4.png b/src/main/resources/abilityClass7K/A+4.png deleted file mode 100644 index cac5432..0000000 --- a/src/main/resources/abilityClass7K/A+4.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/A+5.png b/src/main/resources/abilityClass7K/A+5.png deleted file mode 100644 index fa20543..0000000 --- a/src/main/resources/abilityClass7K/A+5.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/A1.png b/src/main/resources/abilityClass7K/A1.png deleted file mode 100644 index 000b75d..0000000 --- a/src/main/resources/abilityClass7K/A1.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/A2.png b/src/main/resources/abilityClass7K/A2.png deleted file mode 100644 index e27fc19..0000000 --- a/src/main/resources/abilityClass7K/A2.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/A3.png b/src/main/resources/abilityClass7K/A3.png deleted file mode 100644 index d4942f5..0000000 --- a/src/main/resources/abilityClass7K/A3.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/A4.png b/src/main/resources/abilityClass7K/A4.png deleted file mode 100644 index ae6e4c5..0000000 --- a/src/main/resources/abilityClass7K/A4.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/A5.png b/src/main/resources/abilityClass7K/A5.png deleted file mode 100644 index 9cd6daf..0000000 --- a/src/main/resources/abilityClass7K/A5.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/B1.png b/src/main/resources/abilityClass7K/B1.png deleted file mode 100644 index 03c1223..0000000 --- a/src/main/resources/abilityClass7K/B1.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/B2.png b/src/main/resources/abilityClass7K/B2.png deleted file mode 100644 index 8aaedef..0000000 --- a/src/main/resources/abilityClass7K/B2.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/B3.png b/src/main/resources/abilityClass7K/B3.png deleted file mode 100644 index eb62f48..0000000 --- a/src/main/resources/abilityClass7K/B3.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/B4.png b/src/main/resources/abilityClass7K/B4.png deleted file mode 100644 index 1d9f590..0000000 --- a/src/main/resources/abilityClass7K/B4.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/B5.png b/src/main/resources/abilityClass7K/B5.png deleted file mode 100644 index fd8a806..0000000 --- a/src/main/resources/abilityClass7K/B5.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/C1.png b/src/main/resources/abilityClass7K/C1.png deleted file mode 100644 index dd7dbd7..0000000 --- a/src/main/resources/abilityClass7K/C1.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/C2.png b/src/main/resources/abilityClass7K/C2.png deleted file mode 100644 index 1ff004a..0000000 --- a/src/main/resources/abilityClass7K/C2.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/C3.png b/src/main/resources/abilityClass7K/C3.png deleted file mode 100644 index ced4c1d..0000000 --- a/src/main/resources/abilityClass7K/C3.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/C4.png b/src/main/resources/abilityClass7K/C4.png deleted file mode 100644 index 7cacbd5..0000000 --- a/src/main/resources/abilityClass7K/C4.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/C5.png b/src/main/resources/abilityClass7K/C5.png deleted file mode 100644 index 70cc5da..0000000 --- a/src/main/resources/abilityClass7K/C5.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/D1.png b/src/main/resources/abilityClass7K/D1.png deleted file mode 100644 index 013deed..0000000 --- a/src/main/resources/abilityClass7K/D1.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/D2.png b/src/main/resources/abilityClass7K/D2.png deleted file mode 100644 index 45b1ea7..0000000 --- a/src/main/resources/abilityClass7K/D2.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/D3.png b/src/main/resources/abilityClass7K/D3.png deleted file mode 100644 index 0e4f204..0000000 --- a/src/main/resources/abilityClass7K/D3.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/D4.png b/src/main/resources/abilityClass7K/D4.png deleted file mode 100644 index 647d43a..0000000 --- a/src/main/resources/abilityClass7K/D4.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/D5.png b/src/main/resources/abilityClass7K/D5.png deleted file mode 100644 index 486094f..0000000 --- a/src/main/resources/abilityClass7K/D5.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/F.png b/src/main/resources/abilityClass7K/F.png deleted file mode 100644 index 7ac5a3e..0000000 --- a/src/main/resources/abilityClass7K/F.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/S+.png b/src/main/resources/abilityClass7K/S+.png deleted file mode 100644 index 17013e9..0000000 --- a/src/main/resources/abilityClass7K/S+.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass7K/S.png b/src/main/resources/abilityClass7K/S.png deleted file mode 100644 index bf11d9b..0000000 --- a/src/main/resources/abilityClass7K/S.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/A+1.png b/src/main/resources/abilityClass9K/A+1.png deleted file mode 100644 index fa7ee1a..0000000 --- a/src/main/resources/abilityClass9K/A+1.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/A+2.png b/src/main/resources/abilityClass9K/A+2.png deleted file mode 100644 index 2f5baad..0000000 --- a/src/main/resources/abilityClass9K/A+2.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/A+3.png b/src/main/resources/abilityClass9K/A+3.png deleted file mode 100644 index 10f07e7..0000000 --- a/src/main/resources/abilityClass9K/A+3.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/A+4.png b/src/main/resources/abilityClass9K/A+4.png deleted file mode 100644 index f2aa1ea..0000000 --- a/src/main/resources/abilityClass9K/A+4.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/A+5.png b/src/main/resources/abilityClass9K/A+5.png deleted file mode 100644 index 3085262..0000000 --- a/src/main/resources/abilityClass9K/A+5.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/A1.png b/src/main/resources/abilityClass9K/A1.png deleted file mode 100644 index ee746b4..0000000 --- a/src/main/resources/abilityClass9K/A1.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/A2.png b/src/main/resources/abilityClass9K/A2.png deleted file mode 100644 index 892a005..0000000 --- a/src/main/resources/abilityClass9K/A2.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/A3.png b/src/main/resources/abilityClass9K/A3.png deleted file mode 100644 index 4e716ec..0000000 --- a/src/main/resources/abilityClass9K/A3.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/A4.png b/src/main/resources/abilityClass9K/A4.png deleted file mode 100644 index 85e3ade..0000000 --- a/src/main/resources/abilityClass9K/A4.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/A5.png b/src/main/resources/abilityClass9K/A5.png deleted file mode 100644 index 6960224..0000000 --- a/src/main/resources/abilityClass9K/A5.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/B1.png b/src/main/resources/abilityClass9K/B1.png deleted file mode 100644 index 5251df9..0000000 --- a/src/main/resources/abilityClass9K/B1.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/B2.png b/src/main/resources/abilityClass9K/B2.png deleted file mode 100644 index 27a81bf..0000000 --- a/src/main/resources/abilityClass9K/B2.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/B3.png b/src/main/resources/abilityClass9K/B3.png deleted file mode 100644 index 16d792b..0000000 --- a/src/main/resources/abilityClass9K/B3.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/B4.png b/src/main/resources/abilityClass9K/B4.png deleted file mode 100644 index 4686de1..0000000 --- a/src/main/resources/abilityClass9K/B4.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/B5.png b/src/main/resources/abilityClass9K/B5.png deleted file mode 100644 index 769bf02..0000000 --- a/src/main/resources/abilityClass9K/B5.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/C1.png b/src/main/resources/abilityClass9K/C1.png deleted file mode 100644 index 6e1d98a..0000000 --- a/src/main/resources/abilityClass9K/C1.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/C2.png b/src/main/resources/abilityClass9K/C2.png deleted file mode 100644 index 7f38e47..0000000 --- a/src/main/resources/abilityClass9K/C2.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/C3.png b/src/main/resources/abilityClass9K/C3.png deleted file mode 100644 index 323add2..0000000 --- a/src/main/resources/abilityClass9K/C3.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/C4.png b/src/main/resources/abilityClass9K/C4.png deleted file mode 100644 index 4a8245a..0000000 --- a/src/main/resources/abilityClass9K/C4.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/C5.png b/src/main/resources/abilityClass9K/C5.png deleted file mode 100644 index 5aad659..0000000 --- a/src/main/resources/abilityClass9K/C5.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/D1.png b/src/main/resources/abilityClass9K/D1.png deleted file mode 100644 index 8fa896f..0000000 --- a/src/main/resources/abilityClass9K/D1.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/D2.png b/src/main/resources/abilityClass9K/D2.png deleted file mode 100644 index 700fc89..0000000 --- a/src/main/resources/abilityClass9K/D2.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/D3.png b/src/main/resources/abilityClass9K/D3.png deleted file mode 100644 index 679389b..0000000 --- a/src/main/resources/abilityClass9K/D3.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/D4.png b/src/main/resources/abilityClass9K/D4.png deleted file mode 100644 index 5667c97..0000000 --- a/src/main/resources/abilityClass9K/D4.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/D5.png b/src/main/resources/abilityClass9K/D5.png deleted file mode 100644 index de04181..0000000 --- a/src/main/resources/abilityClass9K/D5.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/F.png b/src/main/resources/abilityClass9K/F.png deleted file mode 100644 index 7ac5a3e..0000000 --- a/src/main/resources/abilityClass9K/F.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/S+.png b/src/main/resources/abilityClass9K/S+.png deleted file mode 100644 index 0bc224f..0000000 --- a/src/main/resources/abilityClass9K/S+.png +++ /dev/null Binary files differ diff --git a/src/main/resources/abilityClass9K/S.png b/src/main/resources/abilityClass9K/S.png deleted file mode 100644 index 844d0c2..0000000 --- a/src/main/resources/abilityClass9K/S.png +++ /dev/null Binary files differ