From 0dc82cf9489ac48d2fc51541a5346cf9b9ae3318 Mon Sep 17 00:00:00 2001
From: RedDeadDepresso <94017243+RedDeadDepresso@users.noreply.github.com>
Date: Thu, 21 Dec 2023 16:32:26 +0000
Subject: [PATCH] resolved conflicts

---
 module/config/config_manual.py | 4 ++--
 tasks/shop/ui.py               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/config/config_manual.py b/module/config/config_manual.py
index cf5c334..d1fe26f 100644
--- a/module/config/config_manual.py
+++ b/module/config/config_manual.py
@@ -8,8 +8,8 @@ class ManualConfig:
 
     SCHEDULER_PRIORITY = """
     Restart
-    > Cafe > Circle > Mail > DataUpdate > Bounty
-    > Scrimmage > TacticalChallenge > Task > Shop > Momotalk
+    > Cafe > TacticalChallenge > Circle > Mail
+    > DataUpdate > Bounty > Scrimmage > Task > Shop > Momotalk
     """
 
     """
diff --git a/tasks/shop/ui.py b/tasks/shop/ui.py
index 88713bb..6365cf3 100644
--- a/tasks/shop/ui.py
+++ b/tasks/shop/ui.py
@@ -21,7 +21,7 @@ class ShopUI(UI):
         super().__init__(config, device)
 
         self.click_coords = self.device.click_methods.get(self.config.Emulator_ControlMethod, self.device.click_adb)
-        self.swipe_vector_range = (1.10, 1.15)
+        self.swipe_vector_range = (0.85, 0.9)
         self.swipe_flags = {8:False, 16: False}
         self.list = ITEM_LIST