diff --git a/module/config/generalConfig.mjs b/module/config/generalConfig.mjs index a3ba21db..ccbe2d21 100644 --- a/module/config/generalConfig.mjs +++ b/module/config/generalConfig.mjs @@ -393,6 +393,14 @@ export const abilityCosts = { slayer: { id: 'slayer', label: 'Slayer Dice' + }, + tide: { + id: 'tide', + label: 'Tide' + }, + chaos: { + id: 'chaos', + label: 'Chaos' } }; diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs index 53a69740..654df3d8 100644 --- a/module/data/actor/character.mjs +++ b/module/data/actor/character.mjs @@ -39,13 +39,8 @@ export default class DhCharacter extends BaseDataActor { hitPoints: resourceField(6), stress: resourceField(6), hope: resourceField(6), - rallyDice: new fields.SchemaField({ - d6: new fields.NumberField({ integer: true, initial: 0 }), - d8: new fields.NumberField({ integer: true, initial: 0 }), - d10: new fields.NumberField({ integer: true, initial: 0 }) - }), - slayerDice: new fields.NumberField({ integer: true, initial: 0 }), - tideTokens: new fields.NumberField({ integer: true, initial: 0 }) + tokens: new fields.ObjectField(), + dice: new fields.ObjectField() }), traits: new fields.SchemaField({ agility: attributeField(), @@ -134,7 +129,8 @@ export default class DhCharacter extends BaseDataActor { max: 12, nullable: true, initial: null - }) + }), + runeWard: new fields.BooleanField({ initial: false }) }) }; } @@ -301,7 +297,11 @@ export default class DhCharacter extends BaseDataActor { const data = super.getRollData(); return { ...data, - tier: this.tier + ...this.resources.tokens, + ...this.resources.dice, + ...this.bonuses, + tier: this.tier, + level: this.levelData.level.current }; } }