Added new print statements to preview

src/generators_and_sorters/DNA_Generator.py

@@ -270,40 +270,43 @@ def generateNFT_DNA(possibleCombinations):
    print("Generating " + str(possibleCombinations) + " combinations of DNA...")
    print("")
 
+   if not enableRarity:
+      for i in hierarchy:
+         numChild = len(hierarchy[i])
+         possibleNums = list(range(1, numChild + 1))
+         listOptionVari.append(possibleNums)
 
-   for i in hierarchy:
-      numChild = len(hierarchy[i])
-      possibleNums = list(range(1, numChild + 1))
-      listOptionVari.append(possibleNums)
+      allDNAList = list(itertools.product(*listOptionVari))
+      allDNAstr = []
 
-   allDNAList = list(itertools.product(*listOptionVari))
-   allDNAstr = []
+      for i in allDNAList:
+         dnaStr = ""
+         for j in i:
+            num = "-" + str(j)
+            dnaStr += num
 
-   for i in allDNAList:
-      dnaStr = ""
-      for j in i:
-         num = "-" + str(j)
-         dnaStr += num
+         dna = ''.join(dnaStr.split('-', 1))
+         allDNAstr.append(dna)
 
-      dna = ''.join(dnaStr.split('-', 1))
-      allDNAstr.append(dna)
+      if enableMaxNFTs:
+         '''
+         Remove DNA from DNAList until DNAList = maxNFTs from config.py
+         Will need to be changed when creating Rarity_Sorter
+         '''
+         x = len(allDNAstr)
+         while x > maxNFTs:
+            y = random.choice(allDNAstr)
+            allDNAstr.remove(y)
+            x -= 1
 
-   if enableMaxNFTs:
-      '''
-      Remove DNA from DNAList until DNAList = maxNFTs from config.py
-      Will need to be changed when creating Rarity_Sorter
-      '''
-      x = len(allDNAstr)
-      while x > maxNFTs:
-         y = random.choice(allDNAstr)
-         allDNAstr.remove(y)
-         x -= 1
-
-      possibleCombinations = maxNFTs
+         possibleCombinations = maxNFTs
 
       if nftsPerBatch > maxNFTs:
          print("The Max num of NFTs you chose is smaller than the NFTs Per Batch you set. Only " + str(maxNFTs) + " were added to 1 batch")
 
+   if enableRarity:
+
+
    #Data stored in batchDataDictionary:
    batchDataDictionary["numNFTsGenerated"] = possibleCombinations
    batchDataDictionary["hierarchy"] = hierarchy

src/main/Preview.py

@@ -1,5 +1,5 @@
-# This file allows you to preivew some calculations/numbers generated when you run main. It allows you to make adjustments
-# to the config.py file before running main.py incase there are any issues.
+# This file allows you to preview some calculations/numbers generated when you run main. It allows you to make adjustments
+# to the config.py file before running main.py in case there are any issues.
 
 import bpy
 import os
@@ -65,4 +65,7 @@ if enableMaxNFTs:
     elif remainder2 == 0:
         print("There is no extra batch with this combination.")
 
-    print("The number of possible batches with Max number enabled: " + str(Number_Of_Possible_Batches2))
+    print("The number of possible batches with Max number enabled: " + str(Number_Of_Possible_Batches2))
+
+# Add the ability to render a test image so that you can estimate the time per batch and the over all time to render
+# the total NFT collection.

src/main/config.py

@@ -68,7 +68,7 @@ locationObjectAttribute = {
     "Cube": {"x": 0, "y": 0, "z": 0}
 }
 
-includeRarity = False
+enableRarity = True
 # True = include weighted rarity percentages in NFTRecord.json calculations,
 # False = Pure random selection of variants