Soujuurou/Charlotte/Hakunon/Van Gogh(Miner)/BB Dubai/Ptolemy

app/build.gradle.kts

@@ -141,5 +141,7 @@ dependencies {
     implementation(libs.accompanist.permissions)
 
     implementation(libs.google.android.play.update.ktx)
+    implementation(libs.coil)
+    implementation(libs.coil.gif)
 
 }

app/src/main/java/io/github/fate_grand_automata/ui/battle_config_item/SkillCommandGroup.kt

@@ -62,7 +62,7 @@ fun SkillCommandGroup(
                         errorMessage = ""
                     } catch (e: Exception) {
                         // TODO: Localize
-                        errorMessage = "Invalid skill command"
+                        errorMessage = "Invalid skill command ${e.cause?.message}"
                     }
                 },
                 onCancel = { editing = false },

app/src/main/java/io/github/fate_grand_automata/ui/skill_maker/SkillMakerActivity.kt

@@ -19,6 +19,11 @@ import io.github.fate_grand_automata.ui.FgaScreen
 import io.github.fate_grand_automata.ui.OnPause
 import io.github.fate_grand_automata.ui.PreventRtl
 import io.github.fate_grand_automata.ui.dialog.FgaDialog
+import io.github.fate_grand_automata.ui.skill_maker.special.SkillMakerChoice3
+import io.github.fate_grand_automata.ui.skill_maker.special.SkillMakerChoice2
+import io.github.fate_grand_automata.ui.skill_maker.special.SkillMakerChoice2Target
+import io.github.fate_grand_automata.ui.skill_maker.special.SkillMakerThreeTargets
+import io.github.fate_grand_automata.ui.skill_maker.special.SkillMakerTwoTargets
 
 @AndroidEntryPoint
 class SkillMakerActivity : AppCompatActivity() {
@@ -96,10 +101,10 @@ fun SkillMakerUI(
                 )
             }
 
-            is SkillMakerNav.Emiya -> {
-                SkillMakerEmiya(
-                    onArts = { vm.targetSkill(ServantTarget.Left) },
-                    onBuster = { vm.targetSkill(ServantTarget.Right) }
+            is SkillMakerNav.TwoTargets -> {
+                SkillMakerTwoTargets(
+                    onTargetLeft = { vm.targetSkill(ServantTarget.Left) },
+                    onTargetRight = { vm.targetSkill(ServantTarget.Right) }
                 )
             }
 
@@ -136,58 +141,55 @@ fun SkillMakerUI(
             is SkillMakerNav.SkillTarget -> {
                 SkillMakerTarget(
                     onSkillTarget = { vm.targetSkill(it) },
-                    showEmiya = nav.skill in listOf(
-                        Skill.Servant.A3,
-                        Skill.Servant.B3,
-                        Skill.Servant.C3
-                    ),
-                    onEmiya = {
-                        navigate(SkillMakerNav.Emiya(nav.skill))
+                    showTwoTargets = nav.skill in Skill.Servant.skill3,
+                    onTwoTargets = {
+                        navigate(SkillMakerNav.TwoTargets(nav.skill))
                     },
-                    showSpaceIshtar = nav.skill in listOf(
-                        Skill.Servant.A2,
-                        Skill.Servant.B2,
-                        Skill.Servant.C2
-                    ),
-                    onSpaceIshtar = {
-                        navigate(SkillMakerNav.SpaceIshtar(nav.skill))
+                    showThreeTargets = nav.skill in Skill.Servant.skill2,
+                    onThreeTargets = {
+                        navigate(SkillMakerNav.ThreeTargets(nav.skill))
                     },
-                    showKukulkan = nav.skill !is Skill.Master,
-                    onKukulkan = {
-                        navigate(SkillMakerNav.Kukulkan(nav.skill))
+                    showChoice2 = nav.skill in Skill.Servant.list,
+                    onChoice2 = {
+                        navigate(SkillMakerNav.Choice2(nav.skill))
                     },
-                    showMelusine = nav.skill in listOf(
-                        Skill.Servant.A3,
-                        Skill.Servant.B3,
-                        Skill.Servant.C3
-                    ),
-                    onMelusine = {
-                        vm.targetSkill(ServantTarget.Melusine)
+                    showTransform = nav.skill in Skill.Servant.skill3,
+                    onTransform = {
+                        vm.targetSkill(ServantTarget.Transform)
+                    },
+                    showChoice3Slot1 = nav.skill in Skill.Servant.skill1,
+                    showChoice3Slot3 = nav.skill in Skill.Servant.skill3,
+                    onChoice3 = { slot ->
+                        navigate(SkillMakerNav.Choice3(nav.skill, slot))
                     }
                 )
             }
 
-            is SkillMakerNav.SpaceIshtar -> {
-                SkillMakerSpaceIshtar(
+            is SkillMakerNav.ThreeTargets -> {
+                SkillMakerThreeTargets(
                     onSkillTarget = { vm.targetSkill(it) }
                 )
             }
 
-            is SkillMakerNav.Kukulkan -> {
-                SkillMakerKukulkan(
+            is SkillMakerNav.Choice2 -> {
+                SkillMakerChoice2(
                     onOption1 = { vm.targetSkill(ServantTarget.Option1) },
                     onOption2 = { vm.targetSkill(ServantTarget.Option2) },
-                    goToTarget = nav.skill in listOf(
-                        Skill.Servant.A2,
-                        Skill.Servant.B2,
-                        Skill.Servant.C2
-                    ),
-                    onTarget = { firstTarget -> navigate(SkillMakerNav.KukulkanTarget(nav.skill, firstTarget)) }
+                    goToTarget = nav.skill in Skill.Servant.skill2,
+                    onTarget = { firstTarget -> navigate(SkillMakerNav.Choice2Target(nav.skill, firstTarget)) }
                 )
             }
 
-            is SkillMakerNav.KukulkanTarget -> {
-                SkillMakerKukulkanTarget(onSkillTarget = { vm.targetSkill(listOf(nav.firstTarget, it)) })
+            is SkillMakerNav.Choice2Target -> {
+                SkillMakerChoice2Target(onSkillTarget = { vm.targetSkill(listOf(nav.firstTarget, it)) })
+            }
+            is SkillMakerNav.Choice3 -> {
+                SkillMakerChoice3(
+                    slot = nav.slot,
+                    onSkillTarget = { servantTarget ->
+                        vm.targetSkill(servantTarget)
+                    },
+                )
             }
         }
     }

app/src/main/java/io/github/fate_grand_automata/ui/skill_maker/SkillMakerEntry.kt

@@ -3,26 +3,55 @@ package io.github.fate_grand_automata.ui.skill_maker
 import io.github.fate_grand_automata.scripts.models.AutoSkillAction
 import io.github.fate_grand_automata.scripts.models.ServantTarget
 import io.github.fate_grand_automata.scripts.models.Skill
+import io.github.fate_grand_automata.scripts.models.SpecialCommand
+import io.github.fate_grand_automata.scripts.models.WaveTurn
 
 sealed class SkillMakerEntry {
     class Action(val action: AutoSkillAction) : SkillMakerEntry() {
-        private fun toString(skill: Skill, target: ServantTarget?) =
-            if (target == null)
-                "${skill.autoSkillCode}"
-            else "${skill.autoSkillCode}${target.autoSkillCode}"
+        private fun toString(skill: Skill, target: ServantTarget?) = when (target) {
+            null -> "${skill.autoSkillCode}"
+            else -> {
+                if (target.specialTarget.isNotEmpty()) {
+                    "${skill.autoSkillCode}${target.autoSkillCode}${target.specialTarget}${SpecialCommand.EndSpecialTarget.autoSkillCode}"
+                } else {
+                    "${skill.autoSkillCode}${target.autoSkillCode}"
+                }
+            }
+        }
+
+        private fun toString(skill: Skill, targets: List<ServantTarget>) = when {
+            targets.isEmpty() -> "${skill.autoSkillCode}"
+            targets.size == 1 -> {
+                if (targets[0].specialTarget.isNotEmpty()) {
+                    "${skill.autoSkillCode}${targets[0].autoSkillCode}${targets[0].specialTarget}${SpecialCommand.EndSpecialTarget.autoSkillCode}"
+                } else {
+                    "${skill.autoSkillCode}${targets[0].autoSkillCode}"
+                }
+            }
+
+            else -> {
+                val start = "${skill.autoSkillCode}${SpecialCommand.StartMultiTarget.autoSkillCode}"
+                val end = "${SpecialCommand.EndMultiTarget.autoSkillCode}"
 
-        private fun toString(skill: Skill, targets: List<ServantTarget>) =
-            if (targets.isEmpty()) "${skill.autoSkillCode}"
-            else if (targets.size == 1) "${skill.autoSkillCode}${targets[0].autoSkillCode}"
-            else "${skill.autoSkillCode}(${targets.map(ServantTarget::autoSkillCode).joinToString("")})"
+                val middle = targets.joinToString("") { target ->
+                    if (target.specialTarget.isNotEmpty()) {
+                        "${target.autoSkillCode}${target.specialTarget}${SpecialCommand.EndSpecialTarget.autoSkillCode}"
+                    } else {
+                        "${target.autoSkillCode}"
+                    }
+                }
+
+                start + middle + end
+            }
+        }
 
         override fun toString() = when (action) {
             is AutoSkillAction.Atk -> {
                 if (action == AutoSkillAction.Atk.noOp()) {
                     "0"
                 } else {
                     val cardsBeforeNP = if (action.cardsBeforeNP > 0) {
-                        "n${action.cardsBeforeNP}"
+                        "${SpecialCommand.CardsBeforeNP.autoSkillCode}${action.cardsBeforeNP}"
                     } else ""
 
                     cardsBeforeNP + action.nps.joinToString("") {
@@ -33,8 +62,8 @@ sealed class SkillMakerEntry {
 
             is AutoSkillAction.ServantSkill -> toString(action.skill, action.targets)
             is AutoSkillAction.MasterSkill -> toString(action.skill, action.target)
-            is AutoSkillAction.TargetEnemy -> "t${action.enemy.autoSkillCode}"
-            is AutoSkillAction.OrderChange -> "x${action.starting.autoSkillCode}${action.sub.autoSkillCode}"
+            is AutoSkillAction.TargetEnemy -> "${SpecialCommand.EnemyTarget.autoSkillCode}${action.enemy.autoSkillCode}"
+            is AutoSkillAction.OrderChange -> "${SpecialCommand.OrderChange.autoSkillCode}${action.starting.autoSkillCode}${action.sub.autoSkillCode}"
         }
     }
 
@@ -47,11 +76,11 @@ sealed class SkillMakerEntry {
         else Action(this).toString()
 
         class Wave(action: AutoSkillAction.Atk) : Next(action) {
-            override fun toString() = "${action.str()},#,"
+            override fun toString() = "${action.str()}${WaveTurn.Wave.code}"
         }
 
         class Turn(action: AutoSkillAction.Atk) : Next(action) {
-            override fun toString() = "${action.str()},"
+            override fun toString() = "${action.str()}${WaveTurn.Turn.code}"
         }
     }
 }