Release v0.0.22 (#160)

* Apply Duval font to headings on dialogs with .sheet class.

* Limit Duval headings to journals.

* Set correct primary/secondary token attributes.
Set default max for abilities.

* Support registration of default critical hit/disapproval compendiums or
fumble tables by modules (with the system settings acting as an override
or addition to the settings as appropriate).

* Add a 'dcc.ready' hook to let modules know when the DCC system is
initialised.

* Fix criticialHitsPack hook name.

* Implement rollable mercurial magic effects on the spell sheet.
Closes #125.

* Support Inherit Action Die config variable on spells.

* Update manifest and download URLs.

* Default icons for actors and items. (#141)

* Add a Hook that executes after an actor is imported.

* Apply default icons for Items on imported actors.

* Implement entity creation hooks to set themed default icons.

* Unify default image selection and apply to the parser and embedded entities.

* Add placeholder spell image.

* Only assign an image for actors/items with no existing image.

* Only try to apply the Pop Out flag as GM.
Remove spurious call to hexExistingMercurialEffect before rolling a
Treasure item's value.

* Update download link for v0.0.22-preview.3

* Minor and cosmetic fixes (#157)

* Add fields and dependency for the bug-reporter module.
Closes #152.

* Reorder saves on upper level sheets.
Closes #151.

* Rework Halfling two weapon fighting description on the sheet.
Closes #149.

* Remove actor name from damage and healing chat cards since the token
name is at the top of the card.
Closes #146.

* Fix Skill sheet description size and other item sheet issues.
Replaced item header fields with flexrows (grid caused some layout
problems).
Spell Mercurial Magic and Description now both resize if necessary.
Closes #143.

* Update download link to be v0.0.22-preview-4.

* Remove unnecessary overflow: scroll style on item sheet descriptions.
This created a second scrollbar on Firefox.
Closes #159.

* Update manifest for v0.0.22 release.

* Add a single author node and expand the contributors node.

* Fix download and manifest URLs.

Author: mooped

lang/en.json

@@ -268,10 +268,10 @@
   "DCC.HalflingAbilities": "Halfling Skills",
   "DCC.HalflingTwoWeaponActionDie": "Action dice d16+d16",
   "DCC.HalflingTwoWeaponCrit": "Crit on nat 16",
-  "DCC.HalflingTwoWeaponFumble": "Fumble only on 2x 1",
-  "DCC.HalflingTwoWeaponHighAg": "If Agi > 16 use normal rules",
+  "DCC.HalflingTwoWeaponFumble": "Fumble only on double 1",
+  "DCC.HalflingTwoWeaponHighAg": "If Agi > 16 use normal rules",
   "DCC.HandlePoison": "Handle Poison",
-  "DCC.HealDamage": "{target} is healed for {damage} HP.",
+  "DCC.HealDamage": "Healed for {damage} HP.",
   "DCC.Healing": "Healing",
   "DCC.Health": "Health",
   "DCC.HealthFormula": "Health Formula",
@@ -375,6 +375,9 @@
   "DCC.MercurialEffect": "Mercurial Effect",
   "DCC.MercurialEffectSummary": "Summary",
   "DCC.MercurialEffectValue": "Roll",
+  "DCC.MercurialMagicRoll": "Mercurial Magic Roll",
+  "DCC.MercurialMagicRerollPrompt": "Re-roll Mercurial Magic Roll?",
+  "DCC.MercurialMagicRerollExplain": "Discard previous Mercurial Magic roll and re-roll?",
   "DCC.MightyDeedsOfArms": "Mighty Deeds of Arms",
   "DCC.MigrationComplete": "Finished migration to DCC System version {systemVersion}!",
   "DCC.MigrationInfo": "Beginning DCC System Migration to version {systemVersion}. Please be patient and do not close your game or shut down your server.",
@@ -447,6 +450,8 @@
   "DCC.SettingDisapprovalTablesCompendiumHint": "Compendium to look in for critical hit tables. The specific table to use is selectable from the Cleric sheet.",
   "DCC.SettingFumbleTable": "Fumble Table",
   "DCC.SettingFumbleTableHint": "Roll Table to use for fumbles - must be in a compendium pack",
+  "DCC.SettingMercurialMagicTable": "Mercurial Magic Table",
+  "DCC.SettingMercurialMagicTableHint": "Roll Table to use for Mercurial Magic effects - must be in a compendium pack",
   "DCC.SettingStandardDiceRoller": "Use standard chat cards for dice rolls",
   "DCC.SettingStandardDiceRollerHint": "Use Foundry's standard cards to display attack, damage, crit, and fumble rolls instead of the custom card.",
   "DCC.SheetConfig": "Sheet Configuration",
@@ -532,7 +537,7 @@
   "DCC.SkillUseDie": "Use Die",
   "DCC.SkillUseValue": "Use Modifier",
   "DCC.SkillValue": "Modifier",
-  "DCC.TakeDamage": "{target} takes {damage} HP of damage.",
+  "DCC.TakeDamage": "Takes {damage} HP of damage.",
   "DCC.Target": "Target",
   "DCC.TargetAlly": "Ally",
   "DCC.TargetCone": "Cone",

module/actor-sheet.js

@@ -1,6 +1,7 @@
 /* global ActorSheet, CONFIG, duplicate, Dialog, game, mergeObject, expandObject, $, ENTITY_PERMISSIONS */
 
 import DCCActorConfig from './actor-config.js'
+import EntityImages from './entity-images.js'
 
 /**
  * Extend the basic ActorSheet
@@ -72,6 +73,15 @@ class DCCActorSheet extends ActorSheet {
       this.options.template = 'systems/dcc/templates/actor-sheet-npc.html'
     } else {
       this.options.template = 'systems/dcc/templates/actor-sheet-zero-level.html'
+
+      if (!data.isZero) {
+        // Reorder saves on upper level sheet to define tabbing order
+        data.data.saves = {
+          ref: data.data.saves.ref,
+          frt: data.data.saves.frt,
+          wil: data.data.saves.wil
+        }
+      }
     }
 
     // Prepare item lists by type
@@ -688,6 +698,7 @@ class DCCActorSheet extends ActorSheet {
     // Prepare the item object.
     const itemData = {
       name: name,
+      img: EntityImages.imageForItem(type),
       type: type,
       data: data
     }

module/actor.js

@@ -622,16 +622,17 @@ class DCCActor extends Actor {
 
     // Lookup the crit table if available
     let critResult = null
-    const critsPackName = game.settings.get('dcc', 'critsCompendium')
-    if (critsPackName) {
-      const pack = game.packs.get(critsPackName)
-      if (pack) {
-        await pack.getIndex() // Load the compendium index
-        const critTableFilter = `Crit Table ${this.data.data.attributes.critical.table}`
-        const entry = pack.index.find((entity) => entity.name.startsWith(critTableFilter))
-        if (entry) {
-          const table = await pack.getEntity(entry._id)
-          critResult = await table.draw({ roll, displayChat: options.displayStandardCards })
+    for (const criticalHitPackName of CONFIG.DCC.criticalHitPacks.packs) {
+      if (criticalHitPackName) {
+        const pack = game.packs.get(criticalHitPackName)
+        if (pack) {
+          await pack.getIndex() // Load the compendium index
+          const critTableFilter = `Crit Table ${this.data.data.attributes.critical.table}`
+          const entry = pack.index.find((entity) => entity.name.startsWith(critTableFilter))
+          if (entry) {
+            const table = await pack.getEntity(entry._id)
+            critResult = await table.draw({ roll, displayChat: options.displayStandardCards })
+          }
         }
       }
     }
@@ -681,7 +682,7 @@ class DCCActor extends Actor {
 
     // Lookup the fumble table if available
     let fumbleResult = null
-    const fumbleTableName = game.settings.get('dcc', 'fumbleTable')
+    const fumbleTableName = CONFIG.DCC.fumbleTable
     if (fumbleTableName) {
       const fumbleTablePath = fumbleTableName.split('.')
       let pack
@@ -853,15 +854,16 @@ class DCCActor extends Actor {
 
       // Lookup the disapproval table if available
       let disapprovalTable = null
-      const disapprovalPackName = game.settings.get('dcc', 'disapprovalCompendium')
-      const disapprovalTableName = this.data.data.class.disapprovalTable
-      if (disapprovalPackName && disapprovalTableName) {
-        const pack = game.packs.get(disapprovalPackName)
-        if (pack) {
-          await pack.getIndex() // Load the compendium index
-          const entry = pack.index.find((entity) => entity.name === disapprovalTableName)
-          if (entry) {
-            disapprovalTable = await pack.getEntity(entry._id)
+      for (const disapprovalPackName of CONFIG.DCC.disapprovalPacks.packs) {
+        const disapprovalTableName = this.data.data.class.disapprovalTable
+        if (disapprovalPackName && disapprovalTableName) {
+          const pack = game.packs.get(disapprovalPackName)
+          if (pack) {
+            await pack.getIndex() // Load the compendium index
+            const entry = pack.index.find((entity) => `${disapprovalPackName}.${entity.name}` === disapprovalTableName)
+            if (entry) {
+              disapprovalTable = await pack.getEntity(entry._id)
+            }
           }
         }
       }

module/config.js

@@ -350,7 +350,28 @@ DCC.DICE_CHAIN = [
   3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 30
 ]
 
-// Disapproval tables - updated at runtime from compendiums
+// Critical Hit and Disapproval Compendiums, Fumble table, and Mercurial Magic table
+// Updated at runtime from settings
+DCC.criticalHitPacks = null
+DCC.disapprovalPacks = null
+DCC.fumbleTable = null
+DCC.mercurialMagicTable = null
+
+// List of available disapproval tables for the cleric sheet, generated from disapprovalPacks
 DCC.disapprovalTables = {}
 
+// Default actor images
+DCC.defaultActorImages = {
+  default: 'systems/dcc/styles/images/actor.webp'
+}
+
+// Default item tokens
+DCC.defaultItemImages = {
+  default: 'systems/dcc/styles/images/item.webp',
+  armor: 'systems/dcc/styles/images/armor.webp',
+  spell: 'systems/dcc/styles/images/spell.webp',
+  treasure: 'systems/dcc/styles/images/coins.webp',
+  weapon: 'systems/dcc/styles/images/weapon.webp'
+}
+
 export default DCC

module/dcc.js

@@ -14,6 +14,8 @@ import * as chat from './chat.js'
 import * as migrations from './migrations.js'
 import DiceChain from './dice-chain.js'
 import parser from './parser.js'
+import TablePackManager from './tablePackManager.js'
+import EntityImages from './entity-images.js'
 
 import { registerSystemSettings } from './settings.js'
 
@@ -117,25 +119,55 @@ Hooks.once('ready', async function () {
 
   // Determine whether a system migration is required and feasible
   const currentVersion = game.settings.get('dcc', 'systemMigrationVersion')
-  const NEEDS_MIGRATION_VERSION = 0.16
+  const NEEDS_MIGRATION_VERSION = 0.21
   const needMigration = (currentVersion <= NEEDS_MIGRATION_VERSION) || (currentVersion === null)
 
   // Perform the migration
   if (needMigration && game.user.isGM) {
     migrations.migrateWorld()
   }
 
-  // Load the list of disapproval tables
-  const disapprovalTablesPackName = game.settings.get('dcc', 'disapprovalCompendium')
-  if (disapprovalTablesPackName) {
-    const pack = game.packs.get(disapprovalTablesPackName)
-    if (pack) {
-      await pack.getIndex()
-      pack.index.forEach(function (value, key, map) {
-        CONFIG.DCC.disapprovalTables[key] = value
-      })
+  // Create manager for disapproval tables and register the system setting
+  CONFIG.DCC.disapprovalPacks = new TablePackManager({
+    updateHook: async (manager) => {
+      // Clear disapproval tables
+      CONFIG.DCC.disapprovalTables = {}
+
+      // For each valid pack, update the list of disapproval tables available to a cleric
+      for (const packName of manager.packs) {
+        const pack = game.packs.get(packName)
+        if (pack) {
+          await pack.getIndex()
+          pack.index.forEach(function (value, key, map) {
+            CONFIG.DCC.disapprovalTables[key] = {
+              name: value.name,
+              path: `${packName}.${value.name}`
+            }
+          })
+        }
+      }
     }
+  })
+  CONFIG.DCC.disapprovalPacks.addPack(game.settings.get('dcc', 'disapprovalCompendium'), true)
+
+  // Create manager for critical hit table packs and register the system setting
+  CONFIG.DCC.criticalHitPacks = new TablePackManager()
+  CONFIG.DCC.criticalHitPacks.addPack(game.settings.get('dcc', 'critsCompendium'), true)
+
+  // Set fumble table from the system setting
+  const fumbleTable = game.settings.get('dcc', 'fumbleTable')
+  if (fumbleTable) {
+    CONFIG.DCC.fumbleTable = fumbleTable
   }
+
+  // Set mercurial magic table from the system setting
+  const mercurialMagicTable = game.settings.get('dcc', 'mercurialMagicTable')
+  if (mercurialMagicTable) {
+    CONFIG.DCC.mercurialMagicTable = mercurialMagicTable
+  }
+
+  // Let modules know the DCC system is ready
+  Hooks.callAll('dcc.ready')
 })
 
 /* -------------------------------------------- */
@@ -145,8 +177,11 @@ Hooks.once('ready', async function () {
 Hooks.on('hotbarDrop', (bar, data, slot) => createDCCMacro(data, slot))
 
 // Highlight 1's and 20's for all regular rolls
-Hooks.on('renderChatMessage', (app, html, data) => {
-  chat.highlightCriticalSuccessFailure(app, html, data)
+Hooks.on('renderChatMessage', (message, html, data) => {
+  if (game.user.isGM) {
+    message.setFlag('core', 'canPopout', true)
+  }
+  chat.highlightCriticalSuccessFailure(message, html, data)
 })
 
 // Support context menu on chat cards
@@ -157,9 +192,67 @@ Hooks.on('renderActorDirectory', (app, html) => {
   parser.onRenderActorDirectory(app, html)
 })
 
+// Disapproval table packs
+Hooks.on('dcc.registerDisapprovalPack', (value, fromSystemSetting) => {
+  const disapprovalPacks = CONFIG.DCC.disapprovalPacks
+
+  if (disapprovalPacks) {
+    disapprovalPacks.addPack(value, fromSystemSetting)
+  }
+})
+
+// Critical hit table packs
+Hooks.on('dcc.registerCriticalHitsPack', (value, fromSystemSetting) => {
+  const criticalHitPacks = CONFIG.DCC.criticalHitPacks
+
+  if (criticalHitPacks) {
+    criticalHitPacks.addPack(value, fromSystemSetting)
+  }
+})
+
+// Fumble table
+Hooks.on('dcc.setFumbleTable', (value, fromSystemSetting = false) => {
+  // Set fumble table if unset, or if applying the system setting (which takes precedence)
+  if (fromSystemSetting || !CONFIG.DCC.fumbleTable) {
+    CONFIG.DCC.fumbleTable = value
+  }
+})
+
+// Mercurial Magic mable
+Hooks.on('dcc.setMercurialMagicTable', (value, fromSystemSetting = false) => {
+  // Set mercurial magic table if unset, or if applying the system setting (which takes precedence)
+  if (fromSystemSetting || !CONFIG.DCC.mercurialMagicTable) {
+    CONFIG.DCC.mercurialMagicTable = value
+  }
+})
+
+// Entity creation hook
+Hooks.on('createActor', (entity, options, userId) => {
+  if (!game.user.isGM || entity.data.img) { return }
+
+  // Assign an appropriate DCC actor image
+  const img = EntityImages.imageForActor(entity.type)
+  if (img) {
+    entity.update({
+      img
+    })
+  }
+})
+
+Hooks.on('createItem', (entity, options, userId) => {
+  if (!game.user.isGM || entity.data.img) { return }
+
+  // Assign an appropriate DCC item image
+  const img = EntityImages.imageForItem(entity.type)
+  if (img) {
+    entity.update({
+      img
+    })
+  }
+})
+
 /* -------------------------------------------- */
 /*  Hotbar Macros                               */
-
 /* -------------------------------------------- */
 
 /**

module/entity-images.js

@@ -0,0 +1,41 @@
+/* global CONFIG */
+
+class EntityImages {
+  /**
+   * Select an appropriate image from a map
+   * @param {Object}  map     The map of entity types (or default) to image paths
+   * @param {String}  type    The entity type
+   * @returns {String}        The image to use
+   */
+  static _selectImage (map, type) {
+    // Grab the default image if available
+    let img = map.default
+
+    // Check for a more specialised image based on actor type
+    if (map[type]) {
+      img = map[type]
+    }
+
+    return img
+  }
+
+  /**
+   * Select an appropriate image for an actor
+   * @param {String}  type    The actor type
+   * @returns {String}        The image to use
+   */
+  static imageForActor (type) {
+    return this._selectImage(CONFIG.DCC.defaultActorImages, type)
+  }
+
+  /**
+   * Select an appropriate image for an item
+   * @param {String}  type    The item type
+   * @returns {String}        The image to use
+   */
+  static imageForItem (type) {
+    return this._selectImage(CONFIG.DCC.defaultItemImages, type)
+  }
+}
+
+export default EntityImages