Compare commits

...

2 Commits

Author SHA1 Message Date
Sven Balzer
2d576499df do not show parade for ranged combat talents 2025-05-29 15:53:23 +02:00
Sven Balzer
ac03b7e758 fix calculation of ranged combat talents attack value 2025-05-29 15:48:35 +02:00
2 changed files with 11 additions and 3 deletions

View File

@ -326,9 +326,17 @@
<div data-action="item-open">{{maybeLocalize name prefix="DSA41.talente.kampf.name."}}</div>
<div>{{>editable-input type="number" name=(concat name "system.talentwert") data-name="system.talentwert" value=system.talentwert}}</div>
<div>{{>editable-input type="number" name=(concat name "system.attacke") data-name="system.attacke" value=system.attacke}}</div>
<div>{{>editable-input type="number" name=(concat name "system.parade") data-name="system.parade" value=system.parade}}</div>
{{#if (ne system.kategorie "fernkampf")}}
<div>{{>editable-input type="number" name=(concat name "system.parade") data-name="system.parade" value=system.parade}}</div>
{{else}}
<div></div>
{{/if}}
<div class="center">{{lookup (lookup @root.actor.system.computed.kampf.talente name) "attacke"}}</div>
<div class="center">{{lookup (lookup @root.actor.system.computed.kampf.talente name) "parade"}}</div>
{{#if (ne system.kategorie "fernkampf")}}
<div class="center">{{lookup (lookup @root.actor.system.computed.kampf.talente name) "parade"}}</div>
{{else}}
<div></div>
{{/if}}
</div>
{{/each}}
</div>

View File

@ -694,7 +694,7 @@ class DSA41_CharacterData extends TypeDataModel {
this.kampftalente = this.parent.items.filter((x) => x.type === "Kampftalent").sort((a, b) => a.name > b.name);
for(const talent of this.kampftalente) {
this.computed.kampf.talente[talent.name] = {};
this.computed.kampf.talente[talent.name].attacke = this.computed.attacke.wert + talent.system.attacke;
this.computed.kampf.talente[talent.name].attacke = (talent.system.kategorie === "fernkampf" ? this.computed.fernkampf.wert : this.computed.attacke.wert) + talent.system.attacke;
this.computed.kampf.talente[talent.name].parade = this.computed.parade.wert + talent.system.parade;
this.computed.kampf.talente[talent.name].talent_attacke = talent.system.attacke;