From cc603aacd772bdd393909b20f92d20cf7e50cb99 Mon Sep 17 00:00:00 2001
From: Andrew Beard
Date: Fri, 7 Jun 2024 22:11:45 -0400
Subject: [PATCH 02/19] Add grid.distance and grid.units to prevent warnings on
v12. The old gridDistance and gridUnits are still required until v11
compatibility is dropped.
---
system.json | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/system.json b/system.json
index df664b3..75608fc 100644
--- a/system.json
+++ b/system.json
@@ -144,6 +144,10 @@
"download": "https://github.com/TheLastScrub/delta-green-foundry-vtt-system-unofficial/releases/latest/download/deltagreen.zip",
"gridDistance": 1,
"gridUnits": "m",
+ "grid": {
+ "distance": 1,
+ "units": "m"
+ },
"primaryTokenAttribute": "health",
"secondaryTokenAttribute": "wp"
}
From e11ef6dee834c5dd4f531c44ff602a02ec7976c6 Mon Sep 17 00:00:00 2001
From: jalensailin
Date: Sat, 8 Jun 2024 00:20:45 -0400
Subject: [PATCH 03/19] use Foundry's `toMessage` function over our own custom
method
---
module/roll/roll.js | 56 ++++++++++++++++++---------------------------
1 file changed, 22 insertions(+), 34 deletions(-)
diff --git a/module/roll/roll.js b/module/roll/roll.js
index 67bff8a..fb2db05 100644
--- a/module/roll/roll.js
+++ b/module/roll/roll.js
@@ -29,27 +29,25 @@ export class DGRoll extends Roll {
/**
* Simple function that actually creates the message and sends it to chat.
+ * We override this to have a little more control over certain aspects of the message,
+ * right now, its `speaker` and `rollMode`.
*
- * Broke this out so multiple functions can use it.
- *
- * @returns {Promise} - the created chat message.
+ * @override
+ * The following `@param` descriptions comes from the Foundry VTT code.
+ * @param {object} messageData The data object to use when creating the message
+ * @param {options} [options] Additional options which modify the created message.
+ * @param {string} [options.rollMode] The template roll mode to use for the message from CONFIG.Dice.rollModes
+ * @param {boolean} [options.create=true] Whether to automatically create the chat message, or only return the
+ * prepared chatData object.
+ * @returns {Promise} A promise which resolves to the created ChatMessage document if create is
+ * true, or the Object of prepared chatData otherwise.
*/
- async createMessage(content, flavor, rollMode) {
- const chatData = {
- speaker: ChatMessage.getSpeaker({ actor: this.actor }),
- content,
- flavor,
- type: 5, // CHAT_MESSAGE_TYPES.ROLL,
- roll: this,
- rollMode,
- };
-
- // play the dice rolling sound, like a regular in-chat roll
- AudioHelper.play(
- { src: "sounds/dice.wav", volume: 0.8, autoplay: true, loop: false },
- true,
- );
- return ChatMessage.create(chatData);
+ async toMessage(messageData = {}, { rollMode, create = true } = {}) {
+ messageData.speaker = ChatMessage.getSpeaker({ actor: this.actor });
+ return super.toMessage(messageData, {
+ rollMode: this.options.rollMode || rollMode,
+ create,
+ });
}
}
@@ -194,9 +192,6 @@ export class DGPercentileRoll extends DGRoll {
* @returns {Promise} - the created chat message.
*/
async toChat() {
- let rollMode =
- this.options.rollMode || game.settings.get("core", "rollMode");
-
// if using private san rolls, must hide any SAN roll unless user is a GM
const privateSanSetting = game.settings.get(
"deltagreen",
@@ -207,7 +202,7 @@ export class DGPercentileRoll extends DGRoll {
(this.type === "sanity" || this.key === "ritual") &&
!game.user.isGM
) {
- rollMode = "blindroll";
+ this.options.rollMode = "blindroll";
}
let label = `${game.i18n.localize("DG.Roll.Rolling")} ${
@@ -275,7 +270,7 @@ export class DGPercentileRoll extends DGRoll {
html += `