Corrections des TMRs et météo #539

Merged
uberwald merged 6 commits from VincentVk/foundryvtt-reve-de-dragon:v1.5-tmrs into v1.5 2022-06-26 16:23:58 +02:00
3 changed files with 25 additions and 9 deletions
Showing only changes of commit 8cf43d4e8a - Show all commits

View File

@ -750,6 +750,7 @@ export class RdDTMRDialog extends Dialog {
/* -------------------------------------------- */ /* -------------------------------------------- */
async _maitriserTMR(rollData, callbackMaitrise) { async _maitriserTMR(rollData, callbackMaitrise) {
this.minimize(); // Hide this.minimize(); // Hide
rollData.isTMRCache = rollData.actor.isTMRCache();
const dialog = await RdDRoll.create(this.actor, rollData, const dialog = await RdDRoll.create(this.actor, rollData,
{ {
html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-maitrise-tmr.html', html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-maitrise-tmr.html',

View File

@ -1,6 +1,11 @@
<img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/> <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>
<h4 data-categorie="tmr" data-actor-id="{{actor._id}}"> <h4 data-categorie="tmr" data-actor-id="{{actor._id}}">
{{alias}} tente de {{maitrise.verbe}} {{le tmr.genre}} {{tmr.label}} ({{tmr.coord}}) {{alias}} tente de {{maitrise.verbe}} {{le tmr.genre}}
{{#if isTMRCache}}
{{caseTmr-type tmr.coord}}
{{else}}
{{tmr.label}} ({{tmr.coord}})
{{/if}}
</h4> </h4>
{{#if previous}} {{#if previous}}
{{#with previous}} {{#with previous}}
@ -11,10 +16,15 @@
{{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}} {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
<hr> <hr>
<span> <span>
{{#if rolled.isSuccess}} {{alias}}
{{alias}} parvient à {{maitrise.verbe}} {{le tmr.genre}} {{tmr.label}} ! {{#if rolled.isSuccess}}parvient à{{else}}échoue à{{/if}}
{{maitrise.verbe}} {{le tmr.genre}}
{{#if isTMRCache}}
{{caseTmr-type tmr.coord}}
{{else}} {{else}}
{{alias}} échoue à {{maitrise.verbe}} {{le tmr.genre}} {{tmr.label}}. {{tmr.label}} ({{tmr.coord}})
{{/if}}!
{{#if rolled.isEchec}}
{{alias}} <strong>quitte les Terres Médianes</strong> ! {{alias}} <strong>quitte les Terres Médianes</strong> !
{{#if souffle}} {{#if souffle}}
<br>De plus, son échec total lui fait subir un Souffle de Dragon : {{souffle.name}} <br>De plus, son échec total lui fait subir un Souffle de Dragon : {{souffle.name}}

View File

@ -1,5 +1,10 @@
<form class="skill-roll-dialog"> <form class="skill-roll-dialog">
<h2>Maîtrise {{tmr.label}} ({{tmr.coord}})</h2> <h2>Maîtrise {{#if isTMRCache}}
{{tmr.type}}
{{else}}
{{tmr.label}} ({{tmr.coord}})
{{/if}}
</h2>
<div class="grid grid-2col"> <div class="grid grid-2col">
<div class="flex-group-left"> <div class="flex-group-left">
<img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/> <img class="chat-icon" src="{{competence.img}}" alt="{{competence.name}}"/>