diff --git a/python/src/ffcraft_solver/__main__.py b/python/src/ffcraft_solver/__main__.py index 1100353..252ebd2 100644 --- a/python/src/ffcraft_solver/__main__.py +++ b/python/src/ffcraft_solver/__main__.py @@ -142,7 +142,7 @@ class Recipe: stats = [app_data[0], app_data[1], app_data[2]] advanced_stats = [app_data[3], app_data[4], app_data[5], app_data[6]] else: - print('Log: Something went very wrong in recipe stat assignment.') + loggers.add_log('Something went very wrong in recipe stat assignment.') self.progress = stats[0] self.quality = stats[1] diff --git a/python/src/ffcraft_solver/modules/loader.py b/python/src/ffcraft_solver/modules/loader.py index 3b06296..4af8c12 100644 --- a/python/src/ffcraft_solver/modules/loader.py +++ b/python/src/ffcraft_solver/modules/loader.py @@ -27,7 +27,7 @@ class Loader: with open(self.relative_import(self.config.yaml_user), 'r') as file: self.user_list.update(yaml.safe_load(file)) except FileNotFoundError as e: - print(e) + loggers.add_log(e) try: with open(self.relative_import(self.config.yaml_consumable), 'r') as file: @@ -35,13 +35,13 @@ class Loader: self.foods_list.update(loaded_file['Foods']) self.pots_list.update(loaded_file['Pots']) except FileNotFoundError as e: - print(e) + loggers.add_log(e) try: with open(self.relative_import(self.config.yaml_recipes), 'r') as file: self.recipes_list.update(yaml.safe_load(file)) except (FileNotFoundError, IsADirectoryError) as e: - print(e) + loggers.add_log(e) @staticmethod def relative_import(path): diff --git a/python/src/ffcraft_solver/modules/solver.py b/python/src/ffcraft_solver/modules/solver.py index 670e239..3a2f39a 100644 --- a/python/src/ffcraft_solver/modules/solver.py +++ b/python/src/ffcraft_solver/modules/solver.py @@ -56,7 +56,7 @@ Remaining CP: {self.remaining_cp}""" return justified_text[:-1] - def make_macro(self) -> str: + def make_macro(self) -> True: saved_lines = [''] translated_actions = translator.translate_list(self.actions, "en") count = 0 @@ -65,37 +65,34 @@ Remaining CP: {self.remaining_cp}""" line = f'/ac "{action}" ' saved_lines.append(line) count += 1 + saved_lines = saved_lines[1:] - if self.steps != 29 or self.steps != 44: + if self.steps != 15 and self.steps != 29 and self.steps != 44: saved_lines.append('/echo Craft complete ! ') else: loggers.log(f'No completion message in macro because rotation is exactly {self.steps} steps.') + if self.steps > 15: + saved_lines.insert(14, '/echo Macro 1 complete ') + + if self.steps > 30: + saved_lines.insert(30, '/echo Macro 2 complete ') + # TODO : test index + count = 0 for line in saved_lines: count += 1 - if count < 15: + if count < 16: self.macro1 += line + '\n' - elif 14 < count < 30: + elif 15 < count < 31: self.macro2 += line + '\n' - elif 29 < count < 45: + elif 30 < count < 46: self.macro3 += line + '\n' - else: - print("Log: Macro too long!") - nb_macros = 0 - if self.macro1: - nb_macros = 1 - if self.macro2: - nb_macros += 1 - if self.macro3: - nb_macros += 1 - # TODO: add next macro line - - self.macro1 = self.macro1[1:] - self.macro2 = self.macro2[1:] - self.macro3 = self.macro3[1:] - return self.macro1 + self.macro1 = self.macro1[:-1] + self.macro2 = self.macro2[:-1] + self.macro3 = self.macro3[:-1] + return True class Solver: @@ -146,7 +143,19 @@ class Solver: return self.best_quality def compute_50percent_quality(self) -> Result: - self.safe_50 = Result(self.solutions[round(len(self.solutions)/2)+1], 'Safe 50') + done = False + threshold = self.quality * 1.5 + for s in reversed(self.solutions): + if s.quality > threshold: + self.safe_50 = Result(s, 'Safe 50') + done = True + + if not done: + loggers.add_log('Could not find a rotation for 150% quality.\n' + ' Defaulting to Best Quality.') + self.safe_50 = self.best_quality + + # self.safe_50 = Result(self.solutions[round(len(self.solutions)/2)+1], 'Safe 50') # old version return self.safe_50 def compute_least_steps(self) -> Result: diff --git a/python/src/ffcraft_solver/modules/translator.py b/python/src/ffcraft_solver/modules/translator.py index 28c8d02..1ed2d14 100644 --- a/python/src/ffcraft_solver/modules/translator.py +++ b/python/src/ffcraft_solver/modules/translator.py @@ -40,7 +40,6 @@ supported_languages = { def translate_list(actions: list, lang: str): output = [] - print(actions) if lang in supported_languages: dictionary = supported_languages[lang] for action in actions: @@ -51,9 +50,8 @@ def translate_list(actions: list, lang: str): loggers.log('Translation not found. Defaulting to English.\n' ' Macros will probably be broken because of this.') - else: - print(f'Log: Language code "{lang}" not recognised.') + loggers.add_log(f'Language code "{lang}" not recognised.') return output