Commit Graph

94 Commits

Author SHA1 Message Date
ferina8-14
dea0a02245 Merge remote-tracking branch 'upstream/master' 2020-06-14 02:30:12 +09: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
4fd1b7999a Add: [JP] add event 20200603 for jp server 2020-06-13 02:55:07 +09:00
LmeSzinc
a623e7d082 Fix: rare bugs
- Fix roadblocks in 6-4
- Fix mis-detect BATTLE_STATUS_D when battle executing
- Add call details to popup
2020-06-12 19:29:13 +08:00
LmeSzinc
49ae4c6361 Add: [EN] Skybound Oratorio 2020-06-11 23:13:50 +08:00
Cerz0
69a3d7e253 Create campaign_10_3.py 2020-06-08 18:35:11 +02: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
lans4r
58357483ea
Add: 10-4 (#23)
Add: 10-4
2020-06-07 03:50:41 +08:00
Cerz0
3f27e7de9c Update campaign_10_2.py 2020-06-06 16:03:15 +02:00
LmeSzinc
c1a5ffcb30 Fix: Parameters for 3-4 2020-06-06 14:38:09 +08:00
LmeSzinc
a3feef6f1b Format: PEP-8 for campaign maps 2020-06-05 23:25:50 +08:00
Cerz0
1e94b5d69c
Update: map 10-1
Update campaign_10_1.py
2020-06-05 23:19:03 +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
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
6548677c80
Merge pull request #19 from Cerz0/master
Fix: Update campaign_10_1.py
2020-06-04 20:11:36 +08:00
Cerz0
a953d5b4b2 Update campaign_10_1.py
Corrected map_data
Set up map.weight, spawn_data and roadblocks
2020-06-04 13:50:59 +02:00
LmeSzinc
a41805c14f
Merge pull request #18 from Cerz0/master
Fix: improved navigation on map 9-2
2020-06-04 15:58:51 +08:00
Cerz0
00b09b8369 Update campaign_9_2.py 2020-06-04 02:02:44 +02:00
kyO The NinjA
1756b33211 Fix: [EN] Fix SP2 of the 'Prelude under the Moon' not catching the Mystery 2020-06-03 19:32:54 -03:00
kyO The NinjA
56601b2ae2 Fix: [EN] reduced the threshold of cv2.HoughLines on SP3 of the 'Prelude under the Moon' 2020-06-03 19:17:20 -03:00
Cerz0
dded6eb752 Revert "Create sp1.py"
This reverts commit f696d110af.
2020-06-03 23:57:54 +02:00
kyO The NinjA
8800682b28 Add: [EN] Add 'Prelude under the Moon' SP3 support 2020-06-03 17:28:28 -03:00
kyO The NinjA
a0668712b1 Add: [EN] Add 'Prelude under the Moon' SP2 support 2020-06-03 16:35:23 -03:00
kyO The NinjA
1bebbcbf67 Add: [EN] Add 'Prelude under the Moon' SP1 support 2020-06-03 15:21:52 -03:00
Cerz0
f696d110af Create sp1.py 2020-06-03 20:12:40 +02: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
lans4r
1e15a913ce
add 9-4 2020-06-02 12:02:50 -04:00
Cerz0
613eb5847f Create campaign_9_2.py 2020-06-02 01:26:52 +02:00
LmeSzinc
f22d4755c9 Merge remote-tracking branch 'origin/master' 2020-06-01 08:23:18 +08:00
Cerz0
9615c6d759 Create campaign_9_3.py 2020-06-01 00:44:06 +02:00
LmeSzinc
16cc542219 Fix: [EN] event map 2020-06-01 02:46:05 +08:00
kyO The NinjA
6eabcf6a35 Fix: [EN] Relogin is now working
Optimize: [EN] GUI improved
2020-05-31 04:48:22 -03:00
kyO The NinjA
0138947c24 Fix: [EN] Removed some hardcoded parameters 2020-05-30 16:25:09 -03:00
kyO The NinjA
fa652ebeab Update a3.py 2020-05-30 16:08:00 -03:00
kyO The NinjA
c491fe7ec5 Add: [EN] New B2 battle logic thanks @justtesting
Add: [EN] New C1 battle logic
Add: [EN] New B3 battle logic
Add: [EN] New D3 battle logic
Add: [EN] New assets
2020-05-30 05:41:06 -03:00
kyO The NinjA
b12d8f299c Add: [EN] Assets updated
Fix: [EN] A3 and C3 of the event Iris of Light and Dark Rerun
Optimize: [EN] commission filter, expect many mistakes yet
Optimize: [EN] added some tips on GUI
Add: [EN] New assets for Tactical Class, this module should work now
2020-05-30 01:09:51 -03:00
kyO The NinjA
fe6815d20a [EN] Localization progress
- Some GUI optimizations
- Minor fix in Quick Guide
2020-05-29 14:34:43 -03: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
kyO The NinjA
916e797b34 New assets
- New assets
- New parameters for EN event maps
- New tips GUI
2020-05-28 18:37:17 -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
5f55303421 FIx 3 Star Asset 2020-05-27 21:56:32 -03:00
kyO The NinjA
4302a66bd7 Update d2.py 2020-05-27 20:47:48 -03:00
kyO The NinjA
a3f0c0304e Fix assets for SHIP morale 2020-05-27 19:56:35 -03: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
0645d5cb3f Added new EN assets and new maps support
- Added suport to 10-1 and 10-2
- Added suport to EN event Iris of Light and Dark Rerun, only D2 at the moment
- New EN assets
2020-05-27 13:49:26 -03:00
LmeSzinc
708961ca46 Fix: 优化穹顶下的圣咏曲D3 2020-05-25 01:54:54 +08:00
LmeSzinc
ec03efaa67 Fix: 优化AB图参数 2020-05-24 04:38:59 +08:00
LmeSzinc
d75930cda2 Add: 适配B2B3,D2D3
- 修复超大地图时location2node出错
- 增加走路出错时, 重新定位相机
- 调整CD图的透视识别参数
- 修复开荒时每战过后重新定位相机的多余操作
2020-05-24 00:17:53 +08:00