cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-04-22 07:23:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[Feature] Roll Rules Standardization (#1818)

Browse source 
* Moved default hope/fear/advantage/disadvantage under system/rules/roll and changed them to be dice indexs

* .

* .

* .
This commit is contained in:
WBHarry 2026-04-21 16:13:12 +02:00 • committed by GitHub
parent 7af3f07a26
commit 2c994ac78c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 132 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

8
module/applications/dialogs/d20RollDialog.mjs
View file

@ -176,11 +176,11 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
this.config.roll.advantage = this.config.roll.advantage === advantage ? 0 : advantage;
if (this.config.roll.advantage === 1 && this.config.data.rules.roll.defaultAdvantageDice) {
const faces = Number.parseInt(this.config.data.rules.roll.defaultAdvantageDice);
if (this.config.roll.advantage === 1 && this.config.data.rules.roll.advantageFaces) {
const faces = Number.parseInt(this.config.data.rules.roll.advantageFaces);
this.roll.advantageFaces = Number.isNaN(faces) ? this.roll.advantageFaces : faces;
} else if (this.config.roll.advantage === -1 && this.config.data.rules.roll.defaultDisadvantageDice) {
const faces = Number.parseInt(this.config.data.rules.roll.defaultDisadvantageDice);
} else if (this.config.roll.advantage === -1 && this.config.data.rules.roll.disadvantageFaces) {
const faces = Number.parseInt(this.config.data.rules.roll.disadvantageFaces);
this.roll.advantageFaces = Number.isNaN(faces) ? this.roll.advantageFaces : faces;
}

18
module/applications/dialogs/levelupOptionsDialog.mjs
View file

@ -53,8 +53,23 @@ export default class LevelupOptionsDialog extends HandlebarsApplicationMixin(App
async _prepareContext(_options) {
const context = await super._prepareContext(_options);
context.item = this.item;
context.fields = this.item.system.schema.fields.levelupOptionTiers.element.element.fields;
context.item = this.item;
context.levelupOptionTiers = Object.keys(this.item.system.levelupOptionTiers).reduce((acc, key) => {
const tier = this.item.system.levelupOptionTiers[key];
acc[key] = Object.keys(tier).reduce((acc, key) => {
const option = tier[key];
acc[key] = {
...option,
typeData: option.type ? LevelOptionType[option.type] : null
};
return acc;
}, {});
return acc;
}, {})
context.optionTypes = LevelOptionType;
context.selectedOption = this.selectedOption;
@ -63,6 +78,7 @@ export default class LevelupOptionsDialog extends HandlebarsApplicationMixin(App
static async updateData(_event, _element, formData) {
const data = foundry.utils.expandObject(formData.object);
await this.item.update(data)
this.render();
}

3
module/applications/levelup/levelup.mjs
View file

@ -527,7 +527,8 @@ export default class DhlevelUp extends HandlebarsApplicationMixin(ApplicationV2)
minCost: Number(button.dataset.cost),
amount: button.dataset.amount ? Number(button.dataset.amount) : null,
value: button.dataset.value,
type: button.dataset.type
type: button.dataset.type,
subType: button.dataset.subType
};
if (button.dataset.type === 'domainCard') {

82
module/data/actor/character.mjs
View file

@ -261,24 +261,6 @@ export default class DhCharacter extends DhCreature {
})
}
}),
dualityRoll: new fields.SchemaField({
defaultHopeDice: new fields.NumberField({
nullable: false,
required: true,
integer: true,
choices: CONFIG.DH.GENERAL.dieFaces,
initial: 12,
label: 'DAGGERHEART.ACTORS.Character.defaultHopeDice'
}),
defaultFearDice: new fields.NumberField({
nullable: false,
required: true,
integer: true,
choices: CONFIG.DH.GENERAL.dieFaces,
initial: 12,
label: 'DAGGERHEART.ACTORS.Character.defaultFearDice'
})
}),
burden: new fields.SchemaField({
ignore: new fields.BooleanField({ label: 'DAGGERHEART.ACTORS.Character.burden.ignore.label' })
}),
@ -287,29 +269,49 @@ export default class DhCharacter extends DhCreature {
label: 'DAGGERHEART.ACTORS.Character.roll.guaranteedCritical.label',
hint: 'DAGGERHEART.ACTORS.Character.roll.guaranteedCritical.hint'
}),
defaultAdvantageDice: new fields.NumberField({
nullable: true,
hopeIndex: new fields.NumberField({
required: true,
integer: true,
choices: CONFIG.DH.GENERAL.dieFaces,
initial: null,
label: 'DAGGERHEART.ACTORS.Character.defaultAdvantageDice'
min: 0,
max: 5,
initial: 4,
label: 'DAGGERHEART.ACTORS.Creature.rules.roll.hope.label',
hint: 'DAGGERHEART.ACTORS.Creature.rules.roll.hope.hint'
}),
defaultDisadvantageDice: new fields.NumberField({
nullable: true,
fearIndex: new fields.NumberField({
required: true,
integer: true,
choices: CONFIG.DH.GENERAL.dieFaces,
initial: null,
label: 'DAGGERHEART.ACTORS.Character.defaultDisadvantageDice'
min: 0,
max: 5,
initial: 4,
label: 'DAGGERHEART.ACTORS.Creature.rules.roll.fear.label',
hint: 'DAGGERHEART.ACTORS.Creature.rules.roll.fear.hint'
}),
advantageIndex: new fields.NumberField({
required: true,
integer: true,
min: 0,
max: 5,
initial: 1,
label: 'DAGGERHEART.ACTORS.Creature.rules.roll.advantage.label',
hint: 'DAGGERHEART.ACTORS.Creature.rules.roll.advantage.hint'
}),
disadvantageIndex: new fields.NumberField({
required: true,
integer: true,
min: 0,
max: 5,
initial: 1,
label: 'DAGGERHEART.ACTORS.Creature.rules.roll.disadvantage.label',
hint: 'DAGGERHEART.ACTORS.Creature.rules.roll.disadvantage.hint'
}),
comboDieIndex: new fields.NumberField({
integer: true,
min: 0,
max: 5,
initial: 0,
})
}),
comboDieIndex: new fields.NumberField({
integer: true,
min: 0,
max: 5,
initial: 0,
})
})
};
}
@ -764,8 +766,8 @@ export default class DhCharacter extends DhCreature {
}
});
break;
case 'comboStrikes':
this.rules.comboDieIndex += 1;
case 'dice':
this.rules.roll[selection.subType] += 1;
break;
}
}
@ -824,6 +826,14 @@ export default class DhCharacter extends DhCreature {
isReversed: true
};
/* Add convience <dice>Faces properties for all dice */
const { hopeIndex, fearIndex, advantageIndex, disadvantageIndex, comboDieIndex } = this.rules.roll;
const dice = { hopeIndex, fearIndex, advantageIndex, disadvantageIndex, comboDieIndex };
for (const dieKey of Object.keys(dice)) {
const diceBaseKey = dieKey.replace('Index', '');
this.rules.roll[`${diceBaseKey}Faces`] = CONFIG.DH.GENERAL.dieFaces[dice[dieKey]];
}
this.attack.damage.parts.hitPoints.value.custom.formula = `@prof${this.basicAttackDamageDice}${this.rules.attack.damage.bonus ? ` + ${this.rules.attack.damage.bonus}` : ''}`;
}

22
module/data/actor/companion.mjs
View file

@ -63,21 +63,23 @@ export default class DhCompanion extends DhCreature {
})
}),
roll: new fields.SchemaField({
defaultAdvantageDice: new fields.NumberField({
nullable: true,
advantage: new fields.NumberField({
required: true,
integer: true,
choices: CONFIG.DH.GENERAL.dieFaces,
initial: null,
label: 'DAGGERHEART.ACTORS.Character.defaultAdvantageDice'
min: 0,
max: 5,
initial: 1,
label: 'DAGGERHEART.ACTORS.Creature.rules.roll.advantage.label',
hint: 'DAGGERHEART.ACTORS.Creature.rules.roll.advantage.hint'
}),
defaultDisadvantageDice: new fields.NumberField({
nullable: true,
disadvantage: new fields.NumberField({
required: true,
integer: true,
choices: CONFIG.DH.GENERAL.dieFaces,
initial: null,
label: 'DAGGERHEART.ACTORS.Character.defaultDisadvantageDice'
min: 0,
max: 5,
initial: 1,
label: 'DAGGERHEART.ACTORS.Creature.rules.roll.disadvantage.label',
hint: 'DAGGERHEART.ACTORS.Creature.rules.roll.disadvantage.hint'
}),
})
}),

1
module/data/levelData.mjs
View file

@ -41,6 +41,7 @@ export default class DhLevelData extends foundry.abstract.DataModel {
level: new fields.NumberField({ required: true, integer: true }),
optionKey: new fields.StringField({ required: true }),
type: new fields.StringField({ required: true, choices: LevelOptionType }),
subType: new fields.StringField({ nullable: true }),
checkboxNr: new fields.NumberField({ required: true, integer: true }),
value: new fields.NumberField({ integer: true }),
minCost: new fields.NumberField({ integer: true }),

22
module/data/levelTier.mjs
View file

@ -69,6 +69,10 @@ export class DhLevelOption extends foundry.abstract.DataModel {
choices: LevelOptionType,
label: 'DAGGERHEART.GENERAL.type'
}),
subType: new fields.StringField({
nullable: true,
label: 'DAGGERHEART.GENERAL.subType',
}),
value: new fields.NumberField({
integer: true,
label: 'DAGGERHEART.GENERAL.value'
@ -136,13 +140,6 @@ export const CompanionLevelOptionType = {
}
};
export const ClassLevelOptionTypes = {
comboStrikes: {
id: 'comboStrikes',
label: 'Increase your Combo Die size',
},
};
export const LevelOptionType = {
trait: {
id: 'trait',
@ -192,7 +189,16 @@ export const LevelOptionType = {
id: 'multiclass',
label: 'Multiclass'
},
...ClassLevelOptionTypes,
dice: {
id: 'dice',
label: 'Increase Dice Size',
subTypes: {
hopeIndex: { key: 'hopeIndex', label: 'DAGGERHEART.GENERAL.hope' },
fearIndex: { key: 'fearIndex', label: 'DAGGERHEART.GENERAL.fear' },
advantageIndex: { key: 'advantageIndex', label: 'DAGGERHEART.GENERAL.Advantage.full' },
comboDieIndex:{ key: 'comboDieIndex', label: 'Combo Die' } // Translation pending actual useage
},
},
...CompanionLevelOptionType
};

6
module/data/levelup.mjs
View file

@ -90,6 +90,7 @@ export class DhLevelup extends foundry.abstract.DataModel {
checkboxSelections: new fields.NumberField({ required: true, integer: true }),
minCost: new fields.NumberField({ required: true, integer: true }),
type: new fields.StringField({ required: true, choices: LevelOptionType }),
subType: new fields.StringField({ nullable: true }),
value: new fields.NumberField({ integer: true }),
amount: new fields.NumberField({ integer: true })
})
@ -242,7 +243,7 @@ export class DhLevelup extends foundry.abstract.DataModel {
const checkboxes = [...Array(option.checkboxSelections).keys()].flatMap(index => {
const checkboxNr = index + 1;
const checkboxData = selections[tierKey]?.[optionKey]?.[checkboxNr];
const checkbox = { ...option, checkboxNr, tier: tierKey };
const checkbox = { ...option, checkboxNr, tier: tierKey, option: optionKey };
if (checkboxData) {
checkbox.level = checkboxData.level;
@ -343,7 +344,8 @@ export class DhLevelupLevel extends foundry.abstract.DataModel {
value: new fields.StringField(),
data: new fields.ArrayField(new fields.StringField()),
secondaryData: new fields.TypedObjectField(new fields.StringField()),
type: new fields.StringField({ required: true })
type: new fields.StringField({ required: true }),
subType: new fields.StringField({ nullable: true }),
})
)
)

6
module/dice/dualityRoll.mjs
View file

@ -11,7 +11,7 @@ export default class DualityRoll extends D20Roll {
this.rallyChoices = this.setRallyChoices();
this.guaranteedCritical = options.guaranteedCritical;
const advantageFaces = data.rules?.roll?.defaultAdvantageDice ? Number.parseInt(data.rules.roll.defaultAdvantageDice) : 6
const advantageFaces = data.rules?.roll?.advantageFaces ? Number.parseInt(data.rules.roll.advantageFaces) : 6
this.advantageFaces = Number.isNaN(advantageFaces) ? 6 : advantageFaces;
}
@ -137,11 +137,11 @@ export default class DualityRoll extends D20Roll {
}
this.terms[0] = new game.system.api.dice.diceTypes.HopeDie({
faces: this.data.rules.dualityRoll?.defaultHopeDice ?? 12
faces: this.data.rules.roll?.hopeFaces ?? 12
});
this.terms[1] = new foundry.dice.terms.OperatorTerm({ operator: '+' });
this.terms[2] = new game.system.api.dice.diceTypes.FearDie({
faces: this.data.rules.dualityRoll?.defaultFearDice ?? 12
faces: this.data.rules.roll?.fearFaces ?? 12
});
}