diff --git a/myscripts/collateDomain.js b/myscripts/collateDomain.js index 52ca7d827..5f06e1c01 100644 --- a/myscripts/collateDomain.js +++ b/myscripts/collateDomain.js @@ -116,6 +116,7 @@ function collateDomain(lang) { } }); // data.disorder = xdisorder.filter(d => d.Id+'' === Object.keys(obj.LevelConfigMap)[0]).map(d => language[d.DescTextMapHash]); + data.imagename = obj.EntryPicPath; let filename = makeFileName(getLanguage('EN')[obj.NameTextMapHash]); if(filename === '') return accum; diff --git a/myscripts/collateFood.js b/myscripts/collateFood.js index 18e69efb7..762c31fdc 100644 --- a/myscripts/collateFood.js +++ b/myscripts/collateFood.js @@ -58,6 +58,7 @@ function collateFood(lang) { return accum; }, []); // data.source = + data.imagename = obj.Icon; accum[makeFileName(getLanguage('EN')[obj.NameTextMapHash])] = data; @@ -86,6 +87,7 @@ function collateFood(lang) { spdata.character = language[getAvatar(myspec.AvatarId).NameTextMapHash]; spdata.ingredients = ingredients; + spdata.imagename = xd.Icon; accum[makeFileName(getLanguage('EN')[xd.NameTextMapHash])] = spdata; return accum; diff --git a/myscripts/collateMaterial.js b/myscripts/collateMaterial.js index 0c1112104..df6b44661 100644 --- a/myscripts/collateMaterial.js +++ b/myscripts/collateMaterial.js @@ -5,8 +5,8 @@ MATERIAL_AVATAR_MATERIAL is talent level-up material, etc. const filter = ['MATERIAL_EXCHANGE', 'MATERIAL_WOOD', 'MATERIAL_AVATAR_MATERIAL']; -// Adventure EXP, Mora, Companionship EXP, Apple, Sunsettia -const includeMatId = [102, 202, 105, 100001, 100002]; +// Adventure EXP, Mora, Primogems, Companionship EXP, Apple, Sunsettia +const includeMatId = [102, 202, 201, 105, 100001, 100002]; // Crafted Items, Primordial Essence, Raw Meat (S), Fowl (S) const excludeMatId = [110000, 112001, 100086, 100087]; @@ -40,6 +40,9 @@ function collateMaterial(lang) { } data.source = tmp.TextList.map(ele => language[ele]).filter(ele => ele !== ''); + data.imagename = obj.Icon; + if(!data.imagename) console.log(data.name+' has no icon'); + let filename = makeFileName(getLanguage('EN')[obj.NameTextMapHash]); if(filename === '') return accum; accum[filename] = data; diff --git a/myscripts/collateTalent.js b/myscripts/collateTalent.js index 5e2b71246..67d2a8319 100644 --- a/myscripts/collateTalent.js +++ b/myscripts/collateTalent.js @@ -28,7 +28,7 @@ function collateTalent(lang) { if(filename === 'raidenshogun' && index === 2) return accum2; // skip hidden cannot cook passive if(proud.ProudSkillGroupId) accum2.push(proud.ProudSkillGroupId); return accum2; - }, []) + }, []); let parameters = {}; let costs = {}; combat.forEach((skId, index) => { diff --git a/myscripts/collateWeapon.js b/myscripts/collateWeapon.js index 57a14db9b..a008416e5 100644 --- a/myscripts/collateWeapon.js +++ b/myscripts/collateWeapon.js @@ -109,7 +109,6 @@ function collateWeapon(lang) { data.icon = obj.Icon; data.awakenicon = obj.AwakenIcon; - accum[filename] = data; return accum; }, {}); diff --git a/myscripts/myscript.js b/myscripts/myscript.js index 28160a984..73fde9f30 100644 --- a/myscripts/myscript.js +++ b/myscripts/myscript.js @@ -102,13 +102,13 @@ function exportData(folder, collateFunc, englishonly, skipwrite) { // exportData('characters', require('./collateCharacter.js')); // exportCurve('characters', 'AvatarCurveExcelConfigData'); // exportData('constellations', require('./collateConstellation')); -// exportData('talents', require('./collateTalent.js')); +exportData('talents', require('./collateTalent.js')); // exportData('weapons', require('./collateWeapon.js')); // exportCurve('weapons', 'WeaponCurveExcelConfigData') // exportData('artifacts', require('./collateArtifact.js')); // exportData('foods', require('./collateFood')); // exportData('materials', require('./collateMaterial')); // run twice -exportData('domains', require('./collateDomain')); // run twice // remember to add back recommendedelements and disorder +// exportData('domains', require('./collateDomain')); // run twice // remember to add back recommendedelements and disorder and entrypicpath //console.log(collateCharacter('EN'))