diff --git a/myscripts/collateEnemy.js b/myscripts/collateEnemy.js index 24deb8c6b..25222dd3d 100644 --- a/myscripts/collateEnemy.js +++ b/myscripts/collateEnemy.js @@ -48,7 +48,7 @@ function collateEnemy(lang) { let sub = obj.SubType || 'CODEX_SUBTYPE_ELEMENTAL'; sub = sub.slice(sub.lastIndexOf('_')+1); sub = xmanualtext.find(m => m.TextMapId === `UI_CODEX_ANIMAL_CATEGORY_${sub}`).TextMapContentTextMapHash; - data.type = mon.SecurityLevel || 'COMMON'; + data.enemytype = mon.SecurityLevel || 'COMMON'; data.category = language[sub]; data.imageicon = des.Icon; data.description = sanitizeDescription(language[obj.DescTextMapHash]); @@ -57,6 +57,7 @@ function collateEnemy(lang) { data.bgm = mon.CombatBGMLevel; data.budget = mon.EntityBudgetLevel; + // particle drops let drops = []; for(let x of mon.HpDrops) { if(x.DropId) drops.push(x.DropId); diff --git a/myscripts/collateMaterial.js b/myscripts/collateMaterial.js index c94c5869e..9a182b2d3 100644 --- a/myscripts/collateMaterial.js +++ b/myscripts/collateMaterial.js @@ -3,7 +3,7 @@ MATERIAL_AVATAR_MATERIAL is talent level-up material, etc. */ -const filter = ['MATERIAL_EXCHANGE', 'MATERIAL_WOOD', 'MATERIAL_AVATAR_MATERIAL', 'MATERIAL_EXP_FRUIT']; +const filter = ['MATERIAL_EXCHANGE', 'MATERIAL_WOOD', 'MATERIAL_AVATAR_MATERIAL', 'MATERIAL_EXP_FRUIT', 'MATERIAL_WEAPON_EXP_STONE']; // Adventure EXP, Mora, Primogems, Companionship EXP, Apple, Sunsettia const includeMatId = [102, 202, 201, 105, 100001, 100002]; diff --git a/myscripts/collateWeapon.js b/myscripts/collateWeapon.js index 45d9ec11b..8501f5c36 100644 --- a/myscripts/collateWeapon.js +++ b/myscripts/collateWeapon.js @@ -42,6 +42,7 @@ function collateWeapon(lang) { if(ref === undefined) break; if(offset === 0) data.effectname = language[ref.NameTextMapHash]; let effect = language[ref.DescTextMapHash]; + effect = effect.replaceAll('{NON_BREAK_SPACE}', ' '); effect = effect.replace(/<\/color>s/g, 's<\/color>'); if(filename === 'swordofdescension' || filename === 'predator') { // has extra color effect = effect.replace(//i, '').replace(/<\/color>/i, ''); @@ -54,6 +55,8 @@ function collateWeapon(lang) { data['effect'] = sanitizeDescription(effect.reduce((accum, ele, i) => { if(i % 2 === 0) { return accum + ele; + } else if(ele.includes('#')) { + return accum + `{${ele}}`; } else { data['r'+(offset+1)].push(ele); return accum + `{${(i-1)/2}}`; diff --git a/myscripts/myscript.js b/myscripts/myscript.js index 5fcba1852..02df1385a 100644 --- a/myscripts/myscript.js +++ b/myscripts/myscript.js @@ -110,7 +110,9 @@ function exportData(folder, collateFunc, englishonly, skipwrite) { // exportData('materials', require('./collateMaterial')); // run twice // exportData('domains', require('./collateDomain')); // run twice // remember to add back recommendedelements and disorder and entrypicpath // exportData('enemies', require('./collateEnemy')); -exportData('domains', require('./collateDomainMonsterList')); // run only after both domains and enemies have run. sync +// exportData('domains', require('./collateDomainMonsterList')); // run only after both domains and enemies have run. sync +// exportCurve('enemies', 'MonsterCurveExcelConfigData'); + //console.log(collateCharacter('EN')) //console.log(collateConstellation('EN').hutao)