fix: Inherit default parsers into 5e Layout

javalent · Mar 20, 2024 · 54d9061 · 54d9061
1 parent 6115a6d
commit 54d9061
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 53 deletions.
diff --git a/src/layouts/basic 5e/basic5e.ts b/src/layouts/basic 5e/basic5e.ts
@@ -1,9 +1,5 @@
 import { nanoid } from "src/util/util";
-import type {
-    DefaultLayout,
-    Layout,
-    StatblockItem
-} from "../layout.types";
+import type { DefaultLayout, StatblockItem } from "../layout.types";
 
 export const Statblock5e: StatblockItem[] = [
     {
@@ -738,47 +734,5 @@ export const Layout5e: DefaultLayout = {
     id: "basic-5e-layout",
     name: "Basic 5e Layout",
     edited: false,
-    version: 5,
-    diceParsing: [
-        {
-            regex: /([\+\-])(\d+) to hit/.source,
-            parser: `let [, sign, number] = matches;
-let mult = 1;
-if (sign === "-") {
-    mult = -1;
-}
-if (!isNaN(Number(number))) {
-    return {
-        text: \`1d20+\${mult * Number(number)}\`,
-        original
-    }
-}`,
-            id: "to-hit"
-        },
-        {
-            regex: /(\d+)\s\((\d+d\d+(?:\s*[+\-]\s*\d+)?)\)/.source,
-            parser: `let [, base, dice] = matches;
-let text;
-if (!isNaN(Number(base)) && dice) {
-    text = dice;
-}
-return { text, original: dice ?? original };`,
-            id: "dice"
-        },
-        {
-            regex: /. ([\+\-]\d+)/.source,
-            parser: `let [, save, sign, number] = matches;
-let mult = 1;
-if (sign === "-") {
-    mult = -1;
-}
-let text;
-if (!isNaN(Number(number))) {
-    text = \`1d20+\${mult * Number(number)}\`;
-    original = \`\${save} \${sign}\${number}\`;
-}
-return { text, original };`,
-            id: "modifier"
-        }
-    ]
+    version: 6
 };
diff --git a/src/parser/dice-parsing.ts b/src/parser/dice-parsing.ts
@@ -72,23 +72,23 @@ try {
 export function getDiceParsingDefaults(): DiceParsing[] {
     return [
         {
-            regex: /([\+\-]\d+) to hit/.source,
+            regex: /([\+\-])(\d+) to hit/.source,
             parser: `let [, sign, number] = matches;
 let mult = 1;
 if (sign === "-") {
     mult = -1;
 }
 if (!isNaN(Number(number))) {
     return {
-        text: \`1d20+\$\{mult * Number(number)\}\`,
+        text: \`1d20+\${mult * Number(number)}\`,
         original
     }
 }`,
             id: nanoid(),
             desc: "+10 to hit"
         },
         {
-            regex: /\d+\s\(\d+d\d+(?:\s*[+\-]\s*\d+)?\)/.source,
+            regex: /(\d+)\s\((\d+d\d+(?:\s*[+\-]\s*\d+)?)\)/.source,
             parser: `let [, base, dice] = matches;
 let text;
 if (!isNaN(Number(base)) && dice) {
@@ -107,8 +107,8 @@ if (sign === "-") {
 }
 let text;
 if (!isNaN(Number(number))) {
-    text = \`1d20+\$\{mult * Number(number)\}\`;
-    original = \`\$\{save} \$\{sign\}\$\{number\}\`;
+    text = \`1d20+\${mult * Number(number)}\`;
+    original = \`\${save} \${sign}\${number}\`;
 }
 return { text, original };`,
             id: nanoid(),