Also detect gift box if only 5* EXP is visible

Fate-Grand-Automata · Apr 1, 2024 · 94746fa · 94746fa
1 parent ab6cbc6
commit 94746fa
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
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
@@ -90,6 +90,7 @@ class ImageLoader @Inject constructor(
         Images.SelectedParty -> "selected_party.png"
         Images.SilverXP -> "SilverXP.png"
         Images.GoldXP -> "GoldXP.png"
+        Images.Gold5StarXP -> "Gold5StarXP.png"
         Images.GiftBoxCheck -> "gift_box_check.png"
         Images.GiftBoxScrollEnd -> "gift_box_scroll_end.png"
         Images.DropCE -> "drop_ce.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
@@ -29,6 +29,11 @@ interface AutomataApi {
         similarity: Double? = null
     ): Match? = findAll(pattern, similarity).firstOrNull()
 
+    fun Region.find(
+        patterns: Collection<Pattern>,
+        similarity: Double? = null
+    ): Match? = patterns.firstNotNullOfOrNull { find(it, similarity) }
+
     fun Region.exists(
         image: Pattern,
         timeout: Duration = Duration.ZERO,

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
@@ -42,6 +42,7 @@ enum class Images {
     SelectedParty,
     SilverXP,
     GoldXP,
+    Gold5StarXP,
     GiftBoxCheck,
     GiftBoxScrollEnd,
     DropCE,

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
@@ -24,7 +24,7 @@ class AutoDetect @Inject constructor(
             images[Images.LotteryBoxFinished] in locations.lottery.checkRegion || images[Images.LotteryBoxFinished] in locations.lottery.finishedRegion ->
                 ScriptModeEnum.Lottery
 
-            listOf(images[Images.GoldXP], images[Images.SilverXP]) in emberSearchRegion ->
+            listOf(images[Images.GoldXP], images[Images.SilverXP], images[Images.Gold5StarXP]) 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/entrypoints/AutoGiftBox.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoGiftBox.kt
@@ -46,7 +46,7 @@ class AutoGiftBox @Inject constructor(
 
     override fun script(): Nothing {
         var totalSelected = IterationResult()
-        val xpOffsetX = (locations.scriptArea.find(images[Images.GoldXP]) ?: locations.scriptArea.find(images[Images.SilverXP]))
+        val xpOffsetX = locations.scriptArea.find(listOf(images[Images.GoldXP], images[Images.SilverXP], images[Images.Gold5StarXP]))
             ?.region?.center?.x
             ?: throw ExitException(ExitReason.NoEmbersFound)