diff --git a/javascript/plStat.js b/javascript/plStat.js index b37bbdd..ea11075 100644 --- a/javascript/plStat.js +++ b/javascript/plStat.js @@ -1,63 +1,111 @@ +const elements = [ + "Matières premières", // 0 + "Hydrocarbures", // 1 + "Nourriture", // 2 + "Médicaments", // 3 + "Science", // 4 + "Industrie", // 5 + "Finance", // 6 + "Biens", // 7 +]; + +const resources = [ + "Roches communes", // 0 + "Roches rares", // 1 + "Bois communs", // 2 + "Bois renforcés", // 3 + "Gaz communs", // 4 + "Gaz nobles", // 5 + "Céréales", // 6 + "Elevages", // 7 + "Poissons", // 8 + "Plantes communes", // 9 + "Plantes rares", // 10 + "Universités", // 11 + "Artéfacts", // 12 + "Usines", // 13 + "Bourse", // 14 + "Biens de consommation", // 15 + "Biens de luxe", // 16 + "Sable", // 17 + "Eau", // 18 + "Epaves", // 19 + "Gemmes", // 20 + "Animaux exotiques", // 21 + "Acides faibles", // 22 + "Acides forts", // 23 + "Minerais communs", // 24 + "Minerais rares" // 25 +]; + exports.planetType = { "Tempérée" : { "population" : 100, - "elements" : ["Roches", "Eau", "Bois"], - "resources" : ["Poissons communs", "Plantes communes", "Faune domestique", "Céréales"] + "elements" : [elements[0], elements[2], elements[3]], + "resources" : [resources[0], resources[2], resources[6], resources[7], + resources[9], resources[18], resources[15], resources[24]] }, "Glacée" : { "population" : 1, - "elements" : ["Roches", "Glace", "Gaz"], - "resources" : ["Artefacts", "Epaves", "Minerais rares"] + "elements" : [elements[1], elements[4]], + "resources" : [resources[4], resources[12], resources[18], resources[19]] }, "Volcanique" : { "population" : 2, - "elements" : ["Gaz", "Roches", "Carbone"], - "resources" : ["Minerais rares", "Gaz toxiques"] + "elements" : [elements[0], elements[1]], + "resources" : [resources[0], resources[1], resources[4], resources[20], + resources[24]] }, "Marécageuse" : { "population" : 10, - "elements" : ["Eau", "Bois", "Terre"], - "resources" : ["Faune sauvage", "Bois renforcé", "Eau toxique"] + "elements" : [elements[0], elements[1]], + "resources" : [resources[2], resources[3], resources[8], resources[18], + resources[21]] }, "Forestière" : { "population" : 20, - "elements" : ["Bois"], - "resources" : ["Plantes rares", "Plantes communes", "Bois commun", "Bois renforcé"] + "elements" : [elements[0]], + "resources" : [resources[2], resources[3], resources[9], resources[10], + resources[18], resources[21]] }, "Océanique" : { "population" : 25, - "elements" : ["Eau"], - "resources" : ["Poissons communs", "Poissons rares", "Minérais communs"] + "elements" : [elements[0], elements[1]], + "resources" : [resources[8], resources[18], resources[21], resources[25]] }, "Oecuménopole" : { "population" : 2000, - "elements" : ["Roches"], - "resources" : ["Biens de consommation", "Biens de luxe"] + "elements" : [elements[4], elements[5], elements[6], elements[7]], + "resources" : [resources[6], resources[7], resources[11], resources[13], + resources[14], resources[15], resources[16]] }, "Désert" : { "population" : 50, - "elements" : ["Sable", "Roches"], - "resources" : ["Artefacts", "Epaves", "Minerais communs", "Gemmes"] + "elements" : [elements[0], elements[7]], + "resources" : [resources[0], resources[17], resources[19], resources[20]] }, "Minéralogique" : { "population" : 3, - "elements" : ["Roches"], - "resources" : ["Minerais communs", "Minerais rares", "Gemmes"] + "elements" : [elements[0]], + "resources" : [resources[0], resources[1], resources[20], resources[24], + resources[25]] }, "Gazeuse" : { "population" : 1, - "elements" : ["Gaz"], - "resources" : ["Gaz toxiques", "Gaz nobles"] + "elements" : [elements[1]], + "resources" : [resources[4], resources[5]] }, "Acide" : { "population" : 1, - "elements" : ["Gaz", "Acide"], - "resources" : ["Gaz toxique", "Minerais communs", "Eau toxique"] + "elements" : [elements[1], elements[5]], + "resources" : [resources[0], resources[4], resources[13], resources[17], + resources[22], resources[23]] }, "Monde usine" : { "population" : 500, - "elements" : ["Acide", "Roche"], - "resources" : ["Epaves", "Minerais communs", "Biens de consommation", "Eau toxique"] + "elements" : [elements[1], elements[5]], + "resources" : [resources[0], resources[4], resources[13], resources[15], + resources[22]] } }; diff --git a/javascript/planetFunctions.js b/javascript/planetFunctions.js index 363e25d..d345bab 100644 --- a/javascript/planetFunctions.js +++ b/javascript/planetFunctions.js @@ -22,14 +22,14 @@ const GeneratePlanet = () => { let elementsDescription = ''; for (let element in planetElements) { elementsDescription += ` - ${element}: ${planetElements[element].toFixed(2)}%`; + ${element}: ${planetElements[element].toFixed(3)}%`; } // Resources const planetResources = stat.planetType[planetTypeGeneration].distributedResources; let resourcesDescription = ''; for (let resource in planetResources) { resourcesDescription += ` - ${resource}: ${planetResources[resource].toFixed(2)}%`; + ${resource}: ${planetResources[resource].toFixed(0)}%`; } // Description = planet formatting @@ -40,7 +40,7 @@ Planète : ${planetName} Type : ${planetTypeGeneration} -Eléments : +Production : ${elementsDescription} Ressources naturelles :