feat: Add NP/Star Conditions, Update Target Dialog, and Skill Priority Drag-Sort on Spam Screen #2103

erectorOps · 2025-09-02T22:24:27Z

feat: Add NP/Star Conditions, Update Target Dialog, and Skill Priority Drag-Sort on Spam Screen

Note

This PR has not been rebased onto the #2076 PR.
It was created from upstream/master and manually includes changes equivalent to #2076.
Therefore, merging both this PR and #2076 simultaneously may cause conflicts.

Bug Fix
Feature Implementation
Documentation
Other

This PR is currently combined into a single one, but if needed, it can be split into separate PRs by the following categories:
bugfix api-utility data core ui

Related Issue

Fixed
Spam doesn't work #2072
Spam Skill on NP Turn #903
Feature request: Use skill on turn when Noble Phantasm spam is up #1048
Auto-skill does not detect availability of some skills #1150

Description

Added NP conditions to Servant skill settings in Spam mode
- NP is detected using two methods:
  1. Detect Charged state via the right edge color of the gauge
  2. Calculate NP value from the gauge length (values above 100 treated as 100)
Added Star conditions
- Detect total critical stars using Tesseract OCR
Improved skill cooldown detection
- Detect from the color of the bottom frame of skill icons
- Ignore skills under Eternal Sleep, which do not change bottom frame color
Added Repeat Until Used option for Kishinami Hakuno’s “Sparks Route ∞”
- Allows skills to be cast multiple times in the same turn
- Loop stops when conditions no longer match or skill goes on cooldown
Replaced skill target selection dialog with AutoSkillAction UI
Added DragSort at the bottom to adjust skill priority
- Removed dependency on specific layout in the previous implementation
Bug Fixes
- Integrated fix: Skill window not closing during cooldown #2076 changes
- Fixed bug where moving DragSortAdapter elements via slide caused order mismatch

Screenshots

Spam screen
Skill priority drag-sort at the bottom of the screen
Spam mode dialog
Shows new condition fields
Target selection UI
AutoSkillAction (directly reused without modification)
Cooldown detection (zoomed)
Checks whether the mean HSV of the region is within the HSV range
NP Charged detection (zoomed)
Checks whether the mean HSV of the region is within the HSV range
NP Visual bar detection (zoomed)
Checks 1×8 pixels per column for HSV range and measures bar length to determine NP value
Critical Star OCR detection & normalized image (zoomed)

Testing Notes

Star condition OCR works correctly in all languages
- In Simplified Chinese version, 1 may be recognized as 4; does not break logic since only 10 and 50 stars are used
Cooldown and NP detection verified in all languages
Tested using LDPlayer screenshots and Python scripts
Python script for Cooldown detection
Python script for NP detection
Python script for Star detection

…cy (bugfix)

…lity)

…Pattern (api-utility)

… target order (data)

…pamSkillState (data)

…kill index (api-utility)

…new cooldown detection (core)

…ity, and select targets using AutoSkillAction (core)

…ore)

…ction constants (core)

…ck in SkillSpam (core)

…SPAM (core)

…) (ui)

… UI break (ui)

…g-sort (ui) - Replace simple ListDialog with a condition dialog for Spam mode, NP Condition, Star Condition, and Repeat Until Used - Update Target selection UI from simple ListDialog to AutoSkillAction-based UI - Add DragSortView and DragSortAdapter to set skill usage priority

github-actions · 2025-09-02T22:28:33Z

Build 485

Download the latest APK for testing here

Note

You need a GitHub account to download the APK.

This URL is valid as long as the artifact has not expired yet.

Vylantze · 2025-09-03T07:14:54Z

Well, I'll be damned. NP detection was just what I wanted for my own pull request. Magical.

Also @erectorOps your screenshots are not working.

erectorOps · 2025-09-03T14:43:37Z

Also @erectorOps your screenshots are not working.

I see, so attachments uploaded in my own repository can’t be displayed.
I’ve re-uploaded it, so it should be viewable now.

ArthurKun21 · 2025-09-03T16:08:00Z

You could use this instead of using recycle view

https://github.com/Calvin-LL/Reorderable

Copilot

Pull Request Overview

This PR adds NP conditions, star conditions, and skill priority drag-sort functionality to the Spam screen. It replaces image-based skill detection with color/HSV-based detection and introduces a new target selection UI.

Key changes:

Added NP gauge detection using HSV color analysis and visual bar length measurement
Added critical star detection using Tesseract OCR
Replaced skill image detection with HSV-based cooldown detection
Added skill priority drag-sort functionality with visual ordering
Introduced new conditional fields (NP, Star) to skill spam configuration

Reviewed Changes

Copilot reviewed 42 out of 42 changed files in this pull request and generated 7 comments.

Show a summary per file

File	Description
SkillSpam.kt	Core spam logic with NP/star detection and priority-based skill execution
CriticalStarTracker.kt	New module for OCR-based critical star detection
Caster.kt	Enhanced skill casting with cooldown detection and Eternal Sleep handling
SpamConfig.kt	Extended configuration model with new conditional fields
BattleScreenLocations.kt	Added regions for NP gauge, skill cooldown, and star detection
SpamScreen.kt	Updated UI with new condition selection and target picker
DragSortSkillPriorityAdapter.kt	New drag-sort adapter for skill priority management
libautomata/*.kt	Extended automation API with HSV detection and OCR capabilities

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

Copilot · 2025-09-03T16:20:28Z

scripts/src/main/java/io/github/fate_grand_automata/scripts/modules/SkillSpam.kt

+            // TODO: NpType3 reuses ServantTarget.ABC, so it's affected by deployed state. It should be independent of servant count.
+            actualSlot = when (deployed.size) {
+                1 -> FieldSlot.B
+                2 -> {
+                    if (actualSlot == FieldSlot.B) {
+                        when (null) {
+                            deployed[FieldSlot.A] -> FieldSlot.A
+                            deployed[FieldSlot.C] -> FieldSlot.C
+                            else -> FieldSlot.A // Assume Left when Slot B is empty
+                        }
+                    } else actualSlot
+                }
+                else -> actualSlot
+            }


The when (null) expression on line 212 will never match any conditions since it's comparing null to non-null values from the map. This should likely be checking for null values in the deployed map entries.

The comment is based on the type analysis assumption that the Map’s values are non-null, so the when(null) would never match. However, in reality, if a key does not exist in the Map, deployed[slot] returns null, so this comment is incorrect. That said, my code currently returns the empty slot as actualSlot, which is not the intended behavior, so I will fix it.

Copilot · 2025-09-03T16:20:28Z

scripts/src/main/java/io/github/fate_grand_automata/scripts/modules/SkillSpam.kt

+            else -> true
+        }
+
+        val starCond = when(star) {


Missing space after when. Should be when (star).

Suggested change

val starCond = when(star) {

val starCond = when (star) {

Copilot · 2025-09-03T16:20:29Z

scripts/src/main/java/io/github/fate_grand_automata/scripts/modules/CriticalStarTracker.kt

+     * ⚠️ When calling this function inside `useSameSnapIn`, be aware that it may
+     * reuse a gray cached snapshot and return incorrect results.


This warning about useSameSnapIn appears in multiple places but the function name is inconsistent. It should be useSameSnapIn consistently throughout the codebase.

// OCR Accuracy Report // 0 1 2 3 4 5 6 7 8 9 // TW: ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ // CN: ✅ ⚠️ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ // KO: ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ // JA: ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ // EN: ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ ✅ // ⚠️: Sometimes a “1” is misrecognized as a “4”. // Safe with current Star Condition options.

It seems that it is checking comments containing ⚠️ and flagging the above comment as inconsistent. However, as you can see, this comment is unrelated to useSameSnapIn, so I believe there is no issue.

Copilot · 2025-09-03T16:20:29Z

scripts/src/main/java/io/github/fate_grand_automata/scripts/modules/Caster.kt

+    }
+
+    private fun isSkillConfirmDialogOkButtonDisabled(): Boolean {
+        val brightness = locations.battle.skillUseOkRegion.getPattern().getAverageBrightness()


Creating a pattern object just to get average brightness is inefficient. Consider adding a direct brightness check method to the region API to avoid pattern creation overhead.

Copilot · 2025-09-03T16:20:29Z

libautomata/src/main/java/io/github/lib_automata/Pattern.kt

+     * @param invert if true, the binary result is inverted.
+     * 　　　　　　　　 Set to true for white text


The comment uses full-width spaces (　) instead of regular spaces. This should use regular ASCII spaces for consistency.

Suggested change

* @param invert if true, the binary result is inverted.

* 　　　　　　　　 Set to true for white text

* Set to true for white text

Copilot · 2025-09-03T16:20:30Z

app/src/main/java/io/github/fate_grand_automata/ui/spam/SpamSkillOrderView.kt

+                context, when(item.servantIndex) {
+                    1 -> R.color.servant1_primary_text
+                    2 -> R.color.servant2_primary_text
+                    3 -> R.color.servant3_primary_text
+                    4 -> R.color.servant4_primary_text
+                    5 -> R.color.servant5_primary_text
+                    else -> R.color.servant6_primary_text


The color selection logic is duplicated three times in this function. Consider extracting this into a helper function to reduce code duplication and improve maintainability.

Copilot · 2025-09-03T16:20:30Z

app/src/main/java/io/github/fate_grand_automata/imaging/DroidCvPattern.kt

+                        val row = gray.row(y)
+                        if (Core.countNonZero(row) > 0) count++
+                        row.release()


The OpenCV Mat objects created by gray.row(y) and gray.col(x) should be released in a try-finally block to ensure proper cleanup even if an exception occurs.

…ng pattern creation overhead

…y drag-sort

erectorOps · 2025-09-04T00:56:46Z

Thanks for the reviews, @ArthurKun21 and Copilot! I’ve applied the suggested fixes and improvements. I really appreciate your insights and guidance.

Vylantze · 2025-09-09T02:47:31Z

I think after this has been merged, I'll probably make a pull request to make use of this new system in the default command line processing. So that you can do the following:

Only using Scathach/Skadi skill 3 on its target if the target has < 100% NP bar.
Automatically skip an already used skill, and not accidentally proc the popup window detection (causing the rest of your commands to break because FGA thinks that you are using popups when it only popped up because the skill was already used).

erectorOps added 22 commits September 2, 2025 15:25

fix: Skill window not closing during cooldown (bugfix)

b51fb32

fix: Fix item order bug in DragSortAdapter and remove layout dependen…

0a3fb8d

…cy (bugfix)

feat: Optionally render text along with highlights (api-utility)

b2a8637

feat: Add Hsv data class with extension to convert to Scalar (api-uti…

b0e1ea7

…lity)

feat: Add HSV-based detection and brightness utilities to Region and …

c2c3172

…Pattern (api-utility)

feat: Add API method for bracketed number OCR (api-utility)

58289e2

feat: Add function to measure the length of a gauge bar (api-utility)

4cfee0b

feat: Add NP-based usage condition to SpamSkillState (data)

8d5bc90

feat: Add star-count-based usage condition to SpamSkillState (data)

bbdd09c

feat: Replace SpamSkillTarget with AutoSkillAction to support complex…

e2d233f

… target order (data)

feat: Add priority field and repeat-per-turn option (for Hakuno) to S…

ff6b485

…pamSkillState (data)

feat: Add utility functions for Skill.Servant to get field slot and s…

295ee4c

…kill index (api-utility)

feat: Ignore skills blocked by Oberon’s Eternal Sleep when using the …

c5be9be

…new cooldown detection (core)

feat: Detect skill cooldown via icon brightness, cast skills by prior…

26ffc56

…ity, and select targets using AutoSkillAction (core)

feat: add NP charged detection and NP Condition check in SkillSpam (c…

e79f767

…ore)

docs: add detailed testing notes for NP gauge and skill cooldown dete…

f503c79

…ction constants (core)

feat: feat: implement star count detection and add Star Condition che…

4e040fa

…ck in SkillSpam (core)

feat: Add approximate NP value retrieval and extend NP conditions in …

e0354d3

…SPAM (core)

feat: Update SPAM UI resources (colors, dimens, localized, extensions…

8d38319

…) (ui)

feat: Add skill priority item layout for SPAM UI drag-and-drop view (ui)

c932353

feat: Separate SPAM button label from target screen header to prevent…

059bebc

… UI break (ui)

ArthurKun21 requested a review from Copilot September 3, 2025 16:17

Copilot AI reviewed Sep 3, 2025

View reviewed changes

erectorOps added 2 commits September 4, 2025 06:42

fix: Return a non-empty slot instead of an empty one for actualSlot

e9261f6

fix: Use use to safely release OpenCV Mat rows and columns

a95f88f

erectorOps added 5 commits September 4, 2025 06:50

fix: Replace full-width spaces with regular ASCII spaces for consistency

e9cbce5

fix: Add missing space after when for correct syntax

1108fb9

Add isBelowBrightness API to check region brightness directly, avoidi…

e2faecf

…ng pattern creation overhead

chore(deps): add Reorderable library via Version Catalog

72f9d2a

feat: Replace RecyclerView with Reorderable LazyRow for skill priorit…

e4acbe0

…y drag-sort

ArthurKun21 requested a review from reconman September 8, 2025 11:24

		* ⚠️ When calling this function inside `useSameSnapIn`, be aware that it may
		* reuse a gray cached snapshot and return incorrect results.

		* @param invert if true, the binary result is inverted.
		* 　　　　　　　　 Set to true for white text

	* @param invert if true, the binary result is inverted.
	* 　　　　　　　　 Set to true for white text
	* Set to true for white text

Uh oh!

feat: Add NP/Star Conditions, Update Target Dialog, and Skill Priority Drag-Sort on Spam Screen #2103

Are you sure you want to change the base?

feat: Add NP/Star Conditions, Update Target Dialog, and Skill Priority Drag-Sort on Spam Screen #2103

Uh oh!

Conversation

erectorOps commented Sep 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

feat: Add NP/Star Conditions, Update Target Dialog, and Skill Priority Drag-Sort on Spam Screen

Related Issue

Description

Screenshots

Testing Notes

Uh oh!

github-actions bot commented Sep 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Build 485

Uh oh!

Vylantze commented Sep 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

erectorOps commented Sep 3, 2025

Uh oh!

ArthurKun21 commented Sep 3, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

erectorOps Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

erectorOps Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 3, 2025

Choose a reason for hiding this comment

Uh oh!

erectorOps commented Sep 4, 2025

Uh oh!

Vylantze commented Sep 9, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

erectorOps commented Sep 2, 2025 •

edited

Loading

github-actions bot commented Sep 2, 2025 •

edited

Loading

Vylantze commented Sep 3, 2025 •

edited

Loading