Merge pull request #189 from nEEtdo0d/master

Add: Added Daily Bonus support for Chapter T

config/template.ini

@@ -218,4 +218,15 @@ d2 = 2020-01-01_00:00:00
 d3 = 2020-01-01_00:00:00
 d4 = 2020-01-01_00:00:00
 sp = 2020-01-01_00:00:00
-
+t1 = 2020-01-01_00:00:00
+t2 = 2020-01-01_00:00:00
+t3 = 2020-01-01_00:00:00
+t4 = 2020-01-01_00:00:00
+t5 = 2020-01-01_00:00:00
+t6 = 2020-01-01_00:00:00
+ht1 = 2020-01-01_00:00:00
+ht2 = 2020-01-01_00:00:00
+ht3 = 2020-01-01_00:00:00
+ht4 = 2020-01-01_00:00:00
+ht5 = 2020-01-01_00:00:00
+ht6 = 2020-01-01_00:00:00

module/config/argparser.py

@@ -95,8 +95,8 @@ def main(ini_name=''):
                 value = ''
             saved_config[key] = value
     message = (
-        '蓝叠模拟器:\t127.0.0.1:5555\n' 
+        '蓝叠模拟器:\t127.0.0.1:5555\n'
-        '夜神模拟器:\t127.0.0.1:62001\n' 
+        '夜神模拟器:\t127.0.0.1:62001\n'
         'MuMu模拟器:\t127.0.0.1:7555\n'
         '逍遥模拟器:\t127.0.0.1:21503\n'
         '雷电模拟器:\temulator-5554\n'
@@ -365,7 +365,7 @@ def main(ini_name=''):
 
     # 每日活动图三倍PT
     event_bonus = daily_parser.add_argument_group('活动设置', '', gooey_options={'label_color': '#931D03'})
-    event_bonus.add_argument('--活动奖励章节', default=default('--活动奖励章节'), choices=['AB图', 'ABCD图'], help='有额外PT奖励章节', gooey_options={'label_color': '#4B5F83'})
+    event_bonus.add_argument('--活动奖励章节', default=default('--活动奖励章节'), choices=['AB图', 'ABCD图', 'T图', 'HT图'], help='有额外PT奖励章节', gooey_options={'label_color': '#4B5F83'})
     event_bonus.add_argument('--活动SP图道中队', default=default('--活动SP图道中队'), choices=['1', '2'], help='', gooey_options={'label_color': '#4B5F83'})
     event_bonus.add_argument('--活动名称ab', default=event_latest, choices=event_folder, help='例如 event_20200326_cn', gooey_options={'label_color': '#4B5F83'})
 

module/config/argparser_en.py

@@ -96,8 +96,8 @@ def main(ini_name=''):
                 value = ''
             saved_config[key] = value
     message = (
-        'BlueStacks:\t127.0.0.1:5555\n' 
+        'BlueStacks:\t127.0.0.1:5555\n'
-        'NoxPlayer:\t127.0.0.1:62001\n' 
+        'NoxPlayer:\t127.0.0.1:62001\n'
         'MuMuPlayer:\t127.0.0.1:7555\n'
         'MemuPlayer:\t127.0.0.1:21503\n'
         'LDPlayer:\t\temulator-5554\n'
@@ -409,7 +409,7 @@ def main(ini_name=''):
 
     # event_daily_ab
     event_bonus = daily_parser.add_argument_group('Event Daily Bonus', 'bonus for first clear each day', gooey_options={'label_color': '#931D03'})
-    event_bonus.add_argument('--event_ab_chapter', default=default('--event_ab_chapter'), choices=['chapter_ab', 'chapter_abcd'],
+    event_bonus.add_argument('--event_ab_chapter', default=default('--event_ab_chapter'), choices=['chapter_ab', 'chapter_abcd', 'chapter_t', 'chapter_ht'],
                              help='Chapter with PT bonus', gooey_options={'label_color': '#4B5F83'})
     event_bonus.add_argument('--event_sp_mob_fleet', default=default('--event_sp_mob_fleet'), choices=['1', '2'],
                              help='', gooey_options={'label_color': '#4B5F83'})

module/config/argparser_jp.py

@@ -96,8 +96,8 @@ def main(ini_name=''):
                 value = ''
             saved_config[key] = value
     message = (
-        'BlueStacks:\t127.0.0.1:5555\n' 
+        'BlueStacks:\t127.0.0.1:5555\n'
-        'NoxPlayer:\t127.0.0.1:62001\n' 
+        'NoxPlayer:\t127.0.0.1:62001\n'
         'MuMuPlayer:\t127.0.0.1:7555\n'
         'MemuPlayer:\t127.0.0.1:21503\n'
         'LDPlayer:\t\temulator-5554\n'
@@ -409,7 +409,7 @@ def main(ini_name=''):
 
     # event_daily_ab
     event_bonus = daily_parser.add_argument_group('Event Daily Bonus', 'bonus for first clear each day', gooey_options={'label_color': '#931D03'})
-    event_bonus.add_argument('--event_ab_chapter', default=default('--event_ab_chapter'), choices=['chapter_ab', 'chapter_abcd'],
+    event_bonus.add_argument('--event_ab_chapter', default=default('--event_ab_chapter'), choices=['chapter_ab', 'chapter_abcd', 'chapter_t', 'chapter_ht'],
                              help='Chapter with PT bonus', gooey_options={'label_color': '#4B5F83'})
     event_bonus.add_argument('--event_sp_mob_fleet', default=default('--event_sp_mob_fleet'), choices=['1', '2'],
                              help='', gooey_options={'label_color': '#4B5F83'})

module/config/config.py

@@ -148,7 +148,7 @@ class AzurLaneConfig:
     EVENT_NAME_AB = ''
     ENABLE_EVENT_AB = False
     ENABLE_EVENT_SP = False
-    EVENT_AB_CHAPTER = 'chapter_ab'  # chapter_ab, chapter_abcd
+    EVENT_AB_CHAPTER = 'chapter_ab'  # chapter_ab, chapter_abcd, chapter_t, chapter_ht
     EVENT_SP_MOB_FLEET = 1
 
     """

module/config/dictionary.py

@@ -255,6 +255,8 @@ dic_true_eng_to_eng = {
     'easy': 'easy',
     'chapter_ab': 'chapter_ab',
     'chapter_abcd': 'chapter_abcd',
+    'chapter_t': 'chapter_t',
+    'chapter_ht': 'chapter_ht',
 
     # Research filter preset
     'customized': 'customized',
@@ -492,6 +494,8 @@ dic_chi_to_eng = {
     '简单': 'easy',
     'AB图': 'chapter_ab',
     'ABCD图': 'chapter_abcd',
+    'T图': 'chapter_t',
+    'HT图': 'chapter_ht',
 
     # Research filter preset
     '自定义': 'customized',

module/event/campaign_ab.py

@@ -1,10 +1,11 @@
 import os
+import re
 
 from module.campaign.run import CampaignRun
 from module.logger import logger
 
 RECORD_SINCE = (0,)
-CAMPAIGN_NAME = ['a1', 'a2', 'a3', 'a4', 'b1', 'b2', 'b3', 'b4', 'c1', 'c2', 'c3', 'c4', 'd1', 'd2', 'd3', 'd4']
+CAMPAIGN_NAME = ['a1', 'a2', 'a3', 'a4', 'b1', 'b2', 'b3', 'b4', 'c1', 'c2', 'c3', 'c4', 'd1', 'd2', 'd3', 'd4', 't1', 't2', 't3', 't4', 't5', 't6', 'ht1', 'ht2', 'ht3', 'ht4', 'ht5', 'ht6']
 
 
 class CampaignAB(CampaignRun):
@@ -47,7 +48,8 @@ class CampaignAB(CampaignRun):
         for name in CAMPAIGN_NAME:
             if name not in existing:
                 continue
-            if name[0] not in chapter:
+            strip = re.sub(r'\d+', '', name)
+            if strip not in chapter:
                 continue
             result = self.run(name=name, folder=self.config.EVENT_NAME_AB)
             if result: