From bea124c3b8e0d3beb7b8935cdfafd9c2f7da9156 Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Sun, 7 Feb 2021 17:51:00 +0100
Subject: [PATCH] More cleanup

---
 src/module/risk-dice.ts | 52 +----------------------------------------
 src/module/risk-die.ts  | 51 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 51 deletions(-)
 create mode 100644 src/module/risk-die.ts

diff --git a/src/module/risk-dice.ts b/src/module/risk-dice.ts
index d0a82db..86486ab 100644
--- a/src/module/risk-dice.ts
+++ b/src/module/risk-dice.ts
@@ -1,54 +1,4 @@
-class RiskDie extends DiceTerm {
-    constructor({ modifiers, ...other }: Partial<DiceTerm.TermData>) {
-        const numberModifier = modifiers?.filter((m) => m[0] === 'n')[0];
-        const numberRegex = new RegExp('n([0-9]+)?');
-        const numberMatch = numberModifier?.match(numberRegex);
-        const [numberString] = numberMatch?.slice(1) || [`${4}`];
-        const number = parseInt(numberString);
-
-        const facesModifier = modifiers?.filter((m) => m[0] === 'f')[0];
-        const facesRegex = new RegExp('f([0-9]+)?');
-        const facesMatch = facesModifier?.match(facesRegex);
-        const [facesString] = facesMatch?.slice(1) || [`${10}`];
-        const faces = parseInt(facesString);
-
-        if (number < 3) {
-            throw new Error(game.i18n.localize('RiskDice.ErrorNumberMustBeAtLeast3'));
-        }
-
-        super({ ...other, modifiers, number, faces });
-    }
-
-    /**
-     * Return the dice expression portion of the full term formula, excluding any flavor text.
-     */
-    get expression() {
-        return `dr${this.modifiers.join('')}`;
-    }
-
-    get total(): number | null {
-        if (!this._evaluated) return null;
-        if (this.values.includes(1) && this.values.includes(2)) {
-            return 3;
-        } else if (this.values.filter((res) => res === 1).length > 1) {
-            return 2;
-        } else {
-            return this.values
-                .sort((a, b) => b - a)
-                .slice(0, 2)
-                .reduce((acc, e) => acc + e, 0);
-        }
-    }
-
-    noop(): void {
-        return;
-    }
-
-    static MODIFIERS = {
-        n: 'noop', // Modifier is consumed in constructor for number
-        f: 'noop', // Modifier is consumed in constructor for faces
-    };
-}
+import { RiskDie } from './risk-die';
 
 function registerRiskDie(): void {
     CONFIG.Dice.types.push(RiskDie);
diff --git a/src/module/risk-die.ts b/src/module/risk-die.ts
new file mode 100644
index 0000000..87be868
--- /dev/null
+++ b/src/module/risk-die.ts
@@ -0,0 +1,51 @@
+export class RiskDie extends DiceTerm {
+    constructor({ modifiers, ...other }: Partial<DiceTerm.TermData>) {
+        const numberModifier = modifiers?.filter((m) => m[0] === 'n')[0];
+        const numberRegex = new RegExp('n([0-9]+)?');
+        const numberMatch = numberModifier?.match(numberRegex);
+        const [numberString] = numberMatch?.slice(1) || [`${4}`];
+        const number = parseInt(numberString);
+
+        const facesModifier = modifiers?.filter((m) => m[0] === 'f')[0];
+        const facesRegex = new RegExp('f([0-9]+)?');
+        const facesMatch = facesModifier?.match(facesRegex);
+        const [facesString] = facesMatch?.slice(1) || [`${10}`];
+        const faces = parseInt(facesString);
+
+        if (number < 3) {
+            throw new Error(game.i18n.localize('RiskDice.ErrorNumberMustBeAtLeast3'));
+        }
+
+        super({ ...other, modifiers, number, faces });
+    }
+
+    /**
+     * Return the dice expression portion of the full term formula, excluding any flavor text.
+     */
+    get expression(): string {
+        return `d${RiskDie.DENOMINATION}${this.modifiers.join('')}`;
+    }
+
+    get total(): number | null {
+        if (!this._evaluated) return null;
+        if (this.values.includes(1) && this.values.includes(2)) {
+            return 3;
+        } else if (this.values.filter((res) => res === 1).length > 1) {
+            return 2;
+        } else {
+            return this.values
+                .sort((a, b) => b - a)
+                .slice(0, 2)
+                .reduce((acc, e) => acc + e, 0);
+        }
+    }
+
+    /** @override */
+    static MODIFIERS = {
+        n: (): void => undefined, // Modifier is consumed in constructor for number
+        f: (): void => undefined, // Modifier is consumed in constructor for faces
+    };
+
+    /** @override */
+    static DENOMINATION = 'r';
+}