LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-15 02:59:26 +08:00
Code Activity
7,093 Commits 12 Branches 0 Tags
b308b65cde4b11c5ba0b375cbbde505fc4971dbf
Commit Graph

295 Commits

Author SHA1 Message Date
Zuosizhu
b308b65cde Merge branch 'LmeSzinc:master' into 20230309 2023-06-02 03:55:50 +08:00
LmeSzinc
d63a03ed6d Fix: Strategy search settings exited accidentally 2023-05-30 23:50:52 +08:00
Zuosizhu
987423a96f Merge branch 'LmeSzinc:master' into 20230309 2023-05-27 20:30:22 +08:00
LmeSzinc
ff794e6437 Fix: Handle get items in strategy_search_enter() 2023-05-26 11:59:06 +08:00
Zuosizhu
dba6d7e4e4 Merge branch 'LmeSzinc:master' into 20230309 2023-05-25 13:54:56 +08:00
LmeSzinc
b3628b2a4a Fix: Missing B to 8 digit replacement 2023-05-22 12:10:12 +08:00
Zuosizhu
fa276716d1 Merge branch 'master_lme' 
# Conflicts:
#	alas.py
 2023-04-20 01:25:28 +08:00
LmeSzinc
cb2b398546 Fix: Reset timeout timer in action_point_safe_get() 2023-04-19 20:54:38 +08:00
guoh064
64db1406a0 Fix: Handle 2 Infobars covering action_point ocr (#2503) 2023-04-19 20:48:20 +08:00
LmeSzinc
7bb5c15788 Fix: Recheck AP boxes when having OCR error 2023-04-14 19:08:44 +08:00
Zuosizhu
038483cac3 Merge branch 'LmeSzinc:master' into 20230309 2023-04-13 20:37:10 +08:00
LmeSzinc
9560913ef1 Fix: Recheck AP boxes when having OCR error 2023-04-13 18:46:06 +08:00
Zuosizhu
cacc828f08 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/exercise/assets.py
#	module/exercise/exercise.py
 2023-04-12 15:25:30 +08:00
LmeSzinc
26851c1473 Fix: Don't wait tasks of tomorrow 2023-04-11 21:47:03 +08:00
LmeSzinc
942f8f54cf Fix: Handle AUTO_SEARCH_REWARD in zone_init() 2023-04-09 00:12:54 +08:00
Zuosizhu
b5ac3cc06a Merge branch 'LmeSzinc:master' into 20230309 2023-04-07 15:46:07 +08:00
LmeSzinc
b7c4de3725 Fix: Handle item info in _storage_item_use() 2023-04-04 03:41:43 +08:00
LmeSzinc
9322a3f054 Fix: Skip TB guidance if user didn't have their game settings correctly set (#2449) 2023-04-04 03:41:43 +08:00
Zuosizhu
fb67ae3ab7 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/campaign/campaign_event.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/config_manual.py
#	module/config/config_updater.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-03-24 16:33:37 +08:00
LmeSzinc
0c26b7a001 Upd: [EN] MISSION_OVERVIEW_CHECK 2023-03-17 00:49:43 +08:00
Zuosizhu
aa91c7a814 Merge branch 'master_lme' 
# Conflicts:
#	campaign/Readme.md
#	module/campaign/gems_farming.py
 2023-03-17 00:44:12 +08:00
LmeSzinc
e9f6781524 Fix: Handle DST in is_in_opsi_explore() 2023-03-15 22:52:21 +08:00
Zuosizhu
aabc691fb1 Merge branch 'master_lme' 2023-03-14 19:14:40 +08:00
LmeSzinc
3a12b9e95e Fix: Handle AUTO_SEARCH_REWARD in question_goto() 2023-03-12 01:10:35 +08:00
LmeSzinc
d5797cb153 Fix: Handle AUTO_SEARCH_REWARD when switching fleet lock 2023-03-11 23:46:47 +08:00
Zuosizhu
2bc586ce57 Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/campaign_event.py
#	module/campaign/campaign_status.py
 2023-03-04 03:11:41 +08:00
LmeSzinc
23eb719c78 Fix: Handle AUTO_SEARCH_REWARD in order_enter() 2023-03-03 02:48:02 +08:00
Zuosizhu
b6ee9a46b6 Merge branch 'LmeSzinc:master' into master 2023-03-02 21:00:17 +08:00
LmeSzinc
de1785ab91 Fix: Handle AUTO_SEARCH_REWARD in storage_enter() (fixed #2315) 2023-03-02 20:24:25 +08:00
Zuosizhu
58082e29e0 Merge branch 'LmeSzinc:master' into master 2023-02-27 14:18:41 +08:00
nEEtdo0d
27085dbcfd Upd: [EN] DORM_FURNITURE_CONFIRM, ACTION_POINT_REMAIN_OS 2023-02-26 14:45:24 -05:00
Zuosizhu
b072baa596 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/retire/retirement.py
 2023-02-20 12:35:43 +08:00
LmeSzinc
8c7781c541 Upd: [EN] Swap STRATEGIC_SEARCH_SUBMIT ON/OFF 
No idea why AL swapped them but we just follow
 2023-02-19 20:41:58 +08:00
LmeSzinc
f5f093c67f Opt: Remove OpsiAshBeacon.AshAttack since it should always be True 2023-02-17 23:50:30 +08:00
Zuosizhu
e1811c1ac0 Fix: value log error 2023-02-14 08:10:18 +08:00
Zuosizhu
0a419cb876 Refactor: the way to call LogRes 2023-02-14 02:21:43 +08:00
Zuosizhu
d8bd81be88 Fix: Reduce config write. Part2 2023-02-10 18:51:03 +08:00
Zuosizhu
13e5333569 Refactor: resource record and dashboard display 2023-02-07 10:48:11 +08:00
Zuosizhu
5aa1e7d00a Fix: Meet part of LmeSzinc's demand 2023-02-06 10:52:51 +08:00
MengNianxiaoyao
81729e076c Feature: Dashboard update for further features 2023-02-04 11:24:09 +08:00
MengNianxiaoyao
f760a99812 Feature: Dashboard update for further features 2023-02-04 11:23:26 +08:00
LmeSzinc
6877e55d39 Opt: Don't buy purple coins when CL1 is enabled 2023-02-01 01:43:17 +08:00
LmeSzinc
9db94ec3cb Fix: Accidentally entered globe in os_mission_enter() 2023-02-01 00:48:16 +08:00
LmeSzinc
d80b261b5b Fix: Missing break in get_yellow_coins() (fixed #2190) 2023-02-01 00:04:51 +08:00
LmeSzinc
6471d219fd Refactor: Abstract OSStatus class 2023-01-29 22:46:35 +08:00
LmeSzinc
9cd81ab1ae Upd: [TW] OS_FLEET_LOCKED and OS_FLEET_UNLOCKED 2023-01-17 23:03:38 +08:00
LmeSzinc
aa52b7c753 Fix: Using template matching on MAP_GOTO_GLOBE_FOG 2023-01-16 22:15:07 +08:00
LmeSzinc
a693489cdc Opt: Faster _storage_coordinate_checkout() after _storage_item_use() 2023-01-14 20:44:30 +08:00
LmeSzinc
14e04069d9 Fix: Get action points buy remain with retries 2023-01-14 20:44:27 +08:00
LmeSzinc
c5b1d75009 Fix: Handle random OCR error in action points 2023-01-13 21:22:28 +08:00