From a07e9dbf1c55a189f6422900db4b55e69471cc5d Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Sat, 20 Feb 2021 17:30:17 +0100
Subject: [PATCH] Update types

---
 src/module/rolls/check-factory.ts | 15 ++++-----------
 yarn.lock                         |  4 ++--
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/module/rolls/check-factory.ts b/src/module/rolls/check-factory.ts
index 43d8efa..eb68789 100644
--- a/src/module/rolls/check-factory.ts
+++ b/src/module/rolls/check-factory.ts
@@ -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];
diff --git a/yarn.lock b/yarn.lock
index 3aecb8f..36b0f20 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3605,7 +3605,7 @@ __metadata:
 
 "foundry-vtt-types@github:League-of-Foundry-Developers/foundry-vtt-types#foundry-0.7.9":
   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:
     "@types/howler": 2.2.1
     "@types/jquery": 3.5.1
@@ -3614,7 +3614,7 @@ __metadata:
     pixi.js: 5.3.4
     tinymce: 5.6.2
     typescript: ^4.1.4
-  checksum: e9003e825a3e732a3b33e8f2fa7a8d27b92fba03e415786cedd04fe2d9e9501c370dc2b9b7a624d4b27bcad3e523d74151ea3cdd9b07ca28e1862038cb455aa9
+  checksum: a2d88ed8b75ed10bd7b42d1da76bbeca8e4494db09265c71cbd36918230c9603bbdb1649dca14bdcab8b5c5613f426087b04f5210d45bf4728cf8ebdbcdd36e8
   languageName: node
   linkType: hard