Don't apply wait multiplier to support screen refresh

Fate-Grand-Automata · May 12, 2024 · d120b58 · d120b58
1 parent f1ebfc2
commit d120b58
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/libautomata/src/main/java/io/github/lib_automata/AutomataApi.kt b/libautomata/src/main/java/io/github/lib_automata/AutomataApi.kt
@@ -14,7 +14,12 @@ interface AutomataApi {
 
     fun <T> useColor(block: () -> T): T
 
-    fun Duration.wait()
+    /**
+     * Waits for the specified duration.
+     *
+     * @param applyMultiplier whether to apply the wait multiplier or not
+     */
+    fun Duration.wait(applyMultiplier: Boolean = true)
 
     fun Location.click(times: Int = 1)
 

diff --git a/libautomata/src/main/java/io/github/lib_automata/StandardAutomataApi.kt b/libautomata/src/main/java/io/github/lib_automata/StandardAutomataApi.kt
@@ -29,7 +29,7 @@ class StandardAutomataApi @Inject constructor(
     override fun <T> useColor(block: () -> T): T =
         colorManager.useColor(block)
 
-    override fun Duration.wait() = wait(this)
+    override fun Duration.wait(applyMultiplier: Boolean) = wait(this, applyMultiplier)
 
     override fun Location.click(times: Int) = click(this, times)
 

diff --git a/libautomata/src/main/java/io/github/lib_automata/Waiter.kt b/libautomata/src/main/java/io/github/lib_automata/Waiter.kt
@@ -4,15 +4,15 @@ import javax.inject.Inject
 import kotlin.time.Duration
 
 interface Waiter {
-    operator fun invoke(duration: Duration)
+    operator fun invoke(duration: Duration, applyMultiplier: Boolean = true)
 }
 
 class RealWaiter @Inject constructor(
     private val platformImpl: PlatformImpl,
     private val exitManager: ExitManager
 ): Waiter {
-    override fun invoke(duration: Duration) {
-        val multiplier = platformImpl.prefs.waitMultiplier
+    override fun invoke(duration: Duration, applyMultiplier: Boolean) {
+        val multiplier = if (applyMultiplier) platformImpl.prefs.waitMultiplier else 1.0
         exitManager.wait(duration * multiplier)
     }
 }
diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/modules/SupportScreen.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/modules/SupportScreen.kt
@@ -41,7 +41,7 @@ class RealSupportScreen @Inject constructor(
     override fun click(supportClass: SupportClass) =
         locations.support.locate(supportClass).click()
 
-    override fun delay(duration: Duration) = duration.wait()
+    override fun delay(duration: Duration) = duration.wait(false)
 
     override fun refresh() {
         locations.support.updateClick.click()