public/foundryvtt-reve-de-dragon
1
1
Fork 1
Code Issues 4 Pull Requests Actions Projects Releases 186 Wiki Activity

Preparation du passage en v12

Browse Source
This commit is contained in:
LeRatierBretonnien
2024-05-01 09:13:21 +02:00
parent ad9e75c66d
commit bc35c8d80e
38 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/rdd-combat.js
View File

@ -128,7 +128,7 @@ export class RdDCombatManager extends Combat {
// Send a chat message
let rollMode = messageOptions.rollMode || game.settings.get("core", "rollMode");
let messageData = mergeObject(
let messageData = foundry.utils.mergeObject(
{
speaker: {
scene: canvas.scene._id,
@ -885,7 +885,7 @@ export class RdDCombat {
this.removeChatMessageActionsPasseArme(attackerRoll.passeArme);
if (essaisPrecedents) {
mergeObject(attackerRoll.essais, essaisPrecedents, { overwrite: true });
foundry.utils.mergeObject(attackerRoll.essais, essaisPrecedents, { overwrite: true });
}
// # utilisation esquive