diff --git a/__init__.py b/__init__.py index 640b43a..7c755fb 100644 --- a/__init__.py +++ b/__init__.py @@ -667,6 +667,7 @@ class ResumeFailedBatch(bpy.types.Operator): sender_from=render_settings["sender_from"], email_password=render_settings["email_password"], receiver_to=render_settings["receiver_to"], + enable_debug=render_settings["enable_debug"], fail_state=_fail_state, diff --git a/main/dna_generator.py b/main/dna_generator.py index 62a30c1..d98060d 100644 --- a/main/dna_generator.py +++ b/main/dna_generator.py @@ -110,7 +110,7 @@ def generate_nft_dna( # print(f"Rarity DNA: {single_dna}") if enable_logic: - single_dna = logic.logicafy_dna_single(hierarchy, single_dna, logic_file, enable_rarity, enable_materials) + single_dna = logic.logicafy_dna_single(hierarchy, single_dna, logic_file, enable_rarity) # print(f"Logic DNA: {single_dna}") if enable_materials: @@ -310,7 +310,7 @@ def send_to_record( print( f"\n{TextColors.OK}Blend_My_NFTs Success:\n" - f"{len(data_dictionary['DNAList'])} NFT DNA saved to {nft_record_save_path}. NFT DNA Successfully " + f"{len(data_dictionary['dna_list'])} NFT DNA saved to {nft_record_save_path}. NFT DNA Successfully " f"created.\n{TextColors.RESET}") except Exception: diff --git a/main/exporter.py b/main/exporter.py index 2a70c35..fa3d134 100644 --- a/main/exporter.py +++ b/main/exporter.py @@ -95,6 +95,8 @@ def save_generation_state(input): "email_password": input.email_password, "receiver_to": input.receiver_to, + "enable_debug": input.enable_debug, + "custom_fields": input.custom_fields, }, }) @@ -107,8 +109,8 @@ def save_completed(full_single_dna, a, x, batch_json_save_path, batch_to_generat file_name = os.path.join(batch_json_save_path, "Batch{}.json".format(batch_to_generate)) batch = json.load(open(file_name)) - index = batch["BatchDNAList"].index(a) - batch["BatchDNAList"][index][full_single_dna]["Complete"] = True + index = batch["batch_dna_list"].index(a) + batch["batch_dna_list"][index][full_single_dna]["complete"] = True batch["Generation Save"][-1]["DNA Generated"] = x save_batch(batch, file_name) @@ -315,7 +317,7 @@ def render_and_save_nfts(input): # Generation/Rendering: if input.enable_images: - print(f"{TextColors.OK}-------- Image --------{TextColors.RESET}") + print(f"\n{TextColors.OK}-------- Image --------{TextColors.RESET}") image_render_time_start = time.time() @@ -342,7 +344,7 @@ def render_and_save_nfts(input): ) if input.enable_animations: - print(f"{TextColors.OK}-------- Animation --------{TextColors.RESET}") + print(f"\n{TextColors.OK}-------- Animation --------{TextColors.RESET}") animation_render_time_start = time.time() @@ -394,7 +396,7 @@ def render_and_save_nfts(input): ) if input.enable_models: - print(f"{TextColors.OK}-------- 3D Model --------{TextColors.RESET}") + print(f"\n{TextColors.OK}-------- 3D Model --------{TextColors.RESET}") model_generation_time_start = time.time() diff --git a/main/helpers.py b/main/helpers.py index 870adfa..15e9f25 100644 --- a/main/helpers.py +++ b/main/helpers.py @@ -351,7 +351,7 @@ def check_failed_batches(batch_json_save_path): for i in batch_folders: batch = json.load(open(os.path.join(batch_json_save_path, i))) - nfts_in_batch = batch["NFTs_in_Batch"] + nfts_in_batch = batch["nfts_in_batch"] if "Generation Save" in batch: dna_generated = batch["Generation Save"][-1]["DNA Generated"] if dna_generated is not None and dna_generated < nfts_in_batch: diff --git a/main/logic.py b/main/logic.py index 7f2b0de..86dafc0 100644 --- a/main/logic.py +++ b/main/logic.py @@ -261,6 +261,7 @@ def logicafy_dna_single(hierarchy, single_dna, logic_file, enable_rarity): did_reconstruct = False for rule in logic_file: # Items from 'IF' key for a given rule + print(logic_file) if_dict = create_dicts(hierarchy, logic_file[rule]["IF"], "IF") result_dict_type = ""