Overhauled saves from chat card

Author: SobranDM

CHANGELOG.md

@@ -6,6 +6,11 @@
 
 - All testing efforts were done in v13's Dark mode. The sheet was never designed with v13's theming in mind and it turned out to be pretty difficult to attempt to add it this late in the game. Light mode will _probably_ work fine but don't be surprised if there are small visual issues here and there.
 
+### Known Issue
+
+- Rerolling an individual rerolls all combatants.
+- If two groups ends up with the same initiative value, all combatants will display with decimals. This is a janky workaround to prevent groups with identical initiatives from ending up mixed in the tracker. Doing it the "right" way proved more trouble than it was worth.
+
 ### Changes
 
 - Added container items.
@@ -21,6 +26,7 @@
     - Combined Arts + Spells + Foci and Abilities into a single Abilities compendium.
     - Combined Adventuring Gear + Weapons + Armor into a single Gear compendium.
     - Fixed various errors and inconsistencies. If you spot any I missed, please report them.
+    - Added SRD content, including Deluxe and Atlas classes. Shoutout to pandaniel and Zi-SH on the Discord for their help doing data entry on this one.
   - Added icons to most gear items.
     - A few bits of adventuring gear didn't have anything suitable in Foundry's icon collection.
     - The shields share a single icon, as do two pieces of mail armor, due to limited selection in said collection.
@@ -40,13 +46,16 @@
     - Fixed faction attacks forcing attacks to be against certain asset types.
 - Fixed an error with monster saves.
   - This was caused by an ill-advised "optimization" that had ramifications I didn't foresee. To ensure that all monsters in compendiums are fixed, this is a breaking change. Namely, if you had any characters or monsters that used the "Base Save" in Tweaks to modify their saving throws, you will have to redo the change using the "Universal Save Mod", also located in Tweaks.
+- Clicking a save button on a chat card has been vastly improved.
+  - Now opens a dialog asking for a universal modifier and has individual modifier overrides for each selected token.
+  - Rolls all saves at once and outputs a single chat card containing the results.
 - Fixed weapon charges not displaying on inventory tab.
 - Possible fix for an Item Piles interaction.
 - Moved party sheet button so it is no longer hidden by Foundry's search button in the actors tab.
-- Initiative updates.
-  - Completely reworked initiative, fixing group initiative and a handful of other issues such as reroll and reset. Shoutout to wyrmisis who gave me permission to use their solution from the OSE project!
-  - Fixed Alert 1 not providing a group bonus when Alert combatant's initiative is not the highest within the group.
-  - Updating the initiative of one member of a group should update the initiative of all members.
+- Completely reworked initiative, fixing group initiative and a handful of other issues such as reroll and reset. Shoutout to wyrmisis who gave me permission to use their solution from the OSE project!
+- Fixed Alert 1 not providing a group bonus when Alert combatant's initiative is not the highest within the group.
+- Updating the initiative of one member of a group should update the initiative of all members.
+- Initiative rolls are now grouped into a single chat card instead of spamming the chat.
 
 ## New in 1.4.6
 

api-utils.js

@@ -384,6 +384,7 @@
   "WWN.spells.Time": "Time",
   "WWN.spells.TimeHint": "Length of time effort is committed",
   "WWN.spells.Effort": "Effort",
+  "WWN.spells.Commit": "Commit",
   "WWN.spells.Committed": "Committed",
   "WWN.spells.Current": "Current",
   "WWN.spells.HighMage": "High Mage",

lang/en.json

@@ -8,46 +8,103 @@
  * @return {Array}              The extended options Array including new context choices
  */
 export const addChatMessageContextOptions = function (html, options) {
-  let canApply = (li) =>
-    canvas.tokens.controlled.length && li.find(".dice-roll").length;
-  options.push(
+  /**
+   * Determines if damage can be applied from this message
+   * @param {HTMLElement} li    The chat message element
+   * @return {boolean}          Whether damage can be applied
+   */
+  const canApply = (li) => {
+    const message = game.messages.get(li.dataset.messageId);
+    if (!canvas.tokens.controlled.length) return false;
+
+    // Check for v13 style rolls
+    if (message.rolls?.length) return true;
+
+    // Check for legacy style rolls in content
+    if (message.content) {
+      return message.content.includes("damage-roll") ||
+        message.content.includes("dice-roll");
+    }
+
+    return false;
+  };
+
+  /**
+   * Extracts the damage amount from a chat message
+   * @param {ChatMessage} message    The chat message to extract from
+   * @return {number|null}           The damage amount, or null if not found
+   */
+  const getDamageAmount = (message) => {
+    // Case 1: Message has rolls (v13)
+    if (message.rolls?.length) {
+      return message.rolls[0].total;
+    }
+
+    // Case 2: Legacy damage roll in content
+    if (message.content) {
+      const tempDiv = document.createElement('div');
+      tempDiv.innerHTML = message.content;
+
+      // Try both damage-roll and dice-roll elements
+      const damageRoll = tempDiv.querySelector('.damage-roll .part-total, .dice-roll .dice-total');
+      if (damageRoll) {
+        return Number(damageRoll.textContent);
+      }
+    }
+
+    return null;
+  };
+
+  // Define the damage application options
+  const damageOptions = [
     {
       name: game.i18n.localize("WWN.messages.applyDamage"),
       icon: '<i class="fas fa-user-minus"></i>',
-      condition: canApply,
-      callback: (li) => applyChatCardDamage(li, 1, 1),
+      multiplier: 1
     },
     {
       name: game.i18n.localize("WWN.messages.applyHealing"),
       icon: '<i class="fas fa-user-plus"></i>',
-      condition: canApply,
-      callback: (li) => applyChatCardDamage(li, -1, 1),
+      multiplier: -1
     },
     {
       name: game.i18n.localize("WWN.messages.applyHalfDamage"),
       icon: '<i class="fas fa-user-minus"></i>',
-      condition: canApply,
-      callback: (li) => applyChatCardDamage(li, 0.5, 1),
+      multiplier: 0.5
     },
     {
       name: game.i18n.localize("WWN.messages.applyHalfHealing"),
       icon: '<i class="fas fa-user-plus"></i>',
-      condition: canApply,
-      callback: (li) => applyChatCardDamage(li, -0.5, 1),
+      multiplier: -0.5
     },
     {
       name: game.i18n.localize("WWN.messages.applyDoubleDamage"),
       icon: '<i class="fas fa-user-minus"></i>',
-      condition: canApply,
-      callback: (li) => applyChatCardDamage(li, 2, 1),
+      multiplier: 2
     },
     {
       name: game.i18n.localize("WWN.messages.applyDoubleHealing"),
       icon: '<i class="fas fa-user-plus"></i>',
-      condition: canApply,
-      callback: (li) => applyChatCardDamage(li, -2, 1),
+      multiplier: -2
     }
-  );
+  ];
+
+  // Add each damage option to the context menu
+  damageOptions.forEach(opt => {
+    options.push({
+      name: opt.name,
+      icon: opt.icon,
+      condition: canApply,
+      callback: (li) => {
+        const message = game.messages.get(li.dataset.messageId);
+        const damage = getDamageAmount(message);
+        if (damage !== null) {
+          applyChatCardDamage(damage, opt.multiplier);
+        }
+      }
+    });
+  });
+
   return options;
 };
 
@@ -69,52 +126,38 @@ export const addChatMessageButtons = function (msg, html, data) {
   // Buttons
   let roll = html.find(".damage-roll");
   if (roll.length > 0) {
-    let total = roll.find(".dice-total");
-    let value = total.text();
     roll.append(
       $(
         `<div class="dice-damage"><button type="button" data-action="apply-damage" title="` +
-          game.i18n.localize("WWN.messages.applyDamage") +
-          `"><i class="fas fa-tint"></i></button></div>`
+        game.i18n.localize("WWN.messages.applyDamage") +
+        `"><i class="fas fa-tint"></i></button></div>`
       )
     );
-    roll.find('button[data-action="apply-damage"]').click((ev) => {
-      ev.preventDefault();
-      applyChatCardDamage(roll, 1, 0);
-    });
   }
 
   const shockMessage = html.find(".shock-message");
   if (shockMessage.length > 0) {
     shockMessage.append(
       $(
         `<div class="dice-damage"><button type="button" data-action="apply-damage" title="` +
-          game.i18n.localize("WWN.messages.applyShockDamage") +
-          `"><i class="fas fa-tint"></i></button></div>`
+        game.i18n.localize("WWN.messages.applyShockDamage") +
+        `"><i class="fas fa-tint"></i></button></div>`
       )
     );
-    shockMessage.find('button[data-action="apply-damage"]').click((ev) => {
-      ev.preventDefault();
-      applyChatCardDamage(shockMessage, 1, 0);
-    });
   }
 };
 
 /**
  * Apply rolled dice damage to the token or tokens which are currently controlled.
  * This allows for damage to be scaled by a multiplier to account for healing, critical hits, or resistance
  *
- * @param {HTMLElement} roll    The chat entry which contains the roll data
- * @param {Number} multiplier   A damage multiplier to apply to the rolled damage.
+ * @param {Number} amount        The base damage amount to apply
+ * @param {Number} multiplier    A damage multiplier to apply to the rolled damage.
  * @return {Promise}
  */
-async function applyChatCardDamage(roll, multiplier, index) {
-  const diceTotals = roll.find(".dice-total");
+export async function applyChatCardDamage(amount, multiplier) {
   const targets = canvas.tokens.controlled;
-  const amount =
-    diceTotals.length > 1
-      ? Number(diceTotals[index].textContent)
-      : Number(diceTotals[0].textContent);
+
   const title =
     multiplier > 0
       ? `Applied ${Math.floor(amount * multiplier)} damage`
@@ -126,14 +169,14 @@ async function applyChatCardDamage(roll, multiplier, index) {
     body: `<ul><li>${targets
       .map((t) => t.name)
       .join("</li><li>")}</li></ul>`,
-      image: image
+    image: image
   };
 
   const template = "systems/wwn/templates/chat/apply-damage.html";
   const html = await renderTemplate(template, templateData);
 
   const chatData = {
-    user: game.user_id,
+    user: game.user.id,
     content: html
   };