Commit Graph

1139 Commits

Author SHA1 Message Date
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
78a09977da
Merge pull request #368 from LmeSzinc/bug_fix
Bug fix
2024-03-13 12:02:33 +08:00
LmeSzinc
9ab86eb1c7 Upd: Rogue routes 2024-03-13 02:36:29 +08:00
LmeSzinc
198a9fd810 Fix: Lock position in Jarilo_BackwaterPass_F1_X581Y403 2024-03-13 00:55:08 +08:00
LmeSzinc
09b20a5838 Fix: Avoid ice sculpture in Jarilo_CorridorofFadingEchoes_F1_X463Y123 2024-03-12 18:54:13 +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
Schwarze-Katze
f59764afee
Modify .gitignore for files automatically added by electron deployer (#364)
* Refactor: Select next support character

* Upd: Character (#352)

* 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

* modify .gitignore to ignore files automatically added by electron deployer

---------

Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Co-authored-by: Zero <98764734+X-Zero-L@users.noreply.github.com>
Co-authored-by: Asxcvbn <63904802+Asxcvbn@users.noreply.github.com>
2024-03-11 01:56:58 +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
katze
76c8f9eda6 discard modification of .gitignore cause it is less related to the current PR 2024-03-08 11:31:24 +08:00
katze
7130b09540 translation bugfix 2024-03-06 17:11:37 +08:00
Schwarze-Katze
7c845c0a0e
Merge branch 'LmeSzinc:master' into master 2024-03-06 17:03:33 +08:00
katze
e49ec5479e multilanguage translation 2024-03-06 16:57:01 +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
katze
f50fbb7951 modify .gitignore to ignore files automatically added by src deployer 2024-03-06 15:06:51 +08:00
Zero
dbb5658103
Upd: Character (#352) 2024-02-29 23:01:29 +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
59bd0e8a6f
Merge pull request #341 from LmeSzinc/bug_fix
Bug fix
2024-02-24 00:46:48 +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
4be329597c
Merge pull request #335 from LmeSzinc/bug_fix
Bug fix
2024-02-19 18:17:16 +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
LmeSzinc
16636a3cd2
Merge pull request #331 from LmeSzinc/bug_fix
Bug fix
2024-02-19 01:11:18 +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
b0a6745bc7
Merge pull request #324 from LmeSzinc/bug_fix
Bug fix
2024-02-13 01:39:36 +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
5682ca4891 Fix: Init position in Luofu_Cloudford_F1_X281Y873 2024-02-13 00:25:04 +08:00
LmeSzinc
282ab6da72 Chore: _dungeon_nav_goto now receive nav input 2024-02-12 23:29:21 +08:00
LmeSzinc
666cc196a2
Merge pull request #316 from LmeSzinc/bug_fix
Bug fix
2024-02-10 04:57:09 +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
LmeSzinc
7fa2808791
Merge pull request #310 from LmeSzinc/bug_fix
Bug fix
2024-02-07 22:08:51 +08:00
LmeSzinc
7e8963d88c I18n: Update relic sets 2024-02-07 22:07:40 +08:00