macniel
/
foundry-dsa41-game
2
1
Fork 0
Code Issues 13 Pull Requests Actions Packages Projects 1 Releases 19 Wiki Activity

fixes dice formula for AT, FKAT and PA rolls. Also adds Damage formula on the equipped items.

pull/58/head
macniel 2025-10-12 19:09:19 +02:00
parent 5275a59b70
commit 719e571b21
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/module/sheets/characterSheet.mjs
View File

@ -383,8 +383,10 @@ export class CharacterSheet extends ActorSheet {
context.attacks.push({ context.attacks.push({
name: obj.name, name: obj.name,
using: fernkampf.name, using: fernkampf.name,
atroll: `1d20 + ${this.object.system.fk.aktuell + obj.system.at}`, atroll: `1d20cs<${this.object.system.fk.aktuell + obj.system.at}`,
at: `1w20 + ${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}`, iniroll: `(${context.inidice})d6 + ${context.inivalue + fernkampf.system.iniModifier ?? 0}`,
ini: `${context.inidice}w6 + ${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({ context.attacks.push({
name: obj.name, name: obj.name,
using: links.name, using: links.name,
atroll: `1d20 + ${this.object.system.at.links.aktuell + obj.system.at + links.system.attackModifier}`, atroll: `1d20cs<${this.object.system.at.links.aktuell + obj.system.at + links.system.attackModifier}`, // TODO consider adding W/M
at: `1w20 + ${this.object.system.at.links.aktuell + obj.system.at + links.system.attackModifier}`, at: `${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}`, paroll: `1d20cs<${this.object.system.pa.links.aktuell + obj.system.pa + links.system.parryModifier}`, // TODO consider adding W/M
pa: `1w20 + ${this.object.system.pa.links.aktuell + obj.system.pa + links.system.parryModifier}`, 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}`, iniroll: `(${context.inidice})d6 + ${context.inivalue + links.system.iniModifier ?? 0}`,
ini: `${context.inidice}w6 + ${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({ context.attacks.push({
name: obj.name, name: obj.name,
using: rechts.name, using: rechts.name,
atroll: `1d20 + ${this.object.system.at.rechts.aktuell + obj.system.at + rechts.system.attackModifier}`, atroll: `1d20cs<${this.object.system.at.rechts.aktuell + obj.system.at + rechts.system.attackModifier}`, // TODO consider adding W/M
at: `1w20 + ${this.object.system.at.rechts.aktuell + obj.system.at + rechts.system.attackModifier}`, at: `${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}`, paroll: `1d20cs<${this.object.system.pa.rechts.aktuell + obj.system.pa + rechts.system.parryModifier}`, // TODO consider adding W/M
pa: `1w20 + ${this.object.system.pa.rechts.aktuell + obj.system.pa + rechts.system.parryModifier}`, 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}`, iniroll: `(${context.inidice})d6 + ${context.inivalue + rechts.system.iniModifier ?? 0}`,
ini: `${context.inidice}w6 + ${context.inivalue + rechts.system.iniModifier ?? 0}`, ini: `${context.inidice}w6 + ${context.inivalue + rechts.system.iniModifier ?? 0}`,
}) })

8
src/templates/actor/actor-character-sheet.hbs
View File

@ -43,6 +43,7 @@
{{#each attacks}} {{#each attacks}}
<div> <div>
<h3>{{this.using}} ({{this.name}})</h3> <h3>{{this.using}} ({{this.name}})</h3>
<div class="combined">
{{#if this.at}} {{#if this.at}}
<div class="sidebar-element rollable" data-roll="{{this.atroll}}" data-label="Attacke"> <div class="sidebar-element rollable" data-roll="{{this.atroll}}" data-label="Attacke">
<label>AT</label> <label>AT</label>
@ -55,6 +56,13 @@
<div class="formula">{{this.pa}}</div> <div class="formula">{{this.pa}}</div>
</div> </div>
{{/if}} {{/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}} {{#if this.ini}}
<div class="sidebar-element rollable" data-label="Initiative" data-roll="{{this.iniroll}}"><label>Initiative</label> <div class="sidebar-element rollable" data-label="Initiative" data-roll="{{this.iniroll}}"><label>Initiative</label>
<div class="formula">{{this.ini}}</div> <div class="formula">{{this.ini}}</div>