Fix Macro calls

Vendare · Jun 17, 2023 · 4a42160 · 4a42160
1 parent 2a84a19
commit 4a42160
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -279,6 +279,7 @@
   "NPC_TYPE.ELITE": "Elite",
 
   "NOTIFICATION.MACRO_ITEM_NOT_FOUND": "Couldn't find the Item. You may not have a Token selected or the Actor doesn't posses the item",
+  "NOTIFICATION.MACRO_ACTOR_NOT_FOUND": "Couldn't find the Actor. You not have a Token selected or your default Actor is not set.",
 
   "PSYCHIC_POWER.NAME": "Name",
   "PSYCHIC_POWER.COST": "Cost",

diff --git a/script/common/config.js b/script/common/config.js
@@ -49,15 +49,15 @@ Dh.aimModes = {
     20: "AIMING.FULL"
 };
 
-DH.characteristicCosts = [
+Dh.characteristicCosts = [
     [0, 0, 0],
     [100, 250, 500],
     [250, 500, 750],
     [500, 750, 1000],
     [750, 1000, 1500],
     [1250, 1500, 2500]];
 
-DH.talentCosts = [[200, 300, 600], [300, 450, 900], [400, 600, 1200]];
+Dh.talentCosts = [[200, 300, 600], [300, 450, 900], [400, 600, 1200]];
 
 
 CONFIG.statusEffects = [

diff --git a/script/common/macro.js b/script/common/macro.js
@@ -33,8 +33,10 @@ export default class DhMacroUtil {
 
     static rollAttack(itemName, itemType) {
         let actor = this.getActor();
+
+        if (!actor) return ui.notifications.warn(`${game.i18n.localize("NOTIFICATION.MACRO_ACTOR_NOT_FOUND")}`);
 
-        item = actor ? actor.items.find(i => i.name === itemName && i.type === itemType) : null;
+        let item = actor.items.find(i => i.name === itemName && i.type === itemType);
 
         if (!item) return ui.notifications.warn(`${game.i18n.localize("NOTIFICATION.MACRO_ITEM_NOT_FOUND")} ${itemName}`);
 
@@ -47,7 +49,10 @@ export default class DhMacroUtil {
     }
 
     static rollTest(name, type, specialty) {
-        let actor = getActor();
+        let actor = this.getActor();     
+
+        if (!actor) return ui.notifications.warn(`${game.i18n.localize("NOTIFICATION.MACRO_ACTOR_NOT_FOUND")}`);
+
         let rollData;
 
         if (specialty) {
@@ -57,7 +62,7 @@ export default class DhMacroUtil {
         } else if (name === "fear") {
             rollData = DarkHeresyUtil.createFearTestRolldata(actor);
         } else if (name === "malignancy") {
-            rollData = DarkHeresyUtil.createCorruptionTestRolldata(actor);
+            rollData = DarkHeresyUtil.createMalignancyTestRolldata(actor);
         } else if (name === "trauma") {
             rollData = DarkHeresyUtil.createTraumaTestRolldata(actor);
         } else {

diff --git a/script/common/util.js b/script/common/util.js
@@ -27,7 +27,7 @@ export default class DarkHeresyUtil {
         rollData.isMelee= isMelee;
         rollData.isRange= !isMelee;
         rollData.clip= weapon.clip;
-        rollData.range = weapon.range;
+        rollData.range = 10;
         rollData.rateOfFire= rateOfFire;
         rollData.weaponTraits= this.extractWeaponTraits(weapon.special);
         let attributeMod = (isMelee && !weapon.damage.match(/SB/gi) ? "+SB" : "");
@@ -64,7 +64,7 @@ export default class DarkHeresyUtil {
         const skill = actor.skills[skillName];
         const defaultChar = skill.defaultCharacteristic || skill.characteristics[0];
 
-        let characteristics = getCharacteristicOptions(actor, defaultChar);
+        let characteristics = this.getCharacteristicOptions(actor, defaultChar);
         characteristics = characteristics.map(char => {
             char.target += skill.advance;
             return char;
@@ -113,9 +113,9 @@ export default class DarkHeresyUtil {
     static createMalignancyTestRolldata(actor) {
         const characteristic = actor.characteristics.willpower;
         return {
-            name: "CORRUPTION.HEADER",
+            name: "CORRUPTION.MALIGNANCY",
             baseTarget: characteristic.total,
-            modifier: getMalignancyModifier(actor.corruption),
+            modifier: this.getMalignancyModifier(actor.corruption),
             ownerId: actor.id
         };
     }
@@ -125,7 +125,7 @@ export default class DarkHeresyUtil {
         return {
             name: "TRAUMA.HEADER",
             baseTarget: characteristic.total,
-            modifier: getTraumaModifier(actor.insanity),
+            modifier: this.getTraumaModifier(actor.insanity),
             ownerId: actor.id
         };
     }