`
+})
-const imgSigneDragon = img(imagesHeures[4]);
+const imgSigneDragon = imgHeures[4]
/** De pour les jets de rencontre */
export class DeTMR extends Die {
@@ -25,7 +20,7 @@ export class DeTMR extends Die {
return {
type: "dt",
font: "HeuresDraconiques",
- fontScale: 0.7,
+ fontScale: 0.8,
labels: ['1', '2', '3', '4', '5', '6', 'd', '0'],
system: system
}
@@ -37,13 +32,13 @@ export class DeTMR extends Die {
}
async evaluate(options) {
- await super.evaluate(options);
- this.explode("x=8");
+ await super.evaluate(options)
+ await this.reroll('r=8', { recursive: true })
return this;
}
get total() {
- return this.values.filter(it => it != 8).reduce(Misc.sum(), 0);
+ return this.values.map(it => Misc.modulo(it, 8)).reduce(Misc.sum(), 0);
}
getResultLabel(diceTerm) {
@@ -56,13 +51,14 @@ export class DeTMR extends Die {
/** DeDraconique pour le D8 sans limite avec 8=>0 */
export class DeDraconique extends Die {
+ /** @override */
static DENOMINATION = "r";
static diceSoNiceData(system) {
return {
type: "dr",
font: "HeuresDraconiques",
- fontScale: 0.7,
+ fontScale: 0.8,
labels: ['1', '2', '3', '4', '5', '6', 'd', '0'],
system: system
}
@@ -75,7 +71,7 @@ export class DeDraconique extends Die {
async evaluate(options) {
await super.evaluate(options);
- this.explode("x=7");
+ await this.explode("x=7");
return this;
}
@@ -85,7 +81,7 @@ export class DeDraconique extends Die {
getResultLabel(diceTerm) {
switch (diceTerm.result) {
- case 7: return imgSigneDragon;
+ case 7: return imgSigneDragon
case 8: return '0';
}
return diceTerm.result.toString();
@@ -102,6 +98,7 @@ export class DeHeure extends Die {
return {
type: "dh",
font: "HeuresDraconiques",
+ fontScale: 1.2,
labels: ['v', 'i', 'f', 'o', 'd', 'e', 'l', 's', 'p', 'a', 'r', 'c'],
system: system
}
@@ -113,15 +110,15 @@ export class DeHeure extends Die {
}
getResultLabel(diceTerm) {
- return img(imagesHeures[diceTerm.result - 1]);
+ return imgHeures[diceTerm.result - 1]
}
}
export class RdDDice {
static init() {
- CONFIG.Dice.terms[DeTMR.DENOMINATION] = DeTMR;
- CONFIG.Dice.terms[DeDraconique.DENOMINATION] = DeDraconique;
- CONFIG.Dice.terms[DeHeure.DENOMINATION] = DeHeure;
+ CONFIG.Dice.terms[DeTMR.DENOMINATION] = DeTMR
+ CONFIG.Dice.terms[DeDraconique.DENOMINATION] = DeDraconique
+ CONFIG.Dice.terms[DeHeure.DENOMINATION] = DeHeure
}
static onReady() {
@@ -132,6 +129,14 @@ export class RdDDice {
}
}
+ static diceSoNiceReady(dice3d) {
+ dice3d.DiceFactory.systems.keys().forEach(system => {
+ dice3d.addDicePreset(DeTMR.diceSoNiceData(system));
+ dice3d.addDicePreset(DeDraconique.diceSoNiceData(system));
+ dice3d.addDicePreset(DeHeure.diceSoNiceData(system));
+ })
+ }
+
static async rollHeure(options = { showDice: HIDE_DICE }) {
return await RdDDice.rollTotal("1dh", options) - 1
}
@@ -155,21 +160,13 @@ export class RdDDice {
return array[roll - 1];
}
- static diceSoNiceReady(dice3d) {
- for (const system of Object.keys(dice3d.DiceFactory.systems)) {
- dice3d.addDicePreset(DeTMR.diceSoNiceData(system));
- dice3d.addDicePreset(DeDraconique.diceSoNiceData(system));
- dice3d.addDicePreset(DeHeure.diceSoNiceData(system));
- }
- }
-
/* -------------------------------------------- */
static async showDiceSoNice(roll, options) {
if (options.showDice == HIDE_DICE || !game.modules.get("dice-so-nice")?.active || !game.dice3d) {
return;
}
- let { whisper, blind } = RdDDice._getWhisperBlind(options);
+ let { whisper, blind } = ChatUtility.applyRollMode({}, options?.rollMode);
if (options.forceDiceResult?.total) {
let terms = await RdDDice._getForcedTerms(options);
if (terms) {
@@ -223,24 +220,4 @@ export class RdDDice {
await roll.evaluate();
return roll.total;
}
-
- static _getWhisperBlind(options) {
- let whisper = undefined;
- let blind = false;
- let rollMode = options.rollMode ?? game.settings.get("core", "rollMode");
- switch (rollMode) {
- case "blindroll": //GM only
- blind = true;
- case "gmroll": //GM + rolling player
- whisper = ChatUtility.getUsers(user => user.isGM);
- break;
- case "roll": //everybody
- whisper = ChatUtility.getUsers(user => user.active);
- break;
- case "selfroll":
- whisper = [game.user.id];
- break;
- }
- return { whisper, blind };
- }
}
\ No newline at end of file
diff --git a/module/rdd-empoignade.js b/module/rdd-empoignade.js
index 81c3b965..50307a4e 100644
--- a/module/rdd-empoignade.js
+++ b/module/rdd-empoignade.js
@@ -158,9 +158,12 @@ export class RdDEmpoignade {
empoignade = empoignade ?? (await RdDEmpoignade.createEmpoignade(attacker, defender))
//console.log("W.", empoignade, defender.hasArmeeMeleeEquipee())
if ((isNouvelle || empoignade.system.pointsemp == 0) && defender.hasArmeeMeleeEquipee()) {
- ChatUtility.createChatWithRollMode(attacker.name, {
- content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-empoignade-valider.html`, { attacker: attacker, defender: defender })
- })
+ ChatUtility.createChatWithRollMode(
+ {
+ content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-empoignade-valider.html`, { attacker: attacker, defender: defender })
+ },
+ attacker
+ )
} else {
await this.onAttaqueEmpoignadeValidee(attacker, defender)
}
@@ -213,7 +216,7 @@ export class RdDEmpoignade {
competence: attacker.getCompetenceCorpsACorps()
}
const msg = await ChatMessage.create({
- whisper: ChatUtility.getWhisperRecipientsAndGMs(attacker.name),
+ whisper: ChatUtility.getOwners(attacker),
content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-empoignade-immobilise.html`, rollData)
})
RdDEmpoignade.$storeRollEmpoignade(msg, rollData);
@@ -300,7 +303,7 @@ export class RdDEmpoignade {
/* -------------------------------------------- */
static async $onRollContrerLiberer(rollData) {
let empoignade = rollData.empoignade
-
+
if (rollData.mode == "contrer-empoigner" && !rollData.rolled.isSuccess) {
empoignade.system.pointsemp++
RdDEmpoignade.$updateEtatEmpoignade(empoignade)
@@ -309,7 +312,7 @@ export class RdDEmpoignade {
empoignade.system.pointsemp--
RdDEmpoignade.$updateEtatEmpoignade(empoignade)
}
-
+
await RdDResolutionTable.displayRollData(rollData, rollData.defender, 'chat-empoignade-resultat.html')
if (empoignade.system.pointsemp >= 2) {
let msg = await RdDResolutionTable.displayRollData(rollData, rollData.attacker, 'chat-empoignade-entrainer.html');
diff --git a/module/rdd-hotbar-drop.js b/module/rdd-hotbar-drop.js
index 7bb6db05..979c2a08 100644
--- a/module/rdd-hotbar-drop.js
+++ b/module/rdd-hotbar-drop.js
@@ -79,8 +79,7 @@ export class RdDHotbar {
* Actor - open actor sheet
* Journal - open journal sheet
*/
- static init() {
-
+ static initHooks() {
Hooks.on('hotbarDrop', (bar, documentData, slot) => {
// Create item macro if rollable item - weapon, spell, prayer, trait, or skill
diff --git a/module/rdd-main.js b/module/rdd-main.js
index 7dca3faa..18778107 100644
--- a/module/rdd-main.js
+++ b/module/rdd-main.js
@@ -61,7 +61,7 @@ import { RdDSigneDraconiqueItemSheet } from "./item/sheet-signedraconique.js"
import { RdDItemInventaireSheet } from "./item/sheet-base-inventaire.js"
import { AppAstrologie } from "./sommeil/app-astrologie.js"
import { RdDItemArmure } from "./item/armure.js"
-import { AutoAdjustDarkness as AutoAdjustDarkness } from "./time/auto-adjust-darkness.js"
+import { AutoAdjustDarkness } from "./time/auto-adjust-darkness.js"
import { RdDCreature } from "./actor/creature.js"
import { RdDTMRDialog } from "./rdd-tmr-dialog.js"
import { OptionsAvancees } from "./settings/options-avancees.js"
@@ -80,7 +80,7 @@ export class SystemReveDeDragon {
const system = new SystemReveDeDragon()
Hooks.once('init', async () => await system.onInit())
Hooks.once('diceSoNiceReady', (dice3d) => RdDDice.diceSoNiceReady(dice3d))
- Hooks.once('ready', () => system.onReady())
+ Hooks.once('ready', async () => await system.onReady())
}
constructor() {
@@ -115,24 +115,31 @@ export class SystemReveDeDragon {
game.system.rdd = this
this.AppAstrologie = AppAstrologie
-
- console.log(`Initializing Reve de Dragon System`)
+ console.log(`Initializing Reve de Dragon System Settings`)
// preload handlebars templates
RdDUtility.preloadHandlebarsTemplates()
AppPersonnageAleatoire.preloadHandlebars()
/* -------------------------------------------- */
- this.initSystemSettings()
+ ReglesOptionnelles.initSettings()
+ OptionsAvancees.initSettings()
+ AutoAdjustDarkness.initSettings()
+ RdDTimestamp.initSettings()
+ RdDCalendrier.initSettings()
+ SystemCompendiums.initSettings()
+ DialogChronologie.initSettings()
+ RdDTMRDialog.initSettings()
+ Environnement.initSettings()
+
+ this.initSettings()
/* -------------------------------------------- */
// Set an initiative formula for the system
- CONFIG.Combat.initiative = {
- formula: "1+(1d6/10)",
- decimals: 2
- }
+ CONFIG.Combat.initiative = { formula: "1+(1d6/10)", decimals: 2 }
/* -------------------------------------------- */
+ console.log(`Initializing Reve de Dragon Socket handlers`)
game.socket.on(SYSTEM_SOCKET_ID, async (sockmsg) => {
console.log(">>>>> MSG RECV", sockmsg)
try {
@@ -147,6 +154,7 @@ export class SystemReveDeDragon {
/* -------------------------------------------- */
// Define custom Entity classes
+ console.log(`Initializing Reve de Dragon Documents`)
CONFIG.Actor.documentClass = RdDBaseActor
CONFIG.Item.documentClass = RdDItem
CONFIG.RDD = {
@@ -192,17 +200,12 @@ export class SystemReveDeDragon {
"tarot", "extraitpoetique", "empoignade"
], makeDefault: true
})
- CONFIG.Combat.documentClass = RdDCombatManager
// préparation des différents modules
- AutoAdjustDarkness.init()
- RdDTimestamp.init()
- RdDCalendrier.init()
- SystemCompendiums.init()
- DialogChronologie.init()
- ReglesOptionnelles.init()
- OptionsAvancees.init()
- RdDUtility.init()
+ console.log(`Initializing Reve de Dragon Hooks and handlers`)
+ CONFIG.Combat.documentClass = RdDCombatManager
+ ChatUtility.init()
+ RdDUtility.initHooks()
RdDDice.init()
RdDCommands.init()
RdDCombatManager.init()
@@ -211,15 +214,14 @@ export class SystemReveDeDragon {
RdDCompendiumOrganiser.init()
EffetsDraconiques.init()
TMRUtility.init()
- await RdDTMRDialog.init()
- RdDHotbar.init()
+ RdDHotbar.initHooks()
RdDPossession.init()
TMRRencontres.init()
- Environnement.init()
ExportScriptarium.init()
}
- initSystemSettings() {
+ initSettings() {
+ // TODO: déplacer vers les modules correspondants
game.settings.register(SYSTEM_RDD, "accorder-entite-cauchemar", {
name: "Accorder le rêve aux entités",
hint: "A quel moment les personnages doivent accorder leur rêve aux entités de cauchemar",
@@ -318,4 +320,3 @@ export class SystemReveDeDragon {
}
SystemReveDeDragon.start()
-
diff --git a/module/rdd-meteo.js b/module/rdd-meteo.js
index 8a705747..6b4266b3 100644
--- a/module/rdd-meteo.js
+++ b/module/rdd-meteo.js
@@ -1,3 +1,4 @@
+import { ChatUtility } from "./chat-utility.js"
const vents = [
{ min: 0, max: 0, valeur: 'Calme' },
@@ -117,7 +118,7 @@ export class RdDMeteo {
ChatMessage.create({
content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-resultat-meteo.html', meteo),
- whisper: ChatMessage.getWhisperRecipients('GM')
+ whisper: ChatUtility.getGMs()
});
}
diff --git a/module/rdd-namegen.js b/module/rdd-namegen.js
index 80a47450..a5f27067 100644
--- a/module/rdd-namegen.js
+++ b/module/rdd-namegen.js
@@ -1,4 +1,5 @@
import { RdDBaseActor } from "./actor/base-actor.js";
+import { ChatUtility } from "./chat-utility.js";
import { Misc } from "./misc.js";
import { RdDDice } from "./rdd-dice.js";
@@ -15,7 +16,7 @@ export class RdDNameGen {
const html = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-command-nom.html`, {
nom: await RdDNameGen.generate()
});
- ChatMessage.create({ content: html, whisper: ChatMessage.getWhisperRecipients("GM") });
+ ChatMessage.create({ content: html, whisper: ChatUtility.getGMs() });
}
static async generate() {
diff --git a/module/rdd-resolution-table.js b/module/rdd-resolution-table.js
index f8b341e2..d231370c 100644
--- a/module/rdd-resolution-table.js
+++ b/module/rdd-resolution-table.js
@@ -91,13 +91,14 @@ export class RdDResolutionTable {
/* -------------------------------------------- */
static async displayRollData(rollData, actor = undefined, template = 'chat-resultat-general.html') {
- return await ChatUtility.createChatWithRollMode(RdDResolutionTable.actorChatName(actor), {
- content: await RdDResolutionTable.buildRollDataHtml(rollData, template)
- });
+ return await ChatUtility.createChatWithRollMode(
+ { content: await RdDResolutionTable.buildRollDataHtml(rollData, template) },
+ actor
+ )
}
static actorChatName(actor) {
- return actor?.name ?? game.user.name;
+ return actor ?? game.user.name;
}
/* -------------------------------------------- */
@@ -138,14 +139,14 @@ export class RdDResolutionTable {
if (carac == 0) {
return NaN;
}
- if (rolled >= carac){
- const upper = Math.ceil(rolled/carac);
- return 2*upper -10
+ if (rolled >= carac) {
+ const upper = Math.ceil(rolled / carac);
+ return 2 * upper - 10
}
- if (rolled > Math.floor(carac/2)) {
+ if (rolled > Math.floor(carac / 2)) {
return -8
}
- if (rolled > Math.floor(carac/4)) {
+ if (rolled > Math.floor(carac / 4)) {
return -9
}
if (rolled > 1) {
@@ -265,7 +266,7 @@ export class RdDResolutionTable {
}
/* -------------------------------------------- */
- static subTable(carac, level, delta = { carac: 2, level: 5}) {
+ static subTable(carac, level, delta = { carac: 2, level: 5 }) {
return {
carac,
level,
@@ -287,8 +288,8 @@ export class RdDResolutionTable {
carac: carac,
difficulte: level,
min: minLevel,
- rows: Misc.intArray(minCarac, maxCarac+1),
- cols: Misc.intArray(minLevel, maxLevel+1)
+ rows: Misc.intArray(minCarac, maxCarac + 1),
+ cols: Misc.intArray(minLevel, maxLevel + 1)
});
}
diff --git a/module/rdd-tmr-dialog.js b/module/rdd-tmr-dialog.js
index 5b388e2b..a80eaba3 100644
--- a/module/rdd-tmr-dialog.js
+++ b/module/rdd-tmr-dialog.js
@@ -34,7 +34,7 @@ const TMR_DISPLAY_SIZE = {
/* -------------------------------------------- */
export class RdDTMRDialog extends Dialog {
- static async init() {
+ static initSettings() {
game.settings.register(SYSTEM_RDD, TMR_DISPLAY_SIZE.code, {
name: 'Taille des cases des TMR',
hint: "Taille en pixel des cases des TMR (réglable directement dans la fenêtre des TMR)",
@@ -50,7 +50,7 @@ export class RdDTMRDialog extends Dialog {
await PixiTMR.init()
let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-tmr.html', tmrData);
if (tmrData.mode != 'visu' && !game.user.isGM) {
- ChatMessage.create({ content: actor.name + " est monté dans les TMR en mode : " + tmrData.mode, whisper: ChatMessage.getWhisperRecipients("GM") });
+ ChatMessage.create({ content: actor.name + " est monté dans les TMR en mode : " + tmrData.mode, whisper: ChatUtility.getGMs() });
}
return new RdDTMRDialog(html, actor, tmrData)
}
@@ -82,7 +82,7 @@ export class RdDTMRDialog extends Dialog {
this.rencontreState = 'aucune';
this.subdialog = undefined
this.displaySize = undefined
- if (!this.viewOnly) {
+ if (!this.viewOnly && !game.user.isGM) {
this._tellToGM(this.actor.name + " monte dans les terres médianes (" + tmrData.mode + ")");
}
this.callbacksOnAnimate = [];
@@ -496,7 +496,7 @@ export class RdDTMRDialog extends Dialog {
rencData.message = this.formatMessageRencontre(rencData, result.message);
ChatMessage.create({
- whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name),
+ whisper: ChatUtility.getOwners(this.actor),
content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-rencontre-tmr.html`, rencData)
});
@@ -571,12 +571,20 @@ export class RdDTMRDialog extends Dialog {
/* -------------------------------------------- */
_tellToGM(message) {
- ChatMessage.create({ content: message, user: game.user.id, whisper: ChatMessage.getWhisperRecipients("GM") });
+ ChatMessage.create({
+ user: game.user.id,
+ content: message,
+ whisper: ChatUtility.getGMs()
+ });
}
/* -------------------------------------------- */
_tellToUserAndGM(message) {
- ChatMessage.create({ content: message, user: game.user.id, whisper: [game.user.id].concat(ChatMessage.getWhisperRecipients("GM")) });
+ ChatMessage.create({
+ user: game.user.id,
+ content: message,
+ whisper: ChatUtility.getUserAndGMs()
+ })
}
/* -------------------------------------------- */
@@ -715,7 +723,7 @@ export class RdDTMRDialog extends Dialog {
}
rollData.poesie = await Poetique.getExtrait();
ChatMessage.create({
- whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name),
+ whisper: ChatUtility.getOwners(this.actor),
content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-resultat-maitrise-tmr.html`, rollData)
});
if (rollData.rolled.isEchec) {
@@ -739,7 +747,7 @@ export class RdDTMRDialog extends Dialog {
if (this.isCaseMaitrisee(tmr.coord)) {
ChatMessage.create({
content: tmr.label + ": cette case humide est déja maitrisée grâce à votre Tête Quête des Eaux",
- whisper: ChatMessage.getWhisperRecipients(game.user.name)
+ whisper: ChatUtility.getOwners(this.actor)
});
return false;
}
@@ -751,14 +759,14 @@ export class RdDTMRDialog extends Dialog {
if (tmr.type == 'pont' && EffetsDraconiques.isPontImpraticable(this.actor)) {
ChatMessage.create({
content: tmr.label + ": Vous êtes sous le coup d'une Impraticabilité des Ponts : ce pont doit être maîtrisé comme une case humide.",
- whisper: ChatMessage.getWhisperRecipients(game.user.name)
+ whisper: ChatUtility.getOwners(this.actor)
});
return true;
}
if (this.isCaseInondee(tmr.coord)) {
ChatMessage.create({
content: tmr.label + ": cette case est inondée, elle doit être maîtrisée comme une case humide.",
- whisper: ChatMessage.getWhisperRecipients(game.user.name)
+ whisper: ChatUtility.getOwners(this.actor)
});
return true;
}
@@ -832,7 +840,7 @@ export class RdDTMRDialog extends Dialog {
}
rollData.poesie = await Poetique.getExtrait();
ChatMessage.create({
- whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name),
+ whisper: ChatUtility.getOwners(this.actor),
content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-resultat-maitrise-tmr.html`, rollData)
});
if (rollData.rolled.isEchec) {
@@ -882,17 +890,16 @@ export class RdDTMRDialog extends Dialog {
const reserveSecurite = EffetsDraconiques.isReserveEnSecurite(this.actor);
const reserveExtensible = this.isReserveExtensible(coord);
if (!EffetsDraconiques.isUrgenceDraconique(this.actor) && (reserveSecurite || reserveExtensible)) {
- const msg = await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-demande-declencher-sort.hbs`, {
- actor: this.actor,
- sorts: sorts,
- coord: coord,
- tete: { reserveSecurite: reserveSecurite, reserveExtensible: reserveExtensible }
- })
ChatMessage.create({
- content: msg,
- whisper: ChatMessage.getWhisperRecipients(game.user.name)
- });
- return;
+ content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-demande-declencher-sort.hbs`, {
+ actor: this.actor,
+ sorts: sorts,
+ coord: coord,
+ tete: { reserveSecurite: reserveSecurite, reserveExtensible: reserveExtensible }
+ }),
+ whisper: ChatUtility.getOwners(this.actor)
+ })
+ return
}
await this.processSortReserve(sorts[0]);
}
@@ -906,9 +913,8 @@ export class RdDTMRDialog extends Dialog {
this.processSortReserve(sort);
} else {
ChatMessage.create({
- content:
- "Une erreur est survenue : impossible de récupérer le sort en réserve demandé.",
- whisper: ChatMessage.getWhisperRecipients(game.user.name),
+ content: "Une erreur est survenue : impossible de récupérer le sort en réserve demandé.",
+ whisper: ChatUtility.getOwners(this.actor)
});
}
}
@@ -1091,7 +1097,7 @@ export class RdDTMRDialog extends Dialog {
async notifierResonanceSigneDraconique(coord) {
if (!this.viewOnly && this.actor.isResonanceSigneDraconique(coord)) {
ChatMessage.create({
- whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name),
+ whisper: ChatUtility.getOwners(this.actor),
content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-signe-draconique-resonance.html`, { alias: this.actor.name, typeTMR: TMRUtility.getTMRType(coord) })
});
}
diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index 9b43c877..20b10526 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -99,9 +99,7 @@ export class RdDUtility {
// persistent handling of conteneur show/hide
static afficheContenu = {}
/* -------------------------------------------- */
- static async init() {
- Hooks.on("renderChatMessage", async (app, html, msg) => await ChatUtility.onRenderChatMessage(app, html, msg))
- Hooks.on("createChatMessage", async (chatMessage, options, id) => await ChatUtility.onCreateChatMessage(chatMessage, options, id))
+ static async initHooks() {
Hooks.on('renderChatLog', (log, html, chatLog) => RdDUtility.chatListeners(html))
}
@@ -292,7 +290,7 @@ export class RdDUtility {
Handlebars.registerHelper('array-includes', (array, value) => array.includes(value));
Handlebars.registerHelper('min', (...args) => Math.min(...args.slice(0, -1)));
- Handlebars.registerHelper('isLastIndex', (index, list) => index+1 >= list.length);
+ Handlebars.registerHelper('isLastIndex', (index, list) => index + 1 >= list.length);
Handlebars.registerHelper('regle-optionnelle', (option) => ReglesOptionnelles.isUsing(option));
Handlebars.registerHelper('trier', list => list.sort((a, b) => a.name.localeCompare(b.name)));
Handlebars.registerHelper('filtreTriCompetences', competences => RdDItemCompetence.triVisible(competences));
@@ -645,18 +643,16 @@ export class RdDUtility {
/* -------------------------------------------- */
static onSocketMessage(sockmsg) {
switch (sockmsg.msg) {
- case "msg_gm_chat_message":
- return ChatUtility.handleGMChatMessage(sockmsg.data);
case "msg_app_astrologie_refresh":
- return Hooks.callAll(APP_ASTROLOGIE_REFRESH);
+ return Hooks.callAll(APP_ASTROLOGIE_REFRESH)
case "msg_request_nombre_astral":
- return game.system.rdd.calendrier.requestNombreAstral(sockmsg.data);
+ return game.system.rdd.calendrier.requestNombreAstral(sockmsg.data)
case "msg_tmr_move":
let actor = game.actors.get(sockmsg.data.actorId);
if (actor.isOwner || game.user.isGM) {
- actor.refreshTMRView();
+ actor.refreshTMRView()
}
- break;
+ break
}
}
@@ -808,17 +804,13 @@ export class RdDUtility {
user: game.user.id,
rollMode: modeOverride || game.settings.get("core", "rollMode"),
content: content
- };
-
- if (["gmroll", "blindroll"].includes(chatData.rollMode)) chatData["whisper"] = ChatMessage.getWhisperRecipients("GM").map(u => u.id);
- if (chatData.rollMode === "blindroll") chatData["blind"] = true;
- else if (chatData.rollMode === "selfroll") chatData["whisper"] = [game.user];
+ }
+ ChatUtility.applyRollMode(chatData)
if (forceWhisper) { // Final force !
- chatData["speaker"] = ChatMessage.getSpeaker();
- chatData["whisper"] = ChatMessage.getWhisperRecipients(forceWhisper);
+ chatData.speaker = ChatMessage.getSpeaker();
+ chatData.whisper = ChatMessage.getWhisperRecipients(forceWhisper);
}
-
return chatData;
}
@@ -881,7 +873,7 @@ export class RdDUtility {
const current = game.system.rdd.calendrier.heureCourante();
ChatMessage.create({
content: `A l'heure de ${current.label}, le modificateur de Chance/Malchance est de ${Misc.toSignedString(ajustement)} pour l'heure de naissance ${heure.label}.`,
- whisper: ChatMessage.getWhisperRecipients("GM")
+ whisper: ChatUtility.getGMs()
});
}
else if (heureNaissance) {
@@ -900,7 +892,7 @@ export class RdDUtility {
if (compName.includes('Thanatos')) {
let message = "Vous avez mis des points d'Expérience dans la Voie de Thanatos !Vous devez réduire manuellement d'un même montant d'XP une autre compétence Draconique."; ChatMessage.create({ - whisper: ChatMessage.getWhisperRecipients(game.user.name), + whisper: ChatUtility.getUserAndGMs(), content: message }); } diff --git a/module/settings/options-avancees.js b/module/settings/options-avancees.js index a524bb01..c09c745b 100644 --- a/module/settings/options-avancees.js +++ b/module/settings/options-avancees.js @@ -8,7 +8,7 @@ const OPTIONS_AVANCEES = [ ] export class OptionsAvancees extends FormApplication { - static init() { + static initSettings() { for (const regle of OPTIONS_AVANCEES) { const name = regle.name const id = OptionsAvancees._getId(name) diff --git a/module/settings/regles-optionnelles.js b/module/settings/regles-optionnelles.js index bbb53638..3eac1e2d 100644 --- a/module/settings/regles-optionnelles.js +++ b/module/settings/regles-optionnelles.js @@ -46,7 +46,7 @@ const listeReglesOptionnelles = [ const uniquementJoueur = listeReglesOptionnelles.filter(it => it.uniquementJoueur).map(it=>it.name); export class ReglesOptionnelles extends FormApplication { - static init() { + static initSettings() { for (const regle of listeReglesOptionnelles) { const name = regle.name; const id = ReglesOptionnelles._getIdRegle(name); diff --git a/module/settings/system-compendiums.js b/module/settings/system-compendiums.js index bdff885f..5fa34329 100644 --- a/module/settings/system-compendiums.js +++ b/module/settings/system-compendiums.js @@ -25,7 +25,7 @@ const CONFIGURABLE_COMPENDIUMS = { * ======= Gestion des accès aux compendiums systèmes (ou surchargés) ======= */ export class SystemCompendiums extends FormApplication { - static init() { + static initSettings() { Object.keys(CONFIGURABLE_COMPENDIUMS).forEach(compendium => { const definition = CONFIGURABLE_COMPENDIUMS[compendium]; foundry.utils.mergeObject(definition, { @@ -236,12 +236,12 @@ export class CompendiumTableHelpers { let max = 0; const total = rows.map(it => it.frequence).reduce(Misc.sum(), 0); return rows.map(row => { - const frequence = row.frequence; - row.min = max + 1; - row.max = max + frequence; + const frequence = row.frequence + row.min = max + 1 + row.max = max + frequence row.total = total - max += frequence; - return row; + max += frequence + return row }) } static async getRandom(table, type, subTypes = ['objet'], forcedRoll = undefined, localisation = undefined) { @@ -260,8 +260,8 @@ export class CompendiumTableHelpers { } const total = table[0].total; const formula = `1d${total}`; - if (forcedRoll == undefined && (forcedRoll > total || forcedRoll <= 0)) { - ui.notifications.warn(`Jet de rencontre ${forcedRoll} en dehors de la table [1..${total}], le jet est relancé`); + if (forcedRoll != undefined && (forcedRoll > total || forcedRoll <= 0)) { + ui.notifications.warn(`Jet forcé ${forcedRoll} en dehors de la table [1..${total}], le jet est relancé`); forcedRoll = undefined; } const roll = forcedRoll ? { total: forcedRoll, formula } : await RdDDice.roll(formula, { showDice: HIDE_DICE }); @@ -276,7 +276,7 @@ export class CompendiumTableHelpers { return; } const percentages = (row.total == 100) ? '%' : '' - const flavorContent = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-compendium-table-roll.html', { + const flavorContent = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-compendium-table-roll.hbs', { roll: row.roll, document: row.document, percentages, @@ -291,12 +291,12 @@ export class CompendiumTableHelpers { sound: CONFIG.sounds.dice, content: flavorContent }; - await ChatUtility.createChatWithRollMode(game.user.id, messageData) + await ChatUtility.createChatWithRollMode(messageData) } /* -------------------------------------------- */ static async tableToChatMessage(table, type, subTypes, typeName = undefined) { - const flavorContent = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-compendium-table.html', { + const flavorContent = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-compendium-table.hbs', { img: RdDItem.getDefaultImg(subTypes[0]), typeName: typeName ?? Misc.typeName(type, subTypes[0]), table, @@ -304,10 +304,10 @@ export class CompendiumTableHelpers { }); const messageData = { user: game.user.id, - whisper: game.user.id, + whisper: [game.user], content: flavorContent }; - await ChatUtility.createChatWithRollMode(game.user.id, messageData) + await ChatUtility.createChatWithRollMode(messageData) } } \ No newline at end of file diff --git a/module/time/auto-adjust-darkness.js b/module/time/auto-adjust-darkness.js index 1d851cf1..c7b320e8 100644 --- a/module/time/auto-adjust-darkness.js +++ b/module/time/auto-adjust-darkness.js @@ -4,7 +4,7 @@ export const AUTO_ADJUST_DARKNESS = "auto-adjust-darkness"; export class AutoAdjustDarkness { - static init() { + static initSettings() { game.settings.register(SYSTEM_RDD, AUTO_ADJUST_DARKNESS, { name: AUTO_ADJUST_DARKNESS, scope: "world", diff --git a/module/time/rdd-calendrier.js b/module/time/rdd-calendrier.js index b5b41088..b2a4129d 100644 --- a/module/time/rdd-calendrier.js +++ b/module/time/rdd-calendrier.js @@ -15,7 +15,7 @@ const TEMPLATE_CALENDRIER = "systems/foundryvtt-reve-de-dragon/templates/time/ca const INITIAL_CALENDAR_POS = { top: 200, left: 200, horlogeAnalogique: true }; /* -------------------------------------------- */ export class RdDCalendrier extends Application { - static init() { + static initSettings() { game.settings.register(SYSTEM_RDD, "liste-nombre-astral", { name: "liste-nombre-astral", scope: "world", diff --git a/module/time/rdd-timestamp.js b/module/time/rdd-timestamp.js index c10d55f6..27a5a80f 100644 --- a/module/time/rdd-timestamp.js +++ b/module/time/rdd-timestamp.js @@ -49,7 +49,7 @@ const FORMULES_PERIODE = [ export class RdDTimestamp { - static init() { + static initSettings() { game.settings.register(SYSTEM_RDD, WORLD_TIMESTAMP_SETTING, { name: WORLD_TIMESTAMP_SETTING, scope: "world", diff --git a/module/tmr-rencontres.js b/module/tmr-rencontres.js index 4610d6f4..ef8ea61a 100644 --- a/module/tmr-rencontres.js +++ b/module/tmr-rencontres.js @@ -105,7 +105,7 @@ export class TMRRencontres { /* -------------------------------------------- */ async $chatRolledRencontre(row, rencontre, tmr) { - const flavorContent = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-compendium-table-roll-rencontre.html', + const flavorContent = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-compendium-table-roll-rencontre.hbs', { roll: row.roll, rencontre, diff --git a/module/tmr/effets-rencontres.js b/module/tmr/effets-rencontres.js index 0ab7ebcb..898877c7 100644 --- a/module/tmr/effets-rencontres.js +++ b/module/tmr/effets-rencontres.js @@ -30,7 +30,7 @@ export class EffetsRencontre { static $reve_plus = async (actor, reve) => { if (!ReglesOptionnelles.isUsing("recuperation-reve") && reve < 0) { ChatMessage.create({ - whisper: ChatUtility.getWhisperRecipientsAndGMs(actor.name), + whisper: ChatUtility.getOwners(actor), content: `Pas de récupération de rêve (${reve} points ignorés)` }); return @@ -112,7 +112,7 @@ export class EffetsRencontre { poesie: await Poetique.getExtrait() }) ChatMessage.create({ - whisper: ChatUtility.getWhisperRecipientsAndGMs(context.actor.name), + whisper: ChatUtility.getOwners(context.actor), content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-resultat-reve-de-dragon.html`, context) }); } @@ -127,7 +127,7 @@ export class EffetsRencontre { } ChatMessage.create({ - whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name), + whisper: ChatUtility.getOwners(context.actor), content: await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/chat-resultat-reve-de-dragon.html`, context) }); } diff --git a/module/tmr/present-cites.js b/module/tmr/present-cites.js index 1b00a8b0..6112928a 100644 --- a/module/tmr/present-cites.js +++ b/module/tmr/present-cites.js @@ -28,7 +28,7 @@ export class PresentCites extends Draconique { let existants = actor.items.filter(it => this.isCase(it)).map(it => it.system.coord); if (existants.length > 0) { ChatMessage.create({ - whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name), + whisper: ChatUtility.getOwners(actor), content: "Vous avez encore des présents dans des cités, vous devrez tirer une autre tête pour remplacer celle ci!" }) } diff --git a/module/tmr/urgence-draconique.js b/module/tmr/urgence-draconique.js index f3c00769..8ecbe572 100644 --- a/module/tmr/urgence-draconique.js +++ b/module/tmr/urgence-draconique.js @@ -19,7 +19,7 @@ export class UrgenceDraconique extends Draconique { // La queue se transforme en idée fixe const ideeFixe = await RdDRollTables.getIdeeFixe(); ChatMessage.create({ - whisper: ChatUtility.getWhisperRecipientsAndGMs(game.user.name), + whisper: ChatUtility.getOwners(actor), content: `En l'absence de sorts en réserve, l'urgence draconique de ${actor.name} se transforme en ${ideeFixe.name}` }); await actor.createEmbeddedDocuments('Item', [ideeFixe]); diff --git a/module/voyage/dialog-fatigue-voyage.js b/module/voyage/dialog-fatigue-voyage.js index 591c1942..e4caa365 100644 --- a/module/voyage/dialog-fatigue-voyage.js +++ b/module/voyage/dialog-fatigue-voyage.js @@ -175,7 +175,7 @@ export class DialogFatigueVoyage extends Dialog { .forEach(async it => { const perteFatigue = fatigueBase + it.ajustement ChatMessage.create({ - whisper: ChatUtility.getWhisperRecipientsAndGMs(it.actor.name), + whisper: ChatUtility.getOwners(it.actor), content: await renderTemplate( 'systems/foundryvtt-reve-de-dragon/templates/voyage/chat-fatigue_voyage.hbs', foundry.utils.mergeObject(it, diff --git a/styles/simple.css b/styles/simple.css index 92ec5536..491e0f7b 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -567,7 +567,11 @@ input:is(.blessure-premiers_soins, .blessure-soins_complets) { .dice-img { border-width: 0; + max-width: 1.5rem; + max-height: 1.5rem; + vertical-align: top; } + .in-text-img { max-width: 1.2em; max-height: 1.2em; diff --git a/system.json b/system.json index 860a11ff..a92ba9db 100644 --- a/system.json +++ b/system.json @@ -1,8 +1,8 @@ { "id": "foundryvtt-reve-de-dragon", "title": "Rêve de Dragon", - "version": "12.0.14", - "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-12.0.14.zip", + "version": "12.0.15", + "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-12.0.15.zip", "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v11/system.json", "changelog": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/branch/v11/changelog.md", "compatibility": { diff --git a/templates/actor/competence.html b/templates/actor/competence.html index 19d81ece..fb1624de 100644 --- a/templates/actor/competence.html +++ b/templates/actor/competence.html @@ -1,17 +1,19 @@ {{#unless system.isHidden}} -