mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-01-13 04:01:06 +01:00
Merge branch 'main' into feature/132-Weapon-Armor-Features
This commit is contained in:
commit
7d977cbad7
8 changed files with 548 additions and 889 deletions
|
|
@ -105,7 +105,10 @@ export class DHBaseAction extends foundry.abstract.DataModel {
|
|||
}
|
||||
|
||||
get chatTemplate() {
|
||||
return 'systems/daggerheart/templates/chat/attack-roll.hbs';
|
||||
return 'systems/daggerheart/templates/chat/duality-roll.hbs';
|
||||
}
|
||||
get chatTitle() {
|
||||
return this.item.name;
|
||||
}
|
||||
|
||||
static getRollType() {
|
||||
|
|
@ -133,7 +136,7 @@ export class DHBaseAction extends foundry.abstract.DataModel {
|
|||
this.actor.system.traits[this.roll.trait].value + (this.actor.system.bonuses.attack ?? 0);
|
||||
const config = {
|
||||
event: event,
|
||||
title: this.item.name,
|
||||
title: this.chatTitle,
|
||||
roll: {
|
||||
modifier: modifierValue,
|
||||
label: game.i18n.localize(abilities[this.roll.trait].label),
|
||||
|
|
@ -200,6 +203,12 @@ export class DHAttackAction extends DHBaseAction {
|
|||
static getRollType() {
|
||||
return 'weapon';
|
||||
}
|
||||
|
||||
get chatTitle() {
|
||||
return game.i18n.format('DAGGERHEART.Chat.AttackRoll.Title', {
|
||||
attack: this.item.name
|
||||
});
|
||||
}
|
||||
|
||||
prepareData() {
|
||||
super.prepareData();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue