From 2d5f14975cff70aeabf541da00f22fcb6cb83a2b Mon Sep 17 00:00:00 2001 From: mike8699 Date: Mon, 16 Sep 2024 11:30:35 -0400 Subject: [PATCH] Adjust emulator test controls --- tests/desmume/test_playthrough_1.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/desmume/test_playthrough_1.py b/tests/desmume/test_playthrough_1.py index 0fd530f0..aa871e54 100644 --- a/tests/desmume/test_playthrough_1.py +++ b/tests/desmume/test_playthrough_1.py @@ -20,16 +20,19 @@ def test_mercay_1(base_rom_emu: DeSmuMEWrapper, aux_data: ShufflerAuxData): # Enter oshus's house base_rom_emu.wait(1) - base_rom_emu.touch_input((int(SCREEN_WIDTH * (3 / 4)), 0), 200) - base_rom_emu.wait(1) - base_rom_emu.touch_input((SCREEN_WIDTH, SCREEN_HEIGHT // 2), 50) - base_rom_emu.wait(1) - base_rom_emu.touch_input((SCREEN_WIDTH // 2, 0), 60) - base_rom_emu.touch_input(((SCREEN_WIDTH // 2) - 20, 0), 100) - base_rom_emu.wait(50) + base_rom_emu.touch_input((SCREEN_WIDTH, SCREEN_HEIGHT // 2), 60) + base_rom_emu.input.touch_release() + base_rom_emu.wait(10) + base_rom_emu.touch_input(((SCREEN_WIDTH // 2) - 18, 0), 170) + base_rom_emu.input.touch_release() + base_rom_emu.wait(10) + base_rom_emu.touch_input((SCREEN_WIDTH, SCREEN_HEIGHT // 2), 100) + base_rom_emu.wait(10) + base_rom_emu.touch_input(((SCREEN_WIDTH // 2) - 30, 0), 170) + base_rom_emu.wait(200) # Approach oshus - base_rom_emu.touch_input((SCREEN_WIDTH // 2, 0), 120) + base_rom_emu.touch_input((SCREEN_WIDTH // 2, 0), 80) base_rom_emu.wait(20) base_rom_emu.input.touch_set_pos(125, 80) base_rom_emu.wait(1)