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,449 Commits 9 Branches 0 Tags 274 MiB
5b5c549d30
Commit Graph

409 Commits

Author SHA1 Message Date
LmeSzinc
b554a39351 Refactor: Fleet switching and fleet reverse 
- Revert swipe limit of ensure_edge_insight
 2021-11-06 22:25:14 +08:00
LmeSzinc
12cc90536a Fix: W9-W11 compatible with fleet1_all_fleet2_standby 2021-10-30 22:05:03 +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
fa8d29059b Opt: W14 mechanism 
- Split map_init()
- Add MAP_WALK_USE_CURRENT_FLEET
 2021-10-22 01:08:38 +08:00
LmeSzinc
deddf3d404 Fix: Accessibility check in enemy filter 
- Opt: Swipe multiply factor in W12
 2021-10-19 19:50:51 +08:00
Ray
563720fb16 Merge branch 'master' into app 2021-10-19 15:00:36 +08:00
Ray
b53f271179 Fix: [JP] update map/ FLEET_* & SUBMARINE_* assets 2021-10-19 14:40:22 +08:00
LmeSzinc
d8730025d0 Add: Enemy filter and preserving, opted for W13 2021-10-18 22:00:05 +08:00
LmeSzinc
1835f7493e Fix: fleet1_all_fleet2_standby compatibles with self.fleet_2 calls from old map files 2021-10-18 21:48:55 +08:00
LmeSzinc
4143f26145 Add: Stage Increase for exploring stages one by one (#192) 2021-10-16 19:10:45 +08:00
LmeSzinc
98cb8b1b8d Fix: Disable task if reached stop condition 2021-10-15 01:00:42 +08:00
LmeSzinc
89bf271417 Refactor: Emotion module 
- Fix: Modifications of config will be overridden by the loading of yaml file during update
 2021-09-24 20:24:46 +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
5168609778 Opt: Reset fortress_data in clear mode to correct missing predict 2021-09-17 23:39:12 +08:00
LmeSzinc
54b68d9b77 Fix: Upon the Shimmering Blue SP 2021-09-17 23:00:46 +08:00
LmeSzinc
2ccecbaa7a Fix: Default of _fortress_data (#620) 2021-09-17 22:47:19 +08:00
LmeSzinc
266365f140 Fix: Release fortress block 2021-09-17 18:35:46 +08:00
LmeSzinc
017df17029 Fix: Path finding when grids blocked by fortress 2021-09-17 18:23:25 +08:00
LmeSzinc
54ba53a4d3 Fix: Handle machine fortress 2021-09-16 21:56:27 +08:00
LmeSzinc
eb045242c3 Refactor: Rename retire configs 
- Fix combat drop screenshot missed because clicking too fast
- Close campaign preparation at start
 2021-09-15 23:33:06 +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
071eec530a Move commission to a new module, also faster 2021-09-14 14:56:28 +08:00
nEEtdo0d
4c2669d4de Fix: [EN] sub fleet not handled, map/SUBMARINE_* assets updated 2021-08-08 08:39:45 -04: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
450bfcf167 Fix: Disconnecting grids in wall_data parse 2021-06-27 15:57:17 +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
c3a104d138 Fix: [Tw] FLEET_PREPARATION assets 2021-06-10 22:29:55 +08:00
LmeSzinc
d9128d3f77 Fix: Re-implement hard mode detection 2021-06-10 17:46:55 +08:00
LmeSzinc
05ac576bf1 Fix: Update FLEET_PREPARATION_HARD_* (#470) 2021-06-10 17:00:15 +08:00
LmeSzinc
77899feffd Fix: Increase FLEET_IN_USE_STD to correct submarine.in_use() (#470) 2021-06-10 16:50:01 +08:00
LmeSzinc
7ba14590a6 Fix: UI changes in fleet preparation 
EN, JP, TW need to update assets except *_IN_USE and check _fleet_sidebar
 2021-06-10 16:07:32 +08:00
noname94
75c5a2906a Fix: FLEET_BOSS not work as expected 
fleet_2 should be treated fleet_boss if and only if fleet_2 exists AND FLEET_BOSS == 2
 2021-05-12 10:46:06 +09:00
LmeSzinc
0af4507384 Merge branch 'master' into dev 2021-04-24 15:54:44 +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
bb33e1d183 Add: Handle maze in map 
- Fix: round_wait when no sirens on map
- Fix: Repeated path end in find_path
 2021-04-23 19:13:37 +08:00
LmeSzinc
96a58b52e7 Add: OS meowfficer farming 
- Opt: ZoneManager class to select zones
 2021-04-16 22:01:09 +08:00
noname94
f92234614d Fix: [JP] assets fix 2 after font changed 
Many assets with words need fixes after the font changed. Most functions should work now.
 2021-04-16 13:58:57 +09:00
nEEtdo0d
f1dfc402d2 Opt: Extend handle_2x_book_setting for prep and auto menu 2021-04-09 00:36:24 -04:00
nEEtdo0d
ec04eb7c8c Mov: 2x book check and handle setting 
Opt: Switch for enable and disable for 2x book, get_expected_reduce @property now
 2021-04-02 18:26:00 -04:00
nEEtdo0d
d29ec0c0d2 Opt: Reset iff cached as 4 to override as 2x book impossible to turn on 2021-03-27 10:26:45 -04:00
nEEtdo0d
8817b64bee Add: 2x Book assets for all servers 2021-03-26 22:48:35 -04:00
nEEtdo0d
bee16ad552 Add: Config option enable 2x book for other servers, own copy of assets 2021-03-26 22:21:24 -04:00
nEEtdo0d
f2158a3c06 Add: Capability to turn on 2x book implemented 2021-03-26 21:55:53 -04:00
nEEtdo0d
607e8b1260 Opt: Emotion refactor for enable 2x book configuration 2021-03-26 20:31:44 -04:00
LmeSzinc
51c65f062d Fix: Handle moving normal enemies 
- Add option to disable swipe predict
 2021-03-26 17:15:12 +08:00
whoamikyo
171627cf0e Opt: New toast notifications 2021-03-02 05:53:18 -03: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
0a1b3ae1c7 Opt: Align when showing map 2021-02-23 21:03:07 +08:00
LmeSzinc
82c70c4871 Merge branch 'master' into dev 2021-02-21 21:22:42 +08:00
noname94
78a8e0d121 Fix: fleet_switch_click() may fail when SWITCH_OVER not appeared 
If SWITCH_OVER not appeared (in most cases, connection unstable), we should wait for it instead of skipping the switch click.
 2021-02-21 15:42:33 +09:00
LmeSzinc
2d48654def Merge branch 'master' into dev 2021-02-20 17:35:56 +08:00
whoamikyo
a0f84696e1 Opt: Few changes to match with new notifications system 2021-02-19 20:01:32 -03: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
noname94
5e318f90ff Fix: FLEET_m_BAR_INDEX_n area fixed 
The clickable areas of these buttons do not match their image areas exactly. If we click at the bottom of fleet_n, fleet_n+1 will be chosen.
 2021-02-15 03:31:13 +09:00
noname94
625f03ae54 Fix: [TW] assets updated to fix #348 
Copied from CN folder.
 2021-02-14 13:53:30 +09:00
LmeSzinc
36b85f40e3 Fix: Typo in _emotion_expected_reduce() 2021-02-13 23:44:42 +08:00
LmeSzinc
ae639e9409 Fix: Wrong detection of fleet_2.in_use() in fleet preparation 
if ship avatar background is loaded but ship itself is not loaded
 2021-02-13 23:16:01 +08:00
whoamikyo
e72605ba95 Fix: fixed bluestacks hyper-v multi-instance support 2021-02-13 00:53:19 -03:00
Kyo
df15fc4b57
Merge pull request #345 from noname94/patch1 
Fix: [JP] RETIRE_APPEAR_n assets fixed
 2021-02-13 00:14:25 -03:00
noname94
69124b6679 Opt: comment out unused import 2021-02-13 12:11:05 +09:00
LmeSzinc
c5ded5ad6b Fix: Dropping clicks in 12-2 I4, where has green island above and predict as current fleet 2021-02-13 02:42:50 +08:00
noname94
e654283b24 Opt: Avoid double-clicking CLEAR 
Cropping FLEET_*_IN_USE can avoid wasting time on handling the info_bar. 5113cf9d55
To avoid double-clicking on the clear button, sleep() is needed. (No side effect now.)
 2021-02-13 02:38:57 +09:00
LmeSzinc
5113cf9d55 Opt: Avoid double-clicking CLEAR, and waiting for info_bar in in_use() (#341) 2021-02-13 00:17:02 +08:00
noname94
dc25547361 Opt: ensure fleets selected correctly in preparation 
After the update of auto search, ALAS needs to clear and reselect fleets every time before entering a map. 45c50bda29
It is better to add some check to ensure that fleets are selected correctly, because emulators may drop clicks randomly.
 2021-02-12 21:21:16 +09:00
noname94
13d2a116cd Fix: GET_ITEMS_1 raises MapDetectionError 
It was a quite rare case.
The emulator sometimes treat a swipe as a click (mostly on potato pcs). If this happens while doing map_swipe(), the fleet might step on a mystery, then GET_ITEMS_1 would raise MapDetectionError.
 2021-02-11 12:27:25 +09:00
LmeSzinc
5a73c39590 Opt: Add convert from local view to global map, but haven't used 2021-02-06 17:34:09 +08:00
LmeSzinc
d8f4d4338c Merge branch 'master' into dev 2021-02-03 01:10:27 +08:00
LmeSzinc
8af17fe1f9 Fix: Wait expected emotion reduce of the whole map if auto search disabled 2021-02-02 16:34:33 +08:00
LmeSzinc
14c3dc9b0c Merge branch 'master' into dev 2021-01-28 12:29:13 +08:00
nEEtdo0d
b2f1b21e9b Add: [EN] AUTO_SEARCH_* assets, 
Verified AUTO_SEARCH_SET_* are at the same location as CN for EN,
likely other servers share this same trait
 2021-01-27 18:28:18 -05:00
LmeSzinc
f6fdb1e5ec Fix: Auto fallback to original mode if a map don't have auto search 
- Disable auto search in daily hard currently
- Handle auto search menu sometimes disappear
 2021-01-28 02:58:25 +08:00
LmeSzinc
5ac50e6910 Add: Support auto search 2021-01-28 00:35:15 +08:00
LmeSzinc
0077eb4d9c Add: Operation siren clear full map 
- Skip clicking if already goto destination
- Skip path finding if no fleet 2
- Right align Y axis when showing map
- Fix perspective draw
- Add MAP_FOCUS_ENEMY_AFTER_BATTLE for OS
- ensure_edge_insight now focus to random corner, rather than bottom-right
- Add OSGrids
- Add view mode to detect maps in OS
- Fix OCR debug run before model init
- Add handle_map_event() to include all os handlers
- Add OS map info extractor
 2021-01-26 17:07:34 +08:00
LmeSzinc
cebb785e14
Merge pull request #318 from noname94/patch1 
Fix: [JP] MAP_STAR_n assets fixed.
 2021-01-24 15:53:45 +08:00
noname94
7031594850 Revert "Fix: [JP] Camera positioning after fleet switch" 
This reverts commit 5bed370443.
The camera focus point of JP server has been changed to be  the same as CN and EN server since about 2 months ago, so it should be safe to remove this check now.
 2021-01-24 16:13:37 +09:00
LmeSzinc
8e9e62bb27 Add: Entrance of auto search, but not fully supported yet 
- Add: Option ENABLE_FLEET_REVERSE_IN_HARD
 2021-01-22 23:50:44 +08:00
LmeSzinc
45c50bda29 Fix: Fleet choosing, since AL has changed its logic 
After the update of auto-search, AL no longer chooses the fleet with a smaller index to be the first fleet
 2021-01-22 18:51:15 +08:00
LmeSzinc
c2f23ab5fd Del: Delete spare fleet 
- Fix: [JP] guild boss setting in GUI
 2021-01-22 17:02:35 +08:00
LmeSzinc
453b38f15c Fix: Handle auto search, disable it currently 2021-01-21 19:54:36 +08:00
LmeSzinc
4172c2a0a2 Fix: [TW] FLEET_PREPARATION (#295) 2021-01-12 13:45:49 +08:00
LmeSzinc
48eb29509a Add: spawn_data_loop 
- Dev: Add extraction for spawn_data in chapter_template_loop.lua
 2021-01-01 22:18:06 +08:00
LmeSzinc
fb70aa720d Fix: Enemy genre selecting in Inverted Orthant D1 D3 2021-01-01 18:45:31 +08:00
LmeSzinc
c2ab750f0c Del: Complex logic in STOP_IF_MAP_REACH, now it's just how people understand 2020-12-29 23:42:05 +08:00
nEEtdo0d
f911df51ea Fix: Assets for EN fleet preparation 2020-12-22 16:08:07 -05:00
noname94
cc497ce146 Fix: [JP] assets for the latest update 
4169ffb84d, 635e18e579 and 8b7a46b2c8
 2020-12-23 03:18:36 +09:00
LmeSzinc
8b7a46b2c8 Fix: Assets for campaign mode switching 
- EN and JP need to replace SWITCH_1_*.png
- FLEET_PREPARATION_HARD_*.png don't need to replace
 2020-12-22 19:21:39 +08:00
LmeSzinc
635e18e579 Fix: Assets for fleet preparation 
- EN and JP need to replace the assets
 2020-12-22 19:05:48 +08:00
LmeSzinc
d590d75160 Fix: Mis-detect in_stage as enemy_searching after clearing boss 2020-11-28 22:41:40 +08:00
LmeSzinc
4e9d46fb85 Fix: Handle Game tips 2020-11-26 17:52:24 +08:00
LmeSzinc
3fda7b32df
Merge pull request #246 from noname94/patch 
Add: [JP] meowfficer assets added
 2020-11-21 10:49:53 +08:00
noname94
390235f53c Opt: call logger.warning() when retrying fleet switch 2020-11-20 22:27:34 +09:00
nEEtdo0d
7607d50545 Fix: resolve merge conflicts 2020-11-19 11:19:41 -05:00
LmeSzinc
3772d5046f Add: Disable mechanism when reach threat save 2020-11-19 17:43:47 +08:00
nEEtdo0d
f22e5e68a8 Merge remote-tracking branch 'origin/master' into war_archives 2020-11-17 00:31:45 -05:00
LmeSzinc
a50dbd04cc Merge branch 'master' into dev 2020-11-17 12:22:10 +08:00
noname94
eeff8a0712 Fix: fleet_switch_click() may fail when connection unstable 
Added a check to ensure that current fleet is switched correctly.
 2020-11-17 11:02:51 +09:00
LmeSzinc
ace77fa1c7 Add: Handle mechanism and land_based 2020-11-16 21:16:27 +08:00
LmeSzinc
f7d8946372 Dev: Add extraction of land based 2020-11-13 22:20:31 +08:00
nEEtdo0d
274e56529a Add: War Archives Campaign Run 
TODO: Update images as needed per server, scroll/next page implementation for page_archives, maybe rename and move war archives events back to where others are and prepend with 'war_archives' for those events
 2020-11-07 13:45:30 -05:00
whoamikyo
d1dd15ceec Added: Taiwan server support 2020-10-26 15:22:13 -03:00
noname94
aaf93ee11d Add: added ship level detection in combat 2020-10-05 21:45:08 +09:00
noname94
5902c1446e Fix: handle_strategy() before perspective calculation 
to ensure submarine_view is 'off' while calculating.
 2020-09-23 02:03:03 +09:00
LmeSzinc
be3a1e6887 Fix: Movable enemy predict in one fleet 2020-09-21 19:06:38 +08:00
LmeSzinc
0d90ebdeff Add: SP in Dreamwaker's Butterfly 2020-09-21 00:40:06 +08:00
LmeSzinc
603bd1497a Fix: GridInfo attribute overwrite in clearing mode 
- Opt: change is_ambush_save to may_ambush
 2020-09-20 22:16:40 +08:00
LmeSzinc
5bed370443 Fix: [JP] Camera positioning after fleet switch 2020-09-20 20:54:29 +08:00
LmeSzinc
24e5094680 Opt: Battle logic in HT4 HT5 HT6 T6 
- Add map_is_clear_mode
 2020-09-20 19:15:34 +08:00
LmeSzinc
d36e5754ae Fix: Movable siren path finding 2020-09-20 17:54:43 +08:00
LmeSzinc
dd32089c2a Fix: 1E on MS, SU on FL 
- Opt camera position in T6 HT6
 2020-09-20 16:48:31 +08:00
LmeSzinc
1a4bc96bf2 Fix: Redundant way node when having one-way portal 
- Add: expected story
 2020-09-20 02:51:00 +08:00
LmeSzinc
bcdb4a8ddc Fix: Missing map_data load in hard campaign 2020-09-20 02:01:50 +08:00
LmeSzinc
9e933bc1c2 Add: T4 HT4 in Dreamwaker's Butterfly 
- Fix use boss fleet as mob when push_forward and triggered enemy round
- Opt speed up minitouch
 2020-09-19 20:48:19 +08:00
LmeSzinc
154a8408bb Fix: Path finding with portals 2020-09-19 18:27:36 +08:00
LmeSzinc
3a97d35beb Add: Map portal support, map_data_loop in clearing mode 
- Add T2 in Dreamwaker's Butterfly
 2020-09-19 17:26:29 +08:00
LmeSzinc
eecb4ea1bb Add: T6 HT6 in Dreamwaker's Butterfly 
- Fix prediction if movable enemy tracking lost
- Only correct camera in ensure_edge_insight
 2020-09-19 03:57:00 +08:00
LmeSzinc
c56ef3568c Add: Handle campaign ball 
- Fix: Handle doing map detection on in_stage image
 2020-09-18 21:09:26 +08:00
LmeSzinc
b0d8ae93a8 Dev: Add camera_data_spawn_point auto generate 2020-09-18 19:35:30 +08:00
LmeSzinc
d141f4763e Opt: Move CampaignOcr, CampaignUI to CampaignBase 
- Fix: Handle story after in map enemy searching
- Fix: stage ENTRANCE in event
- Fix: in_stage check in event
- Dev: map_extractor add STAR_REQUIRE_X, fix for tutorial maps
 2020-09-18 19:01:40 +08:00
LmeSzinc
2084a994c7 Fix: Combat loading now check before ambush 2020-09-09 02:04:33 +08:00
LmeSzinc
98d4672175 Fix: Fleet switching when submarine is hunt_only 2020-09-06 00:40:20 +08:00
LmeSzinc
04ce78e5e1 Fix: Reverse swipe in ensure_edge_insight 2020-09-05 01:49:11 +08:00
LmeSzinc
2036ebc8e7 Fix: MapDetectionError after fleet switch (#166) 2020-08-26 18:39:13 +08:00
LmeSzinc
36bf3acfef Merge branch 'master' into dev 2020-08-22 01:49:37 +08:00
LmeSzinc
5a897f7031 Fix: IN_STAGE detect when map detection goes wrong 2020-08-22 01:43:04 +08:00
LmeSzinc
71c079bd0f Merge branch 'master' into dev 2020-08-21 20:27:07 +08:00
LmeSzinc
1895d298dd Add: SP in Scherzo of Iron and Blood Rerun 
- Opt: MAP_SWIPE_MULTIPLY in chapter BCD
- Add: map_covered setting to MapBase
- Add: Map logic fleet_2_protect
- Opt: Map logic in D1D2D3SP
 2020-08-21 04:35:50 +08:00
LmeSzinc
b47524dad9 Fix: Catch in stage in map detection 2020-08-20 23:34:31 +08:00
whoamikyo
09d3f695de Revert "Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev"" 
This reverts commit ac9303012c.
 2020-08-18 20:48:14 -03:00
whoamikyo
ac9303012c Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev" 
This reverts commit bdc5aa0720, reversing
changes made to 6ee7a62edf.
 2020-08-18 20:47:27 -03:00
LmeSzinc
3d5f57f460 Add: minitouch basic config 2020-08-17 18:31:31 +08:00
LmeSzinc
224048560b Opt: Chapter 8 
- Add: clear_first_roadblocks
- Opt: mysteries now only sort by cost
- Fix: clear roadblocks in clear_potential_boss
 2020-08-14 02:34:06 +08:00
LmeSzinc
d648bfde66 Opt: Auto disable if_map_reach if map already reached a specific condition 2020-08-11 00:32:27 +08:00
LmeSzinc
7ee63cc651 Opt: Move Wasteland mode to stop condition if_map_reach 
Opt: Gather map status
 2020-08-11 00:08:29 +08:00
LmeSzinc
3be8617847 Fix: HP bar have_ship, when there's white object on background 
- Back to something similar to hp_record
 2020-08-09 06:52:59 +08:00
LmeSzinc
b909cf5644 Fix: HP calculation 
- Now predict has_ship directly, no need to use record
- Opt: faster hp bar calculation
 2020-08-09 05:09:12 +08:00
LmeSzinc
de9dde2e99 Fix: Retreat before boss appear, but boss fleet is in full hp 
But there will be one more full_scan before real retreat
 2020-08-09 01:42:10 +08:00
LmeSzinc
14f6e51f20 Fix: Handle camera position offset in full_scan 2020-08-08 18:00:19 +08:00
LmeSzinc
39c4f62052 Fix: GridInfo properties 
- Delete old grid files, avoid confused again
 2020-08-08 15:41:22 +08:00
LmeSzinc
7e164528a8 Add: Predict missing movable enemy 
- Fix enemy detection lost in full_scan(mode='movable')
- Move basic functions to utils
 2020-08-08 14:51:05 +08:00
nEEtdo0d
f201336031 Modify equipment swipe implementation to allow exit on same ship (Only 1 card is on grid so cannot swipe). Also used bool return values to indicate whether successful. 
Modify enhanacement to use swipe bool mechanic to exit in case of infinite swipe attempts. Never reaching the 'material exhausted' conditional.

Added get_hp() to fleet switch due to possibility of fleet acquiring emergency repair. However in most cases has full HP but the current HP in program belongs to fleet before switch. Thus is parsing an incorrect HP set when deciding to use repair.
 2020-08-06 22:01:02 -04:00
LmeSzinc
ddefbc048b Fix: Handle different MAP_ENEMY_TURN on different sirens 
- Fix merge error on movable enemies
- Fix old select arguments in 7-2
 2020-08-06 19:25:26 +08:00
Kyo
2a4d4edce7
Merge branch 'nightly' into dev 2020-08-06 03:02:13 -03:00
LmeSzinc
46d4463649 Opt: Different grid.cost for different fleet 2020-08-06 03:37:21 +08:00
LmeSzinc
ec2a6b53f4 Fix: map round reset 2020-08-05 21:19:17 +08:00
LmeSzinc
c22355ee86 Opt: Handle movable enemy in other battle condition 
- Fix walk timeout warning when ambush evade failed
- Disable POOR_MAP_DATA in event_20200723_cn
 2020-08-05 18:29:27 +08:00
LmeSzinc
5d9e4b651d Opt: Handle movable enemy without POOR_MAP_DATA enabled and won't goto previous siren location 
- Fix: enemy_genre merge
- Add: counter of map walk round
- Opt: Smarter enemy moving wait
 2020-08-05 03:07:20 +08:00
LmeSzinc
d4b41aab07 Opt: Expose map.spawn_data 2020-08-04 17:46:19 +08:00
LmeSzinc
6edde3933d Opt: full scan 2020-08-04 01:24:54 +08:00
LmeSzinc
ac095b7d65 Fix: MAP_HAS_FLEET_STEP, MAP_HAS_MOVABLE_ENEMY when fast forward disabled 2020-08-03 17:31:19 +08:00
LmeSzinc
554698f583 Fix: Handle random swipe bug during full scan 2020-08-01 01:16:53 +08:00
LmeSzinc
1acac2faab Fix: grid merge in treasure scanning 2020-07-31 23:41:21 +08:00
LmeSzinc
c79f9e667a Opt: Simplify grid merge 2020-07-31 21:55:07 +08:00
LmeSzinc
7222aa3e28 Fix: Enemy templates now able to configure in map files (#122) 2020-07-27 03:12:47 +08:00
LmeSzinc
46a7676aac Fix: Additional camera_data for spawn point 2020-07-26 03:19:38 +08:00
LmeSzinc
de7d2fb58b Fix: Detect enemy_scale=1 because of map buff icons 2020-07-26 03:10:08 +08:00
LmeSzinc
c0c93b15f2 Opt: Enemy templates now able to configure in map files 
- Delete old siren templates, because of high error rate
- Change templates for event_20200521_cn and event_20200603_cn to monochrome
 2020-07-26 00:17:59 +08:00
LmeSzinc
9a07b271da Fix: Unable to find fleets 2020-07-25 22:09:54 +08:00
LmeSzinc
3b811fca9c Fix: Lots of problems 
- Fix HOMO_EDGE_HOUGHLINES_THRESHOLD not used
- Fix get stuck if kill too fast in combat_executing
- Fix wrong swipe when camera out of map
- Fix walk_out_of_step not detected
- Opt relative_record now save temp images in sub folder
 2020-07-24 19:56:24 +08:00
LmeSzinc
7059587908 Fix: Handle camera out of map 2020-07-24 09:26:49 +08:00
LmeSzinc
122f37752d Merge branch 'master' into dev 2020-07-24 06:04:17 +08:00
LmeSzinc
a3397997ff Fix: Small boss icon detection 2020-07-23 20:54:25 +08:00
LmeSzinc
44ef0f836f Del: Delete old perspective module 
- Del: Image loading in config
- Opt: Less grid predict
 2020-07-23 08:21:49 +08:00
LmeSzinc
2abab2f3f6 Add: Using new detection backend 2020-07-23 07:34:03 +08:00
whoamikyo
79ceb6106b Fix: Fixed stuck at grand capture map 2020-07-22 01:07:18 -03:00
Erik
21d280f67f
Fix: Mis-detect campaign is not 3-star cleared if too fast (#79) 
* Fix: Wrong daily executed count

* Opt: Stop swiping commission list if already reached bottom

* Fix: Config in template.ini for chapter CD

* Fix: Classroom no book chose

* Fix: Choose next research if resources not enough

* Add: Research projects save screenshot before refresh

* Fix: Commission mis-drop the last one

* Opt: pyocr requirements is now JP only

* Fix: Mis-detect campaign is not 3-star cleared if too fast

Co-authored-by: LmeSzinc
 2020-07-19 16:33:04 -03:00
LmeSzinc
ddc0032413 Fix: Siren CV detection 
- rename siren templates
 2020-07-18 22:11:00 +08:00
LmeSzinc
0a8a90cdb1 Typo: Docstring in assets.py 2020-07-15 23:33:38 +08:00
LmeSzinc
1a4d25f33a Fix: fleet_2_step_on failed if all grids were cleared 2020-07-10 14:25:17 +08:00
LmeSzinc
8158ac9be8 Opt: Re-fit _map_swipe 
- Shorten function name of perspective transform
- Delete CAMERA_SWIPE_MULTIPLY
 2020-07-01 13:39:44 +08:00
LmeSzinc
31450ea4d7 Fix: Oil limit not working in raid 
- Add wait_until_stable
- Add ensure_combat_oil_loaded
- Add grid_location_to_screen_point
 2020-06-30 07:10:10 +08:00
whoamikyo
c8bdb7c0c2 Assets: Added Assets for equipment 
- Minor changes in dev_tools.bat
 2020-06-26 19:25:06 -03:00
LmeSzinc
a461d1aee8 Fix: Clear FLEET_2 by mistake when FLEET_2_CHOOSE not detected 2020-06-27 02:07:04 +08:00
LmeSzinc
b4a72d9be7 Fix: Retry timer for potato pc 2020-06-24 10:32:49 +08:00
LmeSzinc
a606ac736b Fix: Mis-disable clearing mode 
- Handle the animation of map information loading instead of hardcoded script sleep
 2020-06-23 17:51:28 +08:00
LmeSzinc
2862d3141e Add: Support 7-3, 7-4, add RoadGrids.combine 2020-06-23 04:37:09 +08:00
LmeSzinc
4f8ba8e911 Fix: Stuck when map is just 100% clear 
- Fix timer arrive_confirm
 2020-06-23 03:17:16 +08:00
LmeSzinc
5202a0cbaa Fix: Swipes now join infinite clicking check 2020-06-23 01:09:56 +08:00
LmeSzinc
11b8c50f16 Fix: AUTO_CONFIRM in daily 
- Fix AUTO_CONFIRM in daily preparation
- Fix exercise quit
- Add additional button clicks in ui_click
- Add support to grid_info 'Me'
 2020-06-22 01:02:10 +08:00
LmeSzinc
e128142678 Fix: Mis-detection 
- Mis-detect BATTLE_STATUS_B when battle executing
- Mis-detect in_stage on potato device
- Optimize enemy_genre select for 12-2 leveling
 2020-06-17 17:56:10 +08:00
LmeSzinc
0450cbdf80 Fix: The info_bar blocks the ammo icon when reversing fleet 2020-06-14 02:28:52 +08:00
ferina8-14
47adffd1a0 Merge branch 'master' into try_jp 
[JP] copy assets from cn

# Conflicts:
#	module/combat/assets.py
#	module/daemon/assets.py
#	module/handler/assets.py
#	module/retire/assets.py
#	module/reward/assets.py
 2020-06-13 03:29:35 +09:00
ferina8-14
c78d5f1371 Add: [JP] add jp assets, map module 2020-06-13 02:52:30 +09:00
LmeSzinc
d042f926b5 Fix: Catch other error caused by info_bar 
- Increase EDGE_LINES_HOUGHLINES_THRESHOLD in chapter 3
 2020-06-05 21:52:30 +08:00
LmeSzinc
66d119e250 Add: camera_data_spawn_point 2020-06-05 20:22:27 +08:00
LmeSzinc
81f9b61ea5 Add: Logic fleet_2_rescue, Logic for chapter 3 
- Fix camera outside map caused by info bar
- Fix mis-detection of is_caught_by_siren
- Fix grid attribute is_caught_by_siren will be kept to next attack
- Fix find_current_fleet when ammo icon of another fleet is covered by the green arrow of current fleet
- Fix fleet_boss_index
- Fix can not predict when boss appear on fleet's face
 2020-06-05 04:05:09 +08:00
LmeSzinc
87127c882a Fix: Now able to use 1 or 2 fleets in chapter 2 to 6 
- If using 1 fleet in 6-4, will pick up the ammo
 2020-06-03 23:11:31 +08:00
LmeSzinc
caee1450e6 Add: [CN] Event「峡湾间的反击」(event_20200603_cn) 
- Lower arrive_confirm when siren is cleared
 2020-06-03 22:15:25 +08:00
LmeSzinc
2609b4a70d Add: Timezone aware 
- Fix mat withdraw on slow device
 2020-06-01 02:26:55 +08:00
LmeSzinc
83508b94d3 Fix: Enemy detection 
- Log shows 'E' and wrong prediction is_siren, because attributes are kept to the next detection
- Fix missing predict also
- Fix log show DEFAULT_BUTTON for the entrance of campaign
 2020-05-31 02:49:06 +08:00
LmeSzinc
c01a075554 Fix: Timeout adjustment 
- increase walk_timeout
- increase in_stage_timer
 2020-05-29 17:29:46 +08:00
Erik
1244f9a6f1
Merge pull request #3 from LmeSzinc/master 
Add: Map logic fleet_2_push_forward, better support 7-1
 2020-05-28 18:52:45 -03:00
LmeSzinc
e8b3e7916c Add: Map logic fleet_2_push_forward, better support 7-1 
- Predict fleets when having 2 fleet spawn_point but only 1 fleet detected
 2020-05-28 16:31:56 +08:00
kyO The NinjA
ba9ae67d63 New EN assets and new maps support 
- Added new EN assets
- Added support to maps A1, A2, A3, B1, B2, B3, C1, C2, C3, D1 and D3
 2020-05-27 18:51:05 -03:00
kyO The NinjA
10b53f80ba Localization for EN version 
- Updated assets for EN version
- Created EN dictionary
- Fix Stage OCR recognition Thanks @LmeSzinc
 2020-05-27 10:32:05 -03:00
LmeSzinc
1989ea9716 Fix: 光之壁在周回模式时仍然存在 2020-05-26 03:45:44 +08:00
LmeSzinc
2f1f999ce5 Add: multi-server support 2020-05-25 22:05:42 +08:00
LmeSzinc
d75930cda2 Add: 适配B2B3,D2D3 
- 修复超大地图时location2node出错
- 增加走路出错时, 重新定位相机
- 调整CD图的透视识别参数
- 修复开荒时每战过后重新定位相机的多余操作
 2020-05-24 00:17:53 +08:00
LmeSzinc
7f27a7a729 Add: 增加处理光墙(海域格子间的分隔) 
- 优化寻路初始化
- 修复海图log显示单字符显示'E'
 2020-05-23 18:26:41 +08:00
LmeSzinc
7b97d3243c Add: 增加处理光墙(海域格子间的分隔) 
- 优化寻路初始化
- 修复海图log显示单字符显示'E'
 2020-05-23 17:22:51 +08:00