fix: update to T26 SimulationCraft scripts

Sidoine · Dec 19, 2020 · bc3a3e1 · bc3a3e1
1 parent 18d7714
commit bc3a3e1
Show file tree

Hide file tree

Showing 57 changed files with 16,845 additions and 6,954 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,9 +8,9 @@
             "type": "node",
             "request": "launch",
             "name": "SimulationCraft",
-            "program": "${workspaceFolder}/dist/src/utils/importsimc.js",
+            "program": "${workspaceFolder}/dist/src/utils/importsimc/index.js",
             "protocol": "inspector",
-            "args": ["../../simc/", "T25_Mage_Arcane.simc"],
+            "args": ["../../simc/", "T26_Druid_Feral_Owlweave.simc"],
             "outFiles": ["${workspaceFolder}/dist/**/*.js"]
         },
         {

diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
         "test": "jest",
         "prepare": "tstolua -p tsconfig.lua.json",
         "prepare-tools": "tsc",
-        "simc": "node dist/src/utils/importsimc.js ../../simc",
+        "simc": "node dist/src/utils/importsimc/index.js ../../simc",
         "dbc": "node dist/src/utils/dbc.js",
         "watch": "tstolua -p tsconfig.lua.json -w",
         "watch-tools": "tsc -w",

diff --git a/src/engine/ast.ts b/src/engine/ast.ts
@@ -125,6 +125,7 @@ export const checkSpellInfo: TypeCheck<SpellInfoValues> = {
     haste: true,
     health: true,
     holypower: true,
+    icd: true,
     inccounter: true,
     insanity: true,
     interrupt: true,
@@ -140,6 +141,7 @@ export const checkSpellInfo: TypeCheck<SpellInfoValues> = {
     rage: true,
     replaced_by: true,
     resetcounter: true,
+    rppm: true,
     runes: true,
     runicpower: true,
     shared_cd: true,

diff --git a/src/engine/compile.ts b/src/engine/compile.ts
@@ -208,25 +208,25 @@ export class OvaleCompileClass {
         if (itemId) {
             const ii = this.ovaleData.ItemInfo(itemId);
             for (const [k, v] of kpairs(namedParams)) {
-                if (k == "proc") {
-                    const buff = v;
-                    if (buff.type === "value" && isNumber(buff.value)) {
-                        const name = "item_proc_" + namedParams.proc;
-                        const list = this.ovaleData.buffSpellList[name] || {};
-                        list[buff.value] = true;
-                        this.ovaleData.buffSpellList[name] = list;
-                    } else {
-                        ok = false;
-                        break;
-                    }
-                } else {
-                    if (v.type === "value" || v.type === "string")
-                        (ii as any)[k] = v.value;
-                    else {
-                        ok = false;
-                        break;
-                    }
+                // if (k == "proc") {
+                //     const buff = v;
+                //     if (buff.type === "value" && isNumber(buff.value)) {
+                //         const name = "item_proc_" + namedParams.proc;
+                //         const list = this.ovaleData.buffSpellList[name] || {};
+                //         list[buff.value] = true;
+                //         this.ovaleData.buffSpellList[name] = list;
+                //     } else {
+                //         ok = false;
+                //         break;
+                //     }
+                // } else {
+                if (v.type === "value" || v.type === "string")
+                    (ii as any)[k] = v.value;
+                else {
+                    ok = false;
+                    break;
                 }
+                // }
             }
             this.ovaleData.itemInfo[itemId] = ii;
         }
@@ -446,7 +446,7 @@ export class OvaleCompileClass {
                                     spellName
                                 );
                             }
-                        } else {
+                        } else if (spellId > 0) {
                             this.tracer.Error(
                                 "Unknown spell with ID %s.",
                                 spellId

diff --git a/src/engine/condition.ts b/src/engine/condition.ts
@@ -55,8 +55,9 @@ export function isComparator(token: string): token is ComparatorId {
 interface NumberParameterInfo<Optional = boolean> {
     type: "number";
     name: string;
-    optional?: Optional;
+    optional: Optional;
     isSpell?: boolean;
+    isItem?: boolean;
     defaultValue?: number;
 }
 

diff --git a/src/engine/data.ts b/src/engine/data.ts
@@ -148,6 +148,9 @@ export interface SpellInfoValues
     gcd?: number;
     shared_cd?: string;
     cd?: number;
+    /** Internal cooldown (mainly on items) */
+    icd?: number;
+    rppm?: number;
     charge_cd?: number;
     forcecd?: number;
     buff_cd?: number; // Internal cooldown, rename?