Support for JP's 100x FP (#1944)

Fate-Grand-Automata · Jan 5, 2025 · e28f4f0 · e28f4f0
1 parent f2f142d
commit e28f4f0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/app/src/main/assets/Jp/fp_continue.png b/app/src/main/assets/Jp/fp_continue.png
diff --git a/app/src/main/assets/Jp/friend_summon.png b/app/src/main/assets/Jp/friend_summon.png
diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/locations/FPLocations.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/locations/FPLocations.kt
@@ -1,5 +1,6 @@
 package io.github.fate_grand_automata.scripts.locations
 
+import io.github.fate_grand_automata.scripts.enums.GameServer
 import io.github.lib_automata.Location
 import io.github.lib_automata.Region
 import io.github.lib_automata.dagger.ScriptScope
@@ -9,12 +10,23 @@ import javax.inject.Inject
 class FPLocations @Inject constructor(
     scriptAreaTransforms: IScriptAreaTransforms
 ): IScriptAreaTransforms by scriptAreaTransforms {
-    val summonCheck = Region(100, 1152, 75, 143).xFromCenter()
-    val initialSummonCheck = Region(-265, 1131, 75, 143).xFromCenter()
-    val initialSummonClick = Location(2, 1052).xFromCenter()
+    val summonCheck = when (gameServer) {
+        is GameServer.Jp -> 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 continueSummonRegion = Region(-36, 1264, 580, 170).xFromCenter()
-    val first10SummonClick = Location(120, 1062).xFromCenter()
+    val first10SummonClick = when (gameServer) {
+        // the old location is still valid but only for 10x FP
+        is GameServer.Jp -> 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()