Fix compatibility with DFreds Convenient Effects

dev7355608 · Aug 4, 2023 · 35e87aa · 35e87aa
1 parent 0df0f68
commit 35e87aa
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/module.json b/module.json
@@ -8,7 +8,7 @@
       "email": "[email protected]"
     }
   ],
-  "version": "1.8.0",
+  "version": "1.8.1",
   "compatibility": {
     "minimum": "11.299",
     "verified": "11.307"
@@ -47,8 +47,8 @@
   },
   "url": "https://github.com/dev7355608/vision-5e",
   "manifest": "https://github.com/dev7355608/vision-5e/releases/latest/download/module.json",
-  "download": "https://github.com/dev7355608/vision-5e/releases/download/v1.8.0/module.zip",
-  "changelog": "https://github.com/dev7355608/vision-5e/releases/tag/v1.8.0",
+  "download": "https://github.com/dev7355608/vision-5e/releases/download/v1.8.1/module.zip",
+  "changelog": "https://github.com/dev7355608/vision-5e/releases/tag/v1.8.1",
   "bugs": "https://github.com/dev7355608/vision-5e/issues",
   "readme": "https://raw.githubusercontent.com/dev7355608/vision-5e/main/README.md",
   "license": "https://raw.githubusercontent.com/dev7355608/vision-5e/main/LICENSE"

diff --git a/scripts/compatibility.mjs b/scripts/compatibility.mjs
@@ -96,7 +96,7 @@ Hooks.once("init", () => {
     });
 });
 
-Hooks.once("setup", () => {
+Hooks.once("init", () => {
     if (!game.modules.get("dfreds-convenient-effects")?.active) {
         return;
     }
@@ -129,23 +129,31 @@ Hooks.once("setup", () => {
         }
     ];
 
-    const EffectDefinitions = game.dfreds.effects.constructor;
+    function addConditions() {
+        const EffectDefinitions = game.dfreds.effects.constructor;
 
-    EffectDefinitions.prototype.initialize = ((initialize) => function () {
-        this._conditions = this.conditions;
+        EffectDefinitions.prototype.initialize = ((initialize) => function () {
+            this._conditions = this.conditions;
 
-        for (const { id, name, icon } of customStatusEffects) {
-            this._conditions.push(this._effectHelpers.createActiveEffect({
-                name,
-                icon,
-                statuses: [id]
-            }));
-        }
+            for (const { id, name, icon } of customStatusEffects) {
+                this._conditions.push(this._effectHelpers.createActiveEffect({
+                    name,
+                    icon,
+                    statuses: [id]
+                }));
+            }
 
-        this._conditions.sort((e1, e2) => e1.name.localeCompare(e2.name, "en"));
+            this._conditions.sort((e1, e2) => e1.name.localeCompare(e2.name, "en"));
 
-        return initialize.call(this);
-    })(EffectDefinitions.prototype.initialize);
+            return initialize.call(this);
+        })(EffectDefinitions.prototype.initialize);
+    }
+
+    if (game.dfreds?.effects) {
+        addConditions();
+    } else {
+        Hooks.once("socketlib.ready", addConditions);
+    }
 
     game.settings.register(
         "vision-5e",