From fe39645e59e17f42e2eb90a27ed8a64a2a9ba69d Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 19 Oct 2023 10:10:18 +0800 Subject: [PATCH] Refactor: Move assets to tasks/rogue/weekly --- assets/share/rogue/{reward => weekly}/CLAIM_ALL.png | Bin .../share/rogue/{reward => weekly}/REWARD_CHECK.png | Bin .../share/rogue/{reward => weekly}/REWARD_CLOSE.png | Bin .../{reward => weekly}/REWARD_ENTER.BUTTON.png | Bin .../share/rogue/{reward => weekly}/REWARD_ENTER.png | Bin .../rogue/{reward => weekly}/REWARD_RED_DOT.png | Bin .../share/rogue/{reward => weekly}/ROGUE_REPORT.png | Bin ...ssets_rogue_reward.py => assets_rogue_weekly.py} | 12 ++++++------ tasks/rogue/bleesing/ui.py | 2 +- tasks/rogue/entry/entry.py | 4 ++-- tasks/rogue/entry/{reward.py => weekly.py} | 2 +- tasks/rogue/route/base.py | 2 +- tasks/rogue/route/exit.py | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename assets/share/rogue/{reward => weekly}/CLAIM_ALL.png (100%) rename assets/share/rogue/{reward => weekly}/REWARD_CHECK.png (100%) rename assets/share/rogue/{reward => weekly}/REWARD_CLOSE.png (100%) rename assets/share/rogue/{reward => weekly}/REWARD_ENTER.BUTTON.png (100%) rename assets/share/rogue/{reward => weekly}/REWARD_ENTER.png (100%) rename assets/share/rogue/{reward => weekly}/REWARD_RED_DOT.png (100%) rename assets/share/rogue/{reward => weekly}/ROGUE_REPORT.png (100%) rename tasks/rogue/assets/{assets_rogue_reward.py => assets_rogue_weekly.py} (80%) rename tasks/rogue/entry/{reward.py => weekly.py} (98%) diff --git a/assets/share/rogue/reward/CLAIM_ALL.png b/assets/share/rogue/weekly/CLAIM_ALL.png similarity index 100% rename from assets/share/rogue/reward/CLAIM_ALL.png rename to assets/share/rogue/weekly/CLAIM_ALL.png diff --git a/assets/share/rogue/reward/REWARD_CHECK.png b/assets/share/rogue/weekly/REWARD_CHECK.png similarity index 100% rename from assets/share/rogue/reward/REWARD_CHECK.png rename to assets/share/rogue/weekly/REWARD_CHECK.png diff --git a/assets/share/rogue/reward/REWARD_CLOSE.png b/assets/share/rogue/weekly/REWARD_CLOSE.png similarity index 100% rename from assets/share/rogue/reward/REWARD_CLOSE.png rename to assets/share/rogue/weekly/REWARD_CLOSE.png diff --git a/assets/share/rogue/reward/REWARD_ENTER.BUTTON.png b/assets/share/rogue/weekly/REWARD_ENTER.BUTTON.png similarity index 100% rename from assets/share/rogue/reward/REWARD_ENTER.BUTTON.png rename to assets/share/rogue/weekly/REWARD_ENTER.BUTTON.png diff --git a/assets/share/rogue/reward/REWARD_ENTER.png b/assets/share/rogue/weekly/REWARD_ENTER.png similarity index 100% rename from assets/share/rogue/reward/REWARD_ENTER.png rename to assets/share/rogue/weekly/REWARD_ENTER.png diff --git a/assets/share/rogue/reward/REWARD_RED_DOT.png b/assets/share/rogue/weekly/REWARD_RED_DOT.png similarity index 100% rename from assets/share/rogue/reward/REWARD_RED_DOT.png rename to assets/share/rogue/weekly/REWARD_RED_DOT.png diff --git a/assets/share/rogue/reward/ROGUE_REPORT.png b/assets/share/rogue/weekly/ROGUE_REPORT.png similarity index 100% rename from assets/share/rogue/reward/ROGUE_REPORT.png rename to assets/share/rogue/weekly/ROGUE_REPORT.png diff --git a/tasks/rogue/assets/assets_rogue_reward.py b/tasks/rogue/assets/assets_rogue_weekly.py similarity index 80% rename from tasks/rogue/assets/assets_rogue_reward.py rename to tasks/rogue/assets/assets_rogue_weekly.py index 494f2e53f..b87040bf1 100644 --- a/tasks/rogue/assets/assets_rogue_reward.py +++ b/tasks/rogue/assets/assets_rogue_weekly.py @@ -6,7 +6,7 @@ from module.base.button import Button, ButtonWrapper CLAIM_ALL = ButtonWrapper( name='CLAIM_ALL', share=Button( - file='./assets/share/rogue/reward/CLAIM_ALL.png', + file='./assets/share/rogue/weekly/CLAIM_ALL.png', area=(871, 524, 1146, 560), search=(851, 504, 1166, 580), color=(238, 186, 85), @@ -16,7 +16,7 @@ CLAIM_ALL = ButtonWrapper( REWARD_CHECK = ButtonWrapper( name='REWARD_CHECK', share=Button( - file='./assets/share/rogue/reward/REWARD_CHECK.png', + file='./assets/share/rogue/weekly/REWARD_CHECK.png', area=(152, 504, 187, 532), search=(132, 484, 207, 552), color=(131, 130, 126), @@ -26,7 +26,7 @@ REWARD_CHECK = ButtonWrapper( REWARD_CLOSE = ButtonWrapper( name='REWARD_CLOSE', share=Button( - file='./assets/share/rogue/reward/REWARD_CLOSE.png', + file='./assets/share/rogue/weekly/REWARD_CLOSE.png', area=(1139, 137, 1169, 167), search=(1119, 117, 1189, 187), color=(64, 64, 64), @@ -36,7 +36,7 @@ REWARD_CLOSE = ButtonWrapper( REWARD_ENTER = ButtonWrapper( name='REWARD_ENTER', share=Button( - file='./assets/share/rogue/reward/REWARD_ENTER.png', + file='./assets/share/rogue/weekly/REWARD_ENTER.png', area=(59, 601, 92, 629), search=(39, 581, 112, 649), color=(128, 128, 129), @@ -46,7 +46,7 @@ REWARD_ENTER = ButtonWrapper( REWARD_RED_DOT = ButtonWrapper( name='REWARD_RED_DOT', share=Button( - file='./assets/share/rogue/reward/REWARD_RED_DOT.png', + file='./assets/share/rogue/weekly/REWARD_RED_DOT.png', area=(94, 582, 122, 610), search=(74, 562, 142, 630), color=(130, 67, 71), @@ -56,7 +56,7 @@ REWARD_RED_DOT = ButtonWrapper( ROGUE_REPORT = ButtonWrapper( name='ROGUE_REPORT', share=Button( - file='./assets/share/rogue/reward/ROGUE_REPORT.png', + file='./assets/share/rogue/weekly/ROGUE_REPORT.png', area=(1198, 19, 1223, 42), search=(1178, 0, 1243, 62), color=(203, 165, 119), diff --git a/tasks/rogue/bleesing/ui.py b/tasks/rogue/bleesing/ui.py index 8460aacf1..27dd43304 100644 --- a/tasks/rogue/bleesing/ui.py +++ b/tasks/rogue/bleesing/ui.py @@ -4,7 +4,7 @@ from module.base.utils import area_offset from module.logger import logger from module.ocr.ocr import Digit, Ocr, OcrResultButton from tasks.base.ui import UI -from tasks.rogue.assets.assets_rogue_reward import REWARD_ENTER +from tasks.rogue.assets.assets_rogue_weekly import REWARD_ENTER from tasks.rogue.assets.assets_rogue_ui import * from tasks.rogue.keywords import RoguePath diff --git a/tasks/rogue/entry/entry.py b/tasks/rogue/entry/entry.py index ebecb7e32..fee5faa6e 100644 --- a/tasks/rogue/entry/entry.py +++ b/tasks/rogue/entry/entry.py @@ -22,10 +22,10 @@ from tasks.rogue.assets.assets_rogue_entry import ( WORLD_PREV, ) from tasks.rogue.assets.assets_rogue_path import CONFIRM_PATH -from tasks.rogue.assets.assets_rogue_reward import REWARD_CLOSE, REWARD_ENTER from tasks.rogue.assets.assets_rogue_ui import ROGUE_LAUNCH +from tasks.rogue.assets.assets_rogue_weekly import REWARD_CLOSE, REWARD_ENTER from tasks.rogue.entry.path import RoguePathHandler -from tasks.rogue.entry.reward import RogueRewardHandler +from tasks.rogue.entry.weekly import RogueRewardHandler from tasks.rogue.exception import RogueReachedWeeklyPointLimit diff --git a/tasks/rogue/entry/reward.py b/tasks/rogue/entry/weekly.py similarity index 98% rename from tasks/rogue/entry/reward.py rename to tasks/rogue/entry/weekly.py index 84c3da069..ede2823da 100644 --- a/tasks/rogue/entry/reward.py +++ b/tasks/rogue/entry/weekly.py @@ -1,6 +1,6 @@ from module.base.timer import Timer from module.logger import logger -from tasks.rogue.assets.assets_rogue_reward import CLAIM_ALL, REWARD_CHECK, REWARD_CLOSE, REWARD_ENTER, REWARD_RED_DOT +from tasks.rogue.assets.assets_rogue_weekly import CLAIM_ALL, REWARD_CHECK, REWARD_CLOSE, REWARD_ENTER, REWARD_RED_DOT from tasks.rogue.bleesing.ui import RogueUI diff --git a/tasks/rogue/route/base.py b/tasks/rogue/route/base.py index 1b29d0821..7c35a12ed 100644 --- a/tasks/rogue/route/base.py +++ b/tasks/rogue/route/base.py @@ -5,8 +5,8 @@ from module.logger import logger from tasks.base.page import page_rogue from tasks.map.control.waypoint import Waypoint, ensure_waypoints from tasks.map.route.base import RouteBase as RouteBase_ -from tasks.rogue.assets.assets_rogue_reward import ROGUE_REPORT from tasks.rogue.assets.assets_rogue_ui import BLESSING_CONFIRM +from tasks.rogue.assets.assets_rogue_weekly import ROGUE_REPORT from tasks.rogue.bleesing.blessing import RogueBlessingSelector from tasks.rogue.bleesing.bonus import RogueBonusSelector from tasks.rogue.bleesing.curio import RogueCurioSelector diff --git a/tasks/rogue/route/exit.py b/tasks/rogue/route/exit.py index 341a2cf2e..c4b183105 100644 --- a/tasks/rogue/route/exit.py +++ b/tasks/rogue/route/exit.py @@ -12,8 +12,8 @@ from tasks.base.page import page_rogue from tasks.combat.interact import CombatInteract from tasks.map.keywords import KEYWORDS_MAP_PLANE, MapPlane from tasks.rogue.assets.assets_rogue_exit import OCR_DOMAIN_EXIT -from tasks.rogue.assets.assets_rogue_reward import ROGUE_REPORT from tasks.rogue.assets.assets_rogue_ui import BLESSING_CONFIRM +from tasks.rogue.assets.assets_rogue_weekly import ROGUE_REPORT def area_center(area):