Avoid Immobilized cards

Fixes #1666
Fate-Grand-Automata · Aug 27, 2023 · c1e08a4 · c1e08a4
1 parent 4d19ef7
commit c1e08a4
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 2 deletions.
diff --git a/app/src/main/assets/En/immobilized.png b/app/src/main/assets/En/immobilized.png
diff --git a/app/src/main/java/io/github/fate_grand_automata/util/ImageLoader.kt b/app/src/main/java/io/github/fate_grand_automata/util/ImageLoader.kt
@@ -85,6 +85,7 @@ class ImageLoader @Inject constructor(
         Images.FPSummonContinue -> "fp_continue.png"
         Images.SkillTen -> "skill_ten.png"
         Images.Stun -> "stun.png"
+        Images.Immobilized -> "immobilized.png"
         Images.SelectedParty -> "selected_party.png"
         Images.SilverXP -> "SilverXP.png"
         Images.GoldXP -> "GoldXP.png"

diff --git a/libautomata/src/main/java/io/github/lib_automata/AutomataApi.kt b/libautomata/src/main/java/io/github/lib_automata/AutomataApi.kt
@@ -22,6 +22,8 @@ interface AutomataApi {
 
     operator fun Region.contains(image: Pattern) = exists(image)
 
+    operator fun Region.contains(images: Collection<Pattern>) = images.any { contains(it) }
+
     fun Region.find(
         pattern: Pattern,
         similarity: Double? = null

diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/Images.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/Images.kt
@@ -37,6 +37,7 @@ enum class Images {
     FPSummonContinue,
     SkillTen,
     Stun,
+    Immobilized,
     SelectedParty,
     SilverXP,
     GoldXP,

diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoDetect.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoDetect.kt
@@ -22,7 +22,7 @@ class AutoDetect @Inject constructor(
             images[Images.LotteryBoxFinished] in locations.lottery.checkRegion || images[Images.LotteryBoxFinished] in locations.lottery.finishedRegion ->
                 ScriptModeEnum.Lottery
 
-            images[Images.GoldXP] in emberSearchRegion || images[Images.SilverXP] in emberSearchRegion ->
+            listOf(images[Images.GoldXP], images[Images.SilverXP]) in emberSearchRegion ->
                 ScriptModeEnum.PresentBox
 
             locations.support.confirmSetupButtonRegion.exists(images[Images.SupportConfirmSetupButton], similarity = 0.75) ->

diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/modules/CardParser.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/modules/CardParser.kt
@@ -38,7 +38,7 @@ class CardParser @Inject constructor(
             height = 188
         )
 
-        return images[Images.Stun] in stunRegion
+        return listOf(images[Images.Stun], images[Images.Immobilized]) in stunRegion
     }
 
     private fun CommandCard.Face.type(): CardTypeEnum {