Commit Graph

905 Commits

Author SHA1 Message Date
LmeSzinc
8dd6ec7811 Fix: Slowly appeared WITHDRAW button (#4044) 2024-08-02 01:02:05 +08:00
guoh064
fe0e687dcb
Add: [TW] event entrance of raid_20240328 (#4038)
* Fix: predict_enemy_genre in event_20220526_cn rerun (#4005)

* Add: [TW] event entrance of raid_20240328

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: Air111 <54128005+Air111@users.noreply.github.com>
2024-07-28 13:31:36 +08:00
LmeSzinc
b868190d40
Merge pull request #4037 from LmeSzinc/dev
Bug fix
2024-07-27 01:56:11 +08:00
LmeSzinc
a92fd8a305 Del: Remove outdated map files 2024-07-27 01:47:27 +08:00
LmeSzinc
9cc9835e27 Fix: Add another frame of TEMPLATE_STAGE_CLEAR_20240725 (#4033) 2024-07-27 01:13:54 +08:00
LmeSzinc
c396f8b49d
Merge pull request #4030 from LmeSzinc/dev
Add: Event Interlude of Illusions (event_20240725_cn)
2024-07-26 03:05:13 +08:00
LmeSzinc
19ba250bd4 Add: Chapter SP 2024-07-26 02:46:17 +08:00
LmeSzinc
5a1bf7f265 Add: Chapter HT 2024-07-26 02:24:41 +08:00
LmeSzinc
5e05db05d0 Add: Switch mode in map preparation 2024-07-26 02:20:15 +08:00
LmeSzinc
96647e6300 Add: Chapter T 2024-07-26 02:20:15 +08:00
LmeSzinc
e2d1d2ff8a Upd: Handle yet another mode switch in event_20240725_cn 2024-07-26 00:23:57 +08:00
LmeSzinc
bec185c855 Add: Event entrance of Interlude of Illusions (event_20240725_cn) 2024-07-25 23:37:48 +08:00
Air111
dc6246849f
Fix: predict_enemy_genre in event_20220526_cn rerun (#4005) 2024-07-19 02:06:34 +08:00
梦念逍遥
6a0466d842
Add: Event Pledge of the Radiant Court Rerun (#4001)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2024-07-18 21:38:27 +08:00
RilyLC
ec1ae2cb3e
Upd:[TW]Event:Tower of Transcendence Rerun (#3981)
* docs: update game configs

* Upd:[TW]Event:Tower of Transcendence Rerun

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: 霞飛 <saarchaffee@qq.com>
2024-07-11 22:11:37 +08:00
LmeSzinc
6bdfbc3dcd Add: Event entrance of coalition_20240627 2024-06-27 23:34:39 +08:00
RilyLC
d1b16a99c2
Upd:[TW]Event:Tempesta and the Fountain of Youth (#3933)
* Fix: Skip first screenshot in tools

since you cannot run benchmark before benckmarked

* Fix: Lower HOMO_CANNY_THRESHOLD in event_20220428_cn

to fit maps in 2024

* Fix: Random background of chapter A hits EXP_INFO_B

* Upd:[TW]Event:Tempesta and the Fountain of Youth

---------

Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2024-06-27 19:59:16 +08:00
Air111
fc5667ebb6
Fix: update camera_data of a/c2 in event_20220428_cn (#3925) 2024-06-26 12:34:34 +08:00
LmeSzinc
86d6c36670 Merge branch 'master' into dev 2024-06-21 01:50:05 +08:00
LmeSzinc
aceeddde6d Fix: Random background of chapter A hits EXP_INFO_B 2024-06-21 01:06:51 +08:00
LmeSzinc
fdf39fa793 Fix: Lower HOMO_CANNY_THRESHOLD in event_20220428_cn
to fit maps in 2024
2024-06-21 00:41:40 +08:00
Air111
473a7b626c
Add: Event Rondo at Rainbow's End Rerun (#3902) 2024-06-20 19:00:11 +08:00
RilyLC
f70bb61ee6
Upd:[TW]Event:Sundered Blue Rerun (#3886) 2024-06-13 22:32:35 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
Air111
1e793295e8 Fix: mob move optimization 2024-06-03 00:04:42 +08:00
Air111
df88ee7c06 Fix: increase tile_center matching success rate in light map 2024-06-02 23:59:01 +08:00
LmeSzinc
c8322b5187 Upd: [TW] Event event_20230525_cn 2024-05-24 03:20:07 +08:00
LmeSzinc
f82260c9fe Add: Chapter SP 2024-05-23 02:10:07 +08:00
LmeSzinc
d8c7a6a5b1 Add: Chapter D 2024-05-23 01:45:05 +08:00
LmeSzinc
339530c5d3 Add: Chapter B 2024-05-23 01:16:41 +08:00
LmeSzinc
a79562aebc Add: Chapter AC 2024-05-22 02:29:23 +08:00
LmeSzinc
b85d646a84 Add: Event entrance of Light of the Martyrium (event_20240521_cn) 2024-05-21 22:53:12 +08:00
rilylc
bbe601b687 Upd:[TW]Event:Upon the Shimmering Blue Rerun 2024-05-09 18:58:41 +08:00
Air111
b0aef79e35
Fix: OCR error on letter muse (fixed #3719) (#3720) 2024-05-03 14:50:52 +08:00
LmeSzinc
74d3aa5ad5
Merge pull request #3701 from LmeSzinc/dev
Bug fix
2024-04-29 00:46:36 +08:00
LmeSzinc
03d99313db Fix: OCR error on letter muse (fixed #3692) 2024-04-28 17:33:50 +08:00
guoh064
faae3c9f21
Add: jp event entrance 20240425 (#3681) 2024-04-26 18:36:05 +08:00
LmeSzinc
a9068bb043 Fix: Turn on MAP_SWIPE_PREDICT_WITH_SEA_GRIDS since W15 have big maps 2024-04-26 13:52:28 +08:00
LmeSzinc
cba28a8aac Fix: Full scan wasn't early stopped cuz mixed use of siren and boss 2024-04-26 13:37:25 +08:00
LmeSzinc
b07d266e49 Fix: Visited inaccessible grid if support fleet was missing 2024-04-26 12:29:15 +08:00
LmeSzinc
bbef93c03d Add: Heart-Linking Harmony chapter ISP 2024-04-26 03:25:58 +08:00
LmeSzinc
fbf7bc02c6 Add: Heart-Linking Harmony chapter SP 2024-04-26 02:45:10 +08:00
LmeSzinc
75644f91d0 Add: Event entrance of Heart-Linking Harmony (event_20240425_cn) 2024-04-26 00:00:28 +08:00
RilyLC
42271e021d
Upd:[TW]Event:The Fool's Scales (#3677) 2024-04-25 19:01:01 +08:00
guoh064
0264e3f347
Opt: mob move strategy in 15-4 (#3672) 2024-04-23 19:39:13 +08:00
guoh064
41075b4a52
Fix: W15 optimization (#3660)
* Fix: force battle function choice for 15-1/15-2 when clear all

* Add: battle strategy when missing support fleet in W15

* Opt: open strategy once when checking mob move

* Opt: reuse strategy_get_mob_move_remain()
2024-04-22 23:16:39 +08:00
LmeSzinc
24326309ed Refactor: Cleaner loops in _mob_move 2024-04-20 02:51:02 +08:00
LmeSzinc
89aa1ad7dc Fix: W15 optimizations
- Upd: [CN] MOB_MOVE_CANCEL
- Opt: MAP_SWIPE_MULTIPLY
- Fix: 15-1 did not inherit ConfigBase
2024-04-20 01:57:27 +08:00
guoh064
74fe3138d7
Opt: INTERNAL_LINES_FIND_PEAKS_PARAMETERS for W15 (#3659) 2024-04-19 22:57:48 +08:00
guoh064
25a33ede7d
Fix: force battle function choice for 15-3/15-4 when clear all (#3655) 2024-04-19 21:13:17 +08:00
LmeSzinc
01a3c29c8b Opt: camera_data_spawn_point should reuse camera_data in W15 2024-04-19 01:54:36 +08:00
guoh064
27693a6762
Add: 15图开荒/周回 (#3563)
* Add: W15 maps extracted

* Add: template for Special Carrier in W15

* Add: method mob_move

* Fix: MapDetectionError in strategy mob move

* Fix: adjacent grid judge condition

* Fix: should focus on location before moving

* Fix: should update view before further operation

* Fix: wait for STRATEGY_OPENED after executing mob move

* Fix: offset for assets in _mob_move()

* Opt: judge if movable before moving camera

* Add: W15 mechanism

* Opt: Rename Special Carrier asset name

* Fix: offset for MOB_MOVE_1/MOB_MOVE_2

* Fix: separate MOB_MOVE_1 and MOB_MOVE_2

* Fix: should use appear_then_click in strategy_mob_move_enter

* Fix: function import in campaign_15_base.py

* Fix: missing assets import

* Fix: missing offset in strategy_mob_move_cancel()

* Fix: should move only once in a campaign

* Temp: modify special carrier filter string to 3E

* Fix: missing self. before 'moved' variable

* Revert "Fix: missing self. before 'moved' variable"

This reverts commit 00f70e0ab55e422898cb90c5d5e54d4e7c989511.

* Revert "Fix: should move only once in a campaign"

This reverts commit b588f5bb07dfc4511f39fa0797fbe160f356d604.

* Fix: force goto special carrier

* Fix: missing return True in battle function

* Fix: enlarge offset of MOB_MOVE_ICON

* Fix: typo in campaing_15_3

* Fix: update view after moving mob

* Fix: should use full_scan_movable since mob moved

* Fix: missing map_data_init() in campaign_15_4.py

* Fix: battle 4 should be done by mob fleet

* Revert "Fix: battle 4 should be done by mob fleet"

This reverts commit 0e2af1ec817b7bc89fe123f03a33ea9ad955973f.

* Fix: should switch to fleet_1 after battle_3

* Add: battle function when using clear mode

* Fix: missing import

* Fix: colliding Config class

* Fix: Config.when should contain all cases

* Opt: pick ammo after third battle in clear mode of 15-4

* Del: old assets CarrierSpecial

* Fix: remake of CarrierSpecial template

* Add: UI mask for W15

* Fix: missing ASSETS import

* Fix: change full_scan_movable() to predict()

* Fix: predict should be done after each move

* Opt: camera_data in W15

* Del: remove predict

* Add: map info process after mob move

* Add: support for multi bosses in _expected_end() for W15

* Opt: show map after moving

* Del: remove redundant import in fleet.py

* Opt: using clear_chosen_enemy() instead of goto() directly

* Fix: should first take screenshot before strategy enter/confirm/cancel

* Add: asset TEMPLATE_SIREN_BOSS

* Opt: Handle first stages of BOSS as Siren in 15-3/15-4

* Fix: missing override map_data

* Add: ignore is_boss prediction for siren boss in 15-3/15-4

* Fix: should not use decorator Config with battle_x functions

* Opt: camera data in 15-4

* Opt: directly overwrite map info into original map_data

* Fix: missing indent block in campaign_15_4.py

* Fix: expect 15-3/15-4 first bosses as siren

* Revert "Add: ignore is_boss prediction for siren boss in 15-3/15-4"

This reverts commit 1104631f92e5df0672dce8c7acaa1eb122731746.

* Revert "Add: asset TEMPLATE_SIREN_BOSS"

This reverts commit a29d6b6b9bfb9d79963adb404ce2091cbfafb810.

* Revert "Add: support for multi bosses in _expected_end() for W15"

This reverts commit 8d357abe5b.

* Del: redundent map config

* Fix: recover boss grids

* Del: redundant clear_siren()

* Del: redundant clear_siren() in battle_6

* Add: template for mob move icon

* Opt: enlarge reinforcement fleet mask area for W15

* Opt: method _mob_move

* Upd: TEMPLATE_MOB_MOVE_ICON

* Fix: should have cool time between clicks of grid

* Revert "Upd: TEMPLATE_MOB_MOVE_ICON"

This reverts commit b3f2dcbc88dbe166470905f33d041b91c2192f57.

* Upd: TEMPLATE_MOB_MOVE_ICON

* Upd: TEMPLATE_MOB_MOVE_ICON

* Upd: predict_mob_move_icon

* Fix: 15-2 camera spawn point

* Fix: should update view using self.device.image

* Revert "Upd: TEMPLATE_MOB_MOVE_ICON"

This reverts commit 92a12596a8f271ec64e249ecb58779d9b64ecea6.

* Del: redundant assets MOB_MOVE_ICON.png

* Fix: using map_is_clear_mode to get real value of clear mode

* Opt: check mob_movable before moving

* Opt: Refactor _mob_move

* Fix: camera_sight in W15

* Opt: move sight to further point in _mob_move
2024-04-19 01:29:17 +08:00
LmeSzinc
bbe4bdae8c Merge branch 'master' into dev
# Conflicts:
#	module/config/argument/args.json
2024-04-14 01:19:21 +08:00
LmeSzinc
8e6bb5631d Fix: Perspective parameters in Abyssal Refrain B 2024-04-14 01:12:20 +08:00
guoh064
d4b5cd11f0
Add: Event entrance of Abyssal Refrain Rerun (#3629) 2024-04-11 17:37:43 +08:00
guoh064
1b8734d24f
Add: HOMO_STORAGE data for d2/d4 in Divergent Chessboard (#3622) 2024-04-10 21:38:53 +08:00
RilyLC
28d3116a81
Upd:[TW]Event:The Flame-Touched Dagger Rerun (#3605) 2024-04-03 23:39:52 +08:00
LmeSzinc
164fcc96c5 Add: Event entrance of From Zero to Hero (raid_20240328) 2024-03-28 23:47:42 +08:00
RilyLC
7a01eadcd2
Upd:[TW]Event:Reflections of the Oasis (#3574)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2024-03-21 19:33:21 +08:00
LmeSzinc
81c59dddd2
Merge branch 'dev' into war_archives_20200603_cn 2024-03-15 00:23:31 +08:00
RilyLC
12b612da44
Upd:[TW]Event:Daedalian Hymn Rerun (#3547)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2024-03-15 00:22:00 +08:00
梦念逍遥
d921c3a845
Upd: Event Virtual Tower Rerun (#3546)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2024-03-15 00:17:29 +08:00
guoh064
b0b54a4b68 Add: War Archives The Way Home in the Night 2024-03-11 22:57:37 +08:00
guoh064
4ba1d50ec7 Add: War Archives The Solomon Ranger 2024-03-11 22:47:32 +08:00
guoh064
0ddd253514 Add: War Archives Prelude under the Moon 2024-03-11 22:26:33 +08:00
guoh064
caeb091ce6 Add: War Archives Counterattack within the Fjord 2024-03-11 21:26:35 +08:00
LmeSzinc
0a59b8efb5 Add: Chapter SP 2024-03-02 03:34:24 +08:00
LmeSzinc
793adb0341 Upd: MAP_SWIPE_MULTIPLY 2024-03-02 02:56:15 +08:00
LmeSzinc
8976c2fba4 Add: Chapter BD 2024-03-02 01:40:33 +08:00
LmeSzinc
479ad90781 Add: Chapter AC of Snowrealm Peregrination 2024-03-01 23:27:07 +08:00
LmeSzinc
ffb38e5d83 Add: Event entrance of Snowrealm Peregrination (event_20240229_cn) 2024-03-01 23:27:03 +08:00
RilyLC
5daf97ff8d
Upd:[TW]Event:Revelations of Dust (#3511)
* Upd:[TW]Event:Revelations of Dust

* remove CN Event
2024-02-29 21:33:41 +08:00
somegituser
4f779f66b2
add: war archive Khorovod of Dawn's Rime (#3505)
新增作战档案:破晓冰华
2024-02-23 21:58:52 +08:00
RilyLC
adaf2a6160
Upd:[TW]war_archives assets (#3490) 2024-02-18 01:37:15 +08:00
RilyLC
511f719240
Upd:[TW]Event:Winter Pathfinder (#3478) 2024-02-06 21:35:22 +08:00
LmeSzinc
c651c250ec Merge branch 'dev'
# Conflicts:
#	campaign/Readme.md
2024-01-31 12:17:49 +08:00
weeswelai
b04b349206 Add: Add raid event Spring Festive Fiasco(raid_20240130) 2024-01-31 10:57:34 +08:00
RilyLC
c4e3c8966d
Upd:[TW]Event:Mirror Involution Rerun (#3449) 2024-01-25 21:32:31 +08:00
somegituser
d29f93c1c1 add: wararchive Dreamwaker's Butterfly & Mirror Involution
新增作战档案: 蝶海梦花&镜位螺旋
2024-01-23 14:05:05 +08:00
LmeSzinc
928a35f53c Fix: Lower edge threshold in event_20211229_cn to the standard nowadays 2024-01-12 18:01:58 +08:00
guoh064
9a13bf1765 Upd: [TW] Event: Anthem of Remembrance 2024-01-11 11:32:04 +08:00
guoh064
c9ef2e0dca Upd: [CN, EN, JP] Event: Tower of Transcendence Rerun 2024-01-11 11:32:04 +08:00
rilylc
fd5b29d02a Upd:[TW]Event:Khorovod of Dawn's Rime Rerun 2024-01-05 11:14:50 +08:00
LmeSzinc
49b40ff648 Fix: Check bottom-right corner as boss covered the left edge 2023-12-23 23:32:37 +08:00
LmeSzinc
a9772c5250 Opt: Handle big sirens in A3C3 2023-12-23 21:44:13 +08:00
LmeSzinc
1c9d4efee6 Add: Chapter SP 2023-12-23 00:23:34 +08:00
LmeSzinc
22dd1f80e9 Add: Chapter BD 2023-12-23 00:11:34 +08:00
LmeSzinc
8abcd65be4 Add: Chapter AC 2023-12-22 02:40:46 +08:00
LmeSzinc
1f3260d8a7 Add: Event entrance of Light-Chasing Sea of Stars (event_20231221_cn) 2023-12-21 23:33:32 +08:00
RilyLC
ed2a244891
Upd:[TW]Event:Parallel Superimposition (#3361)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-12-21 21:51:48 +08:00
RilyLC
1da39e500e
Upd:[TW]Event:The Ninja Scrolls: Azur Flash (#3323)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-11-30 16:13:57 +08:00
LmeSzinc
28c5287a4b Upd: MAP_SWIPE_MULTIPLY in T3/T4/T5 2023-11-24 02:55:04 +08:00
LmeSzinc
b29d5ebc95 Add: Chapter SP 2023-11-24 01:08:14 +08:00
LmeSzinc
296f5d988a Add: Chapter TSK 2023-11-24 00:54:33 +08:00
LmeSzinc
8a8fcaf56f Add: Chapter T 2023-11-24 00:45:23 +08:00
LmeSzinc
530128ea49 Add: Event entrance of The Ninja Scrolls: Azur Flash (event_20231123_cn) 2023-11-24 00:43:34 +08:00
RilyLC
f7461e3ad1
Upd:[TW]Event:Northern Overture Rerun (#3306) 2023-11-23 22:41:47 +08:00
LmeSzinc
39ba51343b Fix: Missing submarine spawn point data in B3D3 (#3287) 2023-11-15 01:29:50 +08:00
Jiahao Yuan
114ffbdc9b
Upd: campaign (#3274) 2023-11-10 11:28:11 +08:00
LmeSzinc
d3c8221e14 Fix: Unknown stage name should not be considered as any chapter 2023-11-01 01:36:52 +08:00