Sync with head

This commit is contained in:
2020-11-03 09:14:14 +01:00
parent e2301b1cfd
commit 34156295ea
10 changed files with 29 additions and 11 deletions

View File

@ -146,9 +146,9 @@ Hooks.once("ready", function() {
let calendrier = new RdDCalendrier();
let templatePath = "systems/foundryvtt-reve-de-dragon/templates/calendar-template.html";
let templateData = {};
renderTemplate(templatePath, templateData).then(html => {
/* DISABLEDrenderTemplate(templatePath, templateData).then(html => {
calendrier.render(true);
} );
} ); */
});
/* -------------------------------------------- */

View File

@ -613,7 +613,7 @@ export class RdDUtility {
static processChatCommand( commands, content, msg ) {
// Setup new message's visibility
let rollMode = game.settings.get("core", "rollMode");
if (["gmroll", "blindroll"].includes(rollMode)) msg["whisper"] = ChatMessage.getWhisperIDs("GM");
if (["gmroll", "blindroll"].includes(rollMode)) msg["whisper"] = ChatMessage.getWhisperRecipients("GM");
if (rollMode === "blindroll") msg["blind"] = true;
msg["type"] = 0;
@ -623,7 +623,7 @@ export class RdDUtility {
if (command === "/table") {
if ( commands[1] ) {
let tableName = commands[1].toLowerCase();
table2func[tableName]();
table2func[tableName].func();
} else {
this.displayHelpTable( msg );
}

View File

@ -422,7 +422,7 @@ export class TMRUtility {
let max = scoreDef.substr(3,2);
if ( roll >= min && roll <= max) {
let force = new Roll(renc.data.force).roll().total;
ChatMessage.create({ content: "Vous rencontrez un " + renc.name + " d'une force de " + force + " Points de Rêve" });
ChatMessage.create({ content: "Rencontre en " + caseName + "(jet : " + roll + "%)<br>Vous rencontrez un " + renc.name + " d'une force de " + force + " Points de Rêve" });
return false;
}
}