fix 100x summon

Author: ArthurKun21

scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoFriendGacha.kt

@@ -25,6 +25,8 @@ class AutoFriendGacha @Inject constructor(
     class ExitException(val reason: ExitReason) : Exception()
 
     private var count = 0
+    private var isInLoop = false
+    private var initialScreen = false
 
     private fun countNext() {
         if (prefs.shouldLimitFP && count >= prefs.limitFP) {
@@ -35,35 +37,66 @@ class AutoFriendGacha @Inject constructor(
     }
 
     override fun script(): Nothing {
-        val initialClickLocation: Location? = if (images[Images.FriendSummon] in locations.fp.initialSummonCheck) {
-            locations.fp.initialSummonClick
-        } else if (!isSummonButtonVisible()) {
-            locations.fp.first10SummonClick
-        } else null
+        val screens: Map<() -> Boolean, () -> Unit> = mapOf(
+            { isInventoryFull() } to {
+                throw ExitException(ExitReason.InventoryFull)
+            },
+            { isFirstSummon() } to {
+                // First 10x or 100x Summon
+                locations.fp.first10SummonClick.click()
+                0.3.seconds.wait()
+                locations.fp.okClick.click()
 
-        initialClickLocation?.let {
-            it.click()
-            0.3.seconds.wait()
-            locations.fp.okClick.click()
+                initialScreen = true
+            },
+            { isDailyFree() } to {
+                // Daily Free Summon
+                locations.fp.initialSummonClick.click()
+                0.3.seconds.wait()
+                locations.fp.initialSummonContinueClick.click()
 
-            countNext()
-        }
+                initialScreen = true
+            },
+            { isSummonButtonVisible() } to { rollFPAgain() }
+        )
 
         while (true) {
-            if (isInventoryFull()) {
-                throw ExitException(ExitReason.InventoryFull)
-            }
-
-            if (isSummonButtonVisible()) {
-                countNext()
+            val actor = useSameSnapIn {
+                screens
+                    .asSequence()
+                    .filter { (validator, _) -> validator() }
+                    .map { (_, actor) -> actor }
+                    .firstOrNull()
+            } ?: { locations.fp.skipRapidClick.click(15) }
+            actor.invoke()
+            0.5.seconds.wait()
+        }
+    }
 
-                locations.fp.continueSummonClick.click()
-                0.3.seconds.wait()
-                locations.fp.okClick.click()
-                3.seconds.wait()
-            } else locations.fp.skipRapidClick.click(15)
+    private fun rollFPAgain() {
+        if (!isInLoop && initialScreen) {
+            countNext()
+            isInLoop = true
         }
+        countNext()
+
+        locations.fp.continueSummonClick.click()
+        0.3.seconds.wait()
+        locations.fp.okClick.click()
+        3.seconds.wait()
     }
 
     private fun isSummonButtonVisible() = findImage(locations.fp.continueSummonRegion, Images.FPSummonContinue)
+
+    private fun isFirstSummon(): Boolean {
+        if (isInLoop) return false
+
+        return images[Images.FriendSummon] in locations.fp.summonCheck
+    }
+
+    private fun isDailyFree(): Boolean {
+        if (isInLoop) return false
+
+        return images[Images.FriendSummon] in locations.fp.initialSummonCheck
+    }
 }

scripts/src/main/java/io/github/fate_grand_automata/scripts/locations/FPLocations.kt

@@ -23,13 +23,14 @@ class FPLocations @Inject constructor(
         Location(2, 977).xFromCenter()
     else
         Location(2, 1052).xFromCenter()
+    val initialSummonContinueClick = Region(341, 1145, 120, 60).xFromCenter()
 
     val continueSummonRegion = Region(-36, 1264, 580, 170).xFromCenter()
     val first10SummonClick = if (afterAnni9)
         // the old location is still valid but only for 10x FP
         Location(400, 1062).xFromCenter()
     else
-        Location(120, 1062).xFromCenter()
+        Location(170, 1062).xFromCenter()
 
     val okClick = Location(320, 1120).xFromCenter()
     val continueSummonClick = Location(320, 1325).xFromCenter()