diff --git a/module/actor.js b/module/actor.js index c8dc3a9f..5c9849fa 100644 --- a/module/actor.js +++ b/module/actor.js @@ -2494,7 +2494,7 @@ export class RdDActor extends Actor { } console.log("rollCompetence !!!", rollData); - const dialog = await RdDRoll.create(this, rollData, { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-competence.html' }, { + const dialog = await RdDRoll.create(this, rollData, { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html' }, { name: 'jet-competence', label: 'Jet ' + Grammar.apostrophe('de', name), callbacks: [ @@ -2556,7 +2556,7 @@ export class RdDActor extends Actor { console.log("rollTache !!!", rollData); - const dialog = await RdDRoll.create(this, rollData, { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-competence.html' }, { + const dialog = await RdDRoll.create(this, rollData, { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html' }, { name: 'jet-competence', label: 'Jet de Tâche ' + tacheData.name, callbacks: [ diff --git a/module/rdd-combat.js b/module/rdd-combat.js index fb02808c..c0c361cf 100644 --- a/module/rdd-combat.js +++ b/module/rdd-combat.js @@ -747,7 +747,7 @@ export class RdDCombat { const dialog = await RdDRoll.create(this.attacker, rollData, { - html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-competence.html', + html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html', options: { height: 540 } }, { name: 'jet-attaque', @@ -1000,7 +1000,7 @@ export class RdDCombat { const dialog = await RdDRoll.create(this.defender, rollData, { - html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-competence.html', + html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html', options: { height: 540 } }, { name: 'jet-parade', @@ -1088,7 +1088,7 @@ export class RdDCombat { let rollData = this._prepareEsquive(attackerRoll, esquive); const dialog = await RdDRoll.create(this.defender, rollData, - { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-competence.html' }, { + { html: 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html' }, { name: 'jet-esquive', label: 'Esquiver', callbacks: [ diff --git a/module/rdd-utility.js b/module/rdd-utility.js index 59c24956..4322b752 100644 --- a/module/rdd-utility.js +++ b/module/rdd-utility.js @@ -164,7 +164,7 @@ export class RdDUtility { 'systems/foundryvtt-reve-de-dragon/templates/casetmr-specific-list.html', // Dialogs 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-resolution.html', - 'systems/foundryvtt-reve-de-dragon/templates/dialog-competence.html', + 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-competence.html', 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-carac.html', 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-sort.html', 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-encaisser.html', @@ -177,10 +177,12 @@ export class RdDUtility { 'systems/foundryvtt-reve-de-dragon/templates/partial-description-sort.html', 'systems/foundryvtt-reve-de-dragon/templates/partial-roll-ajustements.html', 'systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html', + 'systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html', 'systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html', 'systems/foundryvtt-reve-de-dragon/templates/partial-roll-surenc.html', 'systems/foundryvtt-reve-de-dragon/templates/partial-roll-enctotal.html', 'systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html', + 'systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html', 'systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html', 'systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html', // Calendrier diff --git a/templates/dialog-roll-alchimie.html b/templates/dialog-roll-alchimie.html index d6001a79..5e6f8133 100644 --- a/templates/dialog-roll-alchimie.html +++ b/templates/dialog-roll-alchimie.html @@ -10,10 +10,7 @@
-
- - -
+ {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}} {{#if alchimie.sansCristal}}
@@ -21,6 +18,7 @@
{{/if}} + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
diff --git a/templates/dialog-roll-carac.html b/templates/dialog-roll-carac.html index 8d510bba..89c454ab 100644 --- a/templates/dialog-roll-carac.html +++ b/templates/dialog-roll-carac.html @@ -10,6 +10,7 @@
{{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}} + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
diff --git a/templates/dialog-roll-chant.html b/templates/dialog-roll-chant.html index df2482cb..8f72f568 100644 --- a/templates/dialog-roll-chant.html +++ b/templates/dialog-roll-chant.html @@ -11,11 +11,9 @@ {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}}
-
- - -
+ {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}} + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
diff --git a/templates/dialog-competence.html b/templates/dialog-roll-competence.html similarity index 88% rename from templates/dialog-competence.html rename to templates/dialog-roll-competence.html index f298cf8a..86d26d22 100644 --- a/templates/dialog-competence.html +++ b/templates/dialog-roll-competence.html @@ -60,25 +60,16 @@ {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-surenc.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-enctotal.html"}} - - {{#if isGM}} -
- -
- {{/if}} -
{{#if attackerRoll}} -
- - -
+ {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}} {{else}} - {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html"}} + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html"}} {{/if}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}} + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
diff --git a/templates/dialog-roll-danse.html b/templates/dialog-roll-danse.html index d9507232..65d3376e 100644 --- a/templates/dialog-roll-danse.html +++ b/templates/dialog-roll-danse.html @@ -11,12 +11,11 @@ {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}}
-
- - -
+ {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}} + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}} +
diff --git a/templates/dialog-roll-jeu.html b/templates/dialog-roll-jeu.html index 1318700d..049a1512 100644 --- a/templates/dialog-roll-jeu.html +++ b/templates/dialog-roll-jeu.html @@ -14,6 +14,7 @@
{{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffLibre.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}} + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
diff --git a/templates/dialog-roll-maitrise-tmr.html b/templates/dialog-roll-maitrise-tmr.html index feef2c21..7408b24d 100644 --- a/templates/dialog-roll-maitrise-tmr.html +++ b/templates/dialog-roll-maitrise-tmr.html @@ -9,11 +9,9 @@
-
- - -
+ {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}} + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
diff --git a/templates/dialog-roll-meditation.html b/templates/dialog-roll-meditation.html index 918e0315..718ae819 100644 --- a/templates/dialog-roll-meditation.html +++ b/templates/dialog-roll-meditation.html @@ -36,6 +36,7 @@
{{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}} + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
diff --git a/templates/dialog-roll-musique.html b/templates/dialog-roll-musique.html index 6455e3d1..b93161f1 100644 --- a/templates/dialog-roll-musique.html +++ b/templates/dialog-roll-musique.html @@ -11,11 +11,9 @@ {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}}
-
- - -
+ {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}} + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
diff --git a/templates/dialog-roll-oeuvre.html b/templates/dialog-roll-oeuvre.html index 45d23f49..1a0c26db 100644 --- a/templates/dialog-roll-oeuvre.html +++ b/templates/dialog-roll-oeuvre.html @@ -12,11 +12,9 @@ {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}}
-
- - -
+ {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}} + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
diff --git a/templates/dialog-roll-recettecuisine.html b/templates/dialog-roll-recettecuisine.html index ab977783..394ff935 100644 --- a/templates/dialog-roll-recettecuisine.html +++ b/templates/dialog-roll-recettecuisine.html @@ -25,11 +25,9 @@
-
- - -
+ {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}} + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-moral.html"}}
diff --git a/templates/dialog-roll-reve-de-dragon.html b/templates/dialog-roll-reve-de-dragon.html index 4f7857a3..5e93afda 100644 --- a/templates/dialog-roll-reve-de-dragon.html +++ b/templates/dialog-roll-reve-de-dragon.html @@ -9,11 +9,9 @@
-
- - -
+ {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}} + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
diff --git a/templates/dialog-roll-signedraconique.html b/templates/dialog-roll-signedraconique.html index b9de46d9..c790fe6b 100644 --- a/templates/dialog-roll-signedraconique.html +++ b/templates/dialog-roll-signedraconique.html @@ -31,11 +31,9 @@ {{/select}} -
- - -
+ {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffFixe.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}} + {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-forcer.html"}}
diff --git a/templates/dialog-roll-sort.html b/templates/dialog-roll-sort.html index e5e75302..920b4bf7 100644 --- a/templates/dialog-roll-sort.html +++ b/templates/dialog-roll-sort.html @@ -48,7 +48,7 @@
- + {{#select diffLibre}} {{#each difficultesLibres as |key|}} diff --git a/templates/partial-roll-forcer.html b/templates/partial-roll-forcer.html new file mode 100644 index 00000000..db50a91d --- /dev/null +++ b/templates/partial-roll-forcer.html @@ -0,0 +1,6 @@ +{{#if isGM}} +
+ + +
+{{/if}}