tasks/base/assets/assets_base_page.py

@@ -115,17 +115,6 @@ CRAFTING_CHECK = ButtonWrapper(
         button=(103, 4, 226, 41),
     ),
 )
-EVENT_CHECK = ButtonWrapper(
-    name='EVENT_CHECK',
-    jp=None,
-    en=Button(
-        file='./assets/en/base/page/EVENT_CHECK.png',
-        area=(102, 6, 187, 40),
-        search=(82, 0, 207, 60),
-        color=(200, 209, 216),
-        button=(102, 6, 187, 40),
-    ),
-)
 GACHA_CHECK = ButtonWrapper(
     name='GACHA_CHECK',
     jp=Button(
@@ -487,17 +476,6 @@ WORK_GO_TO_COMMISSIONS = ButtonWrapper(
         button=(656, 494, 803, 517),
     ),
 )
-WORK_GO_TO_EVENT = ButtonWrapper(
-    name='WORK_GO_TO_EVENT',
-    jp=None,
-    en=Button(
-        file='./assets/en/base/page/WORK_GO_TO_EVENT.png',
-        area=(67, 131, 142, 201),
-        search=(47, 111, 162, 221),
-        color=(134, 153, 166),
-        button=(67, 131, 142, 201),
-    ),
-)
 WORK_GO_TO_MISSION = ButtonWrapper(
     name='WORK_GO_TO_MISSION',
     jp=Button(

tasks/mission/assets/assets_mission.py

@@ -113,28 +113,6 @@ OCR_AREA = ButtonWrapper(
         button=(108, 176, 176, 219),
     ),
 )
-QUEST_OFF = ButtonWrapper(
-    name='QUEST_OFF',
-    jp=None,
-    en=Button(
-        file='./assets/en/mission/QUEST_OFF.png',
-        area=(859, 69, 1025, 125),
-        search=(839, 49, 1045, 145),
-        color=(231, 235, 235),
-        button=(859, 69, 1025, 125),
-    ),
-)
-QUEST_ON = ButtonWrapper(
-    name='QUEST_ON',
-    jp=None,
-    en=Button(
-        file='./assets/en/mission/QUEST_ON.png',
-        area=(861, 71, 1025, 124),
-        search=(841, 51, 1045, 144),
-        color=(49, 68, 76),
-        button=(861, 71, 1025, 124),
-    ),
-)
 RIGHT = ButtonWrapper(
     name='RIGHT',
     jp=None,

tasks/mission/mission.py

@@ -125,7 +125,9 @@ class Mission(MissionUI, CommissionsUI):
         elif self.current_mode in ["BD", "IR"]:
             return self.select_commission(self.current_mode)
         elif self.current_mode == "E":
-            return self.select_event()
+            #return self.select_mode(SWITCH_QUEST)
+            logger.error("Event not yet implemented")
+            return False
         else:
             logger.error("Uknown mode")
             return False

tasks/mission/ui.py

@@ -2,8 +2,8 @@ from module.base.timer import Timer
 from module.logger import logger
 from module.ui.switch import Switch
 from module.ocr.ocr import Digit
-from tasks.base.assets.assets_base_page import BACK, MISSION_CHECK, EVENT_CHECK
-from tasks.base.page import page_mission, page_commissions #,page_event
+from tasks.base.assets.assets_base_page import BACK, MISSION_CHECK
+from tasks.base.page import page_mission, page_commissions
 from tasks.base.ui import UI
 from tasks.mission.assets.assets_mission import *
 from tasks.stage.ap import AP
@@ -24,9 +24,7 @@ SWITCH_HARD = Switch("HARD_switch")
 SWITCH_HARD.add_state("on", HARD_ON)
 SWITCH_HARD.add_state("off", HARD_OFF)
 
-SWITCH_QUEST = Switch("QUEST_switch")
-SWITCH_QUEST.add_state("on",QUEST_ON)
-SWITCH_QUEST.add_state("off",QUEST_OFF)
+SWITCH_QUEST = None
 
 """
 A dictionary that maps the mode to a tuple where 
@@ -38,7 +36,7 @@ MODE_TO_PAGE = {
     "H": (MISSION_CHECK, page_mission),
     "BD": (CHECK_BD, page_commissions),
     "IR": (CHECK_IR, page_commissions),
-    "E" : (EVENT_CHECK) #page_event
+    "E" : ()
 }
 
 
@@ -94,9 +92,6 @@ class MissionUI(UI, AP):
             return False
         switch.set('on', main=self)
         return True
-    
-    def select_event(self):
-        return self.select_mode(SWITCH_QUEST)
 
     def enter_stage(self, index: int) -> bool:
         if not index:
@@ -106,7 +101,7 @@ class MissionUI(UI, AP):
         return False
 
     def do_sweep(self, mode, num: int) -> bool:
-        if mode in ["N", "H", "E"]:
+        if mode in ["N", "H"]:
             return MISSION_SWEEP.do_sweep(self, num=num)
         else:
             return SHARED_SWEEP.do_sweep(self, num=num)
@@ -148,3 +143,5 @@ class CommissionsUI(UI, AP):
                 return True
             if timer.reached():
                 return False
+
+    

tasks/task/assets/assets_task.py

@@ -31,10 +31,10 @@ CLAIMED = ButtonWrapper(
     ),
     en=Button(
         file='./assets/en/task/CLAIMED.png',
-        area=(937, 641, 1010, 696),
-        search=(917, 621, 1030, 716),
-        color=(212, 212, 211),
-        button=(937, 641, 1010, 696),
+        area=(921, 643, 1026, 692),
+        search=(901, 623, 1046, 712),
+        color=(127, 131, 135),
+        button=(921, 643, 1026, 692),
     ),
 )
 CLAIMED_ALL = ButtonWrapper(
@@ -71,14 +71,3 @@ CLAIM_ALL = ButtonWrapper(
         button=(1054, 642, 1243, 700),
     ),
 )
-COMPLETE = ButtonWrapper(
-    name='COMPLETE',
-    jp=None,
-    en=Button(
-        file='./assets/en/task/COMPLETE.png',
-        area=(921, 643, 1026, 692),
-        search=(901, 623, 1046, 712),
-        color=(127, 131, 135),
-        button=(921, 643, 1026, 692),
-    ),
-)

tasks/task/task.py

@@ -23,7 +23,7 @@ class Task(UI):
                     self.device.click(CLAIM)
                     logger.info("Click Claim")
                     continue
-                if (self.match_color(CLAIMED) or self.match_color(COMPLETE)) and self.match_color(CLAIMED_ALL):
+                if self.match_color(CLAIMED) and self.match_color(CLAIMED_ALL):
                     logger.info("All claimed")
                     break