From 719e571b21f44c8bbb918e8dea9a968fcff4b3c8 Mon Sep 17 00:00:00 2001
From: macniel <yuna.baehr@proton.me>
Date: Sun, 12 Oct 2025 19:09:19 +0200
Subject: [PATCH] fixes dice formula for AT, FKAT and PA rolls. Also adds
 Damage formula on the equipped items.

---
 src/module/sheets/characterSheet.mjs          | 26 ++++++++++++-------
 src/templates/actor/actor-character-sheet.hbs |  8 ++++++
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/module/sheets/characterSheet.mjs b/src/module/sheets/characterSheet.mjs
index da3f6dc4..7a626b42 100644
--- a/src/module/sheets/characterSheet.mjs
+++ b/src/module/sheets/characterSheet.mjs
@@ -383,8 +383,10 @@ export class CharacterSheet extends ActorSheet {
                 context.attacks.push({
                     name: obj.name,
                     using: fernkampf.name,
-                    atroll: `1d20 + ${this.object.system.fk.aktuell + obj.system.at}`,
-                    at: `1w20 + ${this.object.system.fk.aktuell + obj.system.at}`,
+                    atroll: `1d20cs<${this.object.system.fk.aktuell + obj.system.at}`,
+                    at: `${this.object.system.fk.aktuell + obj.system.at}`,
+                    tproll: `${fernkampf.system.rangedAttackDamage}`, // TODO consider adding TP/KK mod and Range mod
+                    tp: `${fernkampf.system.rangedAttackDamage}`,
                     iniroll: `(${context.inidice})d6 + ${context.inivalue + fernkampf.system.iniModifier ?? 0}`,
                     ini: `${context.inidice}w6 + ${context.inivalue + fernkampf.system.iniModifier ?? 0}`,
                 })
@@ -397,10 +399,12 @@ export class CharacterSheet extends ActorSheet {
                 context.attacks.push({
                     name: obj.name,
                     using: links.name,
-                    atroll: `1d20 + ${this.object.system.at.links.aktuell + obj.system.at + links.system.attackModifier}`,
-                    at: `1w20 + ${this.object.system.at.links.aktuell + obj.system.at + links.system.attackModifier}`,
-                    paroll: `1d20 + ${this.object.system.pa.links.aktuell + obj.system.pa + links.system.parryModifier}`,
-                    pa: `1w20 + ${this.object.system.pa.links.aktuell + obj.system.pa + links.system.parryModifier}`,
+                    atroll: `1d20cs<${this.object.system.at.links.aktuell + obj.system.at + links.system.attackModifier}`, // TODO consider adding W/M
+                    at: `${this.object.system.at.links.aktuell + obj.system.at + links.system.attackModifier}`,
+                    paroll: `1d20cs<${this.object.system.pa.links.aktuell + obj.system.pa + links.system.parryModifier}`, // TODO consider adding W/M
+                    pa: `${this.object.system.pa.links.aktuell + obj.system.pa + links.system.parryModifier}`,
+                    tproll: `${links.system.meleeAttackDamage}`, // TODO consider adding TP/KK mod
+                    tp: `${links.system.meleeAttackDamage}`,
                     iniroll: `(${context.inidice})d6 + ${context.inivalue + links.system.iniModifier ?? 0}`,
                     ini: `${context.inidice}w6 + ${context.inivalue + links.system.iniModifier ?? 0}`,
                 })
@@ -414,10 +418,12 @@ export class CharacterSheet extends ActorSheet {
                 context.attacks.push({
                     name: obj.name,
                     using: rechts.name,
-                    atroll: `1d20 + ${this.object.system.at.rechts.aktuell + obj.system.at + rechts.system.attackModifier}`,
-                    at: `1w20 + ${this.object.system.at.rechts.aktuell + obj.system.at + rechts.system.attackModifier}`,
-                    paroll: `1d20 + ${this.object.system.pa.rechts.aktuell + obj.system.pa + rechts.system.parryModifier}`,
-                    pa: `1w20 + ${this.object.system.pa.rechts.aktuell + obj.system.pa + rechts.system.parryModifier}`,
+                    atroll: `1d20cs<${this.object.system.at.rechts.aktuell + obj.system.at + rechts.system.attackModifier}`,  // TODO consider adding W/M
+                    at: `${this.object.system.at.rechts.aktuell + obj.system.at + rechts.system.attackModifier}`,
+                    paroll: `1d20cs<${this.object.system.pa.rechts.aktuell + obj.system.pa + rechts.system.parryModifier}`,  // TODO consider adding W/M
+                    pa: `${this.object.system.pa.rechts.aktuell + obj.system.pa + rechts.system.parryModifier}`,
+                    tproll: `${rechts.system.meleeAttackDamage}`, // TODO consider adding TP/KK mod
+                    tp: `${rechts.system.meleeAttackDamage}`,
                     iniroll: `(${context.inidice})d6 + ${context.inivalue + rechts.system.iniModifier ?? 0}`,
                     ini: `${context.inidice}w6 + ${context.inivalue + rechts.system.iniModifier ?? 0}`,
                 })
diff --git a/src/templates/actor/actor-character-sheet.hbs b/src/templates/actor/actor-character-sheet.hbs
index 1929a542..6d2597d5 100644
--- a/src/templates/actor/actor-character-sheet.hbs
+++ b/src/templates/actor/actor-character-sheet.hbs
@@ -43,6 +43,7 @@
         {{#each attacks}}
             <div>
                 <h3>{{this.using}} ({{this.name}})</h3>
+                <div class="combined">
                 {{#if this.at}}
                     <div class="sidebar-element rollable" data-roll="{{this.atroll}}" data-label="Attacke">
                         <label>AT</label>
@@ -55,6 +56,13 @@
                         <div class="formula">{{this.pa}}</div>
                     </div>
                 {{/if}}
+                </div>
+                {{#if this.at}}
+                    <div class="sidebar-element rollable" data-roll="{{this.tproll}}" data-label="Schaden">
+                        <label>Schaden</label>
+                        <div class="formula">{{this.tp}}</div>
+                    </div>
+                {{/if}}
                 {{#if this.ini}}
                     <div class="sidebar-element rollable" data-label="Initiative" data-roll="{{this.iniroll}}"><label>Initiative</label>
                         <div class="formula">{{this.ini}}</div>