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

Fix: /roll

Browse Source 
Regression sur /roll causée par méthode async:
return Promise(false)=>true au lieu de false...
This commit is contained in:
Vincent Vandemeulebrouck 2022-11-30 13:27:05 +01:00
parent 979a48e4d9
commit e67ac96e93
2 changed files with 46 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
module/rdd-commands.js
View File

@ -22,7 +22,20 @@ const rddRollNumeric = /^(\d+)\s*([\+\-]?\d+)?\s*(s)?/;
export class RdDCommands { export class RdDCommands {
static init() { static init() {
game.system.rdd.commands = new RdDCommands(); const rddCommands = new RdDCommands();
Hooks.on("chatMessage", (html, content, msg) => {
if (content[0] == '/') {
let regExp = /(\S+)/g;
let commands = content.match(regExp);
if (rddCommands.processChatCommand(commands, content, msg)) {
return false;
}
}
return true;
});
game.system.rdd.commands = rddCommands;
} }
constructor() { constructor() {
@ -154,14 +167,7 @@ export class RdDCommands {
/* -------------------------------------------- */ /* -------------------------------------------- */
registerCommand(command) { registerCommand(command) {
this._addCommand(this.getCommands(), command.path, '', command); this._addCommand(this.commandsTable, command.path, '', command);
}
getCommands() {
if (!this.commandsTable){
this._registerCommands();
}
return this.commandsTable;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
@ -198,18 +204,29 @@ export class RdDCommands {
processChatCommand(commandLine, content = '', msg = {}) { processChatCommand(commandLine, content = '', msg = {}) {
// Setup new message's visibility // Setup new message's visibility
let rollMode = game.settings.get("core", "rollMode"); let rollMode = game.settings.get("core", "rollMode");
if (["gmroll", "blindroll"].includes(rollMode)) msg["whisper"] = ChatMessage.getWhisperRecipients("GM"); if (["gmroll", "blindroll"].includes(rollMode)) {
if (rollMode === "blindroll") msg["blind"] = true; msg["whisper"] = ChatMessage.getWhisperRecipients("GM");
}
if (rollMode === "blindroll"){
msg["blind"] = true;
}
msg["type"] = 0; msg["type"] = 0;
let command = commandLine[0].toLowerCase(); if (!this.commandsTable) {
let params = commandLine.slice(1); this._registerCommands();
return this.process(command, params, content, msg);
} }
process(command, params, content, msg) { let command = commandLine[0].toLowerCase();
return this._processCommand(this.getCommands(), command, params, content, msg); if (this._isCommandHandled(command)) {
let params = commandLine.slice(1);
this._processCommand(this.commandsTable, command, params, content, msg);
return true;
}
return false;
}
_isCommandHandled(command){
return this.commandsTable[command] != undefined;
} }
async _processCommand(commandsTable, name, params, content = '', msg = {}, path = "") { async _processCommand(commandsTable, name, params, content = '', msg = {}, path = "") {
@ -217,18 +234,20 @@ export class RdDCommands {
path = path + name + " "; path = path + name + " ";
if (command && command.subTable) { if (command && command.subTable) {
if (params[0]) { if (params[0]) {
return this._processCommand(command.subTable, params[0], params.slice(1), content, msg, path) this._processCommand(command.subTable, params[0], params.slice(1), content, msg, path)
} }
else { else {
this.help(msg, command.subTable); this.help(msg, command.subTable);
}
return true; return true;
} }
}
if (command && command.func) { if (command && command.func) {
new Promise(async () => {
const result = await command.func(content, msg, params); const result = await command.func(content, msg, params);
if (result == false) { if (result == false) {
RdDCommands._chatAnswer(msg, command.descr); RdDCommands._chatAnswer(msg, command.descr);
} }
});
return true; return true;
} }
return false; return false;
@ -240,7 +259,7 @@ export class RdDCommands {
} }
async help(msg, table) { async help(msg, table) {
let commands = [] let commands = []
this._buildSubTableHelp(commands, table ?? this.getCommands()); this._buildSubTableHelp(commands, table ?? this.commandsTable);
let html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/settings/dialog-aide-commands.html", { commands: commands }); let html = await renderTemplate("systems/foundryvtt-reve-de-dragon/templates/settings/dialog-aide-commands.html", { commands: commands });
let d = new Dialog( let d = new Dialog(

14
module/rdd-main.js
View File

@ -345,17 +345,3 @@ async function migrationPngWebp_1_5_34() {
/* -------------------------------------------- */ /* -------------------------------------------- */
Hooks.once('diceSoNiceReady', (dice3d) => RdDDice.diceSoNiceReady(dice3d)); Hooks.once('diceSoNiceReady', (dice3d) => RdDDice.diceSoNiceReady(dice3d));
/* -------------------------------------------- */
/* Foundry VTT chat message */
/* -------------------------------------------- */
Hooks.on("chatMessage", (html, content, msg) => {
if (content[0] == '/') {
let regExp = /(\S+)/g;
let commands = content.match(regExp);
if (game.system.rdd.commands.processChatCommand(commands, content, msg)) {
return false;
}
}
return true;
});