fix WFRP Utility import

moo-man · Aug 28, 2022 · 1c88946 · 1c88946
1 parent bb23653
commit 1c88946
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/modules/actor/actor-wfrp4e.js b/modules/actor/actor-wfrp4e.js
@@ -1,5 +1,4 @@
 import WFRP_Utility from "../system/utility-wfrp4e.js";
-import OpposedWFRP from "../system/opposed-wfrp4e.js";
 import WFRP_Audio from "../system/audio-wfrp4e.js";
 import RollDialog from "../apps/roll-dialog.js";
 import EffectWfrp4e from "../system/effect-wfrp4e.js"
@@ -1859,7 +1858,7 @@ export default class ActorWfrp4e extends Actor {
           }
         }
       }
-      catch (e) { WFRP_UTILITY.log("Sound Context Error: " + e, true) } // Ignore sound errors
+      catch (e) { WFRP_Utility.log("Sound Context Error: " + e, true) } // Ignore sound errors
     }
 
     let scriptArgs = { actor, opposedTest, totalWoundLoss, AP, damageType, updateMsg, messageElements, attacker }
@@ -2072,7 +2071,7 @@ export default class ActorWfrp4e extends Actor {
     }
     catch (error) {
       ui.notifications.info(`${game.i18n.format("ERROR.Species", { name: this.details.species.value })}`)
-      WFRP_UTILITY.log("Could not find species " + this.details.species.value + ": " + error, true);
+      WFRP_Utility.log("Could not find species " + this.details.species.value + ": " + error, true);
       throw error
     }
     // The Roll class used to randomly select skills
@@ -2118,7 +2117,7 @@ export default class ActorWfrp4e extends Actor {
     }
     catch (error) {
       ui.notifications.info(`${game.i18n.format("ERROR.Species", { name: this.details.species.value })}`)
-      WFRP_UTILITY.log("Could not find species " + this.details.species.value + ": " + error, true);
+      WFRP_Utility.log("Could not find species " + this.details.species.value + ": " + error, true);
       throw error
     }
     let talentSelector;

diff --git a/modules/actor/sheet/actor-sheet.js b/modules/actor/sheet/actor-sheet.js
@@ -1464,7 +1464,7 @@ export default class ActorSheetWfrp4e extends ActorSheet {
       }
     }
     catch (error) {
-      WFRP_UTILITY.log("Could not randomize: " + error, true)
+      WFRP_Utility.log("Could not randomize: " + error, true)
     }
   }
 

diff --git a/modules/system/audio-wfrp4e.js b/modules/system/audio-wfrp4e.js
@@ -1,3 +1,6 @@
+import WFRP_Utility from "./utility-wfrp4e.js";
+
+
 export default class WFRP_Audio {
   static PlayContextAudio(context) {
     this.MatchContextAudio(context).then(sound => {
@@ -8,6 +11,7 @@ export default class WFRP_Audio {
       game.wfrp4e.utility.log(`wfrp4e | Playing Sound: ${sound.file}`)
       AudioHelper.play({ src: sound.file }, sound.global)
     })
+
   }
 
   static FindContext(test) {
@@ -266,7 +270,7 @@ export default class WFRP_Audio {
       return { file: files[(await new Roll(`1d${files.length}-1`).roll({ async: true })).total], global: globalSound }
     }
     catch (e) {
-      WFRP_UTILITY.log("Sound Context Error: " + e, true)
+      WFRP_Utility.log("Sound Context Error: " + e, true)
     }
   }
 }
diff --git a/modules/system/opposed-test.js b/modules/system/opposed-test.js
@@ -1,4 +1,6 @@
 import WFRP_Audio from "./audio-wfrp4e.js";
+import WFRP_Utility from "./utility-wfrp4e.js";
+
 
 export default class OpposedTest {
   constructor(attackerTest = undefined, defenderTest = undefined, opposeResult = {}) {
@@ -212,7 +214,7 @@ export default class OpposedTest {
             }
           }
         }
-        catch (e) { WFRP_UTILITY.log("Sound Context Error: " + e, true) } // Ignore sound errors
+        catch (e) { WFRP_Utility.log("Sound Context Error: " + e, true) } // Ignore sound errors
       }
       else // Defender won
       {
@@ -238,7 +240,7 @@ export default class OpposedTest {
             }
           }
         }
-        catch (e) { WFRP_UTILITY.log("Sound Context Error: " + e, true) } // Ignore sound errors
+        catch (e) { WFRP_Utility.log("Sound Context Error: " + e, true) } // Ignore sound errors
 
 
         opposeResult.winner = "defender"

diff --git a/modules/system/utility-wfrp4e.js b/modules/system/utility-wfrp4e.js
@@ -127,7 +127,7 @@ export default class WFRP_Utility {
 
     if (!characteristicFormulae) {
       ui.notifications.info(`${game.i18n.format("ERROR.Species", { name: species })}`)
-      WFRP_UTILITY.log("Could not find species " + species + ": " + error, true);
+      WFRP_Utility.log("Could not find species " + species + ": " + error, true);
       throw error
     }
-Original file line number
+Diff line change
@@ Expand Up @@
           }
         }
         catch (error) {
-          WFRP_UTILITY.log("Could not randomize: " + error, true)
+          WFRP_Utility.log("Could not randomize: " + error, true)
         }
       }
@@ Expand Down @@