diff --git a/changelog.md b/changelog.md index eb76b648..08077bd5 100644 --- a/changelog.md +++ b/changelog.md @@ -5,6 +5,7 @@ - Fix: Le MJ peut correctement masquer les points de tâche requis - Fix: le jet d'appréciation n'utilise pas la compétence - Fix: la qualité négative n'est pas exotique, elle est juste mauvaise: on n'utilise pas la cuisine pour se retenir de jeter l'assiette +- Esthétique: ne pas afficher "+0" pour les ajustements de jets/encaissement ## v11.1.2 - Les vertèbres de Werther de Zloth - Fix: les jets d'encaissement fonctionnent de nouveau normalement diff --git a/templates/actor/archetype.hbs b/templates/actor/archetype.hbs index 20b8200b..08858640 100644 --- a/templates/actor/archetype.hbs +++ b/templates/actor/archetype.hbs @@ -12,7 +12,7 @@
  • {{/each}} diff --git a/templates/actor/carac-derivee.html b/templates/actor/carac-derivee.html index 1fa900d8..0e08859e 100644 --- a/templates/actor/carac-derivee.html +++ b/templates/actor/carac-derivee.html @@ -68,7 +68,7 @@
  • - +
  • diff --git a/templates/actor/combat.html b/templates/actor/combat.html index b8edb5ab..90fd7b2f 100644 --- a/templates/actor/combat.html +++ b/templates/actor/combat.html @@ -20,8 +20,8 @@ ({{arme.system.competence}}) - {{numberFormat arme.system.niveau decimals=0 sign=true}} - {{numberFormat arme.system.dommagesReels decimals=0 sign=true}} + {{plusMoins arme.system.niveau}} + {{plusMoins arme.system.dommagesReels}} {{arme.system.initiative}}
  • @@ -34,7 +34,7 @@ {{esq.name}} - {{numberFormat esq.system.niveau decimals=0 sign=true}} + {{plusMoins esq.system.niveau}} diff --git a/templates/actor/comp-creature.html b/templates/actor/comp-creature.html index 9c20c119..98d1ed8d 100644 --- a/templates/actor/comp-creature.html +++ b/templates/actor/comp-creature.html @@ -11,13 +11,13 @@ {{#unless @root.options.vueDetaillee}}disabled{{/unless}}/> diff --git a/templates/actor/competence.html b/templates/actor/competence.html index 38996591..5b204d95 100644 --- a/templates/actor/competence.html +++ b/templates/actor/competence.html @@ -13,7 +13,7 @@ {{/if}} {{#if @root.options.vueDetaillee}} @@ -42,7 +42,7 @@ {{/if}} {{#if @root.options.isGM}} diff --git a/templates/chat-demande-defense.html b/templates/chat-demande-defense.html index 30d37d91..ec1cf088 100644 --- a/templates/chat-demande-defense.html +++ b/templates/chat-demande-defense.html @@ -63,11 +63,9 @@ {{/unless}} - Encaisser à {{#if (eq dmg.mortalite 'non-mortel')~}} - ({{numberFormat dmg.total decimals=0 sign=true}}) - {{~else~}} - {{numberFormat dmg.total decimals=0 sign=true}} - {{~/if}} ! + Encaisser à {{plusMoins dmg.total}} + {{#if (eq dmg.mortalite 'non-mortel')~}} + (non-mortel) ! \ No newline at end of file diff --git a/templates/chat-infojet.html b/templates/chat-infojet.html index 76227bb9..61b3b129 100644 --- a/templates/chat-infojet.html +++ b/templates/chat-infojet.html @@ -1,6 +1,6 @@
    - {{rolled.caracValue}} à {{numberFormat rolled.finalLevel decimals=0 sign=true}} + {{rolled.caracValue}} à {{plusMoins rolled.finalLevel}} {{#if ajustements}}
    {{#each ajustements as |item key|}} @@ -9,7 +9,7 @@ {{#if item.descr}} {{{item.descr}}} {{else}} - {{item.label}}: {{numberFormat item.value decimals=0 sign=true}} + {{item.label}}: {{plusMoins item.value}} {{/if}}
    {{/if}} @@ -23,6 +23,6 @@
    {{rolled.roll}} : {{rolled.quality}} {{#if rolled.ajustementNecessaire}} - (Réussite si {{numberFormat rolled.niveauNecessaire decimals=0 sign=true}} / avec niveau {{numberFormat rolled.ajustementNecessaire decimals=0 sign=true}}) + (Réussite si {{plusMoins rolled.niveauNecessaire}} / avec niveau {{plusMoins rolled.ajustementNecessaire}}) {{/if}}
    \ No newline at end of file diff --git a/templates/chat-resultat-attaque.html b/templates/chat-resultat-attaque.html index 5c29754e..500cdae9 100644 --- a/templates/chat-resultat-attaque.html +++ b/templates/chat-resultat-attaque.html @@ -20,11 +20,11 @@ {{#if rolled.isSuccess}} {{show.cible}} doit se défendre à {{diffLibre}}, ou encaisser à {{~#if (eq dmg.mortalite 'non-mortel')}} - ({{numberFormat dmg.total decimals=0 sign=true}}) (dommages non-mortel) + ({{plusMoins dmg.total}}) (non-mortel) {{else if (eq dmg.mortalite 'mortel')}} - {{numberFormat dmg.total decimals=0 sign=true}} + {{plusMoins dmg.total}} {{else}} - {{numberFormat dmg.total decimals=0 sign=true}} (entités de cauchemar) + {{plusMoins dmg.total}} (entités de cauchemar) {{~/if}}. {{#if show.isRecul}}Si votre adversaire n'esquive pas, il devra résister à l'impact ou reculer sous le choc!{{/if}} diff --git a/templates/chat-resultat-competence.html b/templates/chat-resultat-competence.html index c28065b5..68f3ee2e 100644 --- a/templates/chat-resultat-competence.html +++ b/templates/chat-resultat-competence.html @@ -10,7 +10,7 @@ {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
    - {{#if rolled.ptTache}}{{rolled.ptTache}} points de tâche{{/if}}{{#if rolled.ptQualite}}{{#if rolled.ptTache}},{{/if}} Qualité ajustée de {{numberFormat rolled.ptQualite decimals=0 sign=true}}{{/if}} + {{#if rolled.ptTache}}{{rolled.ptTache}} points de tâche{{/if}}{{#if rolled.ptQualite}}{{#if rolled.ptTache}},{{/if}} Qualité ajustée de {{rolled.ptQualite}}{{/if}}
    {{> "systems/foundryvtt-reve-de-dragon/templates/chat-info-appel-au-moral.html"}} {{~#if show.explications}} diff --git a/templates/chat-resultat-encaissement.html b/templates/chat-resultat-encaissement.html index 2e35925a..aeb81f2d 100644 --- a/templates/chat-resultat-encaissement.html +++ b/templates/chat-resultat-encaissement.html @@ -10,7 +10,7 @@ {{else}}

    {{alias}} encaisse à - {{numberFormat dmg.total decimals=0 sign=true}} + {{plusMoins dmg.total}} {{#if (eq dmg.mortalite 'non-mortel')~}}(coups non mortels) {{~else if (eq dmg.mortalite 'entiteincarnee')}}(entité incarnée) {{~/if}} diff --git a/templates/chat-resultat-general.html b/templates/chat-resultat-general.html index 830c7e4f..657ecadf 100644 --- a/templates/chat-resultat-general.html +++ b/templates/chat-resultat-general.html @@ -5,13 +5,13 @@ {{alias}} {{#if show.title}}{{show.title}}: {{/if}} {{#if selectedCarac}}{{selectedCarac.label}} {{#if competence}}{{#unless (eq selectedCarac.label competence.name)}} / {{competence.name}}{{/unless}}{{/if}} - à {{diffLibre}} + à {{plusMoins diffLibre}} {{/if}}

    {{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
    - {{#if rolled.ptTache}}{{rolled.ptTache}} points de tâche{{/if}}{{#if rolled.ptQualite}}{{#if rolled.ptTache}},{{/if}} ajustement Qualité {{numberFormat rolled.ptQualite decimals=0 sign=true}}{{/if}} + {{#if rolled.ptTache}}{{rolled.ptTache}} points de tâche{{/if}}{{#if rolled.ptQualite}}{{#if rolled.ptTache}},{{/if}} ajustement Qualité {{rolled.ptQualite}}{{/if}} {{> "systems/foundryvtt-reve-de-dragon/templates/chat-info-appel-au-moral.html"}}
    {{~#if show.explications}} diff --git a/templates/chat-resultat-meteo.html b/templates/chat-resultat-meteo.html index 96d7e4b8..6557f762 100644 --- a/templates/chat-resultat-meteo.html +++ b/templates/chat-resultat-meteo.html @@ -3,7 +3,7 @@
    diff --git a/templates/dialog-roll-alchimie.html b/templates/dialog-roll-alchimie.html index be167856..17fd06af 100644 --- a/templates/dialog-roll-alchimie.html +++ b/templates/dialog-roll-alchimie.html @@ -6,7 +6,7 @@
    - +
    diff --git a/templates/dialog-roll-chant.html b/templates/dialog-roll-chant.html index ffb2732b..af27e9c3 100644 --- a/templates/dialog-roll-chant.html +++ b/templates/dialog-roll-chant.html @@ -6,7 +6,7 @@ {{competence.name}}
    - +
    {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.system}}
    diff --git a/templates/dialog-roll-danse.html b/templates/dialog-roll-danse.html index c7d9c8b9..88069b9e 100644 --- a/templates/dialog-roll-danse.html +++ b/templates/dialog-roll-danse.html @@ -6,7 +6,7 @@ {{competence.name}}
    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html"}} - +
    {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.system}} diff --git a/templates/dialog-roll-defense-empoignade.html b/templates/dialog-roll-defense-empoignade.html index 3c9337be..97a2e2d4 100644 --- a/templates/dialog-roll-defense-empoignade.html +++ b/templates/dialog-roll-defense-empoignade.html @@ -7,7 +7,7 @@ {{competence.name}}
    - +
    diff --git a/templates/dialog-roll-defense-possession.html b/templates/dialog-roll-defense-possession.html index 1c114a10..4fc1a38f 100644 --- a/templates/dialog-roll-defense-possession.html +++ b/templates/dialog-roll-defense-possession.html @@ -9,7 +9,7 @@ {{competence.name}}
    - +
    diff --git a/templates/dialog-roll-encaisser.html b/templates/dialog-roll-encaisser.html index 16e3bba7..4b333977 100644 --- a/templates/dialog-roll-encaisser.html +++ b/templates/dialog-roll-encaisser.html @@ -4,7 +4,7 @@ diff --git a/templates/dialog-roll-jeu.html b/templates/dialog-roll-jeu.html index 17fedcb0..916bb711 100644 --- a/templates/dialog-roll-jeu.html +++ b/templates/dialog-roll-jeu.html @@ -7,7 +7,7 @@
    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html"}} - +
    diff --git a/templates/dialog-roll-maitrise-tmr.html b/templates/dialog-roll-maitrise-tmr.html index c90b9ba2..2f2399ce 100644 --- a/templates/dialog-roll-maitrise-tmr.html +++ b/templates/dialog-roll-maitrise-tmr.html @@ -10,7 +10,7 @@ {{competence.name}}
    - +
    diff --git a/templates/dialog-roll-meditation.html b/templates/dialog-roll-meditation.html index abbb4187..1ccc1ab3 100644 --- a/templates/dialog-roll-meditation.html +++ b/templates/dialog-roll-meditation.html @@ -11,7 +11,7 @@
    + {{numberFormat carac.intellect.value decimals=0 sign=false}} / {{plusMoins competence.system.niveau}}
    diff --git a/templates/dialog-roll-musique.html b/templates/dialog-roll-musique.html index a0dfee56..923a99ab 100644 --- a/templates/dialog-roll-musique.html +++ b/templates/dialog-roll-musique.html @@ -6,7 +6,7 @@ {{competence.name}}
    - +
    {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.system}}
    diff --git a/templates/dialog-roll-oeuvre.html b/templates/dialog-roll-oeuvre.html index a9a8e10b..469c041b 100644 --- a/templates/dialog-roll-oeuvre.html +++ b/templates/dialog-roll-oeuvre.html @@ -7,7 +7,7 @@
    - +
    {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.system}} diff --git a/templates/dialog-roll-recettecuisine.html b/templates/dialog-roll-recettecuisine.html index 5e17ccbb..06f29baf 100644 --- a/templates/dialog-roll-recettecuisine.html +++ b/templates/dialog-roll-recettecuisine.html @@ -9,7 +9,7 @@
    - +
    diff --git a/templates/dialog-roll-reve-de-dragon.html b/templates/dialog-roll-reve-de-dragon.html index 1f89338a..f42260ca 100644 --- a/templates/dialog-roll-reve-de-dragon.html +++ b/templates/dialog-roll-reve-de-dragon.html @@ -5,7 +5,7 @@ {{competence.name}}
    - +
    diff --git a/templates/dialog-roll-signedraconique.html b/templates/dialog-roll-signedraconique.html index e350634d..90c6b852 100644 --- a/templates/dialog-roll-signedraconique.html +++ b/templates/dialog-roll-signedraconique.html @@ -24,7 +24,7 @@ {{#select draconic}} {{#each draconicList as |draconic key|}} - {{/each}} {{/select}} @@ -54,11 +54,11 @@ - +
    {{>"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-validation-encaissement.html b/templates/dialog-validation-encaissement.html index 380c1329..27bf147f 100644 --- a/templates/dialog-validation-encaissement.html +++ b/templates/dialog-validation-encaissement.html @@ -20,22 +20,22 @@ {{/if}}
    {{#if encaissement.dmg.total}} -
    +dom encaissement: {{numberFormat rollData.dmg.total decimals=0 sign=true}}
    +
    +dom encaissement: {{plusMoins rollData.dmg.total}}
    {{/if}} {{#if rollData.dmg.dmgArme}} -
    +dom arme: {{numberFormat rollData.dmg.dmgArme decimals=0 sign=true}}
    +
    +dom arme: {{plusMoins rollData.dmg.dmgArme}}
    {{/if}} {{#if rollData.dmg.dmgActor}} -
    +dom attaquant: {{numberFormat rollData.dmg.dmgActor decimals=0 sign=true}}
    +
    +dom attaquant: {{plusMoins rollData.dmg.dmgActor}}
    {{/if}} {{#if rollData.dmg.dmgParticuliere}} -
    +dom particulière: {{numberFormat rollData.dmg.dmgParticuliere decimals=0 sign=true}}
    +
    +dom particulière: {{plusMoins rollData.dmg.dmgParticuliere}}
    {{/if}} {{#if rollData.dmg.dmgTactique}} -
    +dom tactique: {{numberFormat rollData.dmg.dmgTactique decimals=0 sign=true}}
    +
    +dom tactique: {{plusMoins rollData.dmg.dmgTactique}}
    {{/if}} {{#if rollData.dmg.dmgSurprise}} -
    +dom surprise: {{numberFormat rollData.dmg.dmgSurprise decimals=0 sign=true}}
    +
    +dom surprise: {{plusMoins rollData.dmg.dmgSurprise}}
    {{/if}} diff --git a/templates/partial-roll-ajustements.html b/templates/partial-roll-ajustements.html index 241761e6..c77dbd49 100644 --- a/templates/partial-roll-ajustements.html +++ b/templates/partial-roll-ajustements.html @@ -1,7 +1,7 @@
    Ajustement Final: - {{selectedCarac.value}} / {{numberFormat finalLevel decimals=0 sign=true}} + {{selectedCarac.value}} / {{plusMoins finalLevel}}
    {{#each ajustements as |item key|}} {{#if item.used}} @@ -9,7 +9,7 @@ {{#if item.descr}} {{{item.descr}}} {{else}} - {{item.label}}: {{numberFormat item.value decimals=0 sign=true}} + {{item.label}}: {{plusMoins item.value}} {{/if}}
    {{/if}} diff --git a/templates/partial-roll-diffCondition.html b/templates/partial-roll-diffCondition.html index 4b578a51..d9376af8 100644 --- a/templates/partial-roll-diffCondition.html +++ b/templates/partial-roll-diffCondition.html @@ -2,8 +2,8 @@ diff --git a/templates/partial-roll-diffFixe.html b/templates/partial-roll-diffFixe.html index 25edb580..8ea678ac 100644 --- a/templates/partial-roll-diffFixe.html +++ b/templates/partial-roll-diffFixe.html @@ -1,4 +1,4 @@
    - +
    diff --git a/templates/partial-roll-diffLibre.html b/templates/partial-roll-diffLibre.html index 899d7cbd..61f9c8e1 100644 --- a/templates/partial-roll-diffLibre.html +++ b/templates/partial-roll-diffLibre.html @@ -3,7 +3,7 @@ diff --git a/templates/resolution-table.html b/templates/resolution-table.html index 1e319056..98d49ae1 100644 --- a/templates/resolution-table.html +++ b/templates/resolution-table.html @@ -7,7 +7,7 @@ ... {{/if}} {{#each cols as |col|}} - {{numberFormat col decimals=0 sign=true}} + {{plusMoins col}} {{/each}} {{#each rows as |row|}} diff --git a/templates/roll/explain.hbs b/templates/roll/explain.hbs index c7ee3fee..608180a4 100644 --- a/templates/roll/explain.hbs +++ b/templates/roll/explain.hbs @@ -5,7 +5,7 @@ sur {{rolled.score}}% {{#if (and rolled.caracValue rolled.finalLevel)}} ({{#if (gt rolled.diviseurSignificative 1)}}1/{{rolled.diviseurSignificative}}{{/if}} - de {{rolled.caracValue}} à {{numberFormat rolled.finalLevel decimals=0 sign=true}}) + de {{rolled.caracValue}} à {{plusMoins rolled.finalLevel}}) {{/if}} {{rolled.quality}}

    diff --git a/templates/sommeil/astrologie-gardien.hbs b/templates/sommeil/astrologie-gardien.hbs index adf79101..a31656f6 100644 --- a/templates/sommeil/astrologie-gardien.hbs +++ b/templates/sommeil/astrologie-gardien.hbs @@ -43,7 +43,7 @@ {{#each ajustementActeur.ajustements as |ajustement|}} {{#if (ne ajustement.ajustement 0)}} - {{numberFormat ajustement.ajustement decimals=0 sign=true}} + {{plusMoins ajustement.ajustement}} {{else}}