LmeSzinc
d8f4d4338c
Merge branch 'master' into dev
2021-02-03 01:10:27 +08:00
LmeSzinc
41abcb780c
Fix: Handle guild exchange refresh bug when running across days
2021-02-03 01:05:17 +08:00
LmeSzinc
9032f07185
Opt: Use auto search in daily hard
2021-02-02 17:11:49 +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
7d4b36dde0
Merge branch 'master' into dev
2021-02-01 17:43:11 +08:00
LmeSzinc
05ecbe682a
Upd: [CN] MAP_WORLD in os_handler
2021-02-01 17:42:31 +08:00
nEEtdo0d
374002eb8a
Del: Filter assets all servers, effectively moved to new filter set system
...
Fix: Formatting files through IDE
2021-01-31 20:27:20 -05:00
nEEtdo0d
d2d4e23391
Del: Old switch objects and methods relating to their usage
...
Opt: Swap enhancement to adjust to new filter set system
2021-01-31 19:53:55 -05:00
nEEtdo0d
5a33291944
Fix: Update handler assets.py, forgot in last PR
2021-01-31 19:50:55 -05:00
nEEtdo0d
fc64b2fa48
Add: Asset-less set filter implementation using color count
2021-01-31 19:22:26 -05:00
LmeSzinc
4797565148
Merge branch 'master' into dev
2021-02-01 00:14:36 +08:00
LmeSzinc
3d27c5b94d
Fix: Auto search finish check
...
- Fix argument of triggered_stop_condition in war archives
2021-01-31 23:54:21 +08:00
LmeSzinc
d521cd051a
Add: enable_os_ash_attack to GUI
2021-01-31 18:28:54 +08:00
LmeSzinc
7b69aaf320
Add: Do ash beacon attack in os_clear_map
2021-01-31 18:12:34 +08:00
Kyo
d8fce2b1e1
Merge pull request #326 from nEEtdo0d/my_neet
...
Fix: War Archives Module
2021-01-30 13:55:58 -03:00
nEEtdo0d
fd61568ad0
Add: USE_DATA_KEY_NOTIFIED action to remove pop up in subsequent runs
2021-01-30 11:52:04 -05:00
nEEtdo0d
4d356b27d9
Fix: war_archives triggered_stop_condition inheritance argument oil_check
2021-01-30 11:49:07 -05:00
LmeSzinc
c1bcfa60e7
Fix: Combat detection if fleet lock enabled in OS clear map
...
- Opt predict_sea remove non-blue grids
2021-01-30 20:25:36 +08:00
LmeSzinc
1e5813ddb3
Merge branch 'master' into dev
2021-01-30 10:54:13 +08:00
LmeSzinc
bae2ee8a64
Fix: Change equipment for the first fleet if multiple daily fleets are set ( #324 )
2021-01-30 10:34:05 +08:00
LmeSzinc
26c484bd87
Fix: auto search in event daily AB
...
- Add auto call submarine in auto search
2021-01-28 14:11:06 +08:00
LmeSzinc
14c3dc9b0c
Merge branch 'master' into dev
2021-01-28 12:29:13 +08:00
LmeSzinc
8e84099073
Fix: [EN] Fleet side bar server difference
2021-01-28 12:27:00 +08:00
Kyo
7873c87c9b
Merge pull request #321 from nEEtdo0d/update_asset
...
Fix: Daily Ash and Guild Pop Up
2021-01-27 22:38:18 -03: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
nEEtdo0d
eabede70e1
Fix: Merge latest and resolve conflict in module/campaign/run.py
2021-01-27 15:34:37 -05:00
nEEtdo0d
47ab56713f
Opt: Transfer of detection status for hard campaign
...
Ensure if already True, does not get overwritten
If SP/AB enabled, their run will do handle_guild and
reset the global configuration when executed
If disabled, reward_when_finished will do so instead
2021-01-27 15:16:31 -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
nEEtdo0d
cc5972365d
Opt: Add additional parameter to select ui_click calls during daily
...
Transfer detection status to ensure reward_when_finished or
continuing campaign run will execute handle_guild
2021-01-27 13:50:26 -05:00
LmeSzinc
c244575c94
Fix: _emotion_expected_reduce when using one fleet to clear all
2021-01-28 00:43:06 +08:00
LmeSzinc
16217c8f98
Revert "Opt: Add notice for enable_auto_search ( #317 )"
...
This reverts commit 8d96f7ef
2021-01-28 00:36:58 +08:00
LmeSzinc
5ac50e6910
Add: Support auto search
2021-01-28 00:35:15 +08:00
nEEtdo0d
ec227a039b
Merge remote-tracking branch 'origin/master' into update_asset
2021-01-27 04:58:47 -05:00
LmeSzinc
68398860f7
Add: predict_meowfficer in OS
2021-01-27 15:33:36 +08:00
LmeSzinc
d6ed48ad4c
Merge branch 'master' into dev
2021-01-27 14:48:25 +08:00
LmeSzinc
c6d5438408
Fix: Cover ENABLE_MAP_FLEET_LOCK in daily hard only, not effect event daily
2021-01-27 14:45:37 +08:00
nEEtdo0d
acd4d6c55a
Del: combat already calls combat_status however may end too early,
...
look into further at another time
2021-01-26 15:10:22 -05:00
nEEtdo0d
b4dd5b2d96
Opt: Daily can also trigger guild pop up, cancel when encountered
...
Fix: During campaign, may enter this method too early resulting
in stuck status. Allow method to detect for guild pop up as well
2021-01-26 14:43:16 -05:00
nEEtdo0d
bb9ebc524e
Opt: Match guild pop up handling to predecessor handle_popup_* calls
2021-01-26 13:55:21 -05:00
nEEtdo0d
e6549510f5
Fix: Move switch action into loop to ensure able to select beacon
2021-01-26 13:48:38 -05:00
LmeSzinc
c040a551ef
Fix: Guild logistics can't start guild mission because exiting too fast
2021-01-26 18:39:03 +08:00
LmeSzinc
f26fe7b750
Fix: Handle ash popup
2021-01-26 18:17:52 +08:00
LmeSzinc
711fcf76a5
Add: Add os_clear_map to GUI
2021-01-26 17:40:14 +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
Ray
fb7e62593c
update jp ui assets
2021-01-26 14:22:01 +08:00
Ray
b089097d30
update assets of jp os_ash
2021-01-26 11:02:12 +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 5bed370443c3f2857d9c0d0ce990d3270120ab35.
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
noname94
27b49b736a
Fix: [JP] MAP_STAR_n assets fixed
2021-01-24 15:54:08 +09:00
LmeSzinc
e7bbcb9e56
Fix: Reduce detection area of ASH_ENTRANCE in os ash assistant
...
ASH_ENTRANCE may have red dot, and will change according to the development of ash ship
2021-01-24 01:47:36 +08:00
