Commit Graph

228 Commits

Author SHA1 Message Date
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
0b94fade90 Add: [JP] add jp assets, ui module 2020-06-13 02:54:19 +09:00
ferina8-14
a628c5b02b Add: [JP] add jp assets, template module 2020-06-13 02:53:45 +09:00
ferina8-14
9714b6bb1e Add: [JP] add jp assets, reward module 2020-06-13 02:53:29 +09:00
ferina8-14
10bbdd1a79 Add: [JP] add jp assets, retire module 2020-06-13 02:52:55 +09:00
ferina8-14
c78d5f1371 Add: [JP] add jp assets, map module 2020-06-13 02:52:30 +09:00
ferina8-14
4567da5a55 Add: [JP] add jp assets, hard module 2020-06-13 02:52:10 +09:00
ferina8-14
9657141390 Add: [JP] add jp assets, handler module 2020-06-13 02:51:55 +09:00
ferina8-14
b82388a8a2 Add: [JP] add jp assets, exercise module 2020-06-13 02:51:29 +09:00
ferina8-14
2acfb5e615 Add: [JP] add jp assets, equipment module 2020-06-13 02:51:10 +09:00
ferina8-14
7b590b9853 Add: [JP] add jp assets, daily module 2020-06-13 02:50:51 +09:00
ferina8-14
21998812b4 Add: [JP] add jp assets, daemon module 2020-06-13 02:50:35 +09:00
ferina8-14
ef0fc01b08 Add: [JP] add jp assets, combat module 2020-06-13 02:50:12 +09:00
ferina8-14
ca1fd238a9 Add: [JP] add jp assets, campaign module 2020-06-13 02:49:47 +09:00
ferina8-14
f589ecfaa1 Add: [JP] add jp server support, copy assets from cn 2020-06-13 02:35:40 +09:00
kyO The NinjA
ad90d29525 Fix: [EN] Fix Retire assets and AUTOMATION_CONFIRM asset 2020-06-12 00:15:49 -03:00
kyO The NinjA
f49da62dce Fix: [EN[ Fix INFO_BAR assets 2020-06-11 15:52:15 -03:00
kyO The NinjA
ab18cf38bb Fix: [EN] Fix assets 2020-06-11 15:10:20 -03:00
LmeSzinc
c37fda242c Fix: [EN] POPUP assets now in 1280x720
- Add assets check to button_extract
2020-06-12 00:09:58 +08:00
LmeSzinc
49ae4c6361 Add: [EN] Skybound Oratorio 2020-06-11 23:13:50 +08:00
nEEtdo0d
0e8e25de18 Fixed EN rank D assets, CN so those needs to be updated since I don't play CN I've only inserted dummy files so that button_extract module would run. Also added extra conditions for the exercise loop so that it exits the rank D screens 2020-06-08 17:06:39 -04:00
kyO The NinjA
ae88a57eba Fix: [EN] Fix Miss detect lines as characters in Commission module 2020-06-08 07:54:21 -03:00
kyO The NinjA
7c15659f7f Add: Added support for hard map
- Now is possible cleared a hard map like a normal map
2020-06-08 05:56:43 -03:00
kyO The NinjA
95ca113562 Add: Map 11-4 support, Columbia farm is real
Add: Suport to Rank B
2020-06-08 03:16:00 -03:00
Erik
2b58d4dd6a
Merge pull request #15 from LmeSzinc/master
Fix: Parameters for 3-4
2020-06-06 15:53:44 -03:00
kyO The NinjA
6d5ac959d4 Add: [EN] Ambush assets updated 2020-06-06 15:44:58 -03:00
LmeSzinc
141599c883 Fix: Now will only run commissions with priority > 0 2020-06-06 22:42:32 +08:00
LmeSzinc
3c35974bbe Fix: add new day check to reward_loop
- Fix emotion reduce when calculating recover
2020-06-06 21:53:31 +08:00
LmeSzinc
f9c37ea7e4 Fix: Disable submarine_view check because of icon bug of submarine zone 2020-06-06 15:43:38 +08: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
b186382fdd Add: Boss fleet check from chapter 7 to 13 2020-06-05 20:05:53 +08:00
LmeSzinc
83afdafccb Fix: Commission not found
- Add commission_swipe_to_top, because switching daily/urgent won't reset commission list now
2020-06-05 18:10:48 +08:00
LmeSzinc
2fd9651d60 Fix: Mis-detect GET_SHIP when white screen bug happened in game 2020-06-05 04:28:48 +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
kyO The NinjA
524570d12c Fix: [EN] update assets.py 2020-06-03 14:27:09 -03:00
Erik
0c27eb2141
Merge pull request #12 from LmeSzinc/master
Fix: [CN] Login confirm
2020-06-03 13:54:32 -03:00
kyO The NinjA
9525c49999 "Optimization: [EN] changed translator" 2020-06-03 13:53:32 -03:00
kyO The NinjA
2c3919c2e1 Revert "Optimization: [EN] changed translator"
This reverts commit 68fbe6801e.
2020-06-03 13:51:54 -03:00
kyO The NinjA
68fbe6801e Optimization: [EN] changed translator 2020-06-03 13:49:58 -03:00
LmeSzinc
db82f022a9 Add: Auto choose latest event of server 2020-06-03 23:27:04 +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
kyO The NinjA
5ef664f26e Add: Set up logging.raiseExceptions to False to silence exceptions
FIx: [EN] Minor fix in translation.
2020-06-03 05:30:14 -03:00
kyO The NinjA
ce8cdf8423 Revert "Add: Set up logging.raiseExceptions to False to silence exceptions"
This reverts commit 6fe11505a7.
2020-06-03 05:26:30 -03:00
kyO The NinjA
93717844ce Merge branch 'master' of https://github.com/whoamikyo/AzurLaneAutoScript 2020-06-03 05:17:25 -03:00
kyO The NinjA
6fe11505a7 Add: Set up logging.raiseExceptions to False to silence exceptions
FIx: [EN] Minor fix in translation.
2020-06-03 05:17:20 -03:00
Erik
8924d2369a
Merge pull request #11 from LmeSzinc/master
Add: dev_tools item statistics and doc
2020-06-03 05:16:11 -03:00
LmeSzinc
4094ab1f00 Fix: [CN] Login confirm 2020-06-03 15:21:20 +08:00
LmeSzinc
30e11c6caf Fix: Re-check all timeout timer
- Fix tactical class get stuck when skill level reach to max.
2020-06-03 05:06:51 +08:00