Athemis/ds4
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into 056-items-compendium

Browse source
This commit is contained in:
Johannes Loher 2021-02-20 17:54:17 +01:00
commit df6e1672cf
4 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/module/item/item-sheet.ts
View file

@ -53,7 +53,7 @@ export class DS4ItemSheet extends ItemSheet<ItemSheet.Data<DS4Item>> {
}
/** @override */
setPosition(options: Partial<Application.Position> = {}): Application.Position {
setPosition(options: Partial<Application.Position> = {}): Application.Position & { height: number } {
const position = super.setPosition(options);
if ("find" in this.element) {
const sheetBody = this.element.find(".sheet-body");

15
src/module/rolls/check-factory.ts
View file

@ -7,7 +7,7 @@ class DefaultCheckOptions implements DS4CheckFactoryOptions {
readonly maxCritSuccess = 1;
readonly minCritFailure = 20;
readonly useSlayingDice = false;
readonly rollMode: DS4RollMode = "roll";
readonly rollMode: Const.DiceRollMode = "roll";
mergeWith(other: Partial<DS4CheckFactoryOptions>): DS4CheckFactoryOptions {
return { ...this, ...other };
@ -191,7 +191,7 @@ function parseDialogFormData(formData: HTMLFormElement): Partial<IntermediateGmM
*/
interface GmModifierData {
gmModifier: number;
rollMode: DS4RollMode;
rollMode: Const.DiceRollMode;
}
/**
@ -216,7 +216,7 @@ interface IntermediateGmModifierData extends GmModifierData {
minCritFailure: number;
// TODO: In final version from system settings
useSlayingDice: boolean;
rollMode: DS4RollMode;
rollMode: Const.DiceRollMode;
}
/**
@ -226,12 +226,5 @@ export interface DS4CheckFactoryOptions {
maxCritSuccess: number;
minCritFailure: number;
useSlayingDice: boolean;
rollMode: DS4RollMode;
rollMode: Const.DiceRollMode;
}
/**
* Defines all possible roll modes, both for iterating and typing.
*/
const rollModes = ["roll", "gmroll", "blindroll", "selfroll"] as const;
type DS4RollModeTuple = typeof rollModes;
export type DS4RollMode = DS4RollModeTuple[number];