Merge pull request #61 from kaelad02/fix60

Adapt to some skill and tool changes the system made, fixing #60
kaelad02 · Feb 24, 2024 · ab7fe34 · ab7fe34
2 parents fc712c2 + e57fbb5
commit ab7fe34
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 173 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 3.3.2
+
+- bug fix: [#60](https://github.com/kaelad02/adv-reminder/issues/60) Fix tool checks to show advantage and messages again after the check was moved from the item to the actor
+- bug fix: Honor the ability you can pass into the `rollSkill` function, overriding the normal ability used for a skill. Examples would be a macro or using the new enricher to make a Strength (Intimidation) check.
+
 # 3.3.1
 
 - bug fix: [#56](https://github.com/kaelad02/adv-reminder/issues/56) Fully support messages on damage rolls other than attacks

diff --git a/src/messages.js b/src/messages.js
@@ -115,8 +115,8 @@ export class AbilitySaveMessage extends AbilityBaseMessage {
 }
 
 export class SkillMessage extends AbilityCheckMessage {
-  constructor(actor, skillId) {
-    super(actor, actor.system.skills[skillId].ability);
+  constructor(actor, abilityId, skillId) {
+    super(actor, abilityId);
 
     /** @type {string} */
     this.skillId = skillId;

diff --git a/src/reminders.js b/src/reminders.js
@@ -164,8 +164,8 @@ export class AbilitySaveReminder extends AbilityBaseReminder {
 }
 
 export class SkillReminder extends AbilityCheckReminder {
-  constructor(actor, skillId, checkArmorStealth = true) {
-    super(actor, actor.system.skills[skillId].ability);
+  constructor(actor, abilityId, skillId, checkArmorStealth = true) {
+    super(actor, abilityId);
 
     /** @type {string} */
     this.skillId = skillId;

diff --git a/src/rollers/core.js b/src/rollers/core.js
@@ -101,19 +101,21 @@ export default class CoreRollerHooks {
 
     if (this.isFastForwarding(config)) return;
 
-    new SkillMessage(actor, skillId).addMessage(config);
-    if (showSources) new SkillSource(actor, skillId, true).updateOptions(config);
-    new SkillReminder(actor, skillId, this.checkArmorStealth).updateOptions(config);
+    const ability = config.data.defaultAbility;
+    new SkillMessage(actor, ability, skillId).addMessage(config);
+    if (showSources) new SkillSource(actor, ability, skillId, true).updateOptions(config);
+    new SkillReminder(actor, ability, skillId, this.checkArmorStealth).updateOptions(config);
   }
 
-  preRollToolCheck(item, config) {
+  preRollToolCheck(actor, config, toolId) {
     debug("preRollToolCheck hook called");
 
     if (this.isFastForwarding(config)) return;
 
-    new AbilityCheckMessage(item.actor, item.system.ability).addMessage(config);
-    if (showSources) new AbilityCheckSource(item.actor, item.system.ability).updateOptions(config);
-    new AbilityCheckReminder(item.actor, item.system.ability).updateOptions(config);
+    const ability = config.data.defaultAbility;
+    new AbilityCheckMessage(actor, ability).addMessage(config);
+    if (showSources) new AbilityCheckSource(actor, ability).updateOptions(config);
+    new AbilityCheckReminder(actor, ability).updateOptions(config);
   }
 
   preRollDeathSave(actor, config) {

diff --git a/src/rollers/midi.js b/src/rollers/midi.js
@@ -59,17 +59,19 @@ export default class MidiRollerHooks extends CoreRollerHooks {
 
     if (this.isFastForwarding(config)) return;
 
-    new SkillMessage(actor, skillId).addMessage(config);
-    if (showSources) new SkillSource(actor, skillId, true).updateOptions(config);
+    const ability = config.data.defaultAbility;
+    new SkillMessage(actor, ability, skillId).addMessage(config);
+    if (showSources) new SkillSource(actor, ability, skillId, true).updateOptions(config);
   }
 
-  preRollToolCheck(item, config) {
+  preRollToolCheck(actor, config, toolId) {
     debug("preRollToolCheck hook called");
 
     if (this.isFastForwarding(config)) return;
 
-    new AbilityCheckMessage(item.actor, item.system.ability).addMessage(config);
-    if (showSources) new AbilityCheckSource(item.actor, item.system.ability).updateOptions(config);
+    const ability = config.data.defaultAbility;
+    new AbilityCheckMessage(actor, ability).addMessage(config);
+    if (showSources) new AbilityCheckSource(actor, ability).updateOptions(config);
   }
 
   preRollDeathSave(actor, config) {

diff --git a/src/rollers/rsr.js b/src/rollers/rsr.js
@@ -83,26 +83,28 @@ export default class ReadySetRollHooks extends CoreRollerHooks {
   preRollSkill(actor, config, skillId) {
     debug("preRollSkill hook called");
 
+    const ability = config.data.defaultAbility;
     if (this._doMessages(config)) {
-      new SkillMessage(actor, skillId).addMessage(config);
-      if (showSources) new SkillSource(actor, skillId, true).updateOptions(config);
+      new SkillMessage(actor, ability, skillId).addMessage(config);
+      if (showSources) new SkillSource(actor, ability, skillId, true).updateOptions(config);
     }
 
     if (this._doReminder(config))
-      new SkillReminder(actor, skillId, this.checkArmorStealth).updateOptions(config);
+      new SkillReminder(actor, ability, skillId, this.checkArmorStealth).updateOptions(config);
   }
 
-  preRollToolCheck(item, config) {
+  preRollToolCheck(actor, config, toolId) {
     debug("preRollToolCheck hook called");
 
+    const ability = config.data.defaultAbility;
     if (this._doMessages(config)) {
-      new AbilityCheckMessage(item.actor, item.system.ability).addMessage(config);
+      new AbilityCheckMessage(actor, ability).addMessage(config);
       if (showSources)
-        new AbilityCheckSource(item.actor, item.system.ability).updateOptions(config);
+        new AbilityCheckSource(actor, ability).updateOptions(config);
     }
 
     if (this._doReminder(config))
-      new AbilityCheckReminder(item.actor, item.system.ability).updateOptions(config);
+      new AbilityCheckReminder(actor, ability).updateOptions(config);
   }
 
   preRollDeathSave(actor, config) {

diff --git a/test/common.js b/test/common.js
@@ -3,64 +3,6 @@ export default function commonTestInit() {
 
   globalThis.createActorWithFlags = (...keys) => {
     const actor = {
-      system: {
-        skills: {
-          acr: {
-            ability: "dex",
-          },
-          ani: {
-            ability: "wis",
-          },
-          arc: {
-            ability: "int",
-          },
-          ath: {
-            ability: "str",
-          },
-          dec: {
-            ability: "cha",
-          },
-          his: {
-            ability: "int",
-          },
-          ins: {
-            ability: "wis",
-          },
-          itm: {
-            ability: "cha",
-          },
-          inv: {
-            ability: "int",
-          },
-          med: {
-            ability: "wis",
-          },
-          nat: {
-            ability: "int",
-          },
-          prc: {
-            ability: "wis",
-          },
-          prf: {
-            ability: "cha",
-          },
-          per: {
-            ability: "cha",
-          },
-          rel: {
-            ability: "int",
-          },
-          slt: {
-            ability: "dex",
-          },
-          ste: {
-            ability: "dex",
-          },
-          sur: {
-            ability: "wis",
-          },
-        },
-      },
       flags: {},
     };
     keys.forEach((k) => setProperty(actor, k, true));

diff --git a/test/messages.test.js b/test/messages.test.js
@@ -25,64 +25,6 @@ globalThis.setProperty = (object, key, value) => {
 function createActorWithEffects(...keyValuePairs) {
   const appliedEffects = keyValuePairs.map(createEffect);
   return {
-    system: {
-      skills: {
-        acr: {
-          ability: "dex",
-        },
-        ani: {
-          ability: "wis",
-        },
-        arc: {
-          ability: "int",
-        },
-        ath: {
-          ability: "str",
-        },
-        dec: {
-          ability: "cha",
-        },
-        his: {
-          ability: "int",
-        },
-        ins: {
-          ability: "wis",
-        },
-        itm: {
-          ability: "cha",
-        },
-        inv: {
-          ability: "int",
-        },
-        med: {
-          ability: "wis",
-        },
-        nat: {
-          ability: "int",
-        },
-        prc: {
-          ability: "wis",
-        },
-        prf: {
-          ability: "cha",
-        },
-        per: {
-          ability: "cha",
-        },
-        rel: {
-          ability: "int",
-        },
-        slt: {
-          ability: "dex",
-        },
-        ste: {
-          ability: "dex",
-        },
-        sur: {
-          ability: "wis",
-        },
-      },
-    },
     appliedEffects,
     getRollData: () => ({}),
   };
@@ -491,7 +433,7 @@ describe("SkillMessage no legit active effects", () => {
     const actor = createActorWithEffects();
     const options = {};
 
-    new SkillMessage(actor, "ath").addMessage(options);
+    new SkillMessage(actor, "str", "ath").addMessage(options);
 
     expect(options.dialogOptions).toBeUndefined();
   });
@@ -502,7 +444,7 @@ describe("SkillMessage message flags", () => {
     const actor = createActorWithEffects(["flags.adv-reminder.message.all", "message.all message"]);
     const options = {};
 
-    new SkillMessage(actor, "prc").addMessage(options);
+    new SkillMessage(actor, "wis", "prc").addMessage(options);
 
     expect(options.dialogOptions["adv-reminder"].messages).toStrictEqual(["message.all message"]);
   });
@@ -514,7 +456,7 @@ describe("SkillMessage message flags", () => {
     ]);
     const options = {};
 
-    new SkillMessage(actor, "prc").addMessage(options);
+    new SkillMessage(actor, "wis", "prc").addMessage(options);
 
     expect(options.dialogOptions["adv-reminder"].messages).toStrictEqual([
       "message.ability.all message",
@@ -528,7 +470,7 @@ describe("SkillMessage message flags", () => {
     ]);
     const options = {};
 
-    new SkillMessage(actor, "prc").addMessage(options);
+    new SkillMessage(actor, "wis", "prc").addMessage(options);
 
     expect(options.dialogOptions["adv-reminder"].messages).toStrictEqual([
       "message.ability.check.all message",
@@ -542,7 +484,7 @@ describe("SkillMessage message flags", () => {
     ]);
     const options = {};
 
-    new SkillMessage(actor, "prc").addMessage(options);
+    new SkillMessage(actor, "wis", "prc").addMessage(options);
 
     expect(options.dialogOptions["adv-reminder"].messages).toStrictEqual([
       "message.ability.check.int message",
@@ -556,7 +498,7 @@ describe("SkillMessage message flags", () => {
     ]);
     const options = {};
 
-    new SkillMessage(actor, "acr").addMessage(options);
+    new SkillMessage(actor, "dex", "acr").addMessage(options);
 
     expect(options.dialogOptions).toBeUndefined();
   });
@@ -568,7 +510,7 @@ describe("SkillMessage message flags", () => {
     ]);
     const options = {};
 
-    new SkillMessage(actor, "prc").addMessage(options);
+    new SkillMessage(actor, "wis", "prc").addMessage(options);
 
     expect(options.dialogOptions["adv-reminder"].messages).toStrictEqual([
       "message.skill.all message",
@@ -582,7 +524,7 @@ describe("SkillMessage message flags", () => {
     ]);
     const options = {};
 
-    new SkillMessage(actor, "prc").addMessage(options);
+    new SkillMessage(actor, "wis", "prc").addMessage(options);
 
     expect(options.dialogOptions["adv-reminder"].messages).toStrictEqual([
       "message.skill.prc message",
@@ -596,7 +538,7 @@ describe("SkillMessage message flags", () => {
     ]);
     const options = {};
 
-    new SkillMessage(actor, "nat").addMessage(options);
+    new SkillMessage(actor, "int", "nat").addMessage(options);
 
     expect(options.dialogOptions).toBeUndefined();
   });
@@ -608,7 +550,7 @@ describe("SkillMessage message flags", () => {
     );
     const options = {};
 
-    new SkillMessage(actor, "ste").addMessage(options);
+    new SkillMessage(actor, "dex", "ste").addMessage(options);
 
     expect(options.dialogOptions["adv-reminder"].messages).toStrictEqual(["first", "second"]);
   });