foundry/dsa-4th-edition
4
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases 2 Wiki Activity

Compare commits

base: foundry:2d576499df354b8e66874488a562edacb6e0b06f
Branches Tags
foundry:main
foundry:foundry
foundry:test2
foundry:test1
..
compare: foundry:f21a5ebf061566c0cf18c430ba75724db458c717
Branches Tags
foundry:main
foundry:foundry
foundry:test2
foundry:test1

No commits in common. "2d576499df354b8e66874488a562edacb6e0b06f" and "f21a5ebf061566c0cf18c430ba75724db458c717" have entirely different histories.
2d576499df ... f21a5ebf06

2 changed files with 3 additions and 11 deletions
Show Stats Expand all files Collapse all files

8
src/ActorSheet.hbs
View File

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

2
src/main.mjs
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); this.kampftalente = this.parent.items.filter((x) => x.type === "Kampftalent").sort((a, b) => a.name > b.name);
for(const talent of this.kampftalente) { for(const talent of this.kampftalente) {
this.computed.kampf.talente[talent.name] = {}; this.computed.kampf.talente[talent.name] = {};
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].attacke = 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].parade = this.computed.parade.wert + talent.system.parade;
this.computed.kampf.talente[talent.name].talent_attacke = talent.system.attacke; this.computed.kampf.talente[talent.name].talent_attacke = talent.system.attacke;