Permettre d'avoir plusieurs fenêtres #590

Merged
uberwald merged 5 commits from VincentVk/foundryvtt-reve-de-dragon:v10 into v10 2022-12-09 10:36:48 +01:00
3 changed files with 11 additions and 10 deletions
Showing only changes of commit aefc7a434b - Show all commits

View File

@ -5,7 +5,6 @@ import { TMRUtility } from "./tmr-utility.js";
import { tmrConstants } from "./tmr-constants.js";
import { RdDResolutionTable } from "./rdd-resolution-table.js";
import { RdDTMRRencontreDialog } from "./rdd-tmr-rencontre-dialog.js";
import { TMRRencontres } from "./tmr-rencontres.js";
import { ChatUtility } from "./chat-utility.js";
import { RdDRoll } from "./rdd-roll.js";
import { Poetique } from "./poetique.js";

View File

@ -100,19 +100,21 @@ export class TMRRencontres {
const row = await this.table.getRandom(frequence, filtreMauvaise);
if (row) {
row.document = this.createRencontre(row.document, tmr);
await this.$chatRolledRencontre(row, tmr);
const rencontre = await this.createRencontre(row.document, tmr);
await this.$chatRolledRencontre(row, rencontre, tmr);
return rencontre;
}
return row?.document;
return undefined;
}
/* -------------------------------------------- */
async $chatRolledRencontre(row, tmr) {
async $chatRolledRencontre(row, rencontre,tmr) {
const flavorContent = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-compendium-table-roll-rencontre.html',
{
roll: row.roll,
rencontre: row?.document,
rencontre,
row,
percentages: (row.total == 100) ? '%' : '',
tmr,
isGM: game.user.isGM,

View File

@ -1,11 +1,11 @@
<img class="chat-icon" src="{{rencontre.img}}" alt="{{rencontre.name}}" />
<h4>{{#if mauvaise}}Mauvaise rencontre{{else}}Rencontre{{/if}} en {{typeTmr-name tmr.type}}</h4>
<div>{{rencontre.pack}}</div>
<div>Jet: {{roll.formula}} : {{roll.total}}{{percentages}}</div>
<div>{{row.document.pack}}</div>
<div>Jet: {{row.roll.formula}} : {{row.roll.total}}{{percentages}}</div>
<hr>
<div>
<p>{{rencontre.name}} {{rencontre.system.force}} ({{rencontre.system.formule}})</p>
<p>{{linkCompendium rencontre.pack rencontre.id rencontre.name}}</p>
<p>{{rencontre.name}} de force {{rencontre.system.force}} ({{rencontre.system.formule}})</p>
<p>{{linkCompendium row.document.pack row.document.id row.document.name}}</p>
{{#if rencontre.system.description}}
<div class="poesie-extrait">
{{{rencontre.system.description}}}