xtaodada/StarRailCopilot
1
0
Fork 0
mirror of https://github.com/LmeSzinc/StarRailCopilot.git synced 2024-11-25 10:01:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,221 Commits 3 Branches 49 Tags 288 MiB
7293ad467a
Commit Graph

796 Commits

Author SHA1 Message Date
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
LmeSzinc
7c8d41614f Fix: [CN] OCR error on Stagnant_Shadow_Puppetry 2024-04-25 12:05:04 +08:00
Jerry Lingjie Mei
a8e2dab328
Fix custom resonance filter errors. (#430) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-04-22 23:17:55 +08:00
LmeSzinc
62f7f38f10 Fix: Special match Occurrence_Jarilo_RivetTown_F1_X157Y435 2024-04-21 23:31:49 +08:00
LmeSzinc
fc5dc22dfd Fix: Point in tuple cannot be compared to int 2024-04-19 18:03:55 +08:00
LmeSzinc
d4d1b46dfd Fix: screen2direction gets high DomainDoor when going downhills 2024-04-19 00:34:05 +08:00
LmeSzinc
13199daeb7 Fix: Special match Combat_Herta_SupplyZone_F2_X543Y255 2024-04-18 23:15:00 +08:00
LmeSzinc
fa209e1cf5 Fix: Character trial ended at page_main 2024-04-18 23:00:49 +08:00
LmeSzinc
a0fd30193c Fix: Special match Combat_Luofu_DivinationCommission_F1_X737Y237 2024-04-15 03:45:50 +08:00
LmeSzinc
d4fe1959a8 Fix: No items enroute in Luofu_StargazerNavalia_F1_X521Y595 2024-04-15 02:38:04 +08:00
LmeSzinc
1d57777b32 Fix: Check rogue entry button available 2024-04-14 23:23:49 +08:00
LmeSzinc
6c56f5e286
Merge pull request #361 from Schwarze-Katze/master 
Add feature of material farming in task RogueWorld
 2024-04-14 21:42:29 +08:00
LmeSzinc
d985ca3b67 Upd: Assets for anniversary 3x rogue event (#412) 2024-04-10 23:29:25 +08:00
LmeSzinc
b89289b686 Upd: [CN] CURIO_OBTAINED when using TopazNumby's techniques (#384) 2024-04-08 22:56:23 +08:00
LmeSzinc
5473d74af9 Fix: Special match FuXuan's name handling random OCR error 2024-04-08 22:35:00 +08:00
LmeSzinc
e748d3b83d Merge branch 'master' into dev 2024-04-02 12:38:53 +08:00
LmeSzinc
92288deff3 Fix: Update CONFIRM_ASSIGNMENT and close character list 2024-04-02 12:38:35 +08:00
katze
4988fb1f2f optimize expiration judging 2024-04-02 12:23:28 +08:00
katze
721ae38291 improves readability 2024-04-01 10:33:06 +08:00
katze
f262140fb6 Seperate stored counter into an independent class 2024-04-01 01:58:46 +08:00
Schwarze-Katze
792eb2157a
Merge branch 'LmeSzinc:master' into master 2024-04-01 00:27:15 +08:00
LmeSzinc
92c121f317 Upd: Assignment character assets 2024-03-31 18:57:27 +08:00
LmeSzinc
af07cf9c02 Fix: Avoid special matching Combat_Luofu_Cloudford_F1_X283Y865 in Combat_Herta_SupplyZone_F2_X45Y369 2024-03-30 00:25:04 +08:00
LmeSzinc
0bb9af7275 Fix: AdaptiveScroll to handle transparent scroll on complex background (#391) 2024-03-30 00:20:28 +08:00
LmeSzinc
ca8e4bef05 Upd: ASSIGNMENT_START 2024-03-28 22:29:44 +08:00
LmeSzinc
a135b2c3b7 Fix: Remove currently owned info from assignment names 2024-03-28 22:29:44 +08:00
LmeSzinc
bf5f8fd3c7 Fix: COMBAT_TEAM_SUPPORT is clicked before support_set() 2024-03-27 23:13:14 +08:00
LmeSzinc
fe6030617f Fix: [CLOUD] auto update 2024-03-27 22:57:34 +08:00
LmeSzinc
b6d022866f Upd: _position_match_special 2024-03-27 22:57:34 +08:00
LmeSzinc
4c0faceb0e Upd: Keywords in 2.1 2024-03-27 19:38:30 +08:00
LmeSzinc
f2ada19c16 Fix: Claer items on the way to dungeon exit 2024-03-20 18:39:03 +08:00
LmeSzinc
a650309db1 Add: Click tutorial and dungeon exit in daemon 2024-03-20 18:38:31 +08:00
LmeSzinc
1cfed81433 Add: Do double events 2024-03-20 18:37:49 +08:00
Jerry Lingjie Mei
d9fb903c89
Fix button offset when window resizes (#354) 
* Add button offsets.

* Add offset detection when there's no technique point.

* Remove offset calls for image_crop

* Fix bugs.

* Fix bugs.

* Fix corner case when technique points are being generated.

* Add png source for technique points.

* Remove duplicated assets.
 2024-03-20 17:54:22 +08:00
LmeSzinc
e90f865674 Fix: Limit config combinations in cloud game 2024-03-16 16:24:44 +08:00
LmeSzinc
f93c3cb460 Fix: Use rgb2luma in combat state detection to fit video streaming 2024-03-16 16:13:57 +08:00
LmeSzinc
6a4bdb84e0 Fix: Disable net state display 2024-03-16 16:05:45 +08:00
Yinhr
78d631935e Fix: double information location (#369) 
(cherry picked from commit ff82687166)
 2024-03-16 15:58:59 +08:00
LmeSzinc
e0acc9789e Revert: COMBAT_PAUSE 2024-03-16 15:55:29 +08:00
LmeSzinc
5bb58c7f50 Merge branch 'master' into dev 2024-03-15 18:23:21 +08:00
LmeSzinc
c469d254bd Fix: Special match Luofu_Cloudford_F1_X281Y873 2024-03-12 15:47:56 +08:00
LmeSzinc
87ee7ce593 Upd: [EN] Add another CURIO_OBTAINED (#359) 2024-03-12 15:30:10 +08:00
LmeSzinc
11eb3a5eb5 Fix: Enlarge STORY_OPTION searching to match 2 rows of option text 2024-03-11 01:58:40 +08:00
LmeSzinc
cdb2d97c9f Merge branch 'master' into dev 
# Conflicts:
#	tasks/combat/state.py
 2024-03-11 01:54:56 +08:00
katze
2bc797f3e2 Add comments in stored counter class definition 2024-03-09 15:58:37 +08:00
katze
f5bc0d0ce1 Use stored counter to count boss farming times to run 2024-03-09 15:12:11 +08:00
Schwarze-Katze
7c845c0a0e
Merge branch 'LmeSzinc:master' into master 2024-03-06 17:03:33 +08:00
katze
0d4ee2640f rogue farming feature: enter rogue when RogueWorld_WeeklyFarming is enabled to acquire materials from boss 2024-03-06 16:32:14 +08:00
Asxcvbn
58e054a008
RuanMei OCR postprocess in CN (#358) 
* RuanMei OCR  postprocess in CN

* dont match dot between ruanmei when ocr postprocess

* RuanMei OCR postprocess in CN

update: used a wildcard for the dot between Ruan and Mei
 2024-03-06 15:47:21 +08:00
LmeSzinc
94dca8b9ce Refactor: Select next support character 2024-02-24 17:26:22 +08:00
LmeSzinc
18981f4e5b Fix: Remove noice from the text "In Progress" 2024-02-24 01:35:32 +08:00
LmeSzinc
14e3a9a73a Fix: Handle character died (#317) 2024-02-24 00:45:34 +08:00
LmeSzinc
7820756321 Add: Able to use support characters in weekly (#296) 2024-02-24 00:43:08 +08:00
LmeSzinc
9d263306d7 Upd: Add RuanMei as ranged character 2024-02-23 23:51:40 +08:00
LmeSzinc
60ebf0a3ff Fix: Limit click area of combat states (#339) 2024-02-23 23:51:40 +08:00
LmeSzinc
3ae48fedd8 Upd: [EN] OCR_DOUBLE_EVENT_REMAIN 2024-02-23 12:36:29 +08:00
LmeSzinc
4fc492aeb1 Fix: Wait world tab before falling back 2024-02-19 18:11:57 +08:00
LmeSzinc
c7159e77c3 Upd: Add MAIN_GOTO_CHARACTER under purple screen 2024-02-19 17:50:49 +08:00
LmeSzinc
ca39c06062 Fix: limit_entrance has no effect on calyx crimson dungeons 2024-02-19 01:43:05 +08:00
LmeSzinc
87c322a21b Dev: Dungeon IDs of calyx crimson are not sorted 2024-02-19 01:40:57 +08:00
Yinhr
617be88a71
Fix: Check indexes before using min() (#330) 2024-02-18 00:10:49 +08:00
LmeSzinc
4fb1c85d98 Fix: Wait echo of war list loaded 2024-02-17 21:28:54 +08:00
LmeSzinc
e1ae0c17b5 Fix: Remove random prefix in ocr result 2024-02-17 21:27:27 +08:00
LmeSzinc
e96a5ef1da Fix: [EN] Use roman numbers in dungeon keywords (fixed #325) 2024-02-13 19:06:47 +08:00
LmeSzinc
1bcef3071b Fix: IndexError in OcrRogueWorld 2024-02-13 01:22:35 +08:00
LmeSzinc
4d64ec0252 Upd: MAP_LOADING.SEARCH 2024-02-13 01:05:38 +08:00
LmeSzinc
282ab6da72 Chore: _dungeon_nav_goto now receive nav input 2024-02-12 23:29:21 +08:00
LmeSzinc
6b9aa3b076 Fix: Handle missing world tab 2024-02-10 04:55:11 +08:00
LmeSzinc
766a9db07b Fix: Calyx_Golden_Treasures is not migrated (#315) 2024-02-10 04:37:46 +08:00
LmeSzinc
6692b77db4 Fix: Optimize imports (fixed #314) 2024-02-10 01:53:59 +08:00
Zebartin
4bb0cd6ef6
Add: Add i18n auto generation for assignments (#308) 2024-02-07 21:43:20 +08:00
Zero
da0a1c16ff
Fix: support assets (#307) 2024-02-07 21:10:44 +08:00
LmeSzinc
8599d732e9 Fix: DUNGEON_LIST.use_plane is never set 2024-02-07 12:41:53 +08:00
LmeSzinc
6e26817e5d Upd: Map interact assets 2024-02-07 08:14:05 +08:00
LmeSzinc
8a1520871b Upd: Map control buttons 2024-02-07 08:08:05 +08:00
LmeSzinc
1d5692fa45 Fix: Handle OCR_WORLD moving up and down 2024-02-07 08:08:05 +08:00
LmeSzinc
5191674920 Fix: Entering calyx crimson 2024-02-07 08:04:45 +08:00
LmeSzinc
3f38deedd7 Fix: Wait until dungeon list loaded 2024-02-07 08:04:45 +08:00
LmeSzinc
e27332c609 Add: Switch world before entering calyx golden 2024-02-07 08:04:45 +08:00
LmeSzinc
98efb031bc Chore: Rename KEYWORD_* to KEYWORDS_* 2024-02-07 08:04:45 +08:00
LmeSzinc
162132a0b0 Add: Sorted dungeon name treanslations 2024-02-07 08:04:45 +08:00