Various/changes from 30th may requestsé

This commit is contained in:
2023-06-06 09:18:33 +02:00
parent cf4de99242
commit 0b0b74754f
18 changed files with 186 additions and 184 deletions

View File

@@ -367,20 +367,24 @@ export class Hero6Utility {
rollData.result = roll.total
rollData.bodyValue = this.computeBodyValue(rollData.roll)
this.outputRollMessage(rollData)
this.outputRollMessage(rollData).catch(function() { ui.notifications.warn("Error during message output.") })
}
/* -------------- ----------------------------- */
static async outputRollMessage(rollData) {
let msg = await this.createChatWithRollMode(rollData.alias, {
content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-generic-result.hbs`, rollData)
let msgFlavor = await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-generic-result.hbs`, rollData)
let msg = await rollData.roll.toMessage({
user: game.user.id,
rollMode: game.settings.get("core", "rollMode"),
flavor: msgFlavor
})
rollData.roll = duplicate(rollData.roll) // Convert to object
msg.setFlag("world", "rolldata", rollData)
console.log("Rolldata result", rollData)
}
/* -------------- ----------------------------- */
static convertRollHeroSyntax( hero6Formula) {
static convertRollHeroSyntax(hero6Formula) {
// Ensure we have no space at all
//hero6Formula = hero6Formula.replace(/\s/g, '')
let hasHalfDice = ""
@@ -388,7 +392,7 @@ export class Hero6Utility {
hero6Formula = hero6Formula.replace("1/2d6", "d6")
hasHalfDice = "+round(1d6)"
}
let foundryFormula = hero6Formula + hasHalfDice
foundryFormula = foundryFormula.replace(' ', '')
console.log("Parsed formula : ", hero6Formula, foundryFormula)
@@ -433,7 +437,7 @@ export class Hero6Utility {
static blindMessageToGM(chatOptions) {
let chatGM = duplicate(chatOptions);
chatGM.whisper = this.getUsers(user => user.isGM);
chatGM.content = "Blinde message of " + game.user.name + "<br>" + chatOptions.content;
chatGM.content = "Blind message of " + game.user.name + "<br>" + chatOptions.content;
console.log("blindMessageToGM", chatGM);
game.socket.emit("system.fvtt-hero-system-6", { msg: "msg_gm_chat_message", data: chatGM });
}