1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Commit Graph

572 Commits

Author SHA1 Message Date
LmeSzinc
6514204038 Opt: Remove MAP_ENSURE_EDGE_INSIGHT_CORNER in T4 2021-11-26 22:11:21 +08:00
LmeSzinc
e6ee74b654 Opt: World-spanning Arclight T4
- Fix: Swiping out of swipe box
2021-11-26 14:38:21 +08:00
LmeSzinc
8ac6e59f2a Upd: Update World-spanning Arclight
- Fix: Varies map mode switches
- Fix: Handle stories in map detection
- Upd: GAME_TIPS
2021-11-26 01:17:49 +08:00
LmeSzinc
9b5df053f9 Add: Event maps in World-spanning Arclight (event_20211125_cn) 2021-11-26 01:17:48 +08:00
LmeSzinc
e63212f100 Fix: Missing map shape in 7-1 (#767) 2021-11-24 12:27:49 +08:00
LmeSzinc
4e87034b4e Opt: Update optimized camera data in main chapter
- Standardise the format of map files
2021-11-22 21:42:06 +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
julystone
ebdcae9ed6 Add: WarArchives add Crimson Echoes 2021-11-19 14:40:30 +08:00
julystone
dc4eb7167e Add: WarArchives add Crimson Echoes 2021-11-19 01:09:55 +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
LmeSzinc
c75aa7bd94 Opt: Update map data and spawn data in main chapter 2021-11-10 21:04:34 +08:00
LmeSzinc
71392a5eba Opt: 9-1 and 9-2, also add MAP.ignore_prediction 2021-11-08 20:36:42 +08:00
Cola
07f70ab259 Fix: _archives_loading_complete 2021-11-08 13:01:00 +08:00
Cola
b228f5a940 Fix: war archives loading complete 2021-11-07 20:02:41 +08:00
LmeSzinc
12cc90536a Fix: W9-W11 compatible with fleet1_all_fleet2_standby 2021-10-30 22:05:03 +08:00
LmeSzinc
4d59f57a68 Opt: Skybound Oratorio SP 2021-10-29 00:06:22 +08:00
LmeSzinc
ab6aaa7c48 Fix: [TW] Event maps still inherits war archives 2021-10-28 22:08:12 +08:00
LmeSzinc
f2dadfc9b2 Add: [TW] Iris of Light and Dark rerun 2021-10-28 19:56:09 +08:00
LmeSzinc
7b66923d51 Opt: Skybound Oratorio Rerun (event_20211028_cn)
- Add: fleet1_boss_fleet2_mob, fleet1_standby_fleet2_all for event hard
- Dev: ENEMY_FILTER in map_extractor.py
2021-10-28 17:52:46 +08:00
18870
2587c19b2a Fix: Use perspective detection 2021-10-28 17:11:53 +08:00
18870
dd4d818baf Upd: [CN] Skybound Oratorio Rerun 2021-10-28 16:42:55 +08:00
LmeSzinc
3a489339a4 Fix: Some detection changes for W14
- Expose MAP_SWIPE_PREDICT_WITH_CURRENT_FLEET and MAP_SWIPE_PREDICT_WITH_SEA_GRIDS, due to errors in sea grids predictions
- Expose MAP_WALK_OPTIMIZE, disabled in W14, because of large map size
- Not allow enemy_scale overwrites, but allow 3 overwrites 2. 3 triangle enemies may be detected as 2 if being covered
- Reduce TEMPLATE_ENEMY_L similarity, the same reason as above
2021-10-22 17:40:47 +08:00
LmeSzinc
31cd872145 Fix: Flares counted as mystery in W14
- Refactor: Separate handle_mystery
2021-10-22 02:11:07 +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
825d0651d8 Add: W14 maps extracted
- Opt: _extract_stage_name for color just a little bit higher than 235
- Add: LuaLoader
2021-10-21 22:15:05 +08:00
LmeSzinc
deddf3d404 Fix: Accessibility check in enemy filter
- Opt: Swipe multiply factor in W12
2021-10-19 19:50:51 +08:00
LmeSzinc
d8730025d0 Add: Enemy filter and preserving, opted for W13 2021-10-18 22:00:05 +08:00
LmeSzinc
6a4064e57f Merge branch 'master' into app
# Conflicts:
#	module/config/event.py
2021-10-14 22:07:50 +08:00
Zorachristine
cbbab2735e Add:[TW] Cross Wave 2021-10-14 22:00:26 +08:00
nEEtdo0d
d9cec4134e Add: war archives support for app 2021-10-10 23:38:10 -04:00
nEEtdo0d
5cb9ee1895 Fix: Resolve to allow upstream pull 2021-10-10 23:34:02 -04:00
Zorachristine
ecad85b263 Add: [TW] Sundered Blue 2021-10-09 19:49:36 +08:00
LmeSzinc
93cd3fb6e8 Refactor: 12-2 leveling, 12-4 leveling, 1-1 affinity farming 2021-10-08 19:49:09 +08:00
LmeSzinc
fc5f88a6ab Opt: Expected battles in 7-2 mystery farming 2021-09-26 17:40:41 +08:00
LmeSzinc
5ca0eba158 Fix: SOS to use fleet1_all_fleet2_standby 2021-09-26 17:40:41 +08:00
LmeSzinc
e3816c8d17 Merge branch 'master' into app
# Conflicts:
#	module/equipment/equipment_change.py
2021-09-26 01:16:15 +08:00
Ray
8d49d2576e Fix: event_20210916 d3 avoid path blocking 2021-09-25 20:40:27 +08:00
LmeSzinc
2c58be0c21 Refactor: 7-2 mystery farming 2021-09-25 12:14:33 +08:00
LmeSzinc
36ff135cbd Merge branch 'master' into app 2021-09-24 20:38:47 +08:00
Zorachristine
e719e1b891 Add: [TW} Dreamwaker's Butterfly 2021-09-23 19:49:44 +08:00
LmeSzinc
eb7886df61 Refactor: Hard module
- Add config override
- Delete hard equipment change
2021-09-23 02:35:05 +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
ae6809c9aa Opt: Upon the Shimmering Blue A3 2021-09-17 23:46:25 +08:00
LmeSzinc
54b68d9b77 Fix: Upon the Shimmering Blue SP 2021-09-17 23:00:46 +08:00
LmeSzinc
b6f5dca0c4 Opt: Allow to set multiple template scaling ratios 2021-09-17 18:28:59 +08:00
LmeSzinc
017df17029 Fix: Path finding when grids blocked by fortress 2021-09-17 18:23:25 +08:00
18870
4438b90e58 Fix: MAP_SIREN_TEMPLATE in chapter B/D 2021-09-17 13:33:42 +08:00
18870
c62f216706 Fix: Able to handle multiple machine fortresses in B3/D3 2021-09-17 13:31:24 +08:00
LmeSzinc
837f60720a Fix: Disable MAP_SWIPE_PREDICT in Upon the Shimmering Blue chapter C
- Opt: Low cost farming in chapter A and C2
- Add event announcement
2021-09-17 00:04:41 +08:00
LmeSzinc
54ba53a4d3 Fix: Handle machine fortress 2021-09-16 21:56:27 +08:00
18870
2edebf0ad8 Fix: clear machine fortress once 2021-09-16 20:10:01 +08:00
18870
56e86cc7ae Fix: Handle machine fortress 2021-09-16 19:09:44 +08:00
18870
14b706ac35 Fix: MAP_SIREN_TEMPLATE in chapter A, C 2021-09-16 18:18:35 +08:00
LmeSzinc
b97f3a8a39 Add: MAP_HAS_MYSTERY and its extraction 2021-09-16 18:11:39 +08:00
LmeSzinc
30d242c3ed Add: Upon the Shimmering Blue (event_20210916_cn), but MAP_SIREN_TEMPLATE are still in id 2021-09-16 15:05:03 +08:00
LmeSzinc
61cbe75527 Refactor: More accurate exceptions and add friendly advices 2021-09-16 12:09:00 +08:00
Cerz0
765d3e87da
Update campaign_13_4.py
Noticed one triangle carrier enemy may spawn, they were ignored
2021-09-15 21:08:11 +02:00
Cerz0
bd766f0066
Avoid hardest carrier fleets on 13_4
Commented out readblock logic, didn't notice enemies spawning in such way that would leave your fleet trapped, increased map weight on concerning spots instead.
Made it so mob fleet will get the ammo.
RNG on spawns may make your mob fleet die if it has to face more than 2, 2 triangles carrier fleet.
2021-09-14 23:38:12 +02:00
Cerz0
4698d37720
Add enemy priority
Added enemy priority as to avoid fighting Hard Carrier enemies
2021-09-14 20:47:38 +02:00
fountain
05edaf5166 change war_archives_20190620map 2021-08-30 09:03:31 +08:00
Zorachristine
392f3cd865 Add: [TW] Azur Anthem 2021-08-26 18:14:05 +08:00
LmeSzinc
49aa866eb6 Opt: Perspective parameters in Microlayer Medley 2021-08-20 18:34:05 +08:00
LmeSzinc
47bb8cc979 Fix: Typo in Microlayer Medley A1 2021-08-19 23:54:47 +08:00
LmeSzinc
3295a634f9 Fix: Map detection in Microlayer Medley Chapter B 2021-08-19 23:28:18 +08:00
LmeSzinc
f168518ee6 Fix: Map detection in Microlayer Medley Chapter A 2021-08-19 23:12:06 +08:00
LmeSzinc
721f58ae18 Fix: Event folder typo 2021-08-19 19:23:32 +08:00
18870
c2494e80f7 Fix: MAP_SIREN_TEMPLATE 2021-08-19 18:58:47 +08:00
18870
f2c499037c Upd: Microlayer Medley Rerun 2021-08-19 18:50:45 +08:00
Zorachristine
0159d894e2 Add: [TW] The Enigma and the Shark 2021-08-12 18:41:16 +08:00
LmeSzinc
772bf15f62 Merge branch 'master' into dev
# Conflicts:
#	module/ui/assets.py
2021-08-07 14:32:31 +08:00
Zorachristine
bfb655fc88 Add: [TW] Aurora Noctis 2021-07-28 17:45:57 +08:00
LmeSzinc
22e8b73570 Merge branch 'master' into dev 2021-07-25 21:24:30 +08:00
LmeSzinc
8f80ee34bd Opt: Low cost farming in Azur Anthem 2021-07-25 21:24:01 +08:00
LmeSzinc
e918a5db97 Merge branch 'gems_farming' into dev
# Conflicts:
#	module/campaign/campaign_ocr.py
#	module/equipment/equipment.py
#	module/guild/base.py
2021-07-24 17:33:58 +08:00
LmeSzinc
b0d1ef5697 Fix: Siren templates in Azur Anthem SP 2021-07-23 23:51:27 +08:00
LmeSzinc
5b7a31b462 Add: Siren templates in Azur Anthem SP4 2021-07-23 21:01:37 +08:00
LmeSzinc
7ec9e0d88f Add: Siren templates in Azur Anthem SP3
- Opt: Lower campaign match threshold to 0.8, in order to detect 50% clear SP3
2021-07-23 20:15:05 +08:00
LmeSzinc
6d06346210 Add: Azur Anthem Event maps
- Handle event animation after the 4th battle
- Add ensure_edge_insight configuration
2021-07-23 18:26:24 +08:00
LmeSzinc
7a56028cfb Add: Event entrance of Azur Anthem (The Idol Master Collaboration) 2021-07-23 16:39:56 +08:00
LmeSzinc
5931c01a49 Merge branch 'master' into gems_farming 2021-07-10 15:47:33 +08:00
LmeSzinc
b5a42ff6e3
Merge branch 'master' into master 2021-07-09 21:43:19 +08:00
Zorachristine
d9fff9952a Stars of the Shimmering Fjord2 2021-07-09 18:11:43 +08:00
LmeSzinc
082b738a17 Merge branch 'master' into gems_farming 2021-07-08 23:02:37 +08:00
LmeSzinc
0275f05537 Opt: Enemy preference in chapter 2 2021-07-08 23:02:26 +08:00
LmeSzinc
f933c72d14 Add: Event entrance of Cross Wave Rerun 2021-07-08 22:55:45 +08:00
LmeSzinc
a3d26f17a2 Merge branch 'master' into gems_farming 2021-07-03 22:08:39 +08:00
LmeSzinc
73b90268a4 Opt: Low cost farming in Swirling Cherry Blossoms chapter A 2021-07-03 22:03:29 +08:00
LmeSzinc
cf5bfbc9a7 Opt: Template.match_result returns similarity and Button
- Add Button.move() Button.crop()
2021-06-30 13:59:24 +08:00
LmeSzinc
dc9a3c352e Fix: [TW] Map detection backend in Daedalian Hymn event
Codes are from old files, so use the old detection method.
Turn on MAP_HAS_WALL in B2B3D2D3
2021-06-26 21:26:48 +08:00
LmeSzinc
7b87023ded Opt: 0LB farming in Swirling Cherry Blossoms chapter A and C2 2021-06-26 20:28:16 +08:00
LmeSzinc
28bf4aaea3 Fix: [TW] Daedalian Hymn event
- Merge event_20200521_cn into event_20210624_tw
2021-06-26 20:23:39 +08:00
LmeSzinc
c422d4b0f3 Add: Swirling Cherry Blossoms chapter D and SP 2021-06-26 14:02:40 +08:00
LmeSzinc
c155b9d928 Add: Swirling Cherry Blossoms chapter C 2021-06-25 22:31:35 +08:00
LmeSzinc
98554a98a7 Add: Swirling Cherry Blossoms chapter AB 2021-06-25 17:58:33 +08:00
LmeSzinc
3ff10b89ce Add: Event entrance of Swirling Cherry Blossoms 2021-06-24 22:15:40 +08:00
Zorachristine
9d0dc170dd [TW] Skybound Oratorio 2021-06-23 18:24:40 +08:00
LmeSzinc
3f38f0c7d4 Fix: Add offset argument to all uses of MAP_PREPARATION and FLEET_PREPARATION (#493) 2021-06-20 17:03:35 +08:00
Zorachristine
566545eada Add: [TW] The Way Home in the Night 2021-06-12 10:32:24 +08:00
LmeSzinc
8bd759ebad Add: Mirror Involution chapter B, D and SP 2021-05-28 17:46:24 +08:00
LmeSzinc
ed55052740 Add: Mirror Involution chapter C 2021-05-27 22:26:48 +08:00
LmeSzinc
65cba325e0 Add: Mirror Involution chapter A 2021-05-27 20:39:25 +08:00
LmeSzinc
07bda9e4ff Add: Event entrance of Mirror Involution (event_20210527_cn)
- Dev: Fix map extractor on extracting chapter_template.lua
2021-05-27 20:35:01 +08:00
Zorachristine
fc59e5ca74 Add: [TW] Microlayer Medley 2021-05-26 23:58:53 +08:00
Zorachristine
e44df22f89 Add: [TW] Ink Stained Steel Sakura Rerun 2021-04-28 23:26:37 +08:00
LmeSzinc
4a7bb632b5 Opt: Enemy preference in Daedalian Hymn 2021-04-24 15:52:28 +08:00
LmeSzinc
28f6c47771 Add: Daedalian Hymn SP
- Fix: Round calculation when MAP_HAS_MOVABLE_ENEMY disabled
2021-04-24 15:36:53 +08:00
LmeSzinc
71f8508818 Add: Daedalian Hymn chapter D 2021-04-24 02:18:56 +08:00
LmeSzinc
a8f658bf7d Add: Daedalian Hymn B3 2021-04-23 22:44:14 +08:00
LmeSzinc
399e8352b6 Add: Daedalian Hymn B1B2 2021-04-23 19:49:28 +08:00
LmeSzinc
e39e8c0882 Opt: Swipe multiplier in Daedalian Hymn chapter A and C 2021-04-22 17:34:00 +08:00
LmeSzinc
20618023ef Fix: Siren scaling in Daedalian Hymn chapter A and C 2021-04-22 17:21:36 +08:00
LmeSzinc
5da9635b7d Add: Daedalian Hymn chapter A and C 2021-04-22 16:46:48 +08:00
Zorachristine
646eb76f7e Add: [TW] Encircling Graf Spee Rerun 2021-04-15 22:08:52 +08:00
nEEtdo0d
775ccf90d2 Fix: [EN] Support for Ink-Stained Steel Sakura, update module reference to local
TODO: [TW, JP] may need to acquire assets of their own as can vary
2021-04-08 23:24:07 -04:00
nEEtdo0d
867bd965ea Merge remote-tracking branch 'origin/master' into emotion 2021-04-02 18:36:20 -04:00
LmeSzinc
c5961ffeaf Opt: Perspective parameters in Ashen Simulacrum 2021-03-28 02:15:36 +08:00
nEEtdo0d
3d3a7ab240 Merge remote-tracking branch 'origin/master' into emotion 2021-03-27 10:27:03 -04:00
LmeSzinc
9039da93ec Fix: MOVABLE_ENEMY_TURN in D1, DS1 2021-03-27 21:00:37 +08:00
nEEtdo0d
287b6fe43e Add: Ashen Simulacrum chapter CD 2021-03-27 02:15:25 -04:00
nEEtdo0d
69ea5df1a1 Opt: Recovery if somehow exited page_archives during search 2021-03-26 22:12:27 -04:00
LmeSzinc
be6714473e Add: Ashen Simulacrum chapter B 2021-03-27 01:58:08 +08:00
LmeSzinc
ed7cbf8479 Fix: Map clear percentage in Ashen Simulacrum chapter AC
- Handle siren submarine in Ashen Simulacrum chapter BD
2021-03-26 18:38:47 +08:00
LmeSzinc
eb74acd35d Add: Ashen Simulacrum chapter A 2021-03-26 17:16:17 +08:00
LmeSzinc
fae26f12bd Add: Event entrance of Ashen Simulacrum 2021-03-26 15:12:13 +08:00
nEEtdo0d
c5502bc343 Upd: War Archives Iris of Dark and Light update, stable for general use 2021-03-17 21:33:51 -04:00
nEEtdo0d
18ba5445e8 Add: [EN, JP, TW] Ink Stained Steel Sakura template asset
Opt: Reduce excessive error output for failed search
2021-03-15 22:47:31 -04:00
LmeSzinc
7e228d7336 Opt: Returns in searching war archives entrance
- Fix missing logger import
2021-03-15 22:25:51 +08:00
LmeSzinc
c17ca25410
Merge pull request #379 from nEEtdo0d/war_archives
Add: War Archives enhancement
2021-03-15 20:43:06 +08:00
nEEtdo0d
ae70ce61b4 Opt: Upped swipe distance, removed unused assets and packages 2021-03-14 00:02:41 -05:00
nEEtdo0d
42f8ab2b1e Opt: Override no longer needed as War Archives usage no longer based on fixed intervals 2021-03-13 23:53:09 -05:00
nEEtdo0d
e4caef5071 Opt: War Archives scroll capability to search for archives entrance, fixed number of attempts used to determine failure of search
Add: War Archives support for Iris of Light and Dark, Ink Stained Steel Sakura needs an actual template to use, temporarily using placeholder
2021-03-13 23:45:05 -05:00
LmeSzinc
7c6989b3ea Opt: Enemy preference in SOS 2021-03-13 23:39:05 +08:00
LmeSzinc
662ed34992 Opt: Enemy preference in SOS
Avoid choosing 1 star enemy and treasure enemy
2021-02-28 17:34:55 +08:00
Zorachristine
5e1382c61a Add:[TW] Event entrance of Northern Overture 2021-02-27 12:28:38 +08:00
LmeSzinc
daf547927f Opt: Enemy preference in Khorovod of Dawns Rime SP 2021-02-27 01:06:42 +08:00
LmeSzinc
588c3a92d8 Opt: Enemy preference in Khorovod of Dawns Rime C2 D1 D2 D3 2021-02-26 20:55:06 +08:00
LmeSzinc
7b06a2572c Opt: Khorovod of Dawns Rime SP 2021-02-26 20:40:01 +08:00
LmeSzinc
cbe73a4f78 Fix: Siren detection in Khorovod of Dawns Rime chapter D 2021-02-26 20:28:11 +08:00
LmeSzinc
9a749ce494 Fix: Detection of siren BB red
- Fit swipe multiply in chapter B
2021-02-26 15:16:29 +08:00
LmeSzinc
d2a1e5ab36 Fix: Siren scaling in Khorovod of Dawns Rime chapter BD
- Opt: Perspective parameters in Khorovod of Dawns Rime
2021-02-26 14:27:14 +08:00
LmeSzinc
636fd22cc2 Fix: Siren scaling in Khorovod of Dawns Rime chapter C 2021-02-25 18:21:05 +08:00
LmeSzinc
dfc5e03a65 Fix: Siren scaling in Khorovod of Dawns Rime chapter A 2021-02-25 18:09:01 +08:00
LmeSzinc
595c9dbd27 Opt: camera_data in Khorovod of Dawns Rime 2021-02-25 17:35:52 +08:00
LmeSzinc
d3d7152bd4 Add: Event maps in event Khorovod of Dawns Rime 2021-02-25 15:54:10 +08:00
LmeSzinc
33ea210f4f Add: Event entrance of Khorovod of Dawns Rime 2021-02-25 15:26:40 +08:00
LmeSzinc
d2c71549f1 Fix: Force to disable auto search in customized maps (#333) 2021-02-08 02:14:01 +08:00
LmeSzinc
9032f07185 Opt: Use auto search in daily hard 2021-02-02 17:11:49 +08:00
LmeSzinc
4c81593a3c Fix: Empyreal Tragicomedy SP 2021-01-26 14:45:40 +08:00
LmeSzinc
7f6cb62ac2 Add: Empyreal Tragicomedy chapter SP 2021-01-22 16:40:15 +08:00
LmeSzinc
d49bfd1c95 Fix: Empyreal Tragicomedy chapter D 2021-01-22 00:04:56 +08:00