Simplify Anni 9 condition, also fix FP summons

Author: reconman

app/src/main/assets/Cn/fp_continue.png

@@ -19,18 +19,17 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import io.github.fate_grand_automata.R
 import io.github.fate_grand_automata.prefs.core.BattleConfigCore
+import io.github.fate_grand_automata.scripts.enums.GameServer
 import io.github.fate_grand_automata.ui.dialog.FgaDialog
 import io.github.fate_grand_automata.ui.prefs.remember
-import io.github.fate_grand_automata.scripts.enums.GameServer
 
 @Composable
 fun PartySelection(config: BattleConfigCore) {
@@ -40,7 +39,7 @@ fun PartySelection(config: BattleConfigCore) {
     val isSelectionExtended by remember {
         derivedStateOf {
             when (server.asGameServer()) {
-                null, is GameServer.Jp, is GameServer.Cn -> true
+                null, is GameServer.Jp, GameServer.Cn -> true
                 else -> false
             }
         }

app/src/main/assets/Cn/friend_summon.png

@@ -9,24 +9,28 @@ import javax.inject.Inject
 @ScriptScope
 class FPLocations @Inject constructor(
     scriptAreaTransforms: IScriptAreaTransforms
-): IScriptAreaTransforms by scriptAreaTransforms {
-    val summonCheck = when (gameServer) {
-        is GameServer.Jp -> Region(250, 1121, 100, 143).xFromCenter()
-        else -> Region(100, 1152, 75, 143).xFromCenter()
-    }
+) : IScriptAreaTransforms by scriptAreaTransforms {
+    // 9th anniversary adds 100x summon to the FP screen
+    private val afterAnni9 = gameServer is GameServer.Jp || gameServer is GameServer.Cn
+
+    val summonCheck = if (afterAnni9)
+        Region(250, 1121, 100, 143).xFromCenter()
+    else
+        Region(100, 1152, 75, 143).xFromCenter()
 
     val initialSummonCheck = Region(-305, 1121, 240, 183).xFromCenter()
-    val initialSummonClick = when (gameServer) {
-        is GameServer.Jp -> Location(2, 977).xFromCenter()
-        else -> Location(2, 1052).xFromCenter()
-    }
+    val initialSummonClick = if (afterAnni9)
+        Location(2, 977).xFromCenter()
+    else
+        Location(2, 1052).xFromCenter()
 
     val continueSummonRegion = Region(-36, 1264, 580, 170).xFromCenter()
-    val first10SummonClick = when (gameServer) {
+    val first10SummonClick = if (afterAnni9)
         // the old location is still valid but only for 10x FP
-        is GameServer.Jp -> Location(400, 1062).xFromCenter()
-        else -> Location(120, 1062).xFromCenter()
-    }
+        Location(400, 1062).xFromCenter()
+    else
+        Location(120, 1062).xFromCenter()
+
     val okClick = Location(320, 1120).xFromCenter()
     val continueSummonClick = Location(320, 1325).xFromCenter()
     val skipRapidClick = Location(1240, 1400).xFromCenter()

app/src/main/java/io/github/fate_grand_automata/ui/battle_config_item/PartySelection.kt

@@ -21,10 +21,14 @@ class Locations @Inject constructor(
     val servant: ServantLevelLocations,
 ) : IScriptAreaTransforms by scriptAreaTransforms {
 
-    val continueRegion = when (gameServer) {
-        is GameServer.Jp, is GameServer.Cn -> Region(120, 1100, 800, 200).xFromCenter()
-        else -> Region(120, 1000, 800, 200).xFromCenter()
-    }
+    // 9th anniversary changes the repeat screen and extends to 15 parties
+    private val afterAnni9 = gameServer is GameServer.Jp || gameServer is GameServer.Cn
+
+    val continueRegion = if (afterAnni9)
+        Region(120, 1100, 800, 200).xFromCenter()
+    else
+        Region(120, 1000, 800, 200).xFromCenter()
+
     val continueBoostClick = Location(-20, 1120).xFromCenter()
 
     val inventoryFullRegion = Region(-280, 860, 560, 190).xFromCenter()
@@ -91,27 +95,21 @@ class Locations @Inject constructor(
         BoostItem.Enabled.BoostItem3 -> Location(1280, 1000)
     }.xFromCenter()
 
-    val selectedPartyRegion = when (gameServer) {
-        // JP and CN have 15 max party slots
-        is GameServer.Jp, is GameServer.Cn -> Region(-370, 62, 740, 72).xFromCenter()
-        else -> Region(-270, 62, 550, 72).xFromCenter()
-    }
+    val selectedPartyRegion = if (afterAnni9)
+        Region(-370, 62, 740, 72).xFromCenter()
+    else
+        Region(-270, 62, 550, 72).xFromCenter()
 
-    val partySelectionArray = when (gameServer) {
-        is GameServer.Jp, is GameServer.Cn -> (0..14).map {
+    val partySelectionArray: List<Location> = (0..14).map {
+        val x = if (afterAnni9) {
             // Party 8 is on the center
-            val x = ((it - 7) * 50)
-
-            Location(x, 100).xFromCenter()
-        }
-
-        else -> (0..14).map {
+            ((it - 7) * 50)
+        } else {
             // Party indicators are center-aligned
             // Party 11-15 are going to be on party 10 just in case
-            val x = ((min(it, 9) - 4.5) * 50).roundToInt()
-
-            Location(x, 100).xFromCenter()
+            ((min(it, 9) - 4.5) * 50).roundToInt()
         }
+        Location(x, 100).xFromCenter()
     }
 
     val menuStorySkipRegion = Region(960, 20, 300, 120).xFromCenter()