Add: [EN] added Counterattack Within the Fjord event to EN server

- added stop triggered if get a new ship

module/config/argparser.py

@@ -136,6 +136,9 @@ def main(ini_name=''):
     stop.add_argument('--如果出击次数大于', default=default('--如果出击次数大于'), help='会沿用先前设置, 完成出击将扣除次数, 直至清零', gooey_options={'label_color': '#4B5F83'})
     stop.add_argument('--如果时间超过', default=default('--如果时间超过'), help='使用未来24小时内的时间, 会沿用先前设置, 触发后清零. 建议提前10分钟左右, 以完成当前出击. 格式 14:59', gooey_options={'label_color': '#4B5F83'})
     stop.add_argument('--如果石油低于', default=default('--如果石油低于'), gooey_options={'label_color': '#4B5F83'})
+    stop.add_argument('--if_get_ship', default=default('--if_get_ship'), choices=['yes', 'no'],
+                      help='Will enter in reward loop when\nget a new ship',
+                      gooey_options={'label_color': '#4B5F83'})
     stop.add_argument('--如果地图开荒', default=default('--如果地图开荒'), choices=['否', '地图通关', '地图三星', '地图绿海不打三星', '地图绿海'], help='如果已经满足, 无视此设置', gooey_options={'label_color': '#4B5F83'})
     stop.add_argument('--如果触发心情控制', default=default('--如果触发心情控制'), choices=['是', '否'], help='若是, 等待回复, 完成本次, 停止\n若否, 等待回复, 完成本次, 继续', gooey_options={'label_color': '#4B5F83'})
     # stop.add_argument('--如果船舱已满', default=default('--如果船舱已满'), choices=['是', '否'])

module/config/argparser_en.py

@@ -137,6 +137,9 @@ def main(ini_name=''):
     stop.add_argument('--if_count_greater_than', default=default('--if_count_greater_than'), help='How many map completions\n until ALAS enter in Reward loop.', gooey_options={'label_color': '#4B5F83'})
     stop.add_argument('--if_time_reach', default=default('--if_time_reach'), help='How many time in minutes run ALAS until stop\n. It is recommended about\n 10 minutes to complete the current attack. Format 14:59', gooey_options={'label_color': '#4B5F83'})
     stop.add_argument('--if_oil_lower_than', default=default('--if_oil_lower_than'), help='Will enter in reward loop when\ntriggered Oil limit', gooey_options={'label_color': '#4B5F83'})
+    stop.add_argument('--if_get_ship', default=default('--if_get_ship'), choices=['yes', 'no'],
+                      help='Will enter in reward loop when\nget a new ship',
+                      gooey_options={'label_color': '#4B5F83'})
     stop.add_argument('--if_map_reach', default=default('--if_map_reach'), choices=['no', 'map_100', 'map_3_star', 'map_green_without_3_star', 'map_green'], help='If already reached, ignore this setting', gooey_options={'label_color': '#4B5F83'})
     stop.add_argument('--if_trigger_emotion_control', default=default('--if_trigger_emotion_control'), choices=['yes', 'no'], help='Will enter in reward loop when\ntriggered Mood limit', gooey_options={'label_color': '#4B5F83'})
     # stop.add_argument('--if_dock_full', default=default('--if_dock_full'), choices=['yes', 'no'])

module/config/argparser_jp.py

@@ -137,6 +137,9 @@ def main(ini_name=''):
     stop.add_argument('--if_count_greater_than', default=default('--if_count_greater_than'), help='How many map completions\n until ALAS enter in Reward loop.', gooey_options={'label_color': '#4B5F83'})
     stop.add_argument('--if_time_reach', default=default('--if_time_reach'), help='How many time in minutes run ALAS until stop\n. It is recommended about\n 10 minutes to complete the current attack. Format 14:59', gooey_options={'label_color': '#4B5F83'})
     stop.add_argument('--if_oil_lower_than', default=default('--if_oil_lower_than'), help='Will enter in reward loop when\ntriggered Oil limit', gooey_options={'label_color': '#4B5F83'})
+    stop.add_argument('--if_get_ship', default=default('--if_get_ship'), choices=['yes', 'no'],
+                      help='Will enter in reward loop when\nget a new ship',
+                      gooey_options={'label_color': '#4B5F83'})
     stop.add_argument('--if_map_reach', default=default('--if_map_reach'), choices=['no', 'map_100', 'map_3_star', 'map_green_without_3_star', 'map_green'], help='If already reached, ignore this setting', gooey_options={'label_color': '#4B5F83'})
     stop.add_argument('--if_trigger_emotion_control', default=default('--if_trigger_emotion_control'), choices=['yes', 'no'], help='Will enter in reward loop when\ntriggered Mood limit', gooey_options={'label_color': '#4B5F83'})
     # stop.add_argument('--if_dock_full', default=default('--if_dock_full'), choices=['yes', 'no'])

module/config/config.py

@@ -130,7 +130,8 @@ class AzurLaneConfig:
     STOP_IF_TIME_REACH = 0
     STOP_IF_TRIGGER_EMOTION_LIMIT = False
     STOP_IF_DOCK_FULL = False
-    STOP_IF_MAP_REACH = 'no' # no, map_100, map_3_star, map_green_without_3_star, map_green
+    STOP_IF_MAP_REACH = 'no'
+    STOP_IF_GET_SHIP = False
 
     MAP_CLEAR_ALL_THIS_TIME = False
     # From chapter_template.lua
@@ -287,6 +288,7 @@ class AzurLaneConfig:
     ENHANCE_FAVOURITE = False
     ENHANCE_ORDER_STRING = ''
     DOCK_FULL_TRIGGERED = False
+    GET_SHIP_TRIGGERED = False
     RETIRE_AMOUNT = 'all'  # all, 10
     RETIRE_N = True
     RETIRE_R = False
@@ -532,6 +534,7 @@ class AzurLaneConfig:
         self.STOP_IF_TRIGGER_EMOTION_LIMIT = to_bool(option['if_trigger_emotion_control'])
         self.STOP_IF_DOCK_FULL = to_bool(option['if_dock_full'])
         self.STOP_IF_MAP_REACH = option['if_map_reach']
+        self.STOP_IF_GET_SHIP = to_bool(option['if_get_ship'])
         # Fleet
         self.ENABLE_FLEET_CONTROL = to_bool(option['enable_fleet_control'])
         self.ENABLE_MAP_FLEET_LOCK = to_bool(option['enable_map_fleet_lock'])

module/config/dictionary.py

@@ -54,6 +54,7 @@ dic_true_eng_to_eng = {
     'if_trigger_emotion_control': 'if_trigger_emotion_control',
     'if_dock_full': 'if_dock_full',
     'if_map_reach': 'if_map_reach',
+    'if_get_ship' : 'if_get_ship',
     'enable_fleet_control': 'enable_fleet_control',
     'enable_map_fleet_lock': 'enable_map_fleet_lock',
     'fleet_index_1': 'fleet_index_1',
@@ -297,6 +298,7 @@ dic_chi_to_eng = {
     '如果触发心情控制': 'if_trigger_emotion_control',
     '如果船舱已满': 'if_dock_full',
     '如果地图开荒': 'if_map_reach',
+    'if_get_ship' : 'if_get_ship',
     '启用舰队控制': 'enable_fleet_control',
     '启用阵容锁定': 'enable_map_fleet_lock',
     '舰队编号1': 'fleet_index_1',
@@ -538,6 +540,7 @@ dic_event = {
         'Scherzo_of_Iron_and_Blood_Rerun': 'event_20200820_cn',
         'Stars_of_the_Shimmering_Fjord': 'event_20200903_en',
         'Dreamwakers_Butterfly': 'event_20200917_cn',
+        'Counterattack_Within_the_Fjord': 'event_20200603_cn',
     },
     'jp': {
         '峡湾間の反撃': 'event_20200603_jp',