From d794e14bf1b045338886411eae60dbbc76cf7743 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 30 Oct 2021 00:42:18 +0200 Subject: [PATCH 1/7] Fix typo --- module/rdd-main.js | 2 +- module/rdd-utility.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/rdd-main.js b/module/rdd-main.js index 60bc9f45..110090d3 100644 --- a/module/rdd-main.js +++ b/module/rdd-main.js @@ -148,7 +148,7 @@ Hooks.once("init", async function () { game.socket.on("system.foundryvtt-reve-de-dragon", sockmsg => { console.log(">>>>> MSG RECV", sockmsg); - RdDUtility.onSocketMesssage(sockmsg); + RdDUtility.onSocketMessage(sockmsg); RdDCombat.onSocketMessage(sockmsg); ChatUtility.onSocketMessage(sockmsg); RdDActor.onSocketMessage(sockmsg); diff --git a/module/rdd-utility.js b/module/rdd-utility.js index 89ec1f16..59c24956 100644 --- a/module/rdd-utility.js +++ b/module/rdd-utility.js @@ -622,7 +622,7 @@ export class RdDUtility { } /* -------------------------------------------- */ - static onSocketMesssage(sockmsg) { + static onSocketMessage(sockmsg) { switch (sockmsg.msg) { case "msg_gm_chat_message": return ChatUtility.handleGMChatMessage(sockmsg.data); From c76cb5ae1cf1acb1f289f53d2474700d21a89652 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 30 Oct 2021 02:20:16 +0200 Subject: [PATCH 2/7] =?UTF-8?q?Fix:=20calcul=20r=C3=A9ussite=20en=20dessou?= =?UTF-8?q?s=20de=20-11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sur 01, aucune réussite ne correspondait à cause de l'absence de norm dans les chances de levelDown/levelImpossible --- module/rdd-resolution-table.js | 40 ++++++---------------------------- 1 file changed, 7 insertions(+), 33 deletions(-) diff --git a/module/rdd-resolution-table.js b/module/rdd-resolution-table.js index 269043bb..c4ec2c5c 100644 --- a/module/rdd-resolution-table.js +++ b/module/rdd-resolution-table.js @@ -7,40 +7,14 @@ import { ReglesOptionelles } from "./regles-optionelles.js"; * difficultés au delà de -10 */ const levelDown = [ - { level: -11, score: 1, sign: 0, part: 0, epart: 2, etotal: 90 }, - { level: -12, score: 1, sign: 0, part: 0, epart: 2, etotal: 70 }, - { level: -13, score: 1, sign: 0, part: 0, epart: 2, etotal: 50 }, - { level: -14, score: 1, sign: 0, part: 0, epart: 2, etotal: 30 }, - { level: -15, score: 1, sign: 0, part: 0, epart: 2, etotal: 10 }, - { level: -16, score: 1, sign: 0, part: 0, epart: 0, etotal: 2 } -]; -const levelImpossible = { score: 0, sign: 0, part: 0, epart: 0, etotal: 1 }; -/** - * Table des résultats spéciaux - inutilisée, conservée si on veut afficher la table - */ -const specialResults = [ - { part: 0, epart: 0, etotal: 0, min: 0, max: 0 }, - { part: 1, epart: 81, etotal: 92, min: 1, max: 5 }, - { part: 2, epart: 82, etotal: 92, min: 6, max: 10 }, - { part: 3, epart: 83, etotal: 93, min: 11, max: 15 }, - { part: 4, epart: 84, etotal: 93, min: 16, max: 20 }, - { part: 5, epart: 85, etotal: 94, min: 21, max: 25 }, - { part: 6, epart: 86, etotal: 94, min: 26, max: 30 }, - { part: 7, epart: 87, etotal: 95, min: 31, max: 35 }, - { part: 8, epart: 88, etotal: 95, min: 36, max: 40 }, - { part: 9, epart: 89, etotal: 96, min: 41, max: 45 }, - { part: 10, epart: 90, etotal: 96, min: 46, max: 50 }, - { part: 11, epart: 91, etotal: 97, min: 51, max: 55 }, - { part: 12, epart: 92, etotal: 97, min: 56, max: 60 }, - { part: 13, epart: 93, etotal: 98, min: 61, max: 65 }, - { part: 14, epart: 94, etotal: 98, min: 65, max: 70 }, - { part: 15, epart: 95, etotal: 99, min: 71, max: 75 }, - { part: 16, epart: 96, etotal: 99, min: 76, max: 80 }, - { part: 17, epart: 97, etotal: 100, min: 81, max: 85 }, - { part: 18, epart: 98, etotal: 100, min: 86, max: 90 }, - { part: 19, epart: 99, etotal: 100, min: 81, max: 95 }, - { part: 20, epart: 100, etotal: 100, min: 96, max: 100 } + { level: -11, score: 1, norm: 1, sign: 0, part: 0, epart: 2, etotal: 90 }, + { level: -12, score: 1, norm: 1, sign: 0, part: 0, epart: 2, etotal: 70 }, + { level: -13, score: 1, norm: 1, sign: 0, part: 0, epart: 2, etotal: 50 }, + { level: -14, score: 1, norm: 1, sign: 0, part: 0, epart: 2, etotal: 30 }, + { level: -15, score: 1, norm: 1, sign: 0, part: 0, epart: 2, etotal: 10 }, + { level: -16, score: 1, norm: 1, sign: 0, part: 0, epart: 0, etotal: 2 } ]; +const levelImpossible = { score: 0, norm:0, sign: 0, part: 0, epart: 0, etotal: 1 }; const reussites = [ { code: "etotal", isPart: false, isSign: false, isSuccess: false, isEchec: true, isEPart: true, isETotal: true, ptTache: -4, ptQualite: -6, quality: "Echec total", condition: (target, roll) => roll >= target.etotal && roll <= 100 }, From 179ec39843d3f8e032e8cfd37a664a2dbfad3b30 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 30 Oct 2021 02:21:41 +0200 Subject: [PATCH 3/7] =?UTF-8?q?Fix:=20pas=20de=20bonus=20de=20case=20au=20?= =?UTF-8?q?del=C3=A0=20de=20-10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Si l'ajustement final est -11 à -16, le bonus de case n'augmente plus les chances de succès --- module/rdd-resolution-table.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/rdd-resolution-table.js b/module/rdd-resolution-table.js index c4ec2c5c..52d0bd6a 100644 --- a/module/rdd-resolution-table.js +++ b/module/rdd-resolution-table.js @@ -84,7 +84,7 @@ export class RdDResolutionTable { /* -------------------------------------------- */ static async roll(caracValue, finalLevel, rollData = {}){ let chances = this.computeChances(caracValue, finalLevel); - this._updateChancesWithBonus(chances, rollData.bonus); + this._updateChancesWithBonus(chances, rollData.bonus, finalLevel); this._updateChancesFactor(chances, rollData.diviseurSignificative); chances.showDice = rollData.showDice; chances.rollMode = rollData.rollMode; @@ -121,8 +121,8 @@ export class RdDResolutionTable { } /* -------------------------------------------- */ - static _updateChancesWithBonus(chances, bonus) { - if (bonus) { + static _updateChancesWithBonus(chances, bonus, finalLevel) { + if (bonus && finalLevel>-11) { let newScore = Number(chances.score) + bonus; mergeObject(chances, this._computeCell(null, newScore), { overwrite: true }); } From a813857d5d67286768b7ea72b07c184c125bc6e5 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 30 Oct 2021 00:40:35 +0200 Subject: [PATCH 4/7] Message d'achat par le joueur faisant l'achat --- module/actor.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/module/actor.js b/module/actor.js index c764d574..c8dc3a9f 100644 --- a/module/actor.js +++ b/module/actor.js @@ -3617,10 +3617,7 @@ export class RdDActor extends Actor { return; } if (!Misc.isElectedUser()) { - RdDActor.remoteActorCall({ - actorId: achat.vendeurId ?? achat.acheteurId, - method: 'achatVente', args: [achat] - }); + RdDActor.remoteActorCall({actorId: achat.vendeurId ?? achat.acheteurId, method: 'achatVente', args: [achat]}); return; } @@ -3678,6 +3675,7 @@ export class RdDActor extends Actor { const chatAchatItem = duplicate(vente); chatAchatItem.quantiteTotal = achat.quantiteTotal; ChatMessage.create({ + user: achat.userId, speaker: {alias: (acheteur ?? vendeur).name} , whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name), content: await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/chat-achat-item.html', chatAchatItem) From 9fabaebf34639cc4b948a50f9f828224d16a08fe Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 30 Oct 2021 00:41:55 +0200 Subject: [PATCH 5/7] On ne peut plus prendre s'il n'y a pas de lots --- templates/chat-vente-item.html | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/templates/chat-vente-item.html b/templates/chat-vente-item.html index 4341b07a..ce9f87f1 100644 --- a/templates/chat-vente-item.html +++ b/templates/chat-vente-item.html @@ -22,15 +22,16 @@ {{prixLot}} Sols
{{/if}}

- + {{#if (or (gt quantiteNbLots 0) quantiteIllimite)}} - - {{#if (eq prixLot 0)}}Prendre{{else}}Acheter{{/if}} + + {{#if (eq prixLot 0)}}Prendre{{else}}Acheter{{/if}} + {{/if}} From f7763483439dcbfb27d3c01ba5ec3c89b732f1c4 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 30 Oct 2021 01:34:57 +0200 Subject: [PATCH 6/7] =?UTF-8?q?Am=C3=A9lioration=20templates=20partial?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit partial-roll-diffFixe pour les difficultés choisies partial-roll-diffFixe pour les difficultés imposées partial-roll-forcer pour forcer le résultat du jet renommage dialog-roll-competence --- module/actor.js | 4 ++-- module/rdd-combat.js | 6 +++--- module/rdd-utility.js | 4 +++- templates/dialog-roll-alchimie.html | 6 ++---- templates/dialog-roll-carac.html | 1 + templates/dialog-roll-chant.html | 6 ++---- ...ompetence.html => dialog-roll-competence.html} | 15 +++------------ templates/dialog-roll-danse.html | 7 +++---- templates/dialog-roll-jeu.html | 1 + templates/dialog-roll-maitrise-tmr.html | 6 ++---- templates/dialog-roll-meditation.html | 1 + templates/dialog-roll-musique.html | 6 ++---- templates/dialog-roll-oeuvre.html | 6 ++---- templates/dialog-roll-recettecuisine.html | 6 ++---- templates/dialog-roll-reve-de-dragon.html | 6 ++---- templates/dialog-roll-signedraconique.html | 6 ++---- templates/dialog-roll-sort.html | 3 ++- templates/partial-roll-diffFixe.html | 4 ++++ templates/partial-roll-diffLibre.html | 2 +- templates/partial-roll-forcer.html | 6 ++++++ 20 files changed, 46 insertions(+), 56 deletions(-) rename templates/{dialog-competence.html => dialog-roll-competence.html} (88%) create mode 100644 templates/partial-roll-diffFixe.html create mode 100644 templates/partial-roll-forcer.html 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}} From 0df7f97513430e99486f2a08b65657ff5a3395b0 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 30 Oct 2021 01:36:45 +0200 Subject: [PATCH 7/7] =?UTF-8?q?Nombre=20de=20tentatives=20pour=20une=20t?= =?UTF-8?q?=C3=A2che?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/actor.js | 1 + system.json | 2 +- template.json | 1 + templates/chat-resultat-tache.html | 7 +++++-- templates/item-tache-sheet.html | 6 ++++++ 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/module/actor.js b/module/actor.js index 5c9849fa..cb1208ca 100644 --- a/module/actor.js +++ b/module/actor.js @@ -2574,6 +2574,7 @@ export class RdDActor extends Actor { rollData.appliquerFatigue = ReglesOptionelles.isUsing("appliquer-fatigue"); rollData.tache = duplicate(rollData.tache); rollData.tache.data.points_de_tache_courant += rollData.rolled.ptTache; + rollData.tache.data.tentatives++; if (rollData.rolled.isETotal) { rollData.tache.data.difficulte--; } diff --git a/system.json b/system.json index d3743a53..489b07ca 100644 --- a/system.json +++ b/system.json @@ -6,7 +6,7 @@ "manifestPlusVersion": "1.0.0", "minimumCoreVersion": "0.8.0", "compatibleCoreVersion": "0.8.9", - "templateVersion": 124, + "templateVersion": 125, "author": "LeRatierBretonnien", "authors": [ { diff --git a/template.json b/template.json index 9f8617bf..70c75f83 100644 --- a/template.json +++ b/template.json @@ -719,6 +719,7 @@ "difficulte": 0, "points_de_tache": 0, "points_de_tache_courant": 0, + "tentatives": 0, "description": "", "descriptionmj": "" }, diff --git a/templates/chat-resultat-tache.html b/templates/chat-resultat-tache.html index e6f2c81b..248d89f9 100644 --- a/templates/chat-resultat-tache.html +++ b/templates/chat-resultat-tache.html @@ -6,8 +6,11 @@ {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
- Après {{tache.data.periodicite}} {{alias}} a obtenu {{rolled.ptTache}} point{{~#if (gt rolled.ptTache 1)}}s{{/if}} de tâche, - son avancement est de {{tache.data.points_de_tache_courant}} sur {{tache.data.points_de_tache}} point{{~#if (gt tache.data.points_de_tache_courant 1)}}s{{/if}} de tâche. + {{alias}} a obtenu {{rolled.ptTache}} point{{~#unless (eq rolled.ptTache 1)}}s{{/unless}} de tâche, + son avancement est de + {{tache.data.points_de_tache_courant}} sur {{tache.data.points_de_tache}} + point{{~#unless (eq tache.data.points_de_tache_courant 1)}}s{{/unless}} de tâche + ({{~#unless (eq tache.data.tentatives 1)}}{{tache.data.tentatives}} tentatives{{else}}première tentative{{/unless~}}). {{#if (and tache.data.fatigue appliquerFatigue)}}
Il s'est fatigué de {{tache.data.fatigue}} case{{~#if (gt tache.data.fatigue 1)}}s{{/if}}.{{/if}} {{#if rolled.isETotal}}
Son échec total augmente de 1 la difficulté de la tâche!{{/if~}} {{> "systems/foundryvtt-reve-de-dragon/templates/chat-info-appel-au-moral.html"}} diff --git a/templates/item-tache-sheet.html b/templates/item-tache-sheet.html index d4e1b5af..1287a683 100644 --- a/templates/item-tache-sheet.html +++ b/templates/item-tache-sheet.html @@ -44,10 +44,16 @@
+
+
+ + +
+
{{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}