From f15a080d1b21e91d47990a01effa756e0bcebcaf Mon Sep 17 00:00:00 2001 From: LeFrique Date: Sun, 14 Apr 2024 18:05:06 +0200 Subject: [PATCH 1/5] ABW + Added Ausbrennwahrscheinlichkeit ABW to gear, weapons & armor + Fixed wrong translation of Tragkraft --- lang/de.json | 4 +++- source/module/actors/M5Character.ts | 4 ++++ source/template.json | 3 ++- templates/sheets/item/armor.hbs | 8 +++++++- templates/sheets/item/container.hbs | 10 ++++++++-- templates/sheets/item/defensiveWeapon.hbs | 8 +++++++- templates/sheets/item/item.hbs | 20 ++++++++++++-------- templates/sheets/item/weapon.hbs | 8 +++++++- 8 files changed, 50 insertions(+), 15 deletions(-) diff --git a/lang/de.json b/lang/de.json index c6cc2eb..c1eab7d 100644 --- a/lang/de.json +++ b/lang/de.json @@ -61,6 +61,8 @@ "item-ismagic": "Ist Magisch", "item-wealth": "Vermögenswert", "item-weight": "Gewicht", + "item-abw": "ABW", + "item-abw-long": "Ausbrennwahrscheinlichkeit", "actor-lp": "Lebenspunkte", "actor-lp-short": "LP", @@ -133,7 +135,7 @@ "heavy-load": "Schwere Last", "thrust-load": "Schublast", "load-max": "Höchstlast", - "load-capacity": "Tragkraft", + "capacity": "Tragkraft", "exp-overall": "Erfahrungsschatz", "exp-available": "Erfahrungspunkte", diff --git a/source/module/actors/M5Character.ts b/source/module/actors/M5Character.ts index 3f83d15..e534b2a 100644 --- a/source/module/actors/M5Character.ts +++ b/source/module/actors/M5Character.ts @@ -302,6 +302,7 @@ export class M5Character extends Actor { label: label, icon: icon, magic: item.system.magic, + abw: item.system.abw || 0, calc: item.system.calc, equipped: item.system?.equipped, valuable: item.system?.valuable, @@ -352,6 +353,7 @@ export class M5Character extends Actor { icon: item.img, skillId: item.system.skillId, magic: item.system.magic, + abw: item.system.abw || 0, valuable: item.system?.valuable, hoarded: item.system?.hoarded, value: item.system.value || 0, @@ -395,6 +397,7 @@ export class M5Character extends Actor { icon: item.img, skillId: item.system.skillId, magic: item.system.magic, + abw: item.system.abw || 0, valuable: item.system?.valuable, hoarded: item.system?.hoarded, value: item.system.value || 0, @@ -438,6 +441,7 @@ export class M5Character extends Actor { label: label, icon: item.img, magic: item.system.magic, + abw: item.system.abw || 0, valuable: item.system?.valuable, hoarded: item.system?.hoarded, value: item.system.value || 0, diff --git a/source/template.json b/source/template.json index ba41359..70984db 100644 --- a/source/template.json +++ b/source/template.json @@ -224,7 +224,8 @@ "weight": 0, "capacity": 0, "containerId": "", - "magic": false + "magic": false, + "abw": 0 }, "durationSelection": { "durationSelection": { diff --git a/templates/sheets/item/armor.hbs b/templates/sheets/item/armor.hbs index 6826f32..40bf142 100644 --- a/templates/sheets/item/armor.hbs +++ b/templates/sheets/item/armor.hbs @@ -51,9 +51,15 @@
{{localize "midgard5.item-weight"}} - +
+ +
+ {{localize "midgard5.item-abw"}} + +
+ diff --git a/templates/sheets/item/container.hbs b/templates/sheets/item/container.hbs index 13c1a87..9bd762e 100644 --- a/templates/sheets/item/container.hbs +++ b/templates/sheets/item/container.hbs @@ -18,6 +18,12 @@ + +
+ {{localize "midgard5.item-abw"}} + +
+ @@ -29,7 +35,7 @@
{{localize "midgard5.capacity"}} - +
@@ -51,7 +57,7 @@
{{localize "midgard5.item-weight"}} - +
diff --git a/templates/sheets/item/defensiveWeapon.hbs b/templates/sheets/item/defensiveWeapon.hbs index 26ad39d..9de5a35 100644 --- a/templates/sheets/item/defensiveWeapon.hbs +++ b/templates/sheets/item/defensiveWeapon.hbs @@ -55,9 +55,15 @@
{{localize "midgard5.item-weight"}} - +
+ +
+ {{localize "midgard5.item-abw"}} + +
+ diff --git a/templates/sheets/item/item.hbs b/templates/sheets/item/item.hbs index 1509b7d..6b34d6f 100644 --- a/templates/sheets/item/item.hbs +++ b/templates/sheets/item/item.hbs @@ -37,8 +37,6 @@ - -
{{localize "midgard5.item-value"}} @@ -53,6 +51,18 @@
+ +
+ {{localize "midgard5.item-weight"}} + +
+ + +
+ {{localize "midgard5.item-abw"}} + +
+ @@ -73,12 +83,6 @@ {{/if}} - -
- {{localize "midgard5.item-weight"}} - -
- diff --git a/templates/sheets/item/weapon.hbs b/templates/sheets/item/weapon.hbs index b1c2f79..dcda116 100644 --- a/templates/sheets/item/weapon.hbs +++ b/templates/sheets/item/weapon.hbs @@ -60,9 +60,15 @@
{{localize "midgard5.item-weight"}} - +
+ +
+ {{localize "midgard5.item-abw"}} + +
+ -- 2.40.1 From ac7301d1f26fd3f8736c6c0415e55f197fa15340 Mon Sep 17 00:00:00 2001 From: LeFrique Date: Wed, 17 Apr 2024 21:44:17 +0200 Subject: [PATCH 2/5] Tragkraft+Containerwert+KiDoPrep + Added red flag indicator when item weight in containers is above capacity + Added value count in containers + Added rank for spells and kido --- lang/de.json | 12 ++++++++---- source/module/actors/M5Character.ts | 1 + source/template.json | 4 +++- templates/sheets/character/gear.hbs | 8 ++++---- templates/sheets/item/container.hbs | 4 ++-- templates/sheets/item/item.hbs | 2 +- 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/lang/de.json b/lang/de.json index c1eab7d..35175bc 100644 --- a/lang/de.json +++ b/lang/de.json @@ -358,12 +358,13 @@ "spell-agens": "Agens", "spell-reagens": "Reagens", "spell-material": "Zaubermaterial", + "spell-rank": "Stufe", "kampfkunst-type": "Form", "kampfkunst-variante": "Variante", "kampfkunst-variante-short": "Var", "kampfkunst-ep": "Erfahrungspunkte", - "kampfkunst-rank": "Stufe", + "kampfkunst-rank": "Stufe der Technik", "kampfkunst-weapon": "Waffengruppe", "kampfkunst-enemy": "Einschränkungen durch Art der Gegner", @@ -387,6 +388,9 @@ "kido-variante": "KiDo Variante", "kido-color": "Kampfstilfarbe", "kido-style": "Art der Technik", + "kido-rank": "Stufe der Technik", + "kido-grade": "Ausbildungsgrad", + "kido-enemy": "Einschränkungen durch Art der Gegner", "kido-type-angriff": "Kido Angriff", "kido-type-verteidigung": "Kido Verteidigung", @@ -446,9 +450,9 @@ "reroll": "Neuwürfeln", "options": { - "modifier": "Modifikator", - "difficulty": "Schwellenwert", - "rollMode": "Würfel Modus" + "modifier": "Wurfmodifikator", + "difficulty": "Erfolgswert", + "rollMode": "Würfelmodus" } } } diff --git a/source/module/actors/M5Character.ts b/source/module/actors/M5Character.ts index e534b2a..5f42cdc 100644 --- a/source/module/actors/M5Character.ts +++ b/source/module/actors/M5Character.ts @@ -280,6 +280,7 @@ export class M5Character extends Actor { if (!!item.system.containerId) { ret.gear.containers[item.system.containerId].weight += parseFloat((item.system.weight * item.system.quantity).toPrecision(4)); + ret.gear.containers[item.system.containerId].value += parseFloat(this.calculateValue(item.system.value * item.system.quantity, item.system.currency).toPrecision(3)); if (ret.gear.containers[item.system.containerId].equipped) { ret.stats.encumbrance += item.system.weight * item.system.quantity; } diff --git a/source/template.json b/source/template.json index 70984db..7b1d979 100644 --- a/source/template.json +++ b/source/template.json @@ -439,6 +439,7 @@ "agens": "", "reagens": "", "material": "", + "rank": 0, "rolls": { "formulas": { "0": { @@ -460,10 +461,11 @@ "ap": "", "weapon": "", "ep": "", - "rank": "", + "rank": 0, "enemy": "", "color": "", "style": "", + "grade": "", "rolls": { "formulas": { "0": { diff --git a/templates/sheets/character/gear.hbs b/templates/sheets/character/gear.hbs index c36ef5f..faf4de1 100644 --- a/templates/sheets/character/gear.hbs +++ b/templates/sheets/character/gear.hbs @@ -251,13 +251,13 @@ {{/unless}} - {{#unless (or (eq item.weight "") (eq item.equipped?))}} - {{item.weight}} kg + {{#unless (or (eq item.weight 0) (eq item.equipped?))}} + {{item.weight}}kg {{/unless}} - {{#unless (eq item.capacity "")}} - {{item.capacity}} kg + {{#unless (eq item.capacity 0)}} + {{item.capacity}}kg {{/unless}} diff --git a/templates/sheets/item/container.hbs b/templates/sheets/item/container.hbs index 9bd762e..78c1458 100644 --- a/templates/sheets/item/container.hbs +++ b/templates/sheets/item/container.hbs @@ -35,7 +35,7 @@
{{localize "midgard5.capacity"}} - +
@@ -57,7 +57,7 @@
{{localize "midgard5.item-weight"}} - +
diff --git a/templates/sheets/item/item.hbs b/templates/sheets/item/item.hbs index 6b34d6f..e64b2db 100644 --- a/templates/sheets/item/item.hbs +++ b/templates/sheets/item/item.hbs @@ -54,7 +54,7 @@
{{localize "midgard5.item-weight"}} - +
-- 2.40.1 From c545ee363dec68da33bf4d72e2bfd67f8a1f1df1 Mon Sep 17 00:00:00 2001 From: LeFrique Date: Wed, 17 Apr 2024 22:07:12 +0200 Subject: [PATCH 3/5] Bonus KiDo-Update + Added KiDo-Values to item --- templates/sheets/item/kampfkunst.hbs | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/templates/sheets/item/kampfkunst.hbs b/templates/sheets/item/kampfkunst.hbs index 962dd93..d50e049 100644 --- a/templates/sheets/item/kampfkunst.hbs +++ b/templates/sheets/item/kampfkunst.hbs @@ -25,8 +25,10 @@ {{localize "midgard5.kampfkunst-ep"}} + {{#unless item.system.isKido}} {{localize "midgard5.kampfkunst-rank"}} - + + {{/unless}} {{localize "midgard5.kampfkunst-weapon"}} @@ -83,6 +85,20 @@ {{/unless}} {{/unless}} + {{#if item.system.isKido}} + + {{localize "midgard5.kido-color"}} + + {{localize "midgard5.kido-style"}} + + + + {{localize "midgard5.kido-grade"}} + + {{localize "midgard5.kido-rank"}} + + + {{/if}} {{localize "midgard5.skill"}} -- 2.40.1 From 03064b31491a0946ce4e93b1d078195e62f561a1 Mon Sep 17 00:00:00 2001 From: LeFrique Date: Sat, 20 Apr 2024 17:07:07 +0200 Subject: [PATCH 4/5] KiDo-Finte+Rolls + Fixed KiDo-Var-Finte + Fixed ChatRoll for KiDo --- lang/de.json | 2 ++ source/template.json | 3 ++- templates/chat/roll-m5.hbs | 12 ++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lang/de.json b/lang/de.json index 35175bc..b0fa166 100644 --- a/lang/de.json +++ b/lang/de.json @@ -391,6 +391,7 @@ "kido-rank": "Stufe der Technik", "kido-grade": "Ausbildungsgrad", "kido-enemy": "Einschränkungen durch Art der Gegner", + "kido-weapon": "Waffengruppe", "kido-type-angriff": "Kido Angriff", "kido-type-verteidigung": "Kido Verteidigung", @@ -405,6 +406,7 @@ "kido-variante-blockieren": "Blockieren", "kido-variante-bewegen": "Bewegen", "kido-variante-kontrollieren": "Kontrollieren", + "kido-variante-finte": "Finte", "mod-operation-add100": "Addieren (max 100)", "mod-operation-roll": "Wurf Modifikation", diff --git a/source/template.json b/source/template.json index 7b1d979..cd2fc5d 100644 --- a/source/template.json +++ b/source/template.json @@ -315,7 +315,8 @@ "ausweichen": "midgard5.kido-variante-ausweichen", "blockieren": "midgard5.kido-variante-blockieren", "bewegen": "midgard5.kido-variante-bewegen", - "kontrollieren": "midgard5.kido-variante-kontrollieren" + "kontrollieren": "midgard5.kido-variante-kontrollieren", + "finte": "midgard5.kido-variante-finte" } } }, diff --git a/templates/chat/roll-m5.hbs b/templates/chat/roll-m5.hbs index 9e516fd..7636f52 100644 --- a/templates/chat/roll-m5.hbs +++ b/templates/chat/roll-m5.hbs @@ -94,31 +94,31 @@ {{i.ep}} - {{localize "midgard5.kampfkunst-color"}} + {{localize "midgard5.kido-color"}} {{i.color}} - {{localize "midgard5.kampfkunst-style"}} + {{localize "midgard5.kido-style"}} {{i.style}} {{localize "midgard5.kido-type"}} {{localize (m5concat "midgard5.kido-type-" i.type)}} - {{#if (eq i.type "angriff")}} + {{!--{{#if (eq i.type "angriff")}}--}} {{localize "midgard5.kido-variante"}} {{localize (m5concat "midgard5.kido-variante-" i.variante)}} - {{localize "midgard5.kampfkunst-enemy"}} + {{localize "midgard5.kido-enemy"}} {{i.enemy}} - {{localize "midgard5.kampfkunst-weapon"}} + {{localize "midgard5.kido-weapon"}} {{i.weapon}} - {{/if}} + {{!--{{/if}}--}} {{/unless}} {{/if}} -- 2.40.1 From a4df79a538e41369d7748d67507a80ec36b40359 Mon Sep 17 00:00:00 2001 From: LeFrique Date: Sun, 28 Apr 2024 14:00:39 +0200 Subject: [PATCH 5/5] Fixed difficulty + comments + Changed Erfolgswert to Erfolg gem. KOD S. 50 + Deleted comments in roll-m5.hbs. --- lang/de.json | 2 +- templates/chat/roll-m5.hbs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lang/de.json b/lang/de.json index b0fa166..a12db20 100644 --- a/lang/de.json +++ b/lang/de.json @@ -453,7 +453,7 @@ "options": { "modifier": "Wurfmodifikator", - "difficulty": "Erfolgswert", + "difficulty": "Erfolg", "rollMode": "Würfelmodus" } } diff --git a/templates/chat/roll-m5.hbs b/templates/chat/roll-m5.hbs index 7636f52..ccbbb64 100644 --- a/templates/chat/roll-m5.hbs +++ b/templates/chat/roll-m5.hbs @@ -105,7 +105,6 @@ {{localize "midgard5.kido-type"}} {{localize (m5concat "midgard5.kido-type-" i.type)}} - {{!--{{#if (eq i.type "angriff")}}--}} {{localize "midgard5.kido-variante"}} {{localize (m5concat "midgard5.kido-variante-" i.variante)}} @@ -118,7 +117,6 @@ {{localize "midgard5.kido-weapon"}} {{i.weapon}} - {{!--{{/if}}--}} {{/unless}} {{/if}} -- 2.40.1