Merge branch 'dmdorman:main' into main

phBalance · Nov 9, 2024 · cc884b1 · cc884b1
2 parents 70b12de + 84c82d1
commit cc884b1
Show file tree

Hide file tree

Showing 12 changed files with 97 additions and 103 deletions.
diff --git a/README.md b/README.md
@@ -145,7 +145,7 @@ await damageRoller.roll();
 const cardHtml = await damageRoller.render("Knockback roll");
 
 const chatData = {
-  type: CONST.CHAT_MESSAGE_TYPES.ROLL,
+  style: CONST.CHAT_MESSAGE_STYLES.OTHER,
   rolls: damageRoller.rawRolls(),
   user: game.user._id,
   content: cardHtml,

diff --git a/module/actor/actor-sheet.mjs b/module/actor/actor-sheet.mjs
@@ -933,7 +933,7 @@ export class HeroSystemActorSheet extends ActorSheet {
         speaker.alias = actor.name;
 
         const chatData = {
-            type: CONST.CHAT_MESSAGE_TYPES.ROLL,
+            style: CONST.CHAT_MESSAGE_STYLES.OOC,
             rolls: heroRoller.rawRolls(),
             user: game.user._id,
             content: cardHtml,
@@ -969,8 +969,10 @@ export class HeroSystemActorSheet extends ActorSheet {
         const cardHtml = await characteristicRoller.render(flavor);
 
         const speaker = ChatMessage.getSpeaker({ actor: this.actor });
+        speaker.alias = this.actor.name;
+
         const chatData = {
-            type: CONST.CHAT_MESSAGE_TYPES.ROLL,
+            style: CONST.CHAT_MESSAGE_STYLES.OOC,
             rolls: characteristicRoller.rawRolls(),
             user: game.user._id,
             content: cardHtml,
@@ -1042,8 +1044,10 @@ export class HeroSystemActorSheet extends ActorSheet {
         const template = `systems/${HEROSYS.module}/templates/chat/item-damage-card.hbs`;
         const cardHtml = await renderTemplate(template, cardData);
         const speaker = ChatMessage.getSpeaker({ actor: this.actor });
+        speaker.alias = this.actor.name;
+
         const chatData = {
-            type: CONST.CHAT_MESSAGE_TYPES.ROLL,
+            style: CONST.CHAT_MESSAGE_STYLES.OOC,
             rolls: characteristicRoller.rawRolls(),
             user: game.user._id,
             content: cardHtml,
@@ -1335,7 +1339,7 @@ export class HeroSystemActorSheet extends ActorSheet {
         const speaker = ChatMessage.getSpeaker({ actor: this.actor, token });
         const chatData = {
             user: game.user._id,
-            type: CONST.CHAT_MESSAGE_TYPES.OTHER,
+            style: CONST.CHAT_MESSAGE_STYLES.OTHER,
             content: content,
             speaker: speaker,
         };

diff --git a/module/actor/actor.mjs b/module/actor/actor.mjs
@@ -324,7 +324,7 @@ export class HeroSystem6eActor extends Actor {
             if (asAction) {
                 const chatData = {
                     user: game.user._id,
-                    type: CONST.CHAT_MESSAGE_TYPES.OTHER,
+                    style: CONST.CHAT_MESSAGE_STYLES.OTHER,
                     content: content,
                     speaker: speaker,
                 };
@@ -373,7 +373,7 @@ export class HeroSystem6eActor extends Actor {
 
         const chatData = {
             user: game.user._id,
-            type: CONST.CHAT_MESSAGE_TYPES.OTHER,
+            style: CONST.CHAT_MESSAGE_STYLES.OTHER,
             content: content,
             speaker: speaker,
             whisper: [...ChatMessage.getWhisperRecipients(this.name), ...ChatMessage.getWhisperRecipients("GM")],
@@ -445,9 +445,10 @@ export class HeroSystem6eActor extends Actor {
                 //token,
             });
             speaker["alias"] = game.user.name;
+
             const chatData = {
                 user: game.user._id,
-                type: CONST.CHAT_MESSAGE_TYPES.OTHER,
+                style: CONST.CHAT_MESSAGE_STYLES.OTHER,
                 content: `${this.name} is ${badStatus.join(", ")} and cannot move. Override key was used.`,
                 whisper: whisperUserTargetsForActor(this),
                 speaker,
@@ -503,12 +504,12 @@ export class HeroSystem6eActor extends Actor {
         if (!result && overrideCanAct) {
             const speaker = ChatMessage.getSpeaker({
                 actor: this,
-                //token,
             });
             speaker["alias"] = game.user.name;
+
             const chatData = {
                 user: game.user._id,
-                type: CONST.CHAT_MESSAGE_TYPES.OTHER,
+                style: CONST.CHAT_MESSAGE_STYLES.OTHER,
                 content: `${this.name} is ${badStatus.join(", ")} and cannot act. Override key was used.`,
                 whisper: whisperUserTargetsForActor(this),
                 speaker,

diff --git a/module/combat.mjs b/module/combat.mjs
@@ -531,7 +531,7 @@ export class HeroSystem6eCombat extends Combat {
 
             const chatData = {
                 user: game.user._id,
-                type: CONST.CHAT_MESSAGE_TYPES.OTHER,
+                style: CONST.CHAT_MESSAGE_STYLES.OTHER,
                 content: content,
                 whisper: whisperUserTargetsForActor(combatant.actor),
                 speaker,
@@ -587,18 +587,12 @@ export class HeroSystem6eCombat extends Combat {
 
             await effect.delete();
 
-            let content = `${combatant.actor.name} recovers from being stunned.`;
-            const token = combatant.token;
-            const speaker = ChatMessage.getSpeaker({
-                actor: combatant.actor,
-                token,
-            });
-            speaker["alias"] = combatant.actor.name;
+            const content = `${combatant.actor.name} recovers from being stunned.`;
+
             const chatData = {
                 user: game.user._id,
-                type: CONST.CHAT_MESSAGE_TYPES.OTHER,
+                style: CONST.CHAT_MESSAGE_STYLES.OTHER,
                 content: content,
-                //speaker: speaker
             };
 
             await ChatMessage.create(chatData);
@@ -650,8 +644,8 @@ export class HeroSystem6eCombat extends Combat {
             <p>Skipping because this has already been performed on this turn during this combat.
             This typically occurs when rewinding combat or during speed changes.</p>`;
             const chatData = {
+                style: CONST.CHAT_MESSAGE_STYLES.OTHER,
                 user: game.user._id,
-                type: CONST.CHAT_MESSAGE_TYPES.OTHER,
                 content: content,
             };
 
@@ -731,8 +725,8 @@ export class HeroSystem6eCombat extends Combat {
         content += "</ul>";
         contentHidden += "</ul>";
         const chatData = {
+            style: CONST.CHAT_MESSAGE_STYLES.OTHER,
             user: game.user._id,
-            type: CONST.CHAT_MESSAGE_TYPES.OTHER,
             content: content,
         };
 

diff --git a/module/herosystem6e.mjs b/module/herosystem6e.mjs
@@ -727,14 +727,6 @@ Hooks.on("updateWorldTime", async (worldTime, options) => {
                 }
                 if (game.time.worldTime >= aeWithCharges.flags.startTime + aeWithCharges.duration.seconds) {
                     await aeWithCharges.parent.toggle();
-                    // const chatData = {
-                    //     user: game.user._id,
-                    //     type: CONST.CHAT_MESSAGE_TYPES.OTHER,
-                    //     content: `${aeWithCharges.name} expired`,
-                    //     whisper: whisperUserTargetsForActor(aeWithCharges.parent?.actor),
-                    // };
-                    // ChatMessage.create(chatData);
-                    // await aeWithCharges.delete();
                 } else {
                     if (game.ready) game[HEROSYS.module].effectPanel.refresh();
                 }