diff --git a/lang/de.json b/lang/de.json index f9d48db..7ceaf1c 100644 --- a/lang/de.json +++ b/lang/de.json @@ -278,13 +278,17 @@ "midgard5.spell-process-none": "Ohne", "midgard5.spell-process-beherrschen": "Beherrschen", "midgard5.spell-process-bewegen": "Bewegen", + "midgard5.spell-process-blutzauber": "Blutmagie", + "midgard5.spell-process-chaoswunder": "Chaoswunder", "midgard5.spell-process-erkennen": "Erkennen", "midgard5.spell-process-erschaffen": "Erschaffen", "midgard5.spell-process-formen": "Formen", + "midgard5.spell-process-finstere_magie": "Finstere Magie", "midgard5.spell-process-veraendern": "Verändern", "midgard5.spell-process-zerstoeren": "Zerstören", "midgard5.spell-process-wundertat": "Wundertat", "midgard5.spell-process-dweomer": "Dweomer", + "midgard5.spell-process-wilder_Dweomer": "Wilder Dweomer", "midgard5.spell-process-zauberlied": "Zauberlied", "midgard5.spell-process-salz": "Salz", "midgard5.spell-process-thaumagraphie": "Thaumagraphie", @@ -293,6 +297,8 @@ "midgard5.spell-process-thaumatherapie": "Thaumatherapie", "midgard5.spell-process-zaubermittel": "Zaubermittel", "midgard5.spell-process-zauberschutz": "Zauberschutz", + "midgard5.spell-process-zauberrunen": "Zauberrunen", + "midgard5.spell-process-zaubersiegel": "Zaubersiegel", "midgard5.spell-type-gedanke": "Gedanke", "midgard5.spell-type-geste": "Geste", @@ -310,6 +316,9 @@ "midgard5.spell-effectArea": "Wirkungsbereich", "midgard5.spell-effectDuration": "Wirkungsdauer", "midgard5.spell-origin": "Ursprung", + "midgard5.spell-agens": "Agens", + "midgard5.spell-reagens": "Reagens", + "midgard5.spell-material": "Zaubermaterial", "midgard5.kampfkunst-type": "Kampfkunst Art", "midgard5.kampfkunst-variante": "Kampfkunst Variante", diff --git a/source/module/actors/M5Character.ts b/source/module/actors/M5Character.ts index aacb4e6..5567e3c 100644 --- a/source/module/actors/M5Character.ts +++ b/source/module/actors/M5Character.ts @@ -531,6 +531,16 @@ export class M5Character extends Actor { pp: item.system.pp, calc: item.system.calc, } as M5SkillCalculated; + + // Adjust attribute Aussehen based on Athletik skill + if (item.name === "Athletik") { + ret.attributes.au.value += Math.floor(item.system.fw / 3); + }; + + // Adjust stat Bewegungsweite based on Laufen skill + if (item.name === "Laufen") { + ret.stats.movement.value += Math.floor(item.system.fw / 3); + } }); } diff --git a/source/module/sheets/M5CharacterSheet.ts b/source/module/sheets/M5CharacterSheet.ts index 1e9af95..322a39a 100644 --- a/source/module/sheets/M5CharacterSheet.ts +++ b/source/module/sheets/M5CharacterSheet.ts @@ -219,6 +219,54 @@ export default class M5CharacterSheet extends ActorSheet { }); }); + html.find(".fw-increase").on("click", async (event) => { + let row = event.target.parentElement; + let itemId = row.dataset["item"]; + while (!itemId) { + row = row.parentElement; + if (!row) return; + itemId = row.dataset["item"]; + } + + const context = this.actor as any; + const item = context.items.get(itemId); + if (!item.system.fw) { + item.system.fw = 0; + } + if (item.system.fw < 18) { + item.update({ + data: { + fw: Math.min(item.system.fw + 1, 18), + }, + }); + } + this.render(); + }); + + html.find(".fw-decrease").on("click", async (event) => { + let row = event.target.parentElement; + let itemId = row.dataset["item"]; + while (!itemId) { + row = row.parentElement; + if (!row) return; + itemId = row.dataset["item"]; + } + + const context = this.actor as any; + const item = context.items.get(itemId); + if (!item.system.fw) { + item.system.fw = 0; + } + if (item.system.fw > 8) { + item.update({ + data: { + fw: Math.max(item.system.fw - 1, 8), + }, + }); + } + this.render(); + }); + html.find(".roll-weapon-button").on("click", async (event) => { const row = event.target.parentElement.parentElement; let itemId = row.dataset["item"]; diff --git a/source/template.json b/source/template.json index 5dd1d3b..928e687 100644 --- a/source/template.json +++ b/source/template.json @@ -233,13 +233,17 @@ "none": "midgard5.spell-process-none", "beherrschen": "midgard5.spell-process-beherrschen", "bewegen": "midgard5.spell-process-bewegen", + "blutzauber": "midgard5.spell-process-blutzauber", + "chaoswunder": "midgard5.spell-process-chaoswunder", "erkennen": "midgard5.spell-process-erkennen", "erschaffen": "midgard5.spell-process-erschaffen", "formen": "midgard5.spell-process-formen", + "finstere_magie": "midgard5.spell-process-finstere_magie", "veraendern": "midgard5.spell-process-veraendern", "zerstoeren": "midgard5.spell-process-zerstoeren", "wundertat": "midgard5.spell-process-wundertat", "dweomer": "midgard5.spell-process-dweomer", + "wilder_dweomer": "midgard5.spell-process-wilder_dweomer", "zauberlied": "midgard5.spell-process-zauberlied", "salz": "midgard5.spell-process-salz", "thaumagraphie": "midgard5.spell-process-thaumagraphie", @@ -247,7 +251,9 @@ "nekromantie": "midgard5.spell-process-nekromantie", "thaumatherapie": "midgard5.spell-process-thaumatherapie", "zaubermittel": "midgard5.spell-process-zaubermittel", - "zauberschutz": "midgard5.spell-process-zauberschutz" + "zauberschutz": "midgard5.spell-process-zauberschutz", + "zauberrunen": "midgard5.spell-process-zauberrunen", + "zaubersiegel": "midgard5.spell-process-siegel" }, "spellTypeSelection": { "gedanke": "midgard5.spell-type-gedanke", @@ -401,12 +407,16 @@ "type": "", "process": "", "ap": "", + "lp": "", "castDuration": "", "range": "", "effectTarget": "", "effectArea": "", "effectDuration": "", "origin": "", + "agens": "", + "reagens": "", + "material": "", "rolls": { "formulas": { "0": { diff --git a/templates/chat/roll-m5.hbs b/templates/chat/roll-m5.hbs index 2c86da1..8e06f8e 100644 --- a/templates/chat/roll-m5.hbs +++ b/templates/chat/roll-m5.hbs @@ -9,6 +9,10 @@ {{localize "midgard5.actor-ap"}} {{i.ap}} + + {{localize "midgard5.actor-lp"}} + {{i.lp}} + {{localize "midgard5.spell-castDuration"}} {{i.castDuration}} @@ -41,6 +45,17 @@ {{localize "midgard5.spell-process"}} {{localize (m5concat "midgard5.spell-process-" i.process)}} + + {{localize "midgard5.spell-agens"}} + {{i.agens}} + + {{localize "midgard5.spell-reagens"}} + {{i.reagens}} + + + {{localize "midgard5.spell-material"}} + {{i.material}} + {{/if}} {{#if (eq iType "kampfkunst")}} diff --git a/templates/sheets/character/skills.hbs b/templates/sheets/character/skills.hbs index 15f9c72..78f6fad 100644 --- a/templates/sheets/character/skills.hbs +++ b/templates/sheets/character/skills.hbs @@ -63,7 +63,11 @@ {{#each data.calc.skills.general as |skill skillId|}} {{skill.label}} - {{skill.fw}} + + + {{skill.fw}} + + {{!-- {{{{skill.fw}}}} --}} {{skill.calc.bonus}} {{skill.calc.ew}} {{skill.pp}} diff --git a/templates/sheets/item/spell.hbs b/templates/sheets/item/spell.hbs index ef3d480..c8b4af0 100644 --- a/templates/sheets/item/spell.hbs +++ b/templates/sheets/item/spell.hbs @@ -9,8 +9,14 @@ {{localize "midgard5.bonus"}} + {{localize "midgard5.spell-material"}} + + + {{localize "midgard5.actor-ap"}} + {{localize "midgard5.actor-lp"}} + {{localize "midgard5.spell-castDuration"}} @@ -60,6 +66,12 @@ + + {{localize "midgard5.spell-agens"}} + + {{localize "midgard5.spell-reagens"}} + +