Always select servant with CE (#1799)

Co-authored-by: arthur <[email protected]> Co-authored-by: reconman <[email protected]>
Fate-Grand-Automata · May 24, 2024 · aa955c0 · aa955c0
1 parent ac2a6af
commit aa955c0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/app/src/main/assets/En/support_blank_ce.png b/app/src/main/assets/En/support_blank_ce.png
diff --git a/app/src/main/java/io/github/fate_grand_automata/util/ImageLoader.kt b/app/src/main/java/io/github/fate_grand_automata/util/ImageLoader.kt
@@ -133,6 +133,7 @@ class ImageLoader @Inject constructor(
         Images.Ok -> "ok.png"
         Images.OkKR -> "ok-kr.png"
         Images.Execute -> "execute.png"
+        Images.SupportBlankCE -> "support_blank_ce.png"
     }
 
     override operator fun get(img: Images, gameServer: GameServer?): Pattern = synchronized(regionCachedPatterns) {

diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/Images.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/Images.kt
@@ -87,5 +87,6 @@ enum class Images {
      * 2nd OK button for FGO KR
      */
     OkKR,
-    Execute
+    Execute,
+    SupportBlankCE
 }
diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/supportSelection/CESelection.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/supportSelection/CESelection.kt
@@ -2,6 +2,7 @@ package io.github.fate_grand_automata.scripts.supportSelection
 
 import io.github.fate_grand_automata.SupportImageKind
 import io.github.fate_grand_automata.scripts.IFgoAutomataApi
+import io.github.fate_grand_automata.scripts.Images
 import io.github.fate_grand_automata.scripts.prefs.ISupportPreferences
 import io.github.lib_automata.Region
 import io.github.lib_automata.dagger.ScriptScope
@@ -17,8 +18,10 @@ class CESelection @Inject constructor(
         // TODO: Only check the lower part (excluding Servant)
         val searchRegion = bounds.region.clip(locations.support.listRegion)
 
-        if (ces.isEmpty())
-            return true
+        if (ces.isEmpty()) {
+            // servant must not have blank ce
+            return !searchRegion.exists(images[Images.SupportBlankCE])
+        }
 
         val matched = ces
             .flatMap { entry -> images.loadSupportPattern(SupportImageKind.CE, entry) }