pallando/foundryvtt-wh4-lang-fr-fr
0
0
Fork 0
forked from public/foundryvtt-wh4-lang-fr-fr
Code Pull Requests Activity

Fix char import

Browse Source
This commit is contained in:
sladecraven 2021-07-29 22:53:35 +02:00
parent 4bf5b4ec0f
commit 31ef890408
4 changed files with 136 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
babele-register.js
View File

@ -380,7 +380,7 @@ Hooks.once('init', () => {
"trapping_qualities_flaws": (value) => { "trapping_qualities_flaws": (value) => {
if ( value ) { if ( value ) {
let newQF = []; let newQF = [];
console.log("ATOUTS", value); //console.log("ATOUTS", value);
var i=0; var i=0;
//var re = /(.*) (\d+)/i; //var re = /(.*) (\d+)/i;
for (i=0; i<value.length; i++) { for (i=0; i<value.length; i++) {

2
module.json
View File

@ -2,7 +2,7 @@
"name": "WH4-fr-translation", "name": "WH4-fr-translation",
"title": "WFRP4e - Core Module en français.", "title": "WFRP4e - Core Module en français.",
"description": "Traduction Française pour Warhammer v4.", "description": "Traduction Française pour Warhammer v4.",
"version": "4.0.11", "version": "4.0.12",
"minimumCoreVersion" : "0.8.0", "minimumCoreVersion" : "0.8.0",
"compatibleCoreVersion": "0.8.8", "compatibleCoreVersion": "0.8.8",
"author": "LeRatierBretonnien", "author": "LeRatierBretonnien",

130
modules/import-stat-2.js
View File

@ -27,6 +27,8 @@ Talents: Briber, Criminal, Dealmaker,
Etiquette (Criminals, Doktor, Guilder) Etiquette (Criminals, Doktor, Guilder)
Trappings: Dagger, Hand Weapon (Sword) Trappings: Dagger, Hand Weapon (Sword)
` `
import ItemWfrp4e from "/systems/wfrp4e/modules/item/item-wfrp4e.js";
import WFRP_Utility from "/systems/wfrp4e/modules/system/utility-wfrp4e.js";
/************************************************************************************/ /************************************************************************************/
import "./xregexp-all.js"; import "./xregexp-all.js";
@ -46,8 +48,8 @@ let regName = XRegExp(name_val, 'gi');
/************************************************************************************/ /************************************************************************************/
async function __findItem(itemName, itemType, location = null) { async function __findItem(itemName, itemType, location = null) {
itemName = itemName.trim(); let toSearch = itemName.toLowerCase().trim();
let items = game.items.entities.filter(i => i.type == itemType) let items = game.items.contents.filter(i => i.type == itemType)
// Search imported items first // Search imported items first
for (let i of items) { for (let i of items) {
@ -63,52 +65,54 @@ async function __findItem(itemName, itemType, location = null) {
location.split(".")[1] == p.metadata.name location.split(".")[1] == p.metadata.name
}) })
if (pack) { if (pack) {
if (pack.translations[itemName]) {
let translItemName = pack.translations[itemName].name;
await pack.getIndex().then(index => itemList = index); await pack.getIndex().then(index => itemList = index);
let searchResult = itemList.find(t => t.name == translItemName) let searchResult = itemList.find(t => (t.translated && t.originalName.toLowerCase() == toSearch) || (t.name.toLowerCase() == toSearch) );
if (searchResult) if (searchResult)
return await pack.getEntity(searchResult._id) return await pack.getDocument(searchResult._id)
}
} }
} }
// If all else fails, search each pack // If all else fails, search each pack
for (let p of game.packs.filter(p => p.metadata.tags && p.metadata.tags.includes(itemType))) { for (let p of game.wfrp4e.tags.getPacksWithTag(itemType)) {
if (p.translations[itemName]) {
let translItemName = p.translations[itemName].name;
await p.getIndex().then(index => itemList = index); await p.getIndex().then(index => itemList = index);
let searchResult = itemList.find(t => t.name == translItemName) let searchResult = itemList.find(t => (t.translated && t.originalName.toLowerCase() == toSearch) || (t.name.toLowerCase() == toSearch) );
if (searchResult) if (searchResult)
return await p.getEntity(searchResult._id) return await p.getDocument(searchResult._id)
}
} }
} }
/************************************************************************************/ /************************************************************************************/
async function __findSkill(skillName) { async function __findSkill(skillName, value = undefined) {
skillName = skillName.trim(); let toSearch = skillName.toLowerCase().trim();
// First try world items let parseStr = '(?<name>[a-z\\s]*)[\\s\\+]*(?<specialized>[a-z\\s\\(\\)]*)';
let worldItem = game.items.entities.filter(i => i.type == "skill" && i.name == skillName)[0]; let skillSplit = XRegExp.exec(skillName, XRegExp(parseStr, 'gi'));
if (worldItem) return worldItem
let skillList = []; // First try world items
let packs = game.packs.filter(p => p.metadata.tags && p.metadata.tags.includes("skill")) let worldItem = game.items.contents.filter(i => i.type == "skill" && i.name.toLowerCase() == toSearch)[0];
if (worldItem) return worldItem;
let packs = game.wfrp4e.tags.getPacksWithTag("skill");
for (let pack of packs) { for (let pack of packs) {
//console.log("SEARCH : ", skillName, pack); let skillList = await pack.getIndex();
if ( pack.translations[skillName] ) {
let translSkillName = pack.translations[skillName].name;
skillList = await pack.getIndex()
// Search for specific skill (won't find unlisted specializations) // Search for specific skill (won't find unlisted specializations)
let searchResult = skillList.find(s => s.name == translSkillName) let searchResult = skillList.find(s => (s.translated && s.originalName.toLowerCase() == toSearch) || (s.name.toLowerCase() == toSearch ) );
if (!searchResult) if (!searchResult) {
searchResult = skillList.find(s => s.name.split("(")[0].trim() == skillName.split("(")[0].trim()) let toSearchClean = toSearch.split("(")[0].trim();
searchResult = skillList.find(s => (s.translated && s.originalName.toLowerCase().split("(")[0].trim() == toSearchClean) ||
(s.name.toLowerCase().split("(")[0].trim() == toSearchClean) );
}
if (searchResult) { if (searchResult) {
let dbSkill; let dbSkill;
await pack.getEntity(searchResult._id).then(packSkill => dbSkill = packSkill); await pack.getDocument(searchResult._id).then(packSkill => dbSkill = packSkill);
dbSkill.data.name = translSkillName; // This is important if a specialized skill wasn't found. Without it, <Skill ()> would be added instead of <Skill (Specialization)> if (skillSplit.specialized && ( dbSkill.name.includes('()') || dbSkill.name.includes('( )' ) ) ) {
return dbSkill; let spec = XRegExp.replace(skillSplit.specialized, "(", "");
spec = XRegExp.replace(spec, ")", "");
let skillSplit2 = XRegExp.exec(dbSkill.name, XRegExp(parseStr, 'gi'));
dbSkill.data.update( { name: skillSplit2.name + '(' + game.i18n.localize( spec.trim() ) + ')' } );
} }
//game.babele.translate('wfrp4e-core.skills', dbSkill);
return dbSkill;
} }
} }
throw "Could not find skill (or specialization of) " + skillName + " in compendum or world" throw "Could not find skill (or specialization of) " + skillName + " in compendum or world"
@ -116,28 +120,33 @@ async function __findSkill(skillName) {
/************************************************************************************/ /************************************************************************************/
async function __findTalent(talentName) { async function __findTalent(talentName) {
talentName = talentName.trim(); let parseStr = '(?<name>[a-z\\s]*)[\\s\\+]*(?<specialized>[a-z\\s\\(\\)]*)';
let talentSplit = XRegExp.exec(talentName, XRegExp(parseStr, 'gi'));
let toSearch = talentSplit.name.toLowerCase().trim();
// First try world items // First try world items
let worldItem = game.items.entities.filter(i => i.type == "talent" && i.name == talentName)[0]; let worldItem = game.items.contents.filter(i => i.type == "talent" && i.name.toLowerCase() == toSearch)[0];
if (worldItem) return worldItem if (worldItem) return worldItem;
let talentList = []; let packs = game.wfrp4e.tags.getPacksWithTag("talent");
let packs = game.packs.filter(p => p.metadata.tags && p.metadata.tags.includes("talent"))
for (let pack of packs) { for (let pack of packs) {
if ( pack.translations[talentName] ) { let talentList = await pack.getIndex();
let translTalentName = pack.translations[talentName].name; // Search for specific skill (won't find unlisted specializations)
talentList = await pack.getIndex() let searchResult = talentList.find(s => (s.translated && s.originalName.toLowerCase() == toSearch) || (s.name.toLowerCase() == toSearch ) );
// Search for specific talent (won't find unlisted specializations) if (!searchResult) {
let searchResult = talentList.find(t => t.name == translTalentName) let toSearchClean = toSearch.split("(")[0].trim();
if (!searchResult) searchResult = talentList.find(s => (s.translated && s.originalName.toLowerCase().split("(")[0].trim() == toSearchClean) ||
searchResult = talentList.find(t => t.name.split("(")[0].trim() == talentName.split("(")[0].trim()) (s.name.toLowerCase().split("(")[0].trim() == toSearchClean) );
}
if (searchResult) { if (searchResult) {
let dbTalent; let dbTalent;
await pack.getEntity(searchResult._id).then(packTalent => dbTalent = packTalent); await pack.getDocument(searchResult._id).then(packTalent => dbTalent = packTalent);
dbTalent.data.name = translTalentName; // This is important if a specialized talent wasn't found. Without it, <Talent ()> would be added instead of <Talent (Specialization)> if ( talentSplit.specialized ) {
return dbTalent; let spec = XRegExp.replace(talentSplit.specialized, "(", "");
spec = XRegExp.replace(spec, ")", "");
dbTalent.data.update( { name: talentSplit.name + '(' + game.i18n.localize( spec.trim() ) + ')' } );
} }
return dbTalent;
} }
} }
throw "Could not find talent (or specialization of) " + talentName + " in compendium or world" throw "Could not find talent (or specialization of) " + talentName + " in compendium or world"
@ -213,10 +222,12 @@ export default async function statParserFR( statString, type = "npc") {
// Then create a table of it in termList, with specific sub-parsing rules // Then create a table of it in termList, with specific sub-parsing rules
let termList = XRegExp.split(def.substring, regSep); let termList = XRegExp.split(def.substring, regSep);
for (let name of termList) { for (let name of termList) {
let itemFound, subres; let itemFound, subres, value;
if (def.secondParse) { if (def.secondParse) {
subres = XRegExp.exec(name, XRegExp(def.secondParse, 'gi')); subres = XRegExp.exec(name, XRegExp(def.secondParse, 'gi'));
name = subres.name.trim(); name = subres.name.trim();
value = XRegExp.replace(subres.value, "(", "");
value = XRegExp.replace(subres.value, ")", "");
} }
if (def.name == 'trait') { if (def.name == 'trait') {
try { try {
@ -224,19 +235,17 @@ export default async function statParserFR( statString, type = "npc") {
} }
catch { } catch { }
if (itemFound && subres && subres.value.length > 0) { if (itemFound && subres && subres.value.length > 0) {
subres.value = XRegExp.replace(subres.value, "(", ""); itemFound.data.data.specification.value = game.i18n.localize(value);
subres.value = XRegExp.replace(subres.value, ")", "");
itemFound.data.data.specification.value = game.i18n.localize( subres.value);
} }
if (!itemFound) if (!itemFound)
ui.notifications.error("Trait non trouvé, à ajouter manuellemen : " + name, { permanent: true }) ui.notifications.error("Trait non trouvé, à ajouter manuellement : " + name, { permanent: true })
} else if (def.name == 'skill') { } else if (def.name == 'skill') {
try { try {
itemFound = await __findSkill(name); itemFound = await __findSkill(name, value);
} }
catch { } catch { }
if ( itemFound && subres && subres.value) { if (itemFound && subres && value) {
itemFound.data.data.advances.value = Number(subres.value) - Number(resCarac[itemFound.data.data.characteristic.value]); itemFound.data.data.advances.value = Number(value) - Number(model.characteristics[itemFound.data.data.characteristic.value].initial);
} }
if (!itemFound) if (!itemFound)
ui.notifications.error("Compétence non trouvée, à ajouter manuellement : " + name, { permanent: true }) ui.notifications.error("Compétence non trouvée, à ajouter manuellement : " + name, { permanent: true })
@ -245,8 +254,8 @@ export default async function statParserFR( statString, type = "npc") {
itemFound = await __findTalent(name); itemFound = await __findTalent(name);
} }
catch { } catch { }
if ( itemFound && subres && subres.value) if (itemFound && subres && value)
itemFound.data.data.advances.value = Number(subres.value); itemFound.data.data.advances.value = Number(value);
if (!itemFound) if (!itemFound)
ui.notifications.error("Talent non trouvé, à ajouter manuellement : " + name, { permanent: true }) ui.notifications.error("Talent non trouvé, à ajouter manuellement : " + name, { permanent: true })
} else if (def.name == 'trapping') { } else if (def.name == 'trapping') {
@ -255,7 +264,7 @@ export default async function statParserFR( statString, type = "npc") {
} }
catch { } catch { }
if (!itemFound) { if (!itemFound) {
itemFound = new game.wfrp4e.entities.ItemWfrp4e({ img: "systems/wfrp4e/icons/blank.png", name: name, type: "trapping", data: game.system.model.Item.trapping }) itemFound = new ItemWfrp4e({ img: "systems/wfrp4e/icons/blank.png", name: name, type: "trapping", data: game.system.model.Item.trapping })
itemFound.data.data.trappingType.value = "misc" itemFound.data.data.trappingType.value = "misc"
} }
} }
@ -270,7 +279,12 @@ export default async function statParserFR( statString, type = "npc") {
globalItemList = globalItemList.concat(moneyItems); globalItemList = globalItemList.concat(moneyItems);
//console.log("My liste :", globalItemList); //console.log("My liste :", globalItemList);
let name = pnjName; let name = pnjName;
return { name, type, data: model, items: globalItemList }
let effects = globalItemList.reduce((total, globItem) => total.concat(globItem.data.effects), [])
effects = effects.filter(e => !!e)
effects = effects.filter(e => e.transfer)
return { name, type, data: model, items: globalItemList, effects }
} }
// If the carac string has not been found // If the carac string has not been found

11
workspace.code-workspace Normal file
View File

@ -0,0 +1,11 @@
{
"folders": [
{
"path": "."
},
{
"path": "../WFRP4e-FoundryVTT"
}
],
"settings": {}
}