Improved out of lotto currency detection (#1792)

Co-authored-by: arthur <[email protected]>
Fate-Grand-Automata · Apr 5, 2024 · bf36219 · bf36219
1 parent 54cb493
commit bf36219
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 35 deletions.
diff --git a/app/src/main/assets/En/lottery_lineup_updated.png b/app/src/main/assets/En/lottery_lineup_updated.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
@@ -76,7 +76,6 @@ class ImageLoader @Inject constructor(
         Images.Retry -> "retry.png"
         Images.Withdraw -> "withdraw.png"
         Images.LotteryBoxFinished -> "lottery.png"
-        Images.LotteryLineupUpdated -> "lottery_lineup_updated.png"
         Images.LotteryTransition -> "lottery_transition.png"
         Images.PresentBoxFull -> "StopGifts.png"
         Images.MasterExp -> "master_exp.png"

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
@@ -28,7 +28,6 @@ enum class Images {
     Retry,
     Withdraw,
     LotteryBoxFinished,
-    LotteryLineupUpdated,
     LotteryTransition,
     PresentBoxFull,
     MasterExp,

diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoLottery.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoLottery.kt
@@ -39,33 +39,13 @@ class AutoLottery @Inject constructor(
 
             moveToPresentBox?.region?.click()
 
-            1.seconds.wait()
+            3.seconds.wait()
             giftBox.script()
         }
 
         throw ExitException(ExitReason.PresentBoxFull)
     }
 
-    private fun isOutOfCurrency() = images[Images.LotteryBoxFinished] in locations.lottery.finishedRegion
-
-    private fun ranOutOfCurrency() {
-        // this can also be triggered before the notification about a new box happens
-        // tap any dialog away, then check for the message
-        spin()
-        if (isNewLineup()) {
-            confirmNewLineup()
-        } else if (isOutOfCurrency()) {
-            throw ExitException(ExitReason.RanOutOfCurrency)
-        }
-    }
-
-    private fun isNewLineup() =
-        images[Images.LotteryLineupUpdated] in locations.lottery.lineupUpdatedRegion
-
-    private fun confirmNewLineup() {
-        locations.lottery.confirmNewLineupClick.click()
-    }
-
     private fun isTransition() = images[Images.LotteryTransition] in locations.lottery.transitionRegion
 
 
@@ -75,18 +55,30 @@ class AutoLottery @Inject constructor(
     )
 
     private fun confirmIfLotteryDone() {
-        spin()
-
-        val exist = isLotteryDone()
-        if (exist) {
-            throw ExitException(ExitReason.RanOutOfCurrency)
+        run verify@{
+            repeat(2) {
+                if (connectionRetry.needsToRetry()) {
+                    connectionRetry.retry()
+                }
+                spin()
+                val falseDetection = locations.lottery.doneRegion.waitVanish(
+                    images[Images.LotteryBoxFinished],
+                    timeout = 5.seconds,
+                    similarity = 0.85
+                )
+                if (falseDetection) {
+                    return@verify
+                }
+            }
+            val exist = isLotteryDone()
+            if (exist) {
+                throw ExitException(ExitReason.RanOutOfCurrency)
+            }
         }
     }
 
     override fun script(): Nothing {
         val screens: Map<() -> Boolean, () -> Unit> = mapOf(
-            { isNewLineup() } to { confirmNewLineup() },
-            { isOutOfCurrency() } to { ranOutOfCurrency() },
             { connectionRetry.needsToRetry() } to { connectionRetry.retry() },
             { images[Images.PresentBoxFull] in locations.lottery.fullPresentBoxRegion } to { presentBoxFull() },
             { isLotteryDone() } to { confirmIfLotteryDone() },

diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/locations/LotteryLocations.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/locations/LotteryLocations.kt
@@ -9,12 +9,8 @@ class LotteryLocations @Inject constructor(
 ) : IScriptAreaTransforms by scriptAreaTransforms {
     val finishedRegion = Region(-510, 700, 55, 100).xFromCenter()
     val checkRegion = Region(-1130, 700, 675, 330).xFromCenter()
-    val spinClick = Location(-446, 860).xFromCenter()
+    val spinClick = Location(-646, 860).xFromCenter()
     val fullPresentBoxRegion = Region(20, 860, 1000, 500).xFromCenter()
-    val lineupUpdatedRegion = Region(-320, 360, 640, 100).xFromCenter()
-
-    // center of screen
-    val confirmNewLineupClick = Location(1280, 720)
 
     val doneRegion = Region(-510, 700, 60, 90).xFromCenter()