From 6ffe91174b4dd00404199697bc6b289c987d2a96 Mon Sep 17 00:00:00 2001 From: vicky Date: Tue, 21 Feb 2023 22:26:45 +0100 Subject: [PATCH] i'm not very focused on atomic commits --- configs/consumables.yaml | 25 +++++++ configs/recipes.yaml | 3 + configs/users.yaml | 8 +++ python/dontlook.py | 26 ++------ python/loader.py | 69 +++++++++++++++++++ python/main.py | 140 +++++++++++++++++++++++++++++++-------- 6 files changed, 225 insertions(+), 46 deletions(-) create mode 100644 configs/consumables.yaml create mode 100644 configs/recipes.yaml create mode 100644 configs/users.yaml create mode 100644 python/loader.py diff --git a/configs/consumables.yaml b/configs/consumables.yaml new file mode 100644 index 0000000..60704b7 --- /dev/null +++ b/configs/consumables.yaml @@ -0,0 +1,25 @@ +Foods: + # Name: [(Bonus craftsmanship%, max value), (bonus control%, max value), (bonus cp%, max value)] + # For example, Calamari Ripieni HQ gives 5% craftsmanship up to a maximum of 120, and 26% CP up to a + # maximum of 82, and is hence noted as: + # Calamari Ripieni HQ: [(5, 120), (0, 0), (26, 82)] + # + # Here is your template to copy/paste and fill in: + # Name: [(0, 0), (0, 0), (0, 0)] + + Calamari Ripieni HQ: [[5, 120], [0, 0], [26, 82]] + Calamari Ripieni: [[4, 96], [0, 0], [21, 66]] + Chili Crab HQ: [[0, 0], [6, 70], [26, 72]] + Chili Crab: [[0, 0], [5, 56], [21, 57]] + +Pots: + # Same as above: + # Name: [(Bonus craftsmanship%, max value), (bonus control%, max value), (bonus cp%, max value)] + # For example, Cunning Craftsman's Draught HQ gives 6% CP up to a maximum of 21, and is hence noted as: + # Cunning Craftsman's Draught HQ: [(0, 0), (0, 0), (6, 21)] + # + # Here is your template to copy/paste and fill in: + # Name: [(0, 0), (0, 0), (0, 0)] + + Cunning Craftsman's Draught HQ: [(0, 0), (0, 0), (6, 21)] + Cunning Craftsman's Draught: [(0, 0), (0, 0), (5, 17)] \ No newline at end of file diff --git a/configs/recipes.yaml b/configs/recipes.yaml new file mode 100644 index 0000000..4c8e277 --- /dev/null +++ b/configs/recipes.yaml @@ -0,0 +1,3 @@ +# Name: [Quality, difficulty, durability] +Grade 7 Tincture of Strength: [12628, 5060, 70] +Grade 5 Strength Alkahest: [6200, 1300, 40] \ No newline at end of file diff --git a/configs/users.yaml b/configs/users.yaml new file mode 100644 index 0000000..d19bad5 --- /dev/null +++ b/configs/users.yaml @@ -0,0 +1,8 @@ +# Name: [Craftsmanship, control, cp] +# You are encouraged to use this either for multiple characters if you have them, or different jobs having +# different gear or melds. +# The top line will always be selected by default + +Vicky Crosia: [4021, 3933, 587] +Dandaedre Zadiel: [0, 0, 0] +Sekundes Dullahan: [2566, 2443, 522] \ No newline at end of file diff --git a/python/dontlook.py b/python/dontlook.py index 1b3fe4f..cf6b64f 100644 --- a/python/dontlook.py +++ b/python/dontlook.py @@ -1,24 +1,12 @@ import dearpygui.dearpygui as dpg +import dearpygui.demo as demo dpg.create_context() -dpg.configure_app(manual_callback_management=True) -dpg.create_viewport() +dpg.create_viewport(title='Custom Title', width=600, height=600) + +demo.show_demo() + dpg.setup_dearpygui() - - -def callback(sender, app_data, user_data): - print("Called on the main thread!") - - -with dpg.window(label="Tutorial"): - dpg.add_button(label="Press me", tag="pog", callback=callback) - - -# main loop dpg.show_viewport() -while dpg.is_dearpygui_running(): - jobs = dpg.get_callback_queue() # retrieves and clears queue - dpg.run_callbacks(jobs) - dpg.render_dearpygui_frame() - -dpg.destroy_context() +dpg.start_dearpygui() +dpg.destroy_context() \ No newline at end of file diff --git a/python/loader.py b/python/loader.py new file mode 100644 index 0000000..3c9ea60 --- /dev/null +++ b/python/loader.py @@ -0,0 +1,69 @@ +import rich +import yaml + + +class Loader: + # TODO: create folder/file if missing when clicking "save" + # TODO: log any missing file(s) or the whole folder + def __init__(self): + self.user_list = {'NEW': [0, 0, 0]} + self.foods_list = {' ': [[0, 0], [0, 0], [0, 0]]} + self.pots_list = {' ': [[0, 0], [0, 0], [0, 0]]} + self.recipes_list = {'NEW': [0, 0, 0]} + try: + with open('../configs/users.yaml', 'r') as file: + self.user_list.update(yaml.safe_load(file)) + except FileNotFoundError as e: + print(e) + try: + with open('../configs/consumables.yaml', 'r') as file: + loaded_file = yaml.safe_load(file) + self.foods_list.update(loaded_file['Foods']) + self.pots_list.update(loaded_file['Pots']) + except FileNotFoundError as e: + print(e) + try: + with open('../configs/recipes.yaml', 'r') as file: + self.recipes_list.update(yaml.safe_load(file)) + except FileNotFoundError as e: + print(e) + + def get_users_dict(self) -> dict: + return self.user_list + + def get_users_names(self) -> list: + user_names = [] + for n in self.user_list: + user_names.append(n) + return user_names + + def get_foods_dict(self) -> dict: + return self.foods_list + + def get_foods_names(self) -> list: + foods_names = [] + for f in self.foods_list: + foods_names.append(f) + return foods_names + + def get_pots_dict(self) -> dict: + return self.pots_list + + def get_pots_names(self) -> list: + pots_names = [] + for p in self.pots_list: + pots_names.append(p) + return pots_names + + def get_recipes_dict(self) -> dict: + return self.recipes_list + + def get_recipes_names(self) -> list: + recipes_names = [] + for r in self.recipes_list: + recipes_names.append(r) + return recipes_names + + +if __name__ == "__main__": + loader = Loader() diff --git a/python/main.py b/python/main.py index 3e3a7d2..25ecfb4 100644 --- a/python/main.py +++ b/python/main.py @@ -1,56 +1,142 @@ import dearpygui.dearpygui as dpg +import loader +import rich import xiv_craft_solver as xcs dpg.create_context() dpg.configure_app(manual_callback_management=True) -dpg.create_viewport(title='XIV Solver', width=500, height=900) +dpg.create_viewport(title='XIV Solver', width=500, height=700) -class USER: +class User: + name = '' craftsmanship = 0 control = 0 + cp = 0 + food = '' + pot = '' + + def set_user_stats(self, _, app_data, __): + self.craftsmanship = app_data[0] + self.control = app_data[1] + self.cp = app_data[2] + dpg.set_value(user_stats, user.get_user_stats()) + return self.craftsmanship, self.control, self.cp + + def set_user_name(self, _, app_data, __): + self.name = app_data + self.set_user_stats(0, full_config.get_users_dict()[self.name], None) + dpg.set_value(user_stats, self.get_user_stats()) + return self.name + + def get_user_stats(self): + return self.craftsmanship, self.control, self.cp + + def set_specialist(self, _, app_data, __): + if app_data: + self.craftsmanship += 20 + self.control += 20 + self.cp += 15 + dpg.set_value(user_stats, [self.craftsmanship, self.control, self.cp, 0]) + else: + self.craftsmanship -= 20 + self.control -= 20 + self.cp -= 15 + dpg.set_value(user_stats, [self.craftsmanship, self.control, self.cp, 0]) + return self.craftsmanship, self.control, self.cp + + def set_food(self, un, app_data, nu): + # TODO: create pre- and post-enhancements stats to be able to handle multiple stacking buffs + self.food = app_data + temp_user_craftsmanship = user.craftsmanship + temp_user_control = user.control + temp_user_cp = user.cp + + craftsmanship, control, cp = full_config.get_foods_dict()[app_data] + + if user.craftsmanship * craftsmanship[0] / 100 > craftsmanship[1]: + temp_user_craftsmanship += craftsmanship[1] + else: + temp_user_craftsmanship += round(user.craftsmanship * craftsmanship[0] / 100) + + if user.control * control[0] / 100 > control[1]: + temp_user_control += control[1] + else: + temp_user_control += round(user.control * control[0] / 100) + + if user.cp * cp[0] / 100 > cp[1]: + temp_user_cp += cp[1] + else: + temp_user_cp += round(user.cp * cp[0] / 100) + + dpg.set_value(user_stats, [temp_user_craftsmanship, temp_user_control, temp_user_cp]) -class RECIPE: - durability = 70 +class Recipe: + name = '' + quality = 0 + difficulty = 0 + durability = 0 + + def set_recipe_stats(self, _, app_data, __): + self.quality = app_data[0] + self.difficulty = app_data[1] + self.durability = app_data[2] + return self.quality, self.difficulty, self.durability + + def get_recipe_stats(self): + return self.quality, self.difficulty, self.durability + + def set_recipe_name(self, _, app_data, __): + self.name = app_data + self.set_recipe_stats(0, full_config.get_recipes_dict()[self.name], 0) + dpg.set_value(recipe_stats, self.get_recipe_stats()) + return self.name -def button_callback(sender, app_data, user_data): - print(f"sender is: {sender}") - print(f"app_data is: {app_data}") - print(f"user_data is: {user_data}") +with dpg.window(label="Settings", width=500, height=700, no_resize=True, no_title_bar=True): + user = User() + recipe = Recipe() + full_config = loader.Loader() + characters_names = full_config.get_users_names() + foods_names = full_config.get_foods_names() + pots_names = full_config.get_pots_names() + recipe_names = full_config.get_recipes_names() -def specialist(_, app_data, c_s): - print(c_s) - print(app_data) - if dpg.get_value(specialist_checkbox): - dpg.set_value(stats, [c_s[0]+1, c_s[1]+2, c_s[2]+3, 0]) - else: - dpg.set_value(stats, [c_s[0], c_s[1], c_s[2], 0]) - - -with dpg.window(label="Settings", width=500, height=900): dpg.add_text("Character") - dpg.add_combo(items=("NEW", "AAAAA", "BBBBB"), label="Your character") + user_combo = dpg.add_combo(items=characters_names, label="Your character", callback=user.set_user_name) + dpg.set_value(user_combo, "NEW") + # TODO: Load 1rst user in users.yaml by default # Make NEW prompt for a name when saving - stats = dpg.add_input_intx(size=3, label="Stats", tag="stats_tooltip") + user_stats = dpg.add_input_intx(size=3, label="Stats", tag="stats_tooltip", callback=user.set_user_stats) with dpg.tooltip("stats_tooltip"): dpg.add_text("Craftsmanship / Control / CP") + specialist_checkbox = dpg.add_checkbox(label="Specialist", tag="specialist", callback=user.set_specialist) + dpg.add_button(label="Save!", indent=282) + + dpg.add_separator() + + dpg.add_text("Consumables") + food_combo = dpg.add_combo(items=foods_names, label="Food", callback=user.set_food) + pot_combo = dpg.add_combo(items=pots_names, label="Pot") + + dpg.add_separator() - current_stats = dpg.get_value(stats) - specialist_checkbox = dpg.add_checkbox(label="Specialist", callback=specialist, tag="specialist") - dpg.add_button(label="Save!") dpg.add_text("Recipe") - dpg.add_combo(items=("AAAAA", "BBBBB"), label="Food") - dpg.add_combo(items=("AAAAA", "BBBBB"), label="Pots") - dpg.add_combo(items=("NEW", "AAAAA", "BBBBB"), label="Recipe") - test = dpg.add_input_intx(size=3, label="Stats", tag="recipe_tooltip") + recipe_combo = dpg.add_combo(items=recipe_names, label="Recipe", callback=recipe.set_recipe_name) + dpg.set_value(recipe_combo, "NEW") + recipe_stats = dpg.add_input_intx(size=3, label="Stats", tag="recipe_tooltip", callback=recipe.set_recipe_stats) with dpg.tooltip("recipe_tooltip"): dpg.add_text("Quality / Progress / Durability") + # TODO: add a small grey text message if recipe matches a known recipe + dpg.add_button(label="Save!", indent=282) + dpg.add_button(label="Solve!") dpg.add_collapsing_header(label="Result") + # TODO: add a log space at the bottom + dpg.setup_dearpygui() dpg.show_viewport() while dpg.is_dearpygui_running():