Merge branch 'develop'

changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.2.1] 2-2-06-25
+### Changed
+- Removed some excess logging.
+- DND5e: Renamed Ability Tests to Ability Checks.
+- DND5e: Add choice of showing VSM/C/R info next to spells.
+
 ## [0.2.0] 2020-06-25
 ### Added
 - DND5e: add choice of showing all nonprepared spells (innate, pact, at-will, always prepared), or hiding based on their 'prepared'-ness.

scripts/actions/actions-dnd5e.js

@@ -209,6 +209,10 @@ export class ActionHandler5e extends ActionHandler {
             }
 
             let spell = this._buildItem(tokenId, actor, macroType, s);
+
+            if (settings.get('showSpellInfo'))
+                this._addSpellInfo(s, spell);
+
             if (!max || levelInfo?.slotsAvailable) {
                 if (power) {
                     powers.subcategories[prepType].actions.push(spell);
@@ -230,6 +234,26 @@ export class ActionHandler5e extends ActionHandler {
 
         return result;
     }
+
+    /** @private */
+    _addSpellInfo(s, spell) {
+        let c = s.data.components;
+
+        if (c?.vocal)
+            spell.info1 += 'V';
+
+        if (c?.somatic)
+            spell.info1 += 'S';
+
+        if (c?.material)
+            spell.info1 += 'M';
+
+        if (c?.concentration)
+            spell.info2 += 'C';
+
+        if (c?.ritual)
+            spell.info3 += 'R';
+    }
 
     /** FEATS **/
 

scripts/actions/actions-wfrp.js

@@ -51,7 +51,6 @@ export class ActionHandlerWfrp extends ActionHandler {
         if (Object.entries(characteristics.subcategories).length > 0)
             result.categories["characteristics"] = characteristics;
 
-        console.log(result);
         return result;
     }
 

scripts/actions/checks-dnd5e.js

@@ -9,8 +9,8 @@ export function buildChecksList(tokenId) {
     result["skills"] = { subcategories: skills };
 
     if (settings.get('splitAbilities')) {
-        let tests = mapToSubcategory(tokenId, "tests", "abilityTest", game.dnd5e.config.abilities, abbr);
-        result["tests"] = { subcategories: tests };
+        let checks = mapToSubcategory(tokenId, "checks", "abilityChecks", game.dnd5e.config.abilities, abbr);
+        result["checks"] = { subcategories: checks };
 
         let saves = mapToSubcategory(tokenId, "saves", "abilitySave", game.dnd5e.config.abilities, abbr);
         result["saves"] = { subcategories: saves}; 
@@ -24,7 +24,7 @@ export function buildChecksList(tokenId) {
 }
 
 function mapToSubcategory(tokenId, categoryName, categoryType, list, abbr) {
-    console.log(abbr);
+
     let result = { [categoryName]: 
             { 
                 "actions": Object.entries(list).map(e => {

scripts/init.js

@@ -22,7 +22,6 @@ Hooks.on('init', () => {
     if (!game.tokenActionHUD) {
         let actionHandler = HandlersManager.getActionHandler(system);
         let handlerId = settings.get('rollHandler');
-        console.log(handlerId);
 
         if (! (handlerId === 'core' || game.modules.get(handlerId).active) ) {
             settings.Logger.error(handlerId, "not found, reverting to core roller.")
@@ -31,7 +30,6 @@ Hooks.on('init', () => {
         }
 
         let rollHandler = HandlersManager.getRollHandler(system, handlerId);
-        console.log(rollHandler);
 
         game.tokenActionHUD = new TokenActionHUD(actionHandler, rollHandler);
     }

scripts/logger.js

@@ -9,6 +9,6 @@ export class Logger {
 
     static debug(...args) {
         if (game.settings.get('token-action-hud', 'debug'))
-            Logger.info("debug: ", ...args);
+            Logger.info("debug:", ...args);
     }
 }

scripts/rolls/base-dnd5e-rolls.js

@@ -8,7 +8,7 @@ export class RollHandlerBase5e extends RollHandler {
 
     /** @override */
     handleActionEvent(event, encodedValue) {
-        console.log(encodedValue);
+        settings.Logger.debug(encodedValue);
         let payload = encodedValue.split('.');
 
         if (payload.length != 3) {
@@ -29,8 +29,8 @@ export class RollHandlerBase5e extends RollHandler {
             case "abilitySave":
                 this.rollAbilitySaveMacro(event, tokenId, actionId);
                 break;
-            case "abilityTest":
-                this.rollAbilityTestMacro(event, tokenId, actionId);
+            case "abilityCheck":
+                this.rollAbilityCheckMacro(event, tokenId, actionId);
                 break;
             case "item":
             case "spell":
@@ -46,7 +46,7 @@ export class RollHandlerBase5e extends RollHandler {
         super.getActor(tokenId).rollAbility(checkId, {event: event});
     }
 
-    rollAbilityTestMacro(event, tokenId, checkId) {
+    rollAbilityCheckMacro(event, tokenId, checkId) {
         super.getActor(tokenId).rollAbilityTest(checkId, {event: event});
     }
 

scripts/rolls/base-wfrp-rolls.js

@@ -7,7 +7,7 @@ export class RollHandlerBaseWfrp4e extends RollHandler {
 
     handleActionEvent(event, encodedValue) {
         let payload = encodedValue.split('.');
-        console.log(encodedValue);
+        settings.Logger.debug(encodedValue);
         if (payload.length != 3) {
             super.throwInvalidValueErr();
         }
@@ -18,11 +18,8 @@ export class RollHandlerBaseWfrp4e extends RollHandler {
 
         let actor = super.getActor(tokenId);
         let item = actor.getOwnedItem(actionId).data;
-        console.log(item);
-        console.log(event);
 
         let bypassData = {bypass: !!event.shiftKey};
-        console.log("BypassData: ", bypassData);
 
         switch (macroType) {
             case "weapon":

scripts/rolls/betterrolls5e-dnd5e-rolls.js

@@ -6,7 +6,7 @@ export class RollHandlerBetterRolls5e extends RollHandlerBase5e {
     }
 
     /** @override */
-    rollAbilityTestMacro(event, tokenId, checkId) {
+    rollAbilityCheckMacro(event, tokenId, checkId) {
         let actor = super.getActor(tokenId);
 
         let params = {adv:0, disadv:0};

scripts/settings/dnd5e-settings.js

@@ -10,6 +10,16 @@ export function registerSettings(app, settings, updateSettings) {
         onChange: value => { updateSettings(value); }
     });
 
+    game.settings.register(app,'showSpellInfo', {
+        name: "Display spell information",
+        hint: "If enabled, spell component information, concentration, and ritual status will be noted next to the spell name.",
+        scope: "client",
+        config: true,
+        type: Boolean,
+        default: true,
+        onChange: value => { updateSettings(value); }
+    });
+
     game.settings.register(app,'showAllNonpreparableSpells', {
         name: "Show all non-preparable spells",
         hint: "If disabled, spells such as cantrips, innate, pact, and at-will spells need to be 'prepared' via the spell details to be shown on the HUD.",
@@ -41,8 +51,8 @@ export function registerSettings(app, settings, updateSettings) {
     });
 
     game.settings.register(app,'splitAbilities', {
-        name: "Show separate ability test and save categories",
-        hint: "If enabled, abilities will be separated into tests and saves.",
+        name: "Show separate ability check and save categories",
+        hint: "If enabled, abilities will be separated into checks and saves.",
         scope: "client",
         config: true,
         type: Boolean,
@@ -66,4 +76,5 @@ export function registerSettings(app, settings, updateSettings) {
     settings['hideLongerActions'] = 'hideLongerActions';
     settings['abbreviateSkills'] = 'abbreviateSkills';
     settings['splitAbilities'] = 'splitAbilities';
+    settings['showSpellInfo'] = 'showSpellInfo';
 }