Remove Story Skip option since it's broken in many cases (#2158)

reconman · web-flow · commit 001f1d973d88 · 2025-12-22T21:05:14.000+01:00
diff --git a/app/src/main/assets/Cn/storyskip.png b/app/src/main/assets/Cn/storyskip.png
diff --git a/app/src/main/java/io/github/fate_grand_automata/ui/more/BattleGroup.kt b/app/src/main/java/io/github/fate_grand_automata/ui/more/BattleGroup.kt
@@ -34,13 +34,6 @@ fun LazyListScope.battleGroup(
         )
     }
 
-    item {
-        prefs.storySkip.SwitchPreference(
-            title = stringResource(R.string.p_story_skip),
-            icon = icon(Icons.Default.FastForward)
-        )
-    }
-
     item {
         prefs.withdrawEnabled.SwitchPreference(
             title = stringResource(R.string.p_enable_withdraw),
diff --git a/app/src/main/res/values-b+zh+CN/localized.xml b/app/src/main/res/values-b+zh+CN/localized.xml
@@ -118,7 +118,6 @@
     <string name="p_game_server_auto_detect">"自动检测"</string>
     <string name="p_spam_summary">"选择危险敌人时施放选项需开启自动选取敌人"</string>
     <string name="p_auto_choose_target">"自动选取敌人"</string>
-    <string name="p_story_skip">"跳过剧情"</string>
     <string name="p_enable_withdraw">"启用撤退"</string>
     <string name="p_stop_on_ce_get">"获得礼装时自动停止"</string>
     <string name="p_stop_on_first_clear_rewards">"获得首通奖励时自动停止"</string>
diff --git a/app/src/main/res/values-b+zh+TW/localized.xml b/app/src/main/res/values-b+zh+TW/localized.xml
@@ -115,7 +115,6 @@ Order Change"</string>
     <string name="p_game_server_auto_detect">"自動偵測"</string>
     <string name="p_spam_summary">"選擇 Danger 敵人時施放選項需開啟自動選取敵人"</string>
     <string name="p_auto_choose_target">"自動選取敵人"</string>
-    <string name="p_story_skip">"跳過劇情"</string>
     <string name="p_enable_withdraw">"啟用撤退"</string>
     <string name="p_stop_on_ce_get">"禮裝獲得自動停止"</string>
     <string name="p_stop_on_first_clear_rewards">"首次通關自動停止"</string>
diff --git a/app/src/main/res/values-ja/localized.xml b/app/src/main/res/values-ja/localized.xml
@@ -118,7 +118,6 @@
     <string name="p_game_server_auto_detect">"自動選択"</string>
     <string name="p_spam_summary">"DANGERモードはDANGERエネミー(サーヴァント&gt;DANGERエネミー)を自動選択します"</string>
     <string name="p_auto_choose_target">"ターゲットの自動選択"</string>
-    <string name="p_story_skip">"ストーリースキップ"</string>
     <string name="p_enable_withdraw">"全滅時に撤退"</string>
     <string name="p_stop_on_ce_get">"概念礼装を入手したら停止"</string>
     <string name="p_stop_on_first_clear_rewards">"初回クリア報酬を入手したら停止"</string>
diff --git a/app/src/main/res/values-ko/localized.xml b/app/src/main/res/values-ko/localized.xml
@@ -115,7 +115,6 @@
     <string name="p_game_server_auto_detect">"자동 감지"</string>
     <string name="p_spam_summary">"위험 모드는 자동 표적 활성화가 필요합니다"</string>
     <string name="p_auto_choose_target">"대상 자동 선택"</string>
-    <string name="p_story_skip">"스토리 스킵"</string>
     <string name="p_enable_withdraw">"퇴각 활성화"</string>
     <string name="p_stop_on_ce_get">"예장 획득시 정지"</string>
     <string name="p_stop_on_first_clear_rewards">"초회 클리어 보상 수령시 정지"</string>
diff --git a/app/src/main/res/values-vi/localized.xml b/app/src/main/res/values-vi/localized.xml
@@ -114,7 +114,6 @@ Master"</string>
     <string name="p_game_server_auto_detect">"Tự động nhận diện"</string>
     <string name="p_spam_summary">"Chế độ nguy hiểm yêu cầu Tự động nhắm mục tiêu"</string>
     <string name="p_auto_choose_target">"Luôn tự động chọn mục tiêu"</string>
-    <string name="p_story_skip">"Bỏ qua cốt truyện"</string>
     <string name="p_enable_withdraw">"Bật \"Đầu hàng\""</string>
     <string name="p_stop_on_ce_get">"Dừng lại khi lấy được CE"</string>
     <string name="p_stop_on_first_clear_rewards">"Dừng lại ở phần thưởng đầu tiên"</string>
diff --git a/app/src/main/res/values/localized.xml b/app/src/main/res/values/localized.xml
@@ -118,7 +118,6 @@ Skills"</string>
     <string name="p_game_server_auto_detect">"Auto-detect"</string>
     <string name="p_spam_summary">"Danger mode requires Auto-targeting"</string>
     <string name="p_auto_choose_target">"Auto choose target"</string>
-    <string name="p_story_skip">"Story Skip"</string>
     <string name="p_enable_withdraw">"Enable Withdraw"</string>
     <string name="p_stop_on_ce_get">"Stop on CE GET"</string>
     <string name="p_stop_on_first_clear_rewards">"Stop on first-clear rewards"</string>
diff --git a/prefs/src/main/java/io/github/fate_grand_automata/prefs/Preferences.kt b/prefs/src/main/java/io/github/fate_grand_automata/prefs/Preferences.kt
@@ -63,8 +63,6 @@ class PreferencesImpl @Inject constructor(
             selectedServerConfigPref.selectedAutoSkillKey = value.id
         }
 
-    override val storySkip by prefs.storySkip
-
     override val withdrawEnabled by prefs.withdrawEnabled
 
     override val stopOnCEGet by prefs.stopOnCEGet
diff --git a/prefs/src/main/java/io/github/fate_grand_automata/prefs/core/PrefsCore.kt b/prefs/src/main/java/io/github/fate_grand_automata/prefs/core/PrefsCore.kt
@@ -32,7 +32,6 @@ class PrefsCore @Inject constructor(
 
     val battleConfigList = maker.stringSet("autoskill_list")
 
-    val storySkip = maker.bool("story_skip")
     val withdrawEnabled = maker.bool("withdraw_enabled")
 
     val stopOnCEGet = maker.bool("stop_on_ce_get")
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
@@ -16,7 +16,6 @@ enum class Images(val path: String) {
     LimitBroken("limitbroken.png"),
     SupportScreen("support_screen.png"),
     SupportConfirmSetupButton("support_region_tool.png"),
-    StorySkip("storyskip.png"),
     Menu("menu.png"),
     Stamina("stamina.png"),
     Result("result.png"),
diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoBattle.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoBattle.kt
@@ -82,9 +82,6 @@ class AutoBattle @Inject constructor(
 
     private var isContinuing = false
 
-    // for tracking whether the story skip button could be visible in the current screen
-    private var storySkipPossible = true
-
     // for tracking whether to check for servant death and wave transition animations
     private var isInBattle = false
 
@@ -177,7 +174,6 @@ class AutoBattle @Inject constructor(
         val screens: Map<() -> Boolean, () -> Unit> = mapOf(
             { connectionRetry.needsToRetry() } to { connectionRetry.retry() },
             { battle.isIdle() } to {
-                storySkipPossible = false
                 isInBattle = true
                 battle.performBattle()
             },
@@ -192,7 +188,6 @@ class AutoBattle @Inject constructor(
             { isRepeatScreen() } to { repeatQuest() },
             { isInInterludeEndScreen() } to { locations.interludeCloseClick.click() },
             { withdraw.needsToWithdraw() } to { withdraw.withdraw() },
-            { needsToStorySkip() } to { skipStory() },
             { isFriendRequestScreen() } to { skipFriendRequestScreen() },
             { isBond10CEReward() } to { bond10CEReward() },
             { isCeRewardDetails() } to { ceRewardDetails() },
@@ -323,7 +318,6 @@ class AutoBattle @Inject constructor(
         locations.resultClick.click(
             times = if (prefs.screenshotBond) 5 else 15
         )
-        storySkipPossible = true
     }
 
     private fun isInDropsScreen() =
@@ -370,7 +364,6 @@ class AutoBattle @Inject constructor(
     private fun repeatQuest() {
         // Needed to show we don't need to enter the "StartQuest" function
         isContinuing = true
-        storySkipPossible = false
 
         // Pressing Continue option after completing a quest, resetting the state as would occur in "Menu" function
         battle.resetState()
@@ -444,19 +437,6 @@ class AutoBattle @Inject constructor(
         }
     }
 
-    /**
-     * Checks if the SKIP button exists on the screen.
-     */
-    private fun needsToStorySkip() =
-        prefs.storySkip && storySkipPossible &&
-                locations.menuStorySkipRegion.exists(images[Images.StorySkip], similarity = 0.7)
-
-    private fun skipStory() {
-        locations.menuStorySkipClick.click()
-        0.5.seconds.wait()
-        locations.menuStorySkipYesClick.click()
-    }
-
     /**
      * Checks if BetterFGO is running and an NP is starting.
      */
@@ -484,7 +464,6 @@ class AutoBattle @Inject constructor(
      * Starts the quest after the support has already been selected. The following features are done optionally:
      * 1. The configured party is selected if it is set in the selected AutoSkill config
      * 2. A boost item is selected if [IPreferences.boostItemSelectionMode] is set (needed in some events)
-     * 3. The story is skipped if [IPreferences.storySkip] is activated
      */
     private
 
@@ -496,7 +475,6 @@ class AutoBattle @Inject constructor(
         2.seconds.wait()
 
         useBoostItem()
-        storySkipPossible = true
     }
 
     /**
diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/locations/Locations.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/locations/Locations.kt
@@ -62,8 +62,6 @@ class Locations @Inject constructor(
             .xFromRight()
             .yFromBottom()
 
-    val menuStorySkipYesClick = Location(320, 1100).xFromCenter()
-
     val retryRegion = Region(20, 1000, 700, 300).xFromCenter()
 
     val staminaScreenRegion = Region(-680, 200, 300, 300).xFromCenter()
@@ -115,9 +113,6 @@ class Locations @Inject constructor(
         Location(x, 100).xFromCenter()
     }
 
-    val menuStorySkipRegion = Region(960, 20, 300, 120).xFromCenter()
-    val menuStorySkipClick = Location(1080, 80).xFromCenter()
-
     val resultFriendRequestRegion = Region(600, 150, 100, 94).xFromCenter()
     val resultFriendRequestRejectClick = Location(-680, 1200).xFromCenter()
     val resultMatRewardsRegion = Region(800, 1220, 280, 130).xFromCenter()
diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/prefs/IPreferences.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/prefs/IPreferences.kt
@@ -12,7 +12,6 @@ interface IPreferences {
     var showGameServers: List<GameServer>
     var selectedServerConfigPref: IPerServerConfigPrefs
     var selectedBattleConfig: IBattleConfig
-    val storySkip: Boolean
     val withdrawEnabled: Boolean
     val stopOnCEGet: Boolean
     val stopOnFirstClearRewards: Boolean

Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,6 @@ fun LazyListScope.battleGroup(`
`34`	`34`	`)`
`35`	`35`	`}`
`36`	`36`
`37`		`- item {`
`38`		`- prefs.storySkip.SwitchPreference(`
`39`		`- title = stringResource(R.string.p_story_skip),`
`40`		`- icon = icon(Icons.Default.FastForward)`
`41`		`- )`
`42`		`- }`
`43`		`-`
`44`	`37`	`item {`
`45`	`38`	`prefs.withdrawEnabled.SwitchPreference(`
`46`	`39`	`title = stringResource(R.string.p_enable_withdraw),`
Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,6 @@ class PreferencesImpl @Inject constructor(`
`63`	`63`	`selectedServerConfigPref.selectedAutoSkillKey = value.id`
`64`	`64`	`}`
`65`	`65`
`66`		`- override val storySkip by prefs.storySkip`
`67`		`-`
`68`	`66`	`override val withdrawEnabled by prefs.withdrawEnabled`
`69`	`67`
`70`	`68`	`override val stopOnCEGet by prefs.stopOnCEGet`