Commit Graph

776 Commits

Author SHA1 Message Date
LmeSzinc
0da3a9f328 Del: Delete DungeonDaily group since dailies require dungeons less often 2024-05-27 15:35:44 +08:00
LmeSzinc
8cd2b90346 Add: Do weekly for planner 2024-05-27 03:03:11 +08:00
LmeSzinc
783658be0b Fix: Do double rogue first 2024-05-26 23:05:18 +08:00
LmeSzinc
12ffb8348b Merge branch 'master' into dev 2024-05-24 00:57:05 +08:00
LmeSzinc
5a55a5917b Fix: combat_wave_cost was reset in combat again 2024-05-22 19:19:58 +08:00
Zebartin
8b00515fb8 Upd: [EN] EVENT_COMPLETED 2024-05-21 19:02:45 +08:00
Zebartin
d34120358a Fix: Clear content of ASSIGNMENT_ENTRY_LIST if needed 2024-05-21 18:48:12 +08:00
LmeSzinc
6682f0c158 Merge branch 'master' into dev 2024-05-21 12:36:54 +08:00
LmeSzinc
4ef59d05fa Dev: Sync dungeon_id of the basic item to all calyx items 2024-05-21 12:36:46 +08:00
LmeSzinc
3f291925fa Fix: OBTAIN_* should be moved together 2024-05-21 12:35:45 +08:00
Zebartin
bff1da7899 Fix: ASSIGNMENT_STARTED_CHECK.2 2024-05-21 10:35:15 +08:00
Zebartin
6f1333273e Opt: Insight in assignment _check_event 2024-05-21 10:29:14 +08:00
LmeSzinc
cf31bd93af Add: is_approaching_total(), no use yet 2024-05-21 04:44:42 +08:00
LmeSzinc
8ed52d74bc Merge branch 'master' into dev 2024-05-21 02:34:31 +08:00
LmeSzinc
28af865d75 Opt: Skip first load_rows() if tab switched 2024-05-21 02:31:27 +08:00
LmeSzinc
83333a8a63 Fix: Check the last appear area of assignment started popup 2024-05-21 02:30:46 +08:00
LmeSzinc
408971892c Merge branch 'master' into dev 2024-05-21 00:46:11 +08:00
Zebartin
c43a0837c4 Fix: Check EVENT_FINISHED
TODO: [EN] Add EVENT_FINISHED
2024-05-21 00:15:11 +08:00
LmeSzinc
de53612530 Fix: Reset combat_wave_cost before every combat 2024-05-20 23:50:27 +08:00
LmeSzinc
80802663be Fix: Leave rogue on error instead of restarting 2024-05-20 23:35:06 +08:00
Zebartin
191f2f177f Fix: Ensure necessary load_rows in goto_group 2024-05-20 23:10:20 +08:00
Zebartin
a1a77f921e Fix: Ensure assignment entry loaded 2024-05-20 18:31:39 +08:00
LmeSzinc
43fddd445c Fix: Handle curio popup after combat, the curio effect 2024-05-20 15:30:21 +08:00
LmeSzinc
687e06b639 Fix: Item wasn't added as walk result if item drops blessing, the curio effect 2024-05-20 15:30:21 +08:00
LmeSzinc
272f803d8c Fix: unexpected_confirm has no effect if arrive waypoint at the every first screenshot 2024-05-20 15:30:21 +08:00
LmeSzinc
3d5258b591 Upd: Add Robin as ranged character 2024-05-20 15:30:21 +08:00
LmeSzinc
edb55c6f64 Fix: Close weekly reward popup in _rogue_theme_set() 2024-05-20 15:30:21 +08:00
Zebartin
8e04b0da52 Fix: Color count for CHARACTER_x_SELECTED 2024-05-20 09:50:01 +08:00
Zebartin
3b6fdbf554 Fix: Wrong insight in _check_event 2024-05-20 09:22:45 +08:00
LmeSzinc
616f072a2b Opt: Ignore obtain_frequent_check if combat will be reentered later 2024-05-20 04:28:38 +08:00
LmeSzinc
8fa0c47a96 Fix: No popup names in SRC
(cherry picked from commit 6e5e529a0e)
2024-05-20 01:51:54 +08:00
Yinhr
384c4302a2
Fix: Obtain position & closed (#464)
* Fix: Obtain position & closed

* Add: find may_obtain to locate obtain_1

* Fix: stupid bug
2024-05-20 01:49:50 +08:00
LmeSzinc
6e5e529a0e Fix: No popup names in SRC 2024-05-20 00:41:34 +08:00
LmeSzinc
2e05ff729c Fix: Import tasks.planner.scan 2024-05-20 00:21:56 +08:00
LmeSzinc
aacf1650fc Merge branch 'master' into dev 2024-05-20 00:20:03 +08:00
LmeSzinc
3146a74d35 Fix: Confirm character switch when entering dungeon 2024-05-20 00:09:07 +08:00
LmeSzinc
a023d49f35 Fix: Remove scroll appear check in support list, no need 2024-05-20 00:08:47 +08:00
Zebartin
ef5db390a5 fix: AssignmentOcr regex 2024-05-19 23:50:37 +08:00
Zebartin
99a6ab2a11 feat: Event assignments (All About Boothill) 2024-05-19 23:50:37 +08:00
LmeSzinc
17c4a13d4f Fix: Patch TextDetector to have a better detection on single digit 2024-05-19 20:41:29 +08:00
LmeSzinc
9795103f4d Add: Planner result scanner on GUI 2024-05-19 19:26:20 +08:00
LmeSzinc
82f4f255ad Fix: Re-enter dungeon to check obtained items instead of leaving 2024-05-19 17:17:30 +08:00
LmeSzinc
b04610e1e8 Fix: Progress should be calculated after synthesize 2024-05-18 02:58:17 +08:00
LmeSzinc
fa85ebe2b6 Fix: Empty planner rows are not preserved in config 2024-05-18 02:47:33 +08:00
LmeSzinc
e8dcd8ac95 Add: Do planner requested dungeon first 2024-05-18 02:35:44 +08:00
LmeSzinc
d854a90c4c Chore: Move dungeon/obtain to combat/obtain
Since obtain info is indeed getting before battle
2024-05-18 02:35:13 +08:00
LmeSzinc
9cd6f488f4 Chore: Remove unavailable items 2024-05-18 00:08:06 +08:00
LmeSzinc
d8ea34757a Add: Write planner results into config 2024-05-18 00:08:06 +08:00
LmeSzinc
117704273f Add: Planner progress in config 2024-05-18 00:07:14 +08:00
LmeSzinc
d92cc3bff2 Merge branch 'bug_fix' into dev 2024-05-15 19:15:08 +08:00
LmeSzinc
da52834bb4 Fix: Special match Jarilo_BackwaterPass_F1_X613Y755 before Occurrence_Luofu_DivinationCommission_F2_X425Y791 2024-05-14 03:09:31 +08:00
LmeSzinc
8885d0e791 Fix: Scroll was never set if only one button is at bottom 2024-05-14 03:09:31 +08:00
LmeSzinc
5f9ec0ed57 Fix: Multiple right doors are classified as left and right doors 2024-05-14 03:09:31 +08:00
LmeSzinc
caf3af9973 Dev: Save tracking image on each waypoint 2024-05-14 03:09:31 +08:00
LmeSzinc
e35ab54ebc Fix: [CN] Handle OCR error on 区域精 2024-05-14 03:09:31 +08:00
LmeSzinc
e0707b8286 Fix: [CN] Handle curio fixed
TODO: [EN] Update CURIO_FIXED
2024-05-14 03:09:31 +08:00
LmeSzinc
b784c17ac0 Fix: Match Combat_Luofu_DivinationCommission_F1_X97Y457 before Combat_Luofu_Cloudford_F1_X283Y865 2024-05-14 03:09:31 +08:00
LmeSzinc
415fa61df9 Fix: Try without preprocess if no doors matched 2024-05-14 03:09:31 +08:00
LmeSzinc
acf72b18d5 Fix: [CN] Handle OCR error on 区域件 2024-05-14 01:37:27 +08:00
LmeSzinc
af603eadf8 Fix: Lower OcrCharacterName.merge_thres_y so DanHeng's long name won't mix with others 2024-05-13 19:24:17 +08:00
LmeSzinc
ab6aabeefa Opt: Search prioritize characters before scrolling 2024-05-13 16:36:29 +08:00
LmeSzinc
ccf357703e Opt: Re-arrange interval for faster combat support switch 2024-05-13 16:33:56 +08:00
LmeSzinc
f45c8a4dd6 Fix: Check selected arrow left to character avatar 2024-05-13 16:00:04 +08:00
LmeSzinc
45a6cb668f Fix: Handle battle pass after combat 2024-05-13 15:48:25 +08:00
LmeSzinc
3566ff0302 Fix: handle_ascension_dungeon_prepare() is called in weekly 2024-05-13 15:08:28 +08:00
LmeSzinc
442eaf195b Fix: Combat should not reenter if stamina exhausted but wave limit set 2024-05-13 15:02:56 +08:00
LmeSzinc
5eabcbe22d Fix: Check COMBAT_AGAIN color prevent clicking before loaded 2024-05-13 14:59:48 +08:00
LmeSzinc
bc82e00df9 Upd: Route copy Jarilo_BackwaterPass_F1_X503Y736 2024-05-13 12:57:49 +08:00
LmeSzinc
ba9f2973d2 Fix: Avoid double clicking COMBAT_TEAM_SUPPORT 2024-05-13 12:40:44 +08:00
LmeSzinc
ee3cb4f5ef Fix: Wait current team shown up 2024-05-13 12:38:55 +08:00
LmeSzinc
3018449c9c Fix: Match binary template on MAIN_GOTO_CHARACTER and MAP_EXIT 2024-05-13 12:36:11 +08:00
LmeSzinc
092b2e60db Upd: Assignment resorted in 2.2 (#453) 2024-05-13 03:04:42 +08:00
LmeSzinc
1288b38b3b Upd: Assignment character assets 2024-05-13 02:32:30 +08:00
LmeSzinc
711242b1f4 Add: Get item amount in COMBAT_PREPARE 2024-05-12 02:40:50 +08:00
LmeSzinc
3ce75fe1ef Merge branch 'bug_fix' into dev 2024-05-12 00:55:51 +08:00
LmeSzinc
0135bf9167 Refactor: Set team using next prev buttons instead (#450) 2024-05-12 00:47:35 +08:00
LmeSzinc
9dcc3793be Fix: [CN] Handle OCR error on Stagnant_Shadow_Ire 2024-05-11 22:40:23 +08:00
LmeSzinc
8bbc9bb277 Add: Parse planner results 2024-05-11 18:22:54 +08:00
LmeSzinc
f05148fcf8 Dev: Extract item keywords 2024-05-11 18:21:28 +08:00
Yinhr
4e05aa37a3
Upd: Add new dungeon and weekly in gui by config updater (#447)
* Fix: Food_Improvement_Plan does not exist anymore

* Upd: Add new dungeon and weekly in gui by config updater

* Fix: OCR of TM in dungeon

* Fix: remove TM in keywords

* Fix: remove TM in GUI

* Fix: Remove redundant i18n in en-US

---------

Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
2024-05-09 17:40:41 +08:00
Schwarze-Katze
880bb2a911
Apply StoredCounter for counting farm times (#419)
* Apply StoredCounter in counting farm times

* i18n for SimulatedUniverseElite counter (probably used for display in future)

* change display style to "counter" style

* Configure ConfigUpdater.redirect and rename `SimulatedUniverseElite` config item to `SimulatedUniverseFarm`

* show `Rogue.RogueWorld.SimulatedUniverseFarm` in disabled mode only when `Rogue.RogueWorld.WeeklyFarming` is checked

* treat Rogue_RogueWorld_SimulatedUniverseFarm specially to display value only;
i18n for SimulatedUniverseFarm item;
bugfix on counter convert

* Set display style of stored counter

* update counter despite whether farming is enabled
2024-05-09 15:36:52 +08:00
LmeSzinc
9d514f4e9d Fix: Matching dungeon from map interact 2024-05-08 21:48:45 +08:00
LmeSzinc
9b9e85990a Upd: Combat support assets 2024-05-08 20:38:34 +08:00
LmeSzinc
80d1fbf9e5 Fix: Consider multiple rogue runs as separated tasks 2024-05-08 18:59:31 +08:00
LmeSzinc
09e675758c Fix: Clear blessings after executing a battle so blessings can be handled in rotation_set() 2024-05-08 18:41:42 +08:00
LmeSzinc
50ae72d17a Upd: 2.2 Keyword extract 2024-05-08 16:33:15 +08:00
LmeSzinc
a271bf6ba5 Upd: Support reward assets 2024-05-08 13:55:14 +08:00
LmeSzinc
5ce334ca8c Fix: [EN] Handle omitted assignment names 2024-05-08 13:47:29 +08:00
LmeSzinc
d61924a42b Upd: [CN] Assignment ui tab
the font just changed
2024-05-08 13:36:35 +08:00
LmeSzinc
816c787ed0 Upd: ASSIGNMENT_CHECK 2024-05-08 13:32:47 +08:00
LmeSzinc
7d9ae07e5e Fix: Retry ranged character switch if the first time failed 2024-05-08 02:54:12 +08:00
LmeSzinc
043f07dbf0 Upd: Add Aventurine adn ranged character 2024-05-08 02:28:36 +08:00
LmeSzinc
4d086d1753 Opt: Wait rogue buttons loaded before clicking to prevent retries 2024-05-08 00:47:42 +08:00
LmeSzinc
66aa3c4848 Fix: Special match Occurrence_Luofu_Cloudford_F1_X241Y947 2024-05-07 23:13:33 +08:00
LmeSzinc
348c22cd35 Fix: Handle enemy during rotation_set() 2024-05-07 23:13:33 +08:00
LmeSzinc
9cf388b8e0 Fix: Special match Occurrence_Luofu_DivinationCommission_F2_X149Y659
should before Occurrence_Luofu_DivinationCommission_F2_X425Y791
2024-05-07 23:13:33 +08:00
Zebartin
6a8a7d18c8 Fix: Add handle_blessing_popup in blessing choosing 2024-05-07 12:14:21 +08:00
Asxcvbn
0f33ba733e
Update data_update.py for removing whitespace in credit ocr result (#441)
* Update data_update.py for removing whitespace in credit ocr result

sometimes ocr provides a str like '1 2261000' and conversion to int int('1 2261000') fails. we do a post process here, removing the whitespace and allow the conversion to be successful

* Update data_update.py for removing whitespace in credit ocr result 

sometimes ocr provides a str like '1 2261000' and conversion to int int('1 2261000') fails. we do a post process here, removing the whitespace and allow the conversion to be successful
edited to align with standards of this repo
2024-05-07 12:14:01 +08:00
Yinhr
aa40215cb8
Fix: Anniversary 3x get remain at combat (#438)
* Fix: Anniversary 3x get remain at combat

* Fix: Anniversary 3x get remain at combat
2024-05-02 01:02:34 +08:00
LmeSzinc
871ea9a809 Upd: Anniversary 3x relic event (#433) 2024-04-27 00:24:15 +08:00