diff --git a/src/module/xml-import/xml-import.mjs b/src/module/xml-import/xml-import.mjs index b0e3e734..304c68c3 100644 --- a/src/module/xml-import/xml-import.mjs +++ b/src/module/xml-import/xml-import.mjs @@ -366,7 +366,7 @@ export class XmlImport { } } - async #addAdvantageFromCompendiumByNameToActor(advantageName, advantageValue, actor) { + async #addAdvantageFromCompendiumByNameToActor(advantageName, advantageValue, actor, advantageComment) { const compendiumOfAdvantages = game.packs.get('DSA_4-1.Advantage'); const advantageId = compendiumOfAdvantages.index.find(skill => skill.name.trim() === advantageName.trim()) if (advantageId) { @@ -375,7 +375,11 @@ export class XmlImport { try { const embeddedDocument = (await actor.createEmbeddedDocuments('Item', [advantage]))[0] - embeddedDocument.update({system: {value: advantageValue}}); + if (advantageComment) { + embeddedDocument.update({name: advantageName + " " + advantageComment, system: {name: advantageName + " " + advantageComment, value: advantageValue}}) + } else { + embeddedDocument.update({system: {value: advantageValue}}) + } } catch (error) { console.error(`${advantageName} not found in items`, error) } @@ -461,7 +465,11 @@ export class XmlImport { } for (let advantage in held.vt.vorteil) { advantage = held.vt.vorteil[advantage] - this.#addAdvantageFromCompendiumByNameToActor(advantage.name, advantage.value, actor) + if (advantage.value == null && advantage.auswahl) { + advantage.value = advantage.auswahl.find(a => a["position"] === "0").value + advantage.comment = advantage.auswahl.find(a => a["position"] === "1").value + } + this.#addAdvantageFromCompendiumByNameToActor(advantage.name, advantage.value, actor, advantage.comment) } } diff --git a/src/packs/_source/nachteile/vorurteile.json b/src/packs/_source/nachteile/vorurteile.json index 806f6afe..2965c96a 100644 --- a/src/packs/_source/nachteile/vorurteile.json +++ b/src/packs/_source/nachteile/vorurteile.json @@ -1,5 +1,5 @@ { - "name": "Vorurteile", + "name": "Vorurteile gegen", "value": "", "text": "", "nachteil": true, diff --git a/src/packs/_source/nachteile/weltfremd.json b/src/packs/_source/nachteile/weltfremd.json index dc2020cd..dcf2aafd 100644 --- a/src/packs/_source/nachteile/weltfremd.json +++ b/src/packs/_source/nachteile/weltfremd.json @@ -1,5 +1,5 @@ { - "name": "Weltfremd", + "name": "Weltfremd bzgl.", "value": "", "nachteil": true, "schlechteEigenschaft": true,