From 1de963333df82c023237c18f5db8753d02a9c866 Mon Sep 17 00:00:00 2001 From: Daniel Dolezal Date: Thu, 4 Apr 2024 12:38:15 +0200 Subject: [PATCH] remork CharacterCreater to remove all combineble if one is selected --- classes/Character/CharacterCreater.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/classes/Character/CharacterCreater.py b/classes/Character/CharacterCreater.py index 99688ff..469d0be 100644 --- a/classes/Character/CharacterCreater.py +++ b/classes/Character/CharacterCreater.py @@ -33,13 +33,17 @@ class CharacterCreater: return element[key] @classmethod - def select_a_species(cls, player_config:dict, block_by_fixed_type:bool=False): - print(CharacterCreater.make_dict_list_into_table(player_config["species"], change_by_key=lambda key, element: CharacterCreater.change_character_key(key, element))) + def select_a_species(cls, player_config:dict, block_by_fixed_type:bool=False, current_selected:dict=False): if not block_by_fixed_type: - select_species = list(player_config["species"].keys()) + select_species = player_config["species"] else: - select_species = list(player_config["species"].keys())[:-1] + select_species = { k:v for k, v in player_config["species"].items() if v["combineble"] == False } + if current_selected: + select_species["Current Selected"] = current_selected + + print(CharacterCreater.make_dict_list_into_table(select_species, change_by_key=lambda key, element: CharacterCreater.change_character_key(key, element))) + select_species = [ x for x in select_species.keys() if x != "Current Selected" ] m = TerminalMenu(select_species, title='Select a Species') selection = m.show() @@ -83,10 +87,7 @@ class CharacterCreater: if not characte_species["combineble"]: combineble_species = False else: - # TODO: Remove all combineble Classes - del player_config["species"][characte_species["species"]["name"]] - player_config["species"]["Current Selected"] = characte_species["species"] - combineble_species = CharacterCreater.select_a_species(player_config, block_by_fixed_type=True)["species"] + combineble_species = CharacterCreater.select_a_species(player_config, block_by_fixed_type=True, current_selected=characte_species["species"])["species"] return CharacterCreater.cleanup({ "name": characte_name,