mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-04-22 07:23:37 +02:00
[Feature] Roll Rules Standardization (#1818)
* Moved default hope/fear/advantage/disadvantage under system/rules/roll and changed them to be dice indexs * . * . * .
This commit is contained in:
WBHarry
GitHub
parent
7af3f07a26
commit
2c994ac78c
15 changed files with 132 additions and 83 deletions
|
|
@ -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}` : ''}`;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
}),
|
||||
})
|
||||
}),
|
||||
|
|
|
|||
|
|
@ -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 }),
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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 }),
|
||||
})
|
||||
)
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue