Updated Lottery interaction #1934

ArthurKun21 · 2024-12-17T03:11:40Z

Updated Lottery interaction

Pull Request Type

Bugfix
Feature Implementation
Documentation
Other

Related issue

fixes #1936

Description

They actually moved the done location causing issues.

Added the long press for jp lottery

Screenshots

Testing

Additional context

scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoLottery.kt

ArthurKun21 · 2024-12-26T13:54:31Z

scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoLottery.kt

    private fun spin() {
        // Don't increase this too much or you'll regret when you're not able to stop the script
        // And your phone won't let you press anything
        locations.lottery.spinClick.click(20)
    }

    private fun spinLongClick() {
-        locations.lottery.spinClick.longPress(lottoLongPress * 1_000)


I did this to access the sharedpreference once and store that in memory

reconman · 2024-12-25T23:22:50Z

app/src/main/java/io/github/fate_grand_automata/accessibility/TapperService.kt

@@ -27,6 +29,8 @@ class TapperService : AccessibilityService() {
        // We only want events from FGO
        serviceInfo = serviceInfo.apply {
            packageNames = GameServer.packageNames.keys.toTypedArray()
+            flags = AccessibilityServiceInfo.DEFAULT or AccessibilityServiceInfo.FLAG_REQUEST_TOUCH_EXPLORATION_MODE
+            eventTypes = AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED or AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED


You used the same value twice for the or

oh yeah, bad code that I forgot to delete

reconman · 2024-12-26T00:07:09Z

app/src/main/java/io/github/fate_grand_automata/accessibility/TapperService.kt

+        val source = event?.source
+        source?.let {
+            source.performAction(AccessibilityNodeInfo.ACTION_LONG_CLICK)
+        }


What does this do?

this is the one that handles the long press events

I could have sworn, I remember that it didn't work with the initial setup until I added this.

I can't really find any other people using these kinds of flags and event listeners.

What your code currently does is long press the screen when FGO is opened and when FGA dialogs are closed (for example when you press the play button and then click cancel)

I can't see the long presses or any effects, but this code doesn't seem right.

I also don't get what the touch exploration mode flag is used for.

touch exploration mode flag is used for

this is also needed for long press

ah this might be the one for long press and drag

Do you still have currency to test the code? For example remove the ACTION_LONG_CLICK and see if it still works.

Also, does the new lottery long press code only work for JP lotteries or may it also work for other servers?

Already empty

the long press QOL works much faster than the multiple clicks. I emptied it out before I even notice

Do you still have currency to test the code? For example remove the ACTION_LONG_CLICK and see if it still works.

I still have currency if testing is needed

does the new lottery long press code only work for JP lotteries or may it also work for other servers?

only for JP for now

Also, does the new lottery long press code only work for JP lotteries or may it also work for other servers?

lmao me speed reading didn't read this.

yea there's a lock-in there as it is JP only feature so far.

FGA/scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoLottery.kt

Lines 41 to 47 in 428c187

/**

* Switch between the two different spin methods depending on the server

*/

private fun spinGameServer() = when (prefs.gameServer) {

is GameServer.Jp -> spinLongClick()

else -> spin()

}

reconman · 2024-12-26T14:06:03Z

app/src/main/java/io/github/fate_grand_automata/accessibility/AccessibilityGestures.kt

+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            longPress8(location, duration)
+        } else {
+            click(location, 2)


I guess this will produce weird behavior for Android 7, but I think we should drop support for Android 7 anyways.

I don't mind dropping the android 7

Perhaps it's a bit out of place to ask but it'd be nice to have a "Last working build" release for no-longer-supported Android versions

Co-authored-by: sby1ce <135048812+sby1ce@users.noreply.github.com>

github-actions · 2025-01-16T01:52:07Z

Build 98

Download the latest APK for testing here

Note

You need a GitHub account to download the APK.

This URL is valid as long as the artifact has not expired yet.

ArthurKun21 changed the title ~~Fix JP lottery Location~~ Updated Lottery interaction Dec 21, 2024

sby1ce reviewed Dec 21, 2024

View reviewed changes

scripts/src/main/java/io/github/fate_grand_automata/scripts/entrypoints/AutoLottery.kt Outdated Show resolved Hide resolved

ArthurKun21 requested a review from reconman December 22, 2024 08:49

ArthurKun21 commented Dec 26, 2024

View reviewed changes

reconman reviewed Dec 26, 2024

View reviewed changes

ArthurKun21 and others added 16 commits January 4, 2025 04:21

new done location

4dea239

long press

449854e

fix the wrong import

fea5b50

fix formatting in TapperService for packageNames assignment

ca0ebc3

fix missing

90d04b5

missing import

70f7d26

fix parameter

7e32f2d

add logging for long press gesture start and stop

65121b0

Updated reference image

28b38de

added spin after every long press

0c1a40f

increase max gold ember for Gift Box

4729dac

remove redundant spin, added 2 secs delay

e383c88

forgot to add

8965d96

Co-authored-by: sby1ce <135048812+sby1ce@users.noreply.github.com>

reduce from 2 secs to 1 sec

b88cb6d

Clean up code

f8ff2b9

Rename lotto long press setting, improve text

e05b7d2

ArthurKun21 force-pushed the lotto-jp-new-done-location branch from 428c187 to e05b7d2 Compare January 3, 2025 20:21

ArthurKun21 marked this pull request as draft January 7, 2025 13:49

Merge branch 'master' into lotto-jp-new-done-location

f6619f9

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updated Lottery interaction #1934

Updated Lottery interaction #1934

ArthurKun21 commented Dec 17, 2024 •

edited

Loading

ArthurKun21 Dec 26, 2024

reconman Dec 25, 2024

ArthurKun21 Dec 26, 2024

reconman Dec 26, 2024

ArthurKun21 Dec 26, 2024 •

edited

Loading

ArthurKun21 Dec 26, 2024

reconman Dec 26, 2024

ArthurKun21 Dec 26, 2024

ArthurKun21 Dec 26, 2024

reconman Dec 26, 2024

ArthurKun21 Dec 26, 2024

sby1ce Dec 26, 2024

ArthurKun21 Dec 26, 2024 •

edited

Loading

reconman Dec 26, 2024

ArthurKun21 Dec 26, 2024

sby1ce Dec 26, 2024

github-actions bot commented Jan 16, 2025

	/**
	* Switch between the two different spin methods depending on the server
	*/
	private fun spinGameServer() = when (prefs.gameServer) {
	is GameServer.Jp -> spinLongClick()
	else -> spin()
	}

Updated Lottery interaction #1934

Are you sure you want to change the base?

Updated Lottery interaction #1934

Conversation

ArthurKun21 commented Dec 17, 2024 • edited Loading

Updated Lottery interaction

Pull Request Type

Related issue

Description

Screenshots

Testing

Additional context

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ArthurKun21 Dec 26, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ArthurKun21 Dec 26, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Jan 16, 2025

ArthurKun21 commented Dec 17, 2024 •

edited

Loading

ArthurKun21 Dec 26, 2024 •

edited

Loading

ArthurKun21 Dec 26, 2024 •

edited

Loading