Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for JP's 100x FP #1944

Merged
merged 5 commits into from
Jan 5, 2025
Merged

Support for JP's 100x FP #1944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
726424b
add support for 100x fp
ArthurKun21 Jan 2, 2025
690405f
fix locations
ArthurKun21 Jan 3, 2025
d8860b2
updated the first 10 summon check region
ArthurKun21 Jan 3, 2025
f560787
return back to normal
ArthurKun21 Jan 3, 2025
e83593f
revert changes
ArthurKun21 Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified app/src/main/assets/Jp/fp_continue.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/assets/Jp/friend_summon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 16 additions & 4 deletions scripts/src/main/java/io/github/fate_grand_automata/scripts/locations/FPLocations.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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()
Expand Down