diff --git a/compendium/To Do/wfrp4e-core.items-with-effects.json b/compendium/To Do/wfrp4e-core.items-with-effects.json index 77f980a..73f5f1e 100644 --- a/compendium/To Do/wfrp4e-core.items-with-effects.json +++ b/compendium/To Do/wfrp4e-core.items-with-effects.json @@ -23,7 +23,7 @@ "Lore of Shadow": "Lehre der Schatten", "Lore of Witchcraft": "Lehre der Hexerei", "Petty Spells": "Niedere Magie", - "Trappings": "Gegenstände", + "Trappings": "Ausrüstung", "Ammunition": "Munition", "Armour": "Rüstung", "Books and Documents": "Bücher und Dokumente", diff --git a/compendium/wfrp4e-up-in-arms.items.json b/compendium/wfrp4e-up-in-arms.items.json index 8e9728a..79d31e2 100644 --- a/compendium/wfrp4e-up-in-arms.items.json +++ b/compendium/wfrp4e-up-in-arms.items.json @@ -1,5 +1,5 @@ { - "label": "Gegenstände (Up in Arms)", + "label": "Items (Up in Arms)", "folders": { "Ammunition": "Munition", "Careers": "Karrieren", @@ -7,7 +7,7 @@ "Prayers": "Gebete", "Skills": "Fertigkeiten", "Spells": "Zauber", - "Trappings": "Gegenstände", + "Trappings": "Ausrüstung", "Weapons": "Waffen" }, "mapping": { diff --git a/compendium/To Do/wfrp4e-zoo.items.json b/compendium/wfrp4e-zoo.items.json similarity index 94% rename from compendium/To Do/wfrp4e-zoo.items.json rename to compendium/wfrp4e-zoo.items.json index 98076c3..bcefb97 100644 --- a/compendium/To Do/wfrp4e-zoo.items.json +++ b/compendium/wfrp4e-zoo.items.json @@ -1,11 +1,11 @@ { "label": "Items (Imperial Zoo)", "folders": { - "Ammunition": "Munitions", - "Careers": "Carrières", - "Prayers": "Prières", - "Trappings": "Possessions", - "Weapons": "Armes" + "Ammunition": "Munition", + "Careers": "Karrieren", + "Prayers": "Gebete", + "Trappings": "Ausrüstung", + "Weapons": "Waffen" }, "mapping": { "description": "system.description.value", diff --git a/de.json b/de.json index 1841f49..0c598f7 100644 --- a/de.json +++ b/de.json @@ -1255,7 +1255,7 @@ "SHEET.NewCritical": "Neue kritische Verletzung", "SHEET.NewExtendedTest": "Neuer erweiterter Wurf", "SHEET.NewInjury": "Neue Verletzung", - "SHEET.NewTrapping": "Neuer Besitz", + "SHEET.NewTrapping": "Neue Ausrüstung", "SHEET.NonCurrentCareer": "Dies ist nicht Ihre aktuelle Karriere.", "SHEET.Offhand": "Nebenhand", "SHEET.PassiveEffects": "Passive Effekte", @@ -1362,7 +1362,7 @@ "Trait": "Eigenschaften", "Traits": "Eigenschaften", "TrapBlade": "Klingenfänger", - "Trappings": "Besitz", + "Trappings": "Ausrüstung", "TRAVEL.DangerHigh": "hoch", "TRAVEL.DangerLow": "gering", "TRAVEL.DangerMedium": "mittel", diff --git a/modules/addon-register.js b/modules/addon-register.js index 2b0bae6..59263a9 100644 --- a/modules/addon-register.js +++ b/modules/addon-register.js @@ -141,7 +141,7 @@ let __wfrp4e_tables = { } let __to_table_translate = [{ name: "traits", transl: "Eigenschaften" }, { name: "talents", transl: "Talente" }, { name: "skills", transl: "Fähigkeiten" }, { name: "careers", transl: "Karrieren" }, { name: "spells", transl: "Zauber" }, { name: "prayers", transl: "Gebete und Wunder" }, -{ name: "injuries", transl: "Verletzungen" }, { name: "criticals", transl: "Kritische Treffer" }, { name: "trappings", transl: "Gegenstände" }, +{ name: "injuries", transl: "Verletzungen" }, { name: "criticals", transl: "Kritische Treffer" }, { name: "trappings", transl: "Ausrüstung" }, { name: "bestiary", transl: "Bestiarium" }, { name: "diseases", transl: "Krankheiten" } ] diff --git a/modules/import-stat-2.js b/modules/import-stat-2.js index e5b0129..c33b299 100644 --- a/modules/import-stat-2.js +++ b/modules/import-stat-2.js @@ -44,11 +44,11 @@ const fr_carac = 'm\\s+cc\\s+ct\\s+f\\s+e\\s+i\\s+agi?\\s+dex\\s+int\\s+fm\\s+so const carac_val = '(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-]+)\\s+(?[0-9\\-\*]+)'; const name_val = '(?[a-zA-Zéèêâôïäüù\\s\\-,\']*)[\\s\\r\\na-zA-Zéèêâôïäüù]*(?.*|[\\(\\)a-z0-9]+)'; let sectionDataFR = [ - { name: "trait", toFind: "Traits\\s*:", secondParse: '(?[a-zöàéè\\s]*)[\\s\\+]*(?.*|[\\+0-9]+)', index: -1 }, - { name: "skill", toFind: "Compétences\\s*:", secondParse: '(?[a-zàéè\\s\\(\\)]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, - { name: "talent", toFind: "Talents\\s*:", secondParse: '(?[a-zöàéè\\-\\!\\(\\)\\s\\/\'’]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, - { name: "mutation", toFind: "Mutations\\s*:", secondParse: '(?[a-zöàéè\\s]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, - { name: "trapping", toFind: "Equipement\\s*:", secondParse: '(?[a-zöàéè0-9\\s(\\)\\-]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, + { name: "trait", toFind: "Eigenschaften\\s*:", secondParse: '(?[a-zöàéè\\s]*)[\\s\\+]*(?.*|[\\+0-9]+)', index: -1 }, + { name: "skill", toFind: "Fähigkeiten\\s*:", secondParse: '(?[a-zàéè\\s\\(\\)]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, + { name: "talent", toFind: "Talente\\s*:", secondParse: '(?[a-zöàéè\\-\\!\\(\\)\\s\\/\'’]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, + { name: "mutation", toFind: "Mutationen\\s*:", secondParse: '(?[a-zöàéè\\s]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, + { name: "trapping", toFind: "Ausrüstung\\s*:", secondParse: '(?[a-zöàéè0-9\\s(\\)\\-]*)[\\s\\+]*(?.*|[0-9]+)', index: -1 }, { name: "spell", toFind: "Sorts\\s*\\([a-z\\s]*\\)*:", secondParse: '(?[a-zöàéè\\s]*)', index: -1 }, { name: "spellpetty", toFind: "Spells\\s*\\(Magie Mineure\\)*:", secondParse: '(?[a-zö\\-\\s]*)', index: -1 }, { name: "spellarcane", toFind: "Spells\\s*\\(Arcane[a-z\\s]*\\)*:", secondParse: '(?[a-zö\\-\\s]*)', index: -1 },