sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code
8,325 Commits 9 Branches 0 Tags 274 MiB
ba08e8e494
Commit Graph

464 Commits

Author SHA1 Message Date
LmeSzinc
ed7c7a6fb8 Fix: Fleet repair after map rescan 2022-05-17 20:44:57 +08:00
LmeSzinc
dd879d8088 Fix: STORY_OPTION=0 to choose the first option in special OpSi zones 2022-05-17 02:24:27 +08:00
LmeSzinc
1c9a555963 Fix: Confirm story option stabled to avoid choosing the wrong option 2022-05-17 01:23:19 +08:00
LmeSzinc
15ae857212 Fix: Retry on Camera.update() to allow random MapDetectionError 2022-05-16 21:38:56 +08:00
LmeSzinc
94c2891428 Opt: Rescan only once in SAFE zones 2022-05-16 21:36:23 +08:00
LmeSzinc
ecbfb47302 Fix: HOMO_CANNY_THRESHOLD in OpSi 2022-05-16 20:00:45 +08:00
LmeSzinc
32f939f2bb Fix: Siren scanning tower and logging device are not detected if they are covered by other fleets 2022-05-16 19:54:51 +08:00
LmeSzinc
5867754de1 Fix: Edge detection in OpSi obscure and abyssal 
- Fix: Increase threshold of OCR_SHOP_YELLOW_COINS
- Fix: Akashi's shop has been checked twice
 2022-05-16 01:54:48 +08:00
LmeSzinc
ee4f85ebda Add: OpsiDaemon.SelectEnemy 
- Add archive detection on radar
 2022-05-16 01:30:05 +08:00
LmeSzinc
9094e4dcf4 Add: GUI option OpsiGeneral.DoRandomMapEvent 2022-05-15 17:52:04 +08:00
LmeSzinc
9f2df3c2c5 Add: Do random map events in OpSi 
- Opt: Select the second story option from the bottom in OpSi
- Fix: ui_mask_homo_stroke in OpSi
- Dev: Fix relative_crop.py
 2022-05-15 00:03:33 +08:00
LmeSzinc
2e072a4e47 Fix: Arrive port on radar but port entrance not appear 2022-05-11 20:38:54 +08:00
LmeSzinc
0bd4467ccb Fix: Lower threshold of SELECT_* assets 2022-05-03 20:57:59 +08:00
LmeSzinc
d81a86923d Fix: Port dailies are skipped 2022-05-01 21:13:06 +08:00
LmeSzinc
71885d1544 Opt: Add config_override() teaching people how to use a bot 2022-04-29 11:59:12 +08:00
LmeSzinc
7558b12b91 Fix: OpSi auto search interrupted by retirement 2022-04-26 00:21:22 +08:00
LmeSzinc
516e2d1f7e Fix: Run auto search in OpSi port but not in zone 154 2022-04-25 20:57:06 +08:00
LmeSzinc
cd49c097b6 Fix: Click on MAP_GOTO_GLOBE in os_mission_enter() 2022-04-23 12:39:05 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
Egor Nats
1ebe64950a Fix: [EN] Revert to old assets 
- Tactical class and Dorm feature still broken, please disable until fix.
 2022-04-12 11:20:34 -03:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
LmeSzinc
e697cd0121 Fix: Target Zone ID of Meowfficer Farming is sometimes ignored (#998) 2022-04-09 17:57:55 +08:00
nEEtdo0d
96b39a9ea5 Upd: [EN] post major app update bulk assets; WIP part 1 2022-04-07 22:32:24 -04:00
LmeSzinc
b7470e0601 Fix: Loop in mission accept when OpsiExplore is running and reached the maximum number of mission holdings 2022-04-04 14:11:23 +08:00
LmeSzinc
793fef3a77 Fix: AttributeError when failed to update os image 2022-04-03 12:23:26 +08:00
LmeSzinc
454a07723d Fix: Some OpSi missions are missed 2022-04-03 12:11:08 +08:00
LmeSzinc
b20e2b7863 Opt: Do missions at port when OpsiExplore is running 2022-04-01 21:24:53 +08:00
LmeSzinc
9b3544e1ac Fix: Handle EMP debuff in opsi that limits fleet steps 2022-04-01 18:38:12 +08:00
LmeSzinc
4f4c5d5be6 Opt: Receive mission rewards when having OpsiExplore running 
- Opt: Faster retry in storage_enter()
 2022-04-01 00:35:25 +08:00
LmeSzinc
a3799675cb Opt: Delay OpSi tasks 2.5 hours at the last day of every month 2022-03-31 22:33:47 +08:00
LmeSzinc
91328126ed Opt: Auto reduce ActionPointPreserve at the end of every month 
- Opt: Use turning samples in OpsiExplore
- Opt: Schedule OpsiExplore to next month instead of turning it off
 2022-03-31 19:53:55 +08:00
LmeSzinc
ae1d18055b Fix: Redundant globe_goto call when fleet was already repaired at port 2022-03-23 20:35:39 +08:00
railzy
523f0fe8ca Upd: [JP] SELECT_ARCHIVE & ZONE_ARCHIVE assets 2022-03-05 21:49:23 +08:00
LmeSzinc
1c28482fa6 Fix: Confirm OpSi storage empty cause items are slow to load sometimes 2022-03-02 20:59:14 +08:00
LmeSzinc
f4fcf98133 Add: Support zone name input in OpsiExplore.LastZone 2022-03-01 22:58:54 +08:00
LmeSzinc
f08fb26996 Add: Upload OpSi drop screenshots 2022-02-28 17:21:23 +08:00
nEEtdo0d
3fc5dea783 Add: [EN] OpSi archive zone assets 2022-02-25 10:41:11 -05:00
LmeSzinc
573978040a Add: Run OpSi archive zone as OpSi daily 2022-02-25 13:00:55 +08:00
nEEtdo0d
3e87ae310a Add: handle low resolve debuff after repair for stronghold task 2022-02-18 16:37:14 -05:00
nEEtdo0d
f65226d92f Fix: may result in nested call; entering port twice unnecessarily 2022-02-18 15:41:37 -05:00
LmeSzinc
50ec438da1 Add: Meowfficer farming in center zones 2022-02-17 21:36:27 +08:00
LmeSzinc
f8800d2567 Fix: Increase retry interval of buying Akashi's shop and MAP_GOTO_GLOBE for potato PCs 2022-02-12 17:14:55 +08:00
LmeSzinc
fe8fff68b0 Fix: Saving drop screenshots in OpSi abyssal 
- Increase timer of wait_until_camera_stable()
 2022-02-06 02:35:22 +08:00
LmeSzinc
eec0e8927c Add: Save drop screenshots in OpSi abyssal 2022-02-02 16:21:28 +08:00
LmeSzinc
d591334c76 Fix: Handle locked zones in OpsiExplore, no need to move to NY manually now 2022-02-02 04:02:07 +08:00
LmeSzinc
1b3e44393e Refactor: Split out globe.py from operation_siren.py 2022-02-02 03:13:05 +08:00
LmeSzinc
4dc64a1602 Opt: Auto delay other OpSi tasks during OpsiExplore, no need to disable them manually now 2022-02-02 03:05:51 +08:00
LmeSzinc
791dfa1eb6 Fix: Ensure zone selection fully expanded 2022-02-02 01:43:21 +08:00
LmeSzinc
7b0981fd48 Add: Screenshot interval in non-combat to help reduce CPU 2022-02-02 00:46:06 +08:00
LmeSzinc
a758f24b70 Add: OpSi drop record 2022-01-27 17:09:46 +08:00
LmeSzinc
e92579b5f9 Opt: Remove redundant converts from pillow to numpy 2022-01-24 23:43:53 +08:00
LmeSzinc
d7651559a9 Add: OpSi drop record 2022-01-23 23:03:55 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08:00
LmeSzinc
96e7e77c9a Merge branch 'master' into dev 
# Conflicts:
#	module/logger.py
 2022-01-22 18:43:40 +08:00
LmeSzinc
8374174d55 Refactor: module/device, separate all screenshot method and control methods 
- Better screenshot and control retries, handle common exceptions
 2022-01-22 17:42:47 +08:00
LmeSzinc
fc48b88e03 Fix: Remove non-ascii characters in zone name as a temporary fix 2022-01-21 23:38:34 +08:00
lonelyzerg
868eba53fe Move condition check to storage.py 2022-01-20 04:58:32 -06:00
lonelyzerg
d82880e1c3 Add storage_sample_use_all() to use all samples 2022-01-20 03:50:05 -06:00
lonelyzerg
8f060b8484 Add: Use tuning samples option in OpsiDaily 2022-01-20 02:49:45 -06:00
LmeSzinc
64f8a087a4 Fix: Uncollected zone exploration rewards prevent exit 2022-01-15 20:13:01 +08:00
LmeSzinc
4af820841d Add: Accept port missions in overview 
- Split OpsiDaily into OpsiDaily and OpsiShop
- Add config redirection
 2022-01-13 18:42:05 +08:00
LmeSzinc
61153482b3 Del: Deprecate port_mission_accept() 2022-01-13 17:48:24 +08:00
LmeSzinc
9360601e8e Fix: Typo in os_map_goto_globe() 2022-01-11 20:58:16 +08:00
LmeSzinc
84917ab4e4 Fix: 5 is not in list, if focused on a region 5 zone in find_siren_stronghold() 
- Lower hue to 285 to fix random detection issues
 2022-01-10 21:16:58 +08:00
LmeSzinc
b38694ab1f Fix: Handle map events in os_map_goto_globe 2022-01-09 14:52:57 +08:00
LmeSzinc
f8eeb44057 Fix: Handle fleet died without auto search reward 2022-01-08 22:17:24 +08:00
LmeSzinc
3b0bf249af Fix: Exit from a special zone before running auto search 2022-01-05 20:39:32 +08:00
LmeSzinc
d4a15449d6 Fix: Handle AUTO_SEARCH_REWARD in map_exit() 2022-01-04 01:23:29 +08:00
LmeSzinc
920039dcbf Fix: Handle walk_out_of_step in normal zones (#847) 2021-12-22 00:02:55 +08:00
LmeSzinc
6946769246 Fix: Solve random OCR error in OpSi zone init (#504) 2021-12-16 21:14:15 +08:00
LmeSzinc
60568aa492 Fix: Remove punctuations in zone ocr of JP (#832) 2021-12-16 19:56:08 +08:00
Cola
e76c734819 Fix: [TW] OS fleet assets & os zone name 2021-12-16 13:28:33 +08:00
LmeSzinc
ceb622f0d0 Fix: Not raising MapWalkError in abyssal (#829) 2021-12-14 23:11:33 +08:00
LmeSzinc
02fed26955 Fix: [JP][TW] Clean OpSi zone name suffixes (#825) 2021-12-13 23:18:15 +08:00
LmeSzinc
a1817778f5 Fix: Retry question_goto in abyssal 
- Fix: Handle index error in search_tile_rectangle
 2021-12-13 18:33:36 +08:00
LmeSzinc
e714733498 Fix: Handle auto search reward after battle status C/D 2021-12-11 22:24:32 +08:00
LmeSzinc
f895fb4938 Fix: Redundant meowfficer farming run if started at port 2021-12-11 01:43:09 +08:00
LmeSzinc
dfd334736f Add: OpSi abyssal and handle battle status C/D in auto search 2021-12-11 00:27:04 +08:00
LmeSzinc
377cf712fd
Merge pull request #809 from ddmugicha/master 
Fix: [JP] Battle pass & os fleets assets
 2021-12-10 21:22:05 +08:00
LmeSzinc
265346783c Fix: Leave button in OpSi abyssal 2021-12-10 20:24:19 +08:00
Cola
850c93d31d Fix: [JP] Battle pass & os fleets assets 2021-12-10 19:00:01 +08:00
LmeSzinc
5815ff3cb9 Fix: Handle stories in fleet switching and map order execute 2021-12-10 18:30:35 +08:00
LmeSzinc
20d96f43ff Fix: Auto search in zone 154 
- Fix: Loop in zone_init()
- Opt: Skip auto search in port
 2021-12-10 13:46:09 +08:00
LmeSzinc
e5ae34b033 Upd: [CN][EN][JP] Name of the zone 154 2021-12-10 13:28:52 +08:00
nEEtdo0d
9c25107918 Upd: [EN] ZONE_SWITCH change after game update 2021-12-09 19:38:59 -05:00
LmeSzinc
fbcb8029ee Upd: Create fleet lock assets for opsi 
- Fix: Expand search area of opsi auto search and fleet lock
 2021-12-10 00:57:55 +08:00
LmeSzinc
ed1806f354 Upd: [EN] Assets for OpSi fleet selector 2021-12-10 00:34:11 +08:00
LmeSzinc
d53ac9afad Fix: Zone names have been hidden in safe zones 2021-12-09 22:50:18 +08:00
LmeSzinc
e100b974bc Opt: Allow unknown OpSi fleet 2021-12-09 18:13:37 +08:00
LmeSzinc
45097dd408 Opt: Move ash beacon to a standalone setting group 2021-12-09 18:13:34 +08:00
LmeSzinc
82bce4d52c Fix: Add retry on getting OpSi fleet 2021-12-09 01:11:49 +08:00
LmeSzinc
c309ebcf5f Fix: confirm_timer is re-used in wait_until_walk_stable() 2021-12-09 00:35:09 +08:00
LmeSzinc
6e0bded8c4 Add: OpSi fleet filter 
- Fix: Showing disabled tasks in scheduler
- Fix: Fleet lock not detected in OpSi
- Fix: Filter presets are case sensitive
- Opt: Increase confirm timer in question_goto()
 2021-12-08 21:47:09 +08:00
LmeSzinc
6f0e3a38d0 Add: Handle shared CD of recon scan and submarine call 
- Add entrance of OpSi abyssal and stronghold
 2021-12-08 01:25:35 +08:00
LmeSzinc
d5735604e1 Dev: Uniform comments of generated files 2021-12-07 23:29:33 +08:00
LmeSzinc
29d963a2c0 Add: GUI settings of OpSi abyssal and stronghold 
- Opt: Expose EnsureAshCollect
 2021-12-07 23:14:19 +08:00
LmeSzinc
d7835fe1f0 Refactor: Get zone name in OpSi 2021-12-07 00:14:17 +08:00
LmeSzinc
bf4ff28c6e Add: Clear one abyssal coordinate 
- Fix: Divided by 0 in limit_walk()
- Fix: Taking drop screenshots in abyssal battles
 2021-12-07 00:00:40 +08:00
LmeSzinc
4a392407a0 Opt: Uniform the name of zone types in OpSi 
obscured to obscure
siren logger to abyssal
 2021-12-06 23:41:23 +08:00
LmeSzinc
caf51858e9 Add: Attack abyssal boss 2021-12-06 20:56:57 +08:00
LmeSzinc
1290224c50 Merge branch 'master' into dev 2021-12-06 10:01:42 +08:00
LmeSzinc
fcd6ff411f Refactor: Get zone name in OpSi 2021-12-05 22:47:53 +08:00
LmeSzinc
927be88d08 Add: Fleet switching in OpSi 
- Remove grid predictions except predict_current_fleet(), because they are never used.
 2021-12-05 20:19:42 +08:00
LmeSzinc
699d504c9b Add: Find siren stronghold in globe map 2021-12-05 16:08:33 +08:00
LmeSzinc
32738efaf6 Opt: HP in OpSi shows once only 2021-12-01 17:51:44 +08:00
LmeSzinc
57d60236c4 Opt: Raise exception if there's no auto search option in OpSi 2021-11-30 18:09:32 +08:00
LmeSzinc
2df2c8045e Fix: Not continuing auto search if OpsiGeneral_AshAttack disabled (#760) 2021-11-22 18:39:07 +08:00
LmeSzinc
7a0c566a9e Fix: Map swipe optimize should use local map view to generate blacklist 
- Opt: Take less screenshots during swipe, reuse local view object as possible
- Refactor: handle_boss_appear_refocus()
- Fix: Update swipe box area in map, avoid clicking auto search
 2021-11-22 18:09:38 +08:00
LmeSzinc
b171b329f5 Upd: [TW] Convert name to zone in OpSi (#762) 2021-11-20 23:56:06 +08:00
Zorachristine
ba1ae30a04 Fix: [TW] guild, os, research, ui assets 2021-11-20 22:21:06 +08:00
LmeSzinc
e02a3503db Fix: OpSi functions was called recursively when it triggers a fleet repair in obscure zone 
- Fix: Unable to goto other zones if fleet in in a special zone
 2021-11-18 12:28:21 +08:00
LmeSzinc
f85dbde2a6 Opt: Limit maximum screenshot interval in OpSi 2021-11-16 01:53:28 +08:00
LmeSzinc
72c96de596 Add: [TW] OpSi zone name detection 2021-11-14 15:08:11 +08:00
LmeSzinc
8e0a10974b Add: [TW] OpSi zone names 
- Dev: Update os_extract
- Dev: Auto-find server directory in LuaLoader
 2021-11-14 12:36:42 +08:00
LmeSzinc
940869385c Opt: Check task switching in OpSi daily 
- Opt: Remove the first screenshot in os_init, because first screenshot is taken at task start
 2021-11-14 01:24:00 +08:00
LmeSzinc
a723740528 Add: The Flame-Touched Dagger (event_20211111_cn) 
- Fix: Force to use fleet2 when MAP_CLEAR_ALL_THIS_TIME is True
 2021-11-11 18:25:34 +08:00
nEEtdo0d
95a5d58e2f Fix: refresh zone to spawn mission objectives 2021-11-06 11:19:00 -04:00
LmeSzinc
fa8e46bee4 Refactor: Remove old OpSi functions and rename the current with old names 2021-11-06 22:25:14 +08:00
nEEtdo0d
7a4804541f Fix: submarine settings for auto search and opsi obscure 2021-11-03 20:46:12 -04:00
julystone
7a2cf53a7a Add:os_explore support SpecialRadar option 2021-11-01 23:22:55 +08:00
julystone
0dae3054ae ADD：os_explore support VoyageRecorder option 2021-11-01 16:03:22 +08:00
julystone
90192ebe0c ADD：os_meowfficer_farming add specificSea Explore 2021-10-28 11:07:52 +08:00
julystone
1d66156c13 ADD：os_meowfficer_farming add specificSea Explore 2021-10-27 09:10:06 +08:00
julystone
d40232b41a Add:meowOffice add targetZone explore 2021-10-27 00:41:46 +08:00
julystone
a2edb3c133 Add:meowOffice add targetZone explore 2021-10-27 00:09:16 +08:00
julystone
fff3f59caf ADD：os_meowfficer_farming add specificSea Explore 2021-10-26 17:46:04 +08:00
LmeSzinc
fa8d29059b Opt: W14 mechanism 
- Split map_init()
- Add MAP_WALK_USE_CURRENT_FLEET
 2021-10-22 01:08:38 +08:00
LmeSzinc
b1858e5ccb Merge branch 'master' into app 2021-10-18 22:03:14 +08:00
Ray
3bd2dfea85 Fix: handle GET_ITMES popup when goto page_os 2021-10-17 09:37:50 +08:00
LmeSzinc
b7555bb9a4 Opt: Repair fleet at OS init 2021-10-15 02:32:14 +08:00
LmeSzinc
1075134d99 Fix: OS low hp detection, immigrates to app branch 2021-10-11 18:00:19 +08:00
LmeSzinc
85101590b7 Merge branch 'master' into app 
# Conflicts:
#	module/config/event.py
 2021-10-11 12:58:52 +08:00
LmeSzinc
63a8821112 Fix: OS low hp detection (#634) 2021-10-11 12:58:25 +08:00
LmeSzinc
7fefb6a4f0 Opt: Receive missions again if reach max holding limit 2021-10-03 19:55:36 +08:00
LmeSzinc
a82c9b8ce4 Fix: OS explore calls submarine 2021-10-01 00:50:53 +08:00
LmeSzinc
cb5db9d458 Fix: OS explore scheduling 
- Add config.multi_set
- Fix exercise server update
 2021-09-26 18:47:00 +08:00
LmeSzinc
a52826594e Refactor: OS module 
- Refactor OS explore, able to run without 5000 oil item
- Fix: Screenshot interval recover
 2021-09-26 17:40:38 +08:00
LmeSzinc
019ce4f1dd Del: Remove the use of tinydb and notifypy 2021-09-26 05:00:10 +08:00
LmeSzinc
5ed75c8de5 Merge branch 'master' into app 
# Conflicts:
#	module/config/config.py
#	module/map/fleet.py
#	module/ui/ui.py
 2021-09-17 23:53:15 +08:00
LmeSzinc
54ba53a4d3 Fix: Handle machine fortress 2021-09-16 21:56:27 +08:00
LmeSzinc
46d8d2fadb Refactor: Rename main configs 
- Faster chapter selection and page_campaign
- Rename some old Chinglish variables in map info
 2021-09-15 23:32:31 +08:00
LmeSzinc
ac0cd6f821 Fix #541: Re-enter current zone if triggers walk_out_of_step 2021-09-06 20:48:37 +08:00
LmeSzinc
6d6b693795 Fix: KeyError in convert_radar_to_local 2021-09-06 20:40:11 +08:00
LmeSzinc
bb64d2f90e Opt: Exit special zones in OS init 2021-09-05 19:15:17 +08:00
LmeSzinc
aa03f7c1a3 Fix: Handle a rare game bug, OpSi camera not focusing on current fleet 
- Opt: Add config HOMO_CANNY_THRESHOLD
 2021-09-05 17:50:10 +08:00
LmeSzinc
625602d028 Fix: Retry interval in OS storage and map_exit 2021-08-25 01:36:33 +08:00
nEEtdo0d
51d3429c9c Fix: map_exit interval 3 to 5 to account for loading of MAP_WORLD 2021-08-22 13:11:33 -04:00
LmeSzinc
308846983a Fix: Missing stringify time when no obscure coordinates 2021-08-23 00:30:50 +08:00
LmeSzinc
f18bdc2328
Merge pull request #590 from railzy/jp_zone_name 
Fix: [JP] get correct os zone name in OBSCURE
 2021-08-22 22:50:29 +08:00
Ray
1dc8e260ac Fix: [JP] get correct zone name in OBSCURE 2021-08-22 22:44:12 +08:00
Ray
c5dc75a97c Fix:[JP] update os assets 2021-08-22 21:09:22 +08:00
LmeSzinc
bc02f8ae33 Opt: Able to run obscure finish in os_fully_clear if OS_OBSCURE_FORCE_RUN is enable 2021-08-22 17:43:08 +08:00
LmeSzinc
cb319bb737 Fix: End condition of map_exit() 2021-08-22 17:33:38 +08:00
nEEtdo0d
41c3451772 Upd: [EN] Obscure finish assets 2021-08-21 16:15:22 -04:00
LmeSzinc
2777f00584 Add: Obscure finish in OS fully auto 2021-08-22 00:16:40 +08:00
Ray
8869bc6d8e Fix: [JP] upd os SELECT_* assets for font change 2021-08-17 23:17:05 +08:00
nEEtdo0d
eecb957a04 Add: support to run reward loop during OS 2021-08-07 14:42:11 -04:00
Ray
ef97217f16 Fix: [JP] ZONE_SWITCH text asset 2021-07-20 14:27:09 +08:00
nEEtdo0d
990dc89d33 Fix: [EN] ZONE_SWITCH icon to text asset 2021-07-16 15:05:52 -04:00
LmeSzinc
f67a199bd1 Fix: OS zone switch detection 2021-07-16 22:10:39 +08:00
LmeSzinc
1dbdfff634 Fix: Handle info_bar before entering akashi's shop (#503) 2021-06-29 17:02:09 +08:00
LmeSzinc
2d82f79398 Fix: Akashi detection in OS radar (#502) 2021-06-29 16:44:09 +08:00
LmeSzinc
48ae5460cf Fix: Handle meowfficer popup when going to globe (#462) 2021-06-09 09:25:13 +08:00
noname94
374945ff2a Fix: [JP] Katakana "pe" may be OCRed as Hiragana 
in the name of "St. Petersburg".
 2021-06-09 03:57:23 +09:00
nEEtdo0d
39e9a754bd Fix: Move hp_reset 2021-05-29 19:17:43 -04:00
nEEtdo0d
5b5412ccc0 Fix: HP grid check normal vs os, straight forward, no @Config 2021-05-24 16:21:44 -04:00
nEEtdo0d
5ffc1508b9 Fix: Use handle_map_event for previous clauses plus more 2021-05-20 14:51:47 -04:00
nEEtdo0d
7f8e8d1173 Fix: Revert else clause, resume using zone_type_select after zone_has_safe 2021-05-20 13:00:07 -04:00
nEEtdo0d
91a31201f9 Fix: zone_has_safe handle clause without zone_has_switch otherwise stuck 2021-05-20 06:22:54 -04:00
nEEtdo0d
0a3224ae5e Fix: Minimized HP threshold configuration to 1 setting 2021-05-19 21:39:23 -04:00
nEEtdo0d
af275b7e99 Fix: Daily mission no longer uses globe_goto, thinks zone in azur_port, skips akashi unintentionally 2021-05-18 10:58:51 -04:00
nEEtdo0d
29fb7cb4fc Del: Revert alterations to zone_type_select 
Add: zone_has_safe and use for handling safe checking on zone

Fix: Typo OBSCURE vs OBSCURED asset name

Opt: moved and added clauses for os_auto_search_daemon

Opt: need_repair --> handle_fleet_repair, add 'revert' optional arg
 2021-05-18 00:45:27 -04:00
nEEtdo0d
4d66050d6f Fix: Disclaimer requirement for os_world_clear module 
Fix: Limit user input via 'choices' for min/max level

Fix: Update loop range dynamic rather than presumed in read config
 2021-05-16 20:00:55 -04:00
nEEtdo0d
057911a2ee Add: [EN] Add HP check and repair support for os_fully_auto module 2021-05-14 21:57:49 -04:00
nEEtdo0d
4d1f31f4ba Add: Capability for Config decorator to replace func pointer based on options 
Add: [EN] HP check within OS map after zone clear for os_world_clear module
Retreat for repair if any one ship below configured threshold
 2021-05-14 21:15:57 -04:00
nEEtdo0d
43ee1f35fe Add: [EN] Support for OS world clearing 2021-05-14 16:19:55 -04:00
Ray
f420fc696e Fix: [JP] add os zone logger assets 2021-05-07 10:34:16 +08:00
LmeSzinc
fb9aa9a52c Fix: OS mission changed after maintenance 2021-05-07 09:59:47 +08:00
LmeSzinc
bf828dc971 Add: Clear all zones in OS after monthly reset 
- Doc: Update Readme.md about operation siren
 2021-05-06 22:46:07 +08:00
LmeSzinc
05eec22416 Fix: Force to terminate meowfficer searching when going to OS globe 2021-04-30 23:00:24 +08:00
LmeSzinc
d83bd896c2 Fix: Force to use AP boxes when doing OS dailies 2021-04-30 22:01:00 +08:00
Ray
63d8e649bf Fix: [jp] cut ZONE_DANGEROUS to ignore color 2021-04-30 20:16:27 +08:00
Ray
eaefd4625b Fix: [jp] assets of os zones 2021-04-30 16:52:07 +08:00
Ray
e457275843 fix: [jp] update some os & os_handler assets 2021-04-30 12:34:48 +08:00
LmeSzinc
afcf5cebd1 Fix: Force to finish all OS missions before accepting 2021-04-29 23:24:55 +08:00
LmeSzinc
127212b204 Add: Do os in daily 2021-04-27 16:27:55 +08:00
LmeSzinc
825255f3b7 Fix: Failed to get zone name after oil buy count OCR 
They use the same ocr model and oil buy count set an alphabet whitelist, result in empty zone name
- Opt: Faster click after handle_action_point
 2021-04-25 16:53:44 +08:00
LmeSzinc
ece1a83d5a Opt: Detect as white question if fleet is facing down 2021-04-24 19:33:34 +08:00
LmeSzinc
18c0b2a68f Fix: Use radar to detect akashi instead of map view 
Because akashi on map view may be covered by current fleet or info bar
 2021-04-24 18:27:51 +08:00
LmeSzinc
5d5fb1e6e8 Fix: Saving record of OS daily mission finish 2021-04-24 17:52:53 +08:00
LmeSzinc
45684daebb Fix: Pinned zone showing slowly after os_map_goto_globe 
- Fix: os_auto_search_quit
 2021-04-24 17:23:49 +08:00
LmeSzinc
dcae813f0a Fix: globe_focus_to clicks outside of valid box 2021-04-24 16:30:41 +08:00
LmeSzinc
109876ff97 Add: OS daily support 2021-04-23 15:01:50 +08:00
LmeSzinc
af6c976a26 Fix: Daily mission at current zone 
- Fix: ASH_ENTER_CONFIRM button moving
 2021-04-22 21:05:39 +08:00
LmeSzinc
098d7dfbd6 Fix: Radar prediction out of view when going to port 
Limit port in camera sight
- Opt: Increase click interval of ZONE_ENTRANCE, because it's slow to load
 2021-04-21 22:11:35 +08:00
nEEtdo0d
507c147e86 Upd: os and os_handler assets common among all servers 2021-04-20 21:41:00 -04:00
nEEtdo0d
eed48c10ac Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into operation_siren_dev 2021-04-20 19:19:31 -04:00
LmeSzinc
adb8b863df Opt: Action point buy, confirm AP increase after clicking instead of bored clicking 
- Opt: Add battle count to auto search
- Fix: Add missing akashi call after auto search
 2021-04-20 22:21:59 +08:00
nEEtdo0d
ef7915bd12 Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into operation_siren_dev 2021-04-20 09:02:36 -04:00
LmeSzinc
ea266dab95 Add: Handle Akashi's shop 
- Opt: Detect ash beacon before starting auto search
- Fix: Handle siren scanning device when running auto search
- Opt: Ensure current zone is cleared before switching map
 2021-04-20 17:13:35 +08:00
nEEtdo0d
5f7a316be8 Fix: [EN, JP] argparser, command must be string with no whitespace 
Fix: [EN] get_zone_name, lower() called too late
 2021-04-17 16:02:45 -04:00
nEEtdo0d
8ddf12102e Add: [EN] os assets 2021-04-17 13:56:11 -04:00
LmeSzinc
5940487699 Fix: appear condition when entering zone switch 2021-04-17 22:45:51 +08:00
LmeSzinc
40578204b5 Add: OS full auto and add it to GUI 2021-04-17 22:05:36 +08:00
LmeSzinc
300e368d4e Opt: Skip using AP box if amount equals 0 2021-04-17 13:15:27 +08:00
LmeSzinc
c26aa5bc0c Add: Handle action point in OS 
- Add configs in module.os
 2021-04-17 12:07:17 +08:00
LmeSzinc
4f353c922b Opt: Avoid swiping at the edge of globe map 
- Opt: [CN] Zone name detection
 2021-04-17 09:34:23 +08:00
LmeSzinc
96a58b52e7 Add: OS meowfficer farming 
- Opt: ZoneManager class to select zones
 2021-04-16 22:01:09 +08:00
LmeSzinc
77c6356e84 Resolve merge conflict 2021-04-16 17:52:59 +08:00
LmeSzinc
b914e017a4 Fix: Handle pinned zone when moving in globe 
- Fix: Get mission in zone [154|NA海域中心|NA OCEAN CENTRAL SECTOR|NA海域中心]
 2021-04-16 09:44:29 +08:00
LmeSzinc
5a6a0e24b6 Fix: Goto port in OS and search port on radar 2021-04-16 09:31:08 +08:00
LmeSzinc
446415b906 Fix: Radar detection and add is_port prediction 2021-04-15 14:57:09 +08:00
LmeSzinc
1b07abaf4e Add: Finish all OS daily missions 
- Opt: Skip selecting zone type if already selected at the right one
- Opt: Get zone name in init and after entering map
- Fix: os_init in port shop
 2021-04-14 20:47:23 +08:00
LmeSzinc
ca59000039 Fix: Wrong perspective detection in OS port because of white grids outside map 2021-04-14 19:26:44 +08:00
LmeSzinc
7c0d3d67ef Add: Support auto search in OS 
- Add port mission assets
- Move globe operations from map.py to operation_siren.py
- Add match_appear_on
 2021-04-13 22:17:21 +08:00
LmeSzinc
9990825b8c Fix: Page transition after OS auto search update 2021-04-13 17:50:48 +08:00
LmeSzinc
d1abc2b446 Merge branch 'master' into dev 2021-04-13 15:55:28 +08:00
LmeSzinc
498681f616 Fix: [CN] OS ash assist assets 
- Fix: Handle ash reward when entering ash (#403)
 2021-04-13 15:53:56 +08:00
LmeSzinc
338c4dea94 Merge branch 'master' into dev 2021-04-13 15:23:19 +08:00
nEEtdo0d
244dbcefe1 Fix: Use normal asset instead of template 2021-04-09 10:46:42 -04:00
LmeSzinc
41dad3a072 Fix: Skip zone type select if zone has no options 
- Fix: Handle port enter animation
- Fix: Ensure _get_map_outside_button have a return
 2021-04-06 21:29:25 +08:00
LmeSzinc
9718e1835d Add: Select zone types in OS 
- Fix: os init from other pages
 2021-04-05 21:06:59 +08:00
LmeSzinc
df7fec4e2b Add: Repair ships in port and accept all missions in all ports 
- Fix: Port exit
- Fix: Handle unable to accept more missions
- Opt: Adjust map init, map init should be called at first, and when zone changed
 2021-04-05 18:15:16 +08:00
LmeSzinc
59e723dcf0 Opt: Add load_offset method to Button class 
It will be useful in the future
 2021-04-04 22:27:36 +08:00
LmeSzinc
25830dff67 Add: Support port operations in OS 2021-04-04 22:15:27 +08:00
LmeSzinc
74bbc59f94 Add: Goto to port of current map 
- Fix: Detect zone name if not in OS map
 2021-04-04 21:23:46 +08:00
LmeSzinc
51f51bb006 Opt: Get Zone instance in map init, instead of map size 2021-04-04 20:51:26 +08:00
LmeSzinc
bddb946b46 Opt: Move _get_map_outside_button to camera.py 2021-04-04 19:49:52 +08:00
LmeSzinc
9f4ccaaf44 Opt: Faster globe detection 
Downscale image before template matching, time cost reduced from about 0.6s to 0.15s
- Fix: Zone info use before init
- Opt: Allow globe_goto run from IN_GLOBE
 2021-04-04 19:44:49 +08:00
LmeSzinc
886ed14ef0 Add: Able to goto another map in OS 2021-04-04 17:54:58 +08:00
LmeSzinc
bf95121ff4 Add: Moving in OS globe map 2021-04-03 21:59:58 +08:00
LmeSzinc
02c4964913 Dev: Extract map position in OS 2021-04-02 21:12:56 +08:00
LmeSzinc
a386c10318
Merge pull request #396 from noname94/patch1 
Fix: [JP] os map name fixed
 2021-04-02 00:06:47 +08:00
noname94
26d09cc7c5 Fix: [JP] os map name fixed 2021-04-01 13:42:18 +09:00
LmeSzinc
65169654e8 Opt: Reduce "Arrive with unexpected result" in OS 2021-02-26 18:17:51 +08:00
LmeSzinc
c90772ab9b Opt: Reduce "Arrive with unexpected result" in OS 2021-02-25 23:47:03 +08:00
LmeSzinc
16957e90bd Dev: Optimize camera_data generation, only generated on active grids 2021-02-25 17:07:59 +08:00
LmeSzinc
33620462ed Fix: Check walk result and expected in OS (#363) 2021-02-23 21:48:01 +08:00
LmeSzinc
82c70c4871 Merge branch 'master' into dev 2021-02-21 21:22:42 +08:00
LmeSzinc
be87fd97fe Fix: Confirm ash popup if enable IGNORE_LOW_EMOTION_WARN 2021-02-21 21:21:58 +08:00
LmeSzinc
2d48654def Merge branch 'master' into dev 2021-02-20 17:35:56 +08:00
LmeSzinc
99f0195571 Opt: Handle siren platform after entering map, add logs for akashi 2021-02-20 17:34:03 +08:00
whoamikyo
a0f84696e1 Opt: Few changes to match with new notifications system 2021-02-19 20:01:32 -03:00
LmeSzinc
80cba0e197 Fix: Revert the modification of handle_mystery in module.os 2021-02-18 16:48:44 +08:00
nEEtdo0d
2503916232 Opt: handle_map_event in handle_mystery, can be encountered due to 
update in camera.py recently
 2021-02-17 12:48:32 -05:00
LmeSzinc
ddbd15b26e Add: Predict swipe to handle random game stuck 
- Fix: Urgent commission in OS
- Fix: More accurate predict_current_fleet
- Opt: Increase edge tolerance in homography detection
- Opt: Shorten swipe distance in OS, because swipe predict needs something in common
 2021-02-17 17:46:46 +08:00
whoamikyo
66f9ff53cb Added: added OPsi clear toast notification 2021-02-15 12:39:35 -03:00
Kuwas
15ec109547
fix: fix operation siren mediterranee map not found 2021-02-11 18:36:42 -05:00
Kuwas
d2710a9f2c
fix: fix operation siren mediterranee map not found 2021-02-11 18:35:29 -05:00
LmeSzinc
bd6a467c5e Opt: Simplify sea grids detect and increase swipe distance in OS 2021-02-10 22:01:35 +08:00