diff --git a/develop_tools/explore_task_data_generator.py b/develop_tools/explore_task_data_generator.py index 40822d867..09ed2a488 100644 --- a/develop_tools/explore_task_data_generator.py +++ b/develop_tools/explore_task_data_generator.py @@ -65,7 +65,7 @@ def get_team_info(): pos = get_one_position() teams.append([temp, pos]) cnt -= 1 - valid_team_attr[char] = False + valid_team_attr[temp] = False else: temp = char2attr[char] + "2" if valid_team_attr[temp]: @@ -73,7 +73,7 @@ def get_team_info(): pos = tuple(map(int, get_input().split())) teams.append([temp, pos]) cnt -= 1 - valid_team_attr[char] = False + valid_team_attr[temp] = False else: print("Invalid team attribute") continue @@ -162,14 +162,15 @@ def get_actions(team_cnt): for i in range(p_cnt): one_action["p"].append(get_one_position()) - if team_cnt > 1: + if team_cnt > 1 and one_action['t'] != 'choose_and_change': print("Will formation number change after this action ? [y/n]") if get_y_n(): one_action["ec"] = True + if one_action['t'] != 'choose_and_change': + print("Need wait-over after this action ? [y/n]") + if get_y_n(): + one_action["wait-over"] = True - print("Need wait-over after this action ? [y/n]") - if get_y_n(): - one_action["wait-over"] = True print("please enter the desc : ") one_action["desc"] = get_input() print("current action : \n", one_action) diff --git a/module/activities/SummerSpecialOperationsRABBITPlatoonAndTheMysteryOfTheMissingShrimp.py b/module/activities/SummerSpecialOperationsRABBITPlatoonAndTheMysteryOfTheMissingShrimp.py index db6f52986..2e6b2184b 100644 --- a/module/activities/SummerSpecialOperationsRABBITPlatoonAndTheMysteryOfTheMissingShrimp.py +++ b/module/activities/SummerSpecialOperationsRABBITPlatoonAndTheMysteryOfTheMissingShrimp.py @@ -59,8 +59,8 @@ def preprocess_activity_sweep_times(times): return times -def get_stage_data(): - module_path = 'src.explore_task_data.activities.iveAlive' +def get_stage_data(self): + module_path = 'src.explore_task_data.activities.' + self.current_game_activity stage_module = importlib.import_module(module_path) stage_data = getattr(stage_module, 'stage_data', None) return stage_data @@ -217,12 +217,10 @@ def explore_challenge(self): self.quick_method_to_main_page() to_activity(self, "challenge", True, True) tasks = [ - "challenge2_sss", - "challenge4_sss", - "challenge2_task", - "challenge4_task", + "challenge2_sss_task", + "challenge4_sss_task", ] - stage_data = get_stage_data() + stage_data = get_stage_data(self) for i in range(0, len(tasks)): data = tasks[i].split("_") task_number = int(data[0].replace("challenge", "")) diff --git a/module/explore_normal_task.py b/module/explore_normal_task.py index fafed3c9a..8a293e0a8 100644 --- a/module/explore_normal_task.py +++ b/module/explore_normal_task.py @@ -169,7 +169,7 @@ def start_action(self, actions): if type(op) is str: op = [op] if 'p' in act: - if type(act['p']) is tuple: + if type(act['p']) is tuple or (len(act['p']) == 2 and type(act['p'][0]) is int): act['p'] = [act['p']] skip_first_screenshot = False for j in range(0, len(op)): @@ -517,6 +517,7 @@ def common_gird_method(self, current_task_stage_data): img_possibles = { 'normal_task_help': (1017, 131), 'normal_task_task-info': (946, 540), + 'activity_task-info': (946, 540), "plot_menu": (1205, 34), "plot_skip-plot-button": (1213, 116), "plot_skip-plot-notice": (766, 520), diff --git a/src/explore_task_data/activities/SummerSpecialOperationsRABBITPlatoonAndTheMysteryOfTheMissingShrimp.py b/src/explore_task_data/activities/SummerSpecialOperationsRABBITPlatoonAndTheMysteryOfTheMissingShrimp.py new file mode 100644 index 000000000..267d229f7 --- /dev/null +++ b/src/explore_task_data/activities/SummerSpecialOperationsRABBITPlatoonAndTheMysteryOfTheMissingShrimp.py @@ -0,0 +1,341 @@ +stage_data = { + "challenge2_sss_task": { + "start": [ + [ + "pierce1", + [ + 792, + 561 + ] + ], + [ + "pierce2", + [ + 535, + 389 + ] + ] + ], + "action": [ + { + "t": "click", + "p": [ + 668, + 402 + ], + "ec": True, + "desc": "1 upper left", + "pre-wait": 7 + }, + { + "t": "choose_and_change", + "p": [ + 666, + 396 + ], + "desc": "change 1 2" + }, + { + "t": "click", + "p": [ + 723, + 317 + ], + "ec": True, + "wait-over": True, + "desc": "2 upper right" + }, + { + "t": "click", + "p": [ + 491, + 314 + ], + "ec": True, + "desc": "1 upper left" + }, + { + "t": "click", + "p": [ + 690, + 247 + ], + "ec": True, + "wait-over": True, + "desc": "2 upper left" + }, + { + "t": "exchange_and_click", + "p": [ + 612, + 191 + ], + "ec": True, + "desc": "2 upper left" + }, + { + "t": "click", + "p": [ + 492, + 353 + ], + "wait-over": True, + "desc": "1 upper left" + }, + { + "t": "click", + "p": [ + 559, + 273 + ], + "ec": True, + "desc": "1 upper right" + }, + { + "t": "choose_and_change", + "p": [ + 614, + 329 + ], + "desc": "change 1 2" + }, + { + "t": "click", + "p": [ + 552, + 246 + ], + "desc": "2 upper left" + } + ] + }, +"challenge4_sss_task": { + "start": [ + [ + "pierce1", + [ + 731, + 555 + ] + ], + [ + "pierce2", + [ + 865, + 392 + ] + ], + [ + "burst1", + [ + 894, + 226 + ] + ] + ], + "action": [ + { + "t": "exchange_and_click", + "p": [ + 666, + 386 + ], + "ec": True, + "desc": "2 left", + "pre-wait": 7 + }, + { + "t": "choose_and_change", + "p": [ + 666, + 386 + ], + "desc": "change 1 2" + }, + { + "t": "click", + "p": [ + 610, + 300 + ], + "ec": True, + "desc": "1 upper left" + }, + { + "t": "click", + "p": [ + 694, + 233 + ], + "ec": True, + "wait-over": True, + "desc": "3 upper left" + }, + { + "t": "exchange_and_click", + "p": [ + 503, + 507 + ], + "ec": True, + "desc": "2 left" + }, + { + "t": "click", + "p": [ + 710, + 225 + ], + "ec": True, + "desc": "1 upper right" + }, + { + "t": "click", + "p": [ + 622, + 306 + ], + "ec": True, + "wait-over": True, + "desc": "3 left" + }, + { + "t": "click", + "p": [ + 504, + 302 + ], + "ec": True, + "desc": "1 upper left" + }, + { + "t": [ + "exchange", + "choose_and_change" + ], + "p": [ + 591, + 286 + ], + "desc": "change 1 3" + }, + { + "t": "click", + "p": [ + 475, + 286 + ], + "ec": True, + "wait-over": True, + "desc": "3 left" + }, + { + "t": "click", + "p": [ + 560, + 442 + ], + "ec": True, + "wait-over": True, + "desc": "2 left" + }, + { + "t": "exchange_twice_and_click", + "p": [ + 532, + 273 + ], + "ec": True, + "desc": "3 left" + }, + { + "t": "click", + "p": [ + 893, + 344 + ], + "ec": True, + "desc": "1 right" + }, + { + "t": "click", + "p": [ + 485, + 392 + ], + "ec": True, + "wait-over": True, + "desc": "2 upper left" + }, + { + "t": "click_and_teleport", + "p": [ + 819, + 249 + ], + "ec": True, + "desc": "1 upper left and tp" + }, + { + "t": "click", + "p": [ + 493, + 400 + ], + "ec": True, + "desc": "2 upper left" + }, + { + "t": "choose_and_change", + "p": [ + 563, + 352 + ], + "desc": "change 1 3" + }, + { + "t": "choose_and_change", + "p": [ + 501, + 438 + ], + "desc": "change 2 3" + }, + { + "t": "click", + "p": [ + 385, + 440 + ], + "ec": True, + "wait-over": True, + "desc": "3 left" + }, + { + "t": "exchange_and_click", + "p": [ + 588, + 289 + ], + "ec": True, + "desc": "2 upper left" + }, + { + "t": "choose_and_change", + "p": [ + 588, + 293 + ], + "desc": "change 1 2" + }, + { + "t": "click", + "p": [ + 540, + 206 + ], + "desc": "1 upper left" + } + ] + } +}