Skip to content

fix: Add OCR cooldown guard to prevent skill spam false positives #2195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DCPMA wants to merge 4 commits into from
Closed

fix: Add OCR cooldown guard to prevent skill spam false positives #2195

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f9a5c41
fix: Add OCR cooldown guard to prevent skill spam false positives
DCPMA Mar 16, 2026
61c7ebf
refactor: Use platform similarity instead of hardcoded value
DCPMA Mar 16, 2026
8926ddc
refactor: Address PR review comments
DCPMA Mar 16, 2026
9b584a2
fix: Correct cooldownTextRegion offset to target actual cooldown text
DCPMA Mar 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...ts/src/main/java/io/github/fate_grand_automata/scripts/locations/BattleScreenLocations.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ class BattleScreenLocations @Inject constructor(
fun imageRegion(skill: Skill.Servant) =
Region(22, 28, 30, 30) + locate(skill)

fun cooldownTextRegion(skill: Skill.Servant) =
Region(8, 108, 96, 48) + locate(skill)

val servantDetailsInfoClick = Location(-660, 110).xFromCenter()

val servantDetailsFaceCardRegion = when (gameServer) {
Expand Down
39 changes: 37 additions & 2 deletions scripts/src/main/java/io/github/fate_grand_automata/scripts/modules/SkillSpam.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import io.github.fate_grand_automata.scripts.models.SkillSpamTarget
import io.github.fate_grand_automata.scripts.models.SpamConfigPerTeamSlot
import io.github.fate_grand_automata.scripts.models.battle.BattleState
import io.github.fate_grand_automata.scripts.models.skills
import io.github.lib_automata.Pattern
import io.github.lib_automata.dagger.ScriptScope
import javax.inject.Inject
import kotlin.time.Duration.Companion.seconds
Expand All @@ -22,6 +23,8 @@ class SkillSpam @Inject constructor(
) : IFgoAutomataApi by api {
companion object {
val skillSpamDelay = 0.25.seconds
val skillReadyRecheckDelay = 0.1.seconds
val cooldownRegex = Regex("""\d+""")
}
Comment on lines 26 to 29
Copy link
Copy Markdown
Author

@DCPMA DCPMA Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already addressed in 61c7ebf — the hardcoded skillReadySimilarity = 0.9 constant was removed and the calls were reverted to the in operator (Region.contains), which passes similarity = null and defers to platformImpl.prefs.minSimilarity. This is consistent with how the rest of the codebase handles image matching.


fun spamSkills() {
Expand All @@ -42,7 +45,7 @@ class SkillSpam @Inject constructor(
// Some delay for skill icon to be loaded
skillSpamDelay.wait()

if (skillImage in locations.battle.imageRegion(skill)) {
if (isReadyForSpam(skill, skillImage)) {
val target = skillSpamConfig.determineTarget(servantSlot)

caster.castServantSkill(skill, target)
Expand All @@ -68,4 +71,36 @@ class SkillSpam @Inject constructor(
SkillSpamTarget.Left -> ServantTarget.Left
SkillSpamTarget.Right -> ServantTarget.Right
}
}

private fun isReadyForSpam(skill: io.github.fate_grand_automata.scripts.models.Skill.Servant, skillImage: Pattern): Boolean {
val isReady = useSameSnapIn {
skillImage in locations.battle.imageRegion(skill) && !hasCooldownText(skill)
}

if (!isReady) {
return false
}

skillReadyRecheckDelay.wait()

return useSameSnapIn {
skillImage in locations.battle.imageRegion(skill) && !hasCooldownText(skill)
}
}

private fun hasCooldownText(skill: io.github.fate_grand_automata.scripts.models.Skill.Servant): Boolean {
val text = locations.battle.cooldownTextRegion(skill)
.detectText(outlinedText = true)
.replace('O', '0')
.replace('o', '0')
Copy link
Copy Markdown
Author

@DCPMA DCPMA Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 8926ddc — extracted the predicate into a local checkReady() function.

.replace('I', '1')
.replace('l', '1')

val cooldown = cooldownRegex
Copy link
Copy Markdown
Author

@DCPMA DCPMA Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in 8926ddc — added import io.github.fate_grand_automata.scripts.models.Skill and replaced the fully-qualified names with Skill.Servant, consistent with Caster.kt.

.find(text)
?.value
?.toIntOrNull()

return cooldown != null && cooldown > 0
}
}
Loading