Update types

This commit is contained in:
Johannes Loher 2021-02-20 17:30:17 +01:00
parent 3989e76958
commit a07e9dbf1c
2 changed files with 6 additions and 13 deletions

View file

@ -7,7 +7,7 @@ class DefaultCheckOptions implements DS4CheckFactoryOptions {
readonly maxCritSuccess = 1; readonly maxCritSuccess = 1;
readonly minCritFailure = 20; readonly minCritFailure = 20;
readonly useSlayingDice = false; readonly useSlayingDice = false;
readonly rollMode: DS4RollMode = "roll"; readonly rollMode: Const.DiceRollMode = "roll";
mergeWith(other: Partial<DS4CheckFactoryOptions>): DS4CheckFactoryOptions { mergeWith(other: Partial<DS4CheckFactoryOptions>): DS4CheckFactoryOptions {
return { ...this, ...other }; return { ...this, ...other };
@ -191,7 +191,7 @@ function parseDialogFormData(formData: HTMLFormElement): Partial<IntermediateGmM
*/ */
interface GmModifierData { interface GmModifierData {
gmModifier: number; gmModifier: number;
rollMode: DS4RollMode; rollMode: Const.DiceRollMode;
} }
/** /**
@ -216,7 +216,7 @@ interface IntermediateGmModifierData extends GmModifierData {
minCritFailure: number; minCritFailure: number;
// TODO: In final version from system settings // TODO: In final version from system settings
useSlayingDice: boolean; useSlayingDice: boolean;
rollMode: DS4RollMode; rollMode: Const.DiceRollMode;
} }
/** /**
@ -226,12 +226,5 @@ export interface DS4CheckFactoryOptions {
maxCritSuccess: number; maxCritSuccess: number;
minCritFailure: number; minCritFailure: number;
useSlayingDice: boolean; 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];

View file

@ -3605,7 +3605,7 @@ __metadata:
"foundry-vtt-types@github:League-of-Foundry-Developers/foundry-vtt-types#foundry-0.7.9": "foundry-vtt-types@github:League-of-Foundry-Developers/foundry-vtt-types#foundry-0.7.9":
version: 0.1.0 version: 0.1.0
resolution: "foundry-vtt-types@https://github.com/League-of-Foundry-Developers/foundry-vtt-types.git#commit=7ca5fb8f8662ab6ef96eacbe874dda0afb9f6e92" resolution: "foundry-vtt-types@https://github.com/League-of-Foundry-Developers/foundry-vtt-types.git#commit=254bd502a8c68cb1fb4bb363a0b86a2ddd846e80"
dependencies: dependencies:
"@types/howler": 2.2.1 "@types/howler": 2.2.1
"@types/jquery": 3.5.1 "@types/jquery": 3.5.1
@ -3614,7 +3614,7 @@ __metadata:
pixi.js: 5.3.4 pixi.js: 5.3.4
tinymce: 5.6.2 tinymce: 5.6.2
typescript: ^4.1.4 typescript: ^4.1.4
checksum: e9003e825a3e732a3b33e8f2fa7a8d27b92fba03e415786cedd04fe2d9e9501c370dc2b9b7a624d4b27bcad3e523d74151ea3cdd9b07ca28e1862038cb455aa9 checksum: a2d88ed8b75ed10bd7b42d1da76bbeca8e4494db09265c71cbd36918230c9603bbdb1649dca14bdcab8b5c5613f426087b04f5210d45bf4728cf8ebdbcdd36e8
languageName: node languageName: node
linkType: hard linkType: hard