Merge pull request #66 from thepeanutgalleryandco/v1-7-7-Layer-Global…

…-Maximum-Repeatability

V1 7 7 layer global maximum repeatability

README.md

@@ -203,6 +203,9 @@ If you would like to support my NFT collection, please take a look at the below.
 ## UPDATES & FIXES
 
 
+### Added Layer Global Maximum Repeatability Setting
+Added a new `layerItemsMaxRepeatedTrait` setting that can be used to set the maximum repeatability for all items within a layer. If this is set to 2 for example and your layer has 8 layer items, then a maximum of 16 images will be generated. This allows users to set the maximum repeatability once off for a layer's items instead of specifying each layer item with the same maximum repeatability. [Feature - Add Maximum Repeatability For All Items In A Layer In A Single Configuration](https://github.com/thepeanutgalleryandco/create-and-mint-nft-collection/issues/65)
+
 ### Added Opensea Selling Scripts
 Added a new script `utils/opensea/sell_nfts.js` that will allow users to sell NFTs between two edition numbers (inclusive) to be put up for sale if the user owns the NFTs. This functionality uses Puppeteer and Chainsafe's Dappeteer, so please use at your own discretion as you will need to make use of your seed phrase for this functionality to work. [Feature - Opensea Polygon Script To Auto Sell NFTs](https://github.com/thepeanutgalleryandco/create-and-mint-nft-collection/issues/42), [Feature - Opensea Polygon Script To Auto Sell NFTs Additional Fields](https://github.com/thepeanutgalleryandco/create-and-mint-nft-collection/issues/47) and [Feature - Opensea Polygon Script To Auto Sell NFTs Added Metamask Account Number](https://github.com/thepeanutgalleryandco/create-and-mint-nft-collection/issues/49)
 
@@ -261,13 +264,12 @@ Modify the following parts at the very least, below are just sample values that
 
 #### b. Update your layer configurations
 - Update your folder names, order in which they need to be processed and the number of images to create
-- Optionally add maximum repeatability filtration rule in for the layers - Please see [Maximum Repeatability Feature](https://github.com/thepeanutgalleryandco/create-and-mint-nft-collection/issues/16) and [Layer Item Maximum Repeatability Settings](https://github.com/thepeanutgalleryandco/create-and-mint-nft-collection/issues/20)
+- Optionally add maximum repeatability filtration rule in for the layers - Please see [Maximum Repeatability Feature](https://github.com/thepeanutgalleryandco/create-and-mint-nft-collection/issues/16) and [Layer Item Maximum Repeatability Settings](https://github.com/thepeanutgalleryandco/create-and-mint-nft-collection/issues/20) and [Add Maximum Repeatability For All Items In A Layer In A Single Configuration](https://github.com/thepeanutgalleryandco/create-and-mint-nft-collection/issues/65)
 - Optionally add layer combination filtration rules in for the layers - Please see [Layer Combination Exclusion Feature](https://github.com/thepeanutgalleryandco/create-and-mint-nft-collection/issues/15)
 - Optionally add layer dependent traits filtration rules in for the layers - Please see [Layer Trait Dependencies Feature](https://github.com/thepeanutgalleryandco/create-and-mint-nft-collection/issues/29)
 
 *Example of default configuration along with maximum repeatability and layer compatibility*
-
-![Screenshot 2022-03-15 at 01 10 17](https://user-images.githubusercontent.com/52892685/158283474-cba5a3cd-011c-4e1b-8371-69093f5dff9d.png)
+<img width="554" alt="Screenshot 2022-05-05 at 17 55 14" src="https://user-images.githubusercontent.com/52892685/166963557-ee08ff09-557e-4898-a484-8dcf07db5607.png">
 
 
 #### c. Update the width and height of your canvas

package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-and-mint-nft-collection",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "description": "Source code to create and mint generative art via NFTPort API. Special thanks to codeSTACKr and Hashlips for their source codebase.",
   "main": "index.js",
   "bin": "index.js",

src/config.js

@@ -43,7 +43,7 @@ const layerConfigurations = [
       { name: "Eyeball" },
       { name: "Eye color", maxRepeatedTrait: 2 },
       { name: "Iris" },
-      { name: "Shine" },
+      { name: "Shine", layerItemsMaxRepeatedTrait: 4 },
       { name: "Bottom lid", maxRepeatedTrait: 3 },
       { name: "Top lid" },
     ],

src/filters/combination_traits.js

@@ -18,11 +18,17 @@ const combinationOfTraitsAlreadyExists  = (selectedTraitsList, newTraits, maxRep
 
   // Loops through each new trait and add to count
   for (let i = 0; i < newTraits.length; i++) {
-
+        
     // Check if trait exists in traitLayerCounts and traitLayerItemCounts objects and if it does, then add to the count, otherwise initialize with a count of 1.
     traitLayerCounts[`${newTraits[i].layer}`] = traitLayerCounts[`${newTraits[i].layer}`] ? traitLayerCounts[`${newTraits[i].layer}`] + 1 : 1 ;
     traitLayerItemCounts[`${newTraits[i].layer}/${newTraits[i].name}`] = traitLayerItemCounts[`${newTraits[i].layer}/${newTraits[i].name}`] ? traitLayerItemCounts[`${newTraits[i].layer}/${newTraits[i].name}`] + 1 : 1 ;
 
+    // Check if the selected trait has breached the global layer item maximum repeatability limit and return true if that is the case
+    if (traitLayerItemCounts[`${newTraits[i].layer}/${newTraits[i].name}`] > newTraits[i].layerItemsMaxRepeatedTrait) {
+      console.log(`Combination of traits filtered because of global layer item (${newTraits[i].layer}) maximum repeatability filtration rule!`);
+      return true;
+    }   
+
     // Check if the selected trait has breached the layer maximum repeatability limit and return true if that is the case
     if (traitLayerCounts[`${newTraits[i].layer}`] > newTraits[i].maxRepeatedTrait) {
       console.log(`Combination of traits filtered because of layer (${newTraits[i].layer}) maximum repeatability filtration rule!`);
@@ -43,7 +49,7 @@ const combinationOfTraitsAlreadyExists  = (selectedTraitsList, newTraits, maxRep
     if (traitLayerItemCounts[`${layerItemsMaxRepeatedTraits[layerItem].name}`] > layerItemsMaxRepeatedTraits[layerItem].layerItemMaxRepeatedTrait) {
       console.log(`Combination of traits filtered because of layer item (${layerItemsMaxRepeatedTraits[layerItem].name}) maximum repeatability filtration rule!`);
       return true;
-    }
+    } 
   }
 
   // Return false if the traits have been looped through and the maximum repeatability have not been breached

src/main.js

@@ -94,6 +94,7 @@ const layersSetup = (layersOrder) => {
         ? layerObj.options?.["displayName"]
         : layerObj.name,
     maxRepeatedTrait: layerObj.maxRepeatedTrait,    
+    layerItemsMaxRepeatedTrait: layerObj.layerItemsMaxRepeatedTrait,
     blend:
       layerObj.options?.["blend"] != undefined
         ? layerObj.options?.["blend"]
@@ -324,7 +325,8 @@ const selectTraits = (layers) => {
           name: layer.elements[i].name,
           filename: layer.elements[i].filename,
           bypassDNA: layer.bypassDNA,
-          maxRepeatedTrait: layer.maxRepeatedTrait
+          maxRepeatedTrait: layer.maxRepeatedTrait,
+          layerItemsMaxRepeatedTrait: layer.layerItemsMaxRepeatedTrait
           },
         );
       }

utils/nftport/uploadMetas_directory.js

@@ -95,6 +95,7 @@ async function main() {
     const response = await fetchWithRetry("https://api.nftport.xyz/v0/metadata/directory", options);
 
     console.log("Done with upload of metadata.");
+    console.log("Starting with update on metadata files to include upload data.");
 
     // Loop through each file in the list.
     for (const file of files) {
@@ -123,9 +124,6 @@ async function main() {
 
         // Write the allMetadata array to the ipfsMetasDir directory
         fs.writeFileSync(`${FOLDERS.ipfsMetasDir}/_ipfsMetas.json`,JSON.stringify(allMetadata, null, 2));
-
-        console.log(`${metaData.name} metadata uploaded!`);
-
       }
     }