Skip to content

Add more checks for Support servant #2108

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add more checks for Support servant #2108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6124518
Add handling for when Support Servant fails to be detected
Vylantze Sep 7, 2025
8ae56a4
Restrict the search region so that it needs to search less.
Vylantze Sep 7, 2025
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
14 changes: 14 additions & 0 deletions ...ts/src/main/java/io/github/fate_grand_automata/scripts/locations/AttackScreenLocations.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,20 @@ class AttackScreenLocations @Inject constructor(
fun supportCheckRegion(card: CommandCard.Face) =
affinityRegion(card) + Location(-50, 100)

fun supportCheckNewRegion(card: CommandCard.Face): Region {
val region = affinityRegion(card) + Location(-40, 155)
val newHeight = 120
val newWidth = 250
return Region(region.x, region.y, newWidth, newHeight)
}

fun supportCheckNewRegion2(card: CommandCard.Face): Region {
val region = affinityRegion(card) + Location(100, 170)
val newHeight = 100
val newWidth = 100
return Region(region.x, region.y, newWidth, newHeight)
}

val backClick =
(if (isWide)
Location(-325, 1310)
Expand Down
15 changes: 10 additions & 5 deletions scripts/src/main/java/io/github/fate_grand_automata/scripts/modules/ServantTracker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,11 @@ class ServantTracker @Inject constructor(

if (supportSlot == null && isSupport) {
supportSlot = teamSlot
} else if (!isSupport) {
// Don't useSameSnapIn here, since we open a dialog
initFaceCard(teamSlot, slot)
}

// We now always want to init the face card, so that there is a fallback for support servant detection failing
// Don't useSameSnapIn here, since we open a dialog
initFaceCard(teamSlot, slot)
}

private fun initFaceCard(teamSlot: TeamSlot, slot: FieldSlot, addAnotherImage: Boolean = false) {
Expand Down Expand Up @@ -200,16 +201,20 @@ class ServantTracker @Inject constructor(
supportSlot?.let { supportSlot ->
if (supportSlot in deployed.values) {
val matched = cardsRemaining.filter { card ->
images[Images.Support] in locations.attack.supportCheckRegion(card)
images[Images.Support] in locations.attack.supportCheckNewRegion(card)
}.toSet()

cardsRemaining -= matched
result[supportSlot] = matched
}
}

// Fallback for if the support servant is not found
val currentSupportSlot = supportSlot
val isSupportFound = if (currentSupportSlot != null) (result.getOrElse(currentSupportSlot) { emptySet() }).isNotEmpty() else false

val ownedServants = faceCardImages
.filterKeys { it != supportSlot && it in deployed.values }
.filterKeys { (!isSupportFound || it != supportSlot) && it in deployed.values }
cardsRemaining
.groupBy { card ->
// find the best matching Servant which isn't the support
Expand Down