diff --git a/contracts/Rocketeer.sol b/contracts/Rocketeer.sol index 7e4cee7..2c3d2a9 100644 --- a/contracts/Rocketeer.sol +++ b/contracts/Rocketeer.sol @@ -23,7 +23,7 @@ contract Rocketeer is ERC721Tradable { { // Birth the genesis Rocketeers - for( uint i=0; i < 50; i++ ) { + for( uint i=0; i < 10; i++ ) { spawnRocketeer( owner() ); } diff --git a/functions/modules/helpers.js b/functions/modules/helpers.js index c74f93d..4ba68c0 100644 --- a/functions/modules/helpers.js +++ b/functions/modules/helpers.js @@ -42,6 +42,15 @@ exports.pickRandomAttributes = ( attributes ) => { } +const nameColor = require('color-namer') +exports.getColorName = ( rgb ) => { + try { + return nameColor( rgb ).basic[0].name + } catch( e ) { + return rgb + } +} + // /////////////////////////////// // Attribute sources // /////////////////////////////// diff --git a/functions/modules/rocketeer.js b/functions/modules/rocketeer.js index 9ce9561..a6cc0a8 100644 --- a/functions/modules/rocketeer.js +++ b/functions/modules/rocketeer.js @@ -1,9 +1,9 @@ const name = require( 'random-name' ) const { db } = require( './firebase' ) const { getTotalSupply } = require( './contract' ) -const { pickRandomArrayEntry, pickRandomAttributes, randomNumberBetween, globalAttributes, heavenlyBodies, web2domain, lorem } = require( './helpers' ) +const { pickRandomArrayEntry, pickRandomAttributes, randomNumberBetween, globalAttributes, heavenlyBodies, web2domain, lorem, getColorName } = require( './helpers' ) const svgFromAttributes = require( './svg-generator' ) -const nameColor = require('color-namer') + // /////////////////////////////// // Caching @@ -53,7 +53,7 @@ async function generateRocketeer( id, network='mainnet' ) { // The base object of a new Rocketeer const rocketeer = { name: `${ name.first() } ${ name.middle() } ${ name.last() } of ${ id % 42 == 0 ? 'the Towel' : pickRandomArrayEntry( heavenlyBodies ) }`, - description: lorem, + description: '', image: ``, external_url: `https://viewer.rocketeer.fans/?rocketeer=${ id }` + ( network == 'mainnet' ? '' : '&testnet=true' ), attributes: [] @@ -101,11 +101,14 @@ async function generateRocketeer( id, network='mainnet' ) { if( !attribute.trait_type.includes( 'color' ) ) return attribute return { ...attribute, - value: nameColor( attribute.value ) + value: getColorName( attribute.value ) } } ) + // Create description + rocketeer.description = `${ rocketeer.name } is a proud member of the ${ rocketeer.attributes.find( ( { trait_type } ) => trait_type == 'patch' ).value } guild.` + // Save new Rocketeer await db.collection( `${ network }Rocketeers` ).doc( id ).set( rocketeer ) diff --git a/truffle-config.js b/truffle-config.js index 837c171..77b1d91 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -77,7 +77,7 @@ module.exports = { // return new HDWalletProvider(MNEMONIC, rinkebyNodeUrl); return new LedgerWalletProvider( ledgerOptions, rinkebyNodeUrl ); }, - gas: 5000000, + gas: 29999944, // very very high network_id: 4, }, live: {