From 43375a19c8cc8a94d9b71a45a3e25546917a3802 Mon Sep 17 00:00:00 2001 From: LeFrique Date: Thu, 14 Mar 2024 11:35:26 +0100 Subject: [PATCH] Kampfkunstupdate (#86) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + Added more types & variants + Modified Kampfkunstitem, Combatsheet and rollmessage Hab grad die Kampfkünste in der extension anscheinend direkt nach develop durchgepusht ohne meine kampfkunstbranch dazwischen, hier dann auch die Anpassungen im System dafür. Läuft beides bei mir rund. Reviewed-on: https://git.byroks.de/MidgardVTT-Entwicklung/foundry-vtt-system-midgard5/pulls/86 Reviewed-by: oskaloq Co-authored-by: LeFrique Co-committed-by: LeFrique --- lang/de.json | 35 +++++++++++++++------- source/template.json | 15 ++++++++-- templates/chat/roll-m5.hbs | 42 +++++++++++++++++++++++---- templates/sheets/character/combat.hbs | 4 +-- templates/sheets/item/kampfkunst.hbs | 14 +++++++-- 5 files changed, 86 insertions(+), 24 deletions(-) diff --git a/lang/de.json b/lang/de.json index bd65e5d..327c633 100644 --- a/lang/de.json +++ b/lang/de.json @@ -326,26 +326,39 @@ "midgard5.spell-reagens": "Reagens", "midgard5.spell-material": "Zaubermaterial", - "midgard5.kampfkunst-type": "Kampfkunst Art", - "midgard5.kampfkunst-variante": "Kampfkunst Variante", + "midgard5.kampfkunst-type": "Form", + "midgard5.kampfkunst-variante": "Variante", "midgard5.kampfkunst-variante-short": "Var", - "midgard5.kido-type": "Kido Art", - "midgard5.kido-variante": "Kido Variante", + "midgard5.kampfkunst-ep": "Erfahrungspunkte", + "midgard5.kampfkunst-rank": "Stufe", + "midgard5.kampfkunst-weapon": "Waffengruppe", + "midgard5.kampfkunst-enemy": "Einschränkungen durch Art der Gegner", - "midgard5.kampfkunst-type-angriff": "Angriffstechnik", - "midgard5.kampfkunst-type-verteidigung": "Verteidigungstechnik", + "midgard5.kampfkunst-type-angriff": "Angriff", + "midgard5.kampfkunst-type-verteidigung": "Verteidigung", "midgard5.kampfkunst-type-finte": "Finte", "midgard5.kampfkunst-type-geist": "Geistestechnik", "midgard5.kampfkunst-type-schießkunst": "Schießkunst", - "midgard5.kampfkunst-type-fechten": "Fechtkunst", - "midgard5.kido-type-angriff": "Kido Angriffstechnik", - "midgard5.kido-type-verteidigung": "Kido Verteidigungstechnik", - "midgard5.kido-type-finte": "Kido Finte", - "midgard5.kido-type-leib": "Kido Leibestechnik", + "midgard5.kampfkunst-type-fechtkunst": "Fechtkunst", "midgard5.kampfkunst-variante-anstuermen": "Anstürmen", "midgard5.kampfkunst-variante-attackieren": "Attackieren", "midgard5.kampfkunst-variante-entwaffnen": "Entwaffnen", + "midgard5.kampfkunst-variante-fechten": "Fechten", + "midgard5.kampfkunst-variante-schusstechnik": "Schusstechnik", + "midgard5.kampfkunst-variante-finten": "Finten", + "midgard5.kampfkunst-variante-geistestechnik": "Geistestechnik", + "midgard5.kampfkunst-variante-verteidigung": "Verteidigung", + + "midgard5.kido-type": "KiDo Form", + "midgard5.kido-variante": "KiDo Variante", + "midgard5.kido-color": "Kampfstilfarbe", + "midgard5.kido-style": "Art der Technik", + + "midgard5.kido-type-angriff": "Kido Angriff", + "midgard5.kido-type-verteidigung": "Kido Verteidigung", + "midgard5.kido-type-finte": "Kido Finte", + "midgard5.kido-type-leib": "Kido Leibestechnik", "midgard5.kido-variante-anspringen": "Anspringen", "midgard5.kido-variante-attackieren": "Attackieren", diff --git a/source/template.json b/source/template.json index de65935..ddf875d 100644 --- a/source/template.json +++ b/source/template.json @@ -274,7 +274,7 @@ "finte": "midgard5.kampfkunst-type-finte", "geist": "midgard5.kampfkunst-type-geist", "schießkunst": "midgard5.kampfkunst-type-schießkunst", - "fechten": "midgard5.kampfkunst-type-fechten" + "fechtkunst": "midgard5.kampfkunst-type-fechtkunst" }, "kidoTypeSelection": { "angriff": "midgard5.kido-type-angriff", @@ -285,7 +285,12 @@ "kampfkunstVarianteSelection": { "anstuermen": "midgard5.kampfkunst-variante-anstuermen", "attackieren": "midgard5.kampfkunst-variante-attackieren", - "entwaffnen": "midgard5.kampfkunst-variante-entwaffnen" + "entwaffnen": "midgard5.kampfkunst-variante-entwaffnen", + "fechten": "midgard5.kampfkunst-variante-fechten", + "schusstechnik": "midgard5.kampfkunst-variante-schusstechnik", + "finten": "midgard5.kampfkunst-variante-finten", + "geistestechnik": "midgard5.kampfkunst-variante-geistestechnik", + "verteidigung": "midgard5.kampfkunst-variante-verteidigung" }, "kidoVarianteSelection": { "none": "midgard5.spell-process-none", @@ -437,6 +442,12 @@ "variante": "", "isKido": false, "ap": "", + "weapon": "", + "ep": "", + "rank": "", + "enemy": "", + "color": "", + "style": "", "rolls": { "formulas": { "0": { diff --git a/templates/chat/roll-m5.hbs b/templates/chat/roll-m5.hbs index 8e06f8e..1613af5 100644 --- a/templates/chat/roll-m5.hbs +++ b/templates/chat/roll-m5.hbs @@ -64,21 +64,43 @@ {{localize "midgard5.actor-ap"}} {{i.ap}} + + {{localize "midgard5.kampfkunst-ep"}} + {{i.ep}} + {{localize "midgard5.kampfkunst-type"}} {{localize (m5concat "midgard5.kampfkunst-type-" i.type)}} - {{#if (eq i.type "angriff")}} - - {{localize "midgard5.kampfkunst-variante"}} - {{localize (m5concat "midgard5.kampfkunst-variante-" i.variante)}} - - {{/if}} + + {{localize "midgard5.kampfkunst-variante"}} + {{localize (m5concat "midgard5.kampfkunst-variante-" i.variante)}} + + + {{localize "midgard5.kampfkunst-enemy"}} + {{i.enemy}} + + + {{localize "midgard5.kampfkunst-weapon"}} + {{i.weapon}} + {{else}} {{localize "midgard5.actor-ap"}} {{i.ap}} + + {{localize "midgard5.kampfkunst-ep"}} + {{i.ep}} + + + {{localize "midgard5.kampfkunst-color"}} + {{i.color}} + + + {{localize "midgard5.kampfkunst-style"}} + {{i.style}} + {{localize "midgard5.kido-type"}} {{localize (m5concat "midgard5.kido-type-" i.type)}} @@ -88,6 +110,14 @@ {{localize "midgard5.kido-variante"}} {{localize (m5concat "midgard5.kido-variante-" i.variante)}} + + {{localize "midgard5.kampfkunst-enemy"}} + {{i.enemy}} + + + {{localize "midgard5.kampfkunst-weapon"}} + {{i.weapon}} + {{/if}} {{/unless}} {{/if}} diff --git a/templates/sheets/character/combat.hbs b/templates/sheets/character/combat.hbs index 44abf11..d2a38f2 100644 --- a/templates/sheets/character/combat.hbs +++ b/templates/sheets/character/combat.hbs @@ -112,9 +112,7 @@ {{/unless}} {{else}} {{localize (m5concat "midgard5.kampfkunst-type-" item.type)}} - {{#if (eq item.type "angriff")}} - ({{localize (m5concat "midgard5.kampfkunst-variante-" item.variante)}}) - {{/if}} + ({{localize (m5concat "midgard5.kampfkunst-variante-" item.variante)}}) {{/if}} {{item.calc.ew}} diff --git a/templates/sheets/item/kampfkunst.hbs b/templates/sheets/item/kampfkunst.hbs index d97e4ba..962dd93 100644 --- a/templates/sheets/item/kampfkunst.hbs +++ b/templates/sheets/item/kampfkunst.hbs @@ -22,6 +22,18 @@ {{localize "midgard5.actor-ap"}} + + {{localize "midgard5.kampfkunst-ep"}} + + {{localize "midgard5.kampfkunst-rank"}} + + + + {{localize "midgard5.kampfkunst-weapon"}} + + {{localize "midgard5.kampfkunst-enemy"}} + + {{#unless item.system.isKido}} {{localize "midgard5.kampfkunst-type"}} @@ -47,7 +59,6 @@ {{/unless}} {{#unless item.system.isKido}} - {{#if (eq item.system.type "angriff")}} {{localize "midgard5.kampfkunst-variante"}} - {{/if}} {{else}} {{#unless (eq item.system.type "finte")}} {{localize "midgard5.kido-variante"}}