Fix skill testing

This commit is contained in:
2023-10-03 10:48:42 +02:00
parent 8c7848bf2b
commit e427e3702b
35 changed files with 85 additions and 112 deletions

View File

@ -158,29 +158,32 @@ Hooks.once('init', () => {
for (i = 0; i < len; i++) {
skills_list[i] = skills_list[i].trim();
for (let compData of validCompendiums) {
let transl = game.babele.translate(compData.metadata.id, { name: skills_list[i], type: "skill" }, true).name;
let translItem = game.babele.translate(compData.metadata.id, { name: skills_list[i], type: "skill" }, true)
let transl = translItem?.name || undefined
if (!transl) transl = skills_list[i]
//console.log("List ...", skills_list[i]);
console.log("List ...", skills_list[i], compData.metadata.id, translItem);
if (transl == skills_list[i]) {
let res = re.exec(skills_list[i]);
if (res) {
//console.log("Matched/split:", res[1], res[2]);
let subword = game.i18n.localize(res[2].trim());
let s1 = res[1].trim() + " ()";
let translw = game.babele.translate(compData.metadata.id, { name: s1, type: "skill" }, true).name;
translItem = game.babele.translate(compData.metadata.id, { name: s1, type: "skill" }, true)
let translw = translItem?.name || undefined
if (translw != s1) {
let res2 = re.exec(translw);
transl = res2[1] + "(" + subword + ")";
} else {
s1 = res[1].trim() + " ( )";
translw = game.babele.translate(compData.metadata.id, { name: s1, type: "skill" }, true).name;
translItem = game.babele.translate(compData.metadata.id, { name: s1, type: "skill" }, true)
translw = translItem?.name || undefined
let res2 = re.exec(translw);
transl = res2[1] + "(" + subword + ")";
}
}
}
skills_list[i] = transl;
if (transl?.system)
if (translItem?.system)
break;
}
}
@ -241,26 +244,26 @@ Hooks.once('init', () => {
let len = talents_list.length;
let re = /(.*)\((.*)\)/i;
for (i = 0; i < len; i++) {
let translated = false;
for (let compData of validCompendiums) {
//console.log("TALENT - Parsing : ", talents_list)
let transl = game.babele.translate(compData.metadata.id, { name: talents_list[i], type: "talent" }, true).name;
let translItem = game.babele.translate(compData.metadata.id, { name: talents_list[i], type: "talent" }, true);
let transl = translItem?.name || undefined
if (!transl) transl = talents_list[i]
if (transl == talents_list[i]) {
let res = re.exec(talents_list[i]);
if (res) {
let subword = game.i18n.localize(res[2].trim());
let s1 = res[1].trim(); // No () in talents table
let translw = game.babele.translate(compData.metadata.id, { name: s1, type: "talent" }, true).name;
translItem = game.babele.translate(compData.metadata.id, { name: s1, type: "talent" }, true)
let translw = translItem?.name || undefined
//console.log("Ssearch talent name:", compData.metadata.id, s1, translw);
if (translw && translw != s1) {
transl = translw + " (" + subword + ")";
translated = true
}
}
}
talents_list[i] = transl;
if (translated)
if (translItem?.system)
break;
}
}