From fb490f8ac8ccc78b6a37c0a256e9ebbd2d093dc9 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Thu, 22 Apr 2021 19:08:37 +0200 Subject: [PATCH 1/7] description complete sur mouseover --- module/rdd-utility.js | 2 ++ styles/simple.css | 10 ++++++++++ templates/dialog-roll-chant.html | 2 +- templates/dialog-roll-danse.html | 2 +- templates/dialog-roll-jeu.html | 2 +- templates/dialog-roll-musique.html | 2 +- templates/dialog-roll-oeuvre.html | 2 +- templates/dialog-roll-recettecuisine.html | 8 ++------ templates/partial-description-overflow.html | 8 ++++++++ 9 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 templates/partial-description-overflow.html diff --git a/module/rdd-utility.js b/module/rdd-utility.js index 5d690f0c..2efb0b21 100644 --- a/module/rdd-utility.js +++ b/module/rdd-utility.js @@ -157,6 +157,7 @@ export class RdDUtility { 'systems/foundryvtt-reve-de-dragon/templates/dialog-roll-alchimie.html', 'systems/foundryvtt-reve-de-dragon/templates/dialog-astrologie-joueur.html', // Partials + 'systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.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-diffCondition.html', @@ -164,6 +165,7 @@ export class RdDUtility { '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-select-carac.html', + // Calendrier 'systems/foundryvtt-reve-de-dragon/templates/calendar-template.html', 'systems/foundryvtt-reve-de-dragon/templates/calendar-editor-template.html', diff --git a/styles/simple.css b/styles/simple.css index d7fdb732..08607232 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -447,6 +447,16 @@ table {border: 1px solid #7a7971;} font-size: 0.70rem; text-align: right; } +.poesie-overflow { + color: rgba(82, 17, 131, 0.9); + max-height: 2.5rem; + overflow: hidden; +} +.poesie-overflow:hover { + max-height: unset; + overflow: visible; +} + /* ======================================== */ /* Sheet */ .window-app.sheet .window-content .sheet-header{ diff --git a/templates/dialog-roll-chant.html b/templates/dialog-roll-chant.html index 74eab22e..df2482cb 100644 --- a/templates/dialog-roll-chant.html +++ b/templates/dialog-roll-chant.html @@ -8,7 +8,7 @@ - {{> "systems/foundryvtt-reve-de-dragon/templates/chat-poesie.html" oeuvre.data}} + {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}}
diff --git a/templates/dialog-roll-danse.html b/templates/dialog-roll-danse.html index 20025e53..d9507232 100644 --- a/templates/dialog-roll-danse.html +++ b/templates/dialog-roll-danse.html @@ -8,7 +8,7 @@ {{>"systems/foundryvtt-reve-de-dragon/templates/partial-select-carac.html"}}
- {{> "systems/foundryvtt-reve-de-dragon/templates/chat-poesie.html" oeuvre.data}} + {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}}
diff --git a/templates/dialog-roll-jeu.html b/templates/dialog-roll-jeu.html index 8cac1127..1318700d 100644 --- a/templates/dialog-roll-jeu.html +++ b/templates/dialog-roll-jeu.html @@ -18,7 +18,7 @@
- {{> "systems/foundryvtt-reve-de-dragon/templates/chat-poesie.html" oeuvre.data}} + {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}}
diff --git a/templates/dialog-roll-musique.html b/templates/dialog-roll-musique.html index 1ff59d94..6455e3d1 100644 --- a/templates/dialog-roll-musique.html +++ b/templates/dialog-roll-musique.html @@ -8,7 +8,7 @@ - {{> "systems/foundryvtt-reve-de-dragon/templates/chat-poesie.html" oeuvre.data}} + {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}}
diff --git a/templates/dialog-roll-oeuvre.html b/templates/dialog-roll-oeuvre.html index bcaf114b..45d23f49 100644 --- a/templates/dialog-roll-oeuvre.html +++ b/templates/dialog-roll-oeuvre.html @@ -9,7 +9,7 @@
- {{> "systems/foundryvtt-reve-de-dragon/templates/chat-poesie.html" oeuvre.data}} + {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}}
diff --git a/templates/dialog-roll-recettecuisine.html b/templates/dialog-roll-recettecuisine.html index a8316dbb..ab977783 100644 --- a/templates/dialog-roll-recettecuisine.html +++ b/templates/dialog-roll-recettecuisine.html @@ -1,9 +1,5 @@
-

Cuisiner: {{oeuvre.name}} -
- {{> "systems/foundryvtt-reve-de-dragon/templates/chat-poesie.html" oeuvre.data}} -
-

+

Cuisiner: {{oeuvre.name}}

@@ -38,7 +34,7 @@
- + {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" oeuvre.data}}
diff --git a/templates/partial-description-overflow.html b/templates/partial-description-overflow.html new file mode 100644 index 00000000..11b4b2ad --- /dev/null +++ b/templates/partial-description-overflow.html @@ -0,0 +1,8 @@ +{{#if (or description reference)}} +
+ {{{description}}} + {{#if reference}} +

{{reference}}

+ {{/if}} +
+{{/if}} From 3fe8e834c821d6d48513b78b93121d9a6b00e41d Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Thu, 22 Apr 2021 20:12:29 +0200 Subject: [PATCH 2/7] =?UTF-8?q?Fix=20d=C3=A9=20draconique=200.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/de-draconique.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/module/de-draconique.js b/module/de-draconique.js index abfa4d45..4cd5d6bd 100644 --- a/module/de-draconique.js +++ b/module/de-draconique.js @@ -15,8 +15,7 @@ export class DeDraconique extends Roll{ evaluate() { super.evaluate(); const rerolls = Math.ceil(this.total / 8); - this.terms[this.terms.length - 1] = rerolls; - this.results[this.results.length - 1] = rerolls; + this.terms[this.terms.length - 1].number = rerolls; this._total -= rerolls; return this; } From 208dfef83fa1c44c6f40699d04a084718b8d0e40 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Fri, 23 Apr 2021 02:47:18 +0200 Subject: [PATCH 3/7] Fix cuisine/recettecuisine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Utiliser le nom de la compétence ou le nom de l'objet --- module/actor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/actor.js b/module/actor.js index 677fea6f..959e5797 100644 --- a/module/actor.js +++ b/module/actor.js @@ -2320,7 +2320,7 @@ export class RdDActor extends Actor { { oeuvre: oeuvre, art: oeuvre.type, - competence: duplicate(Misc.data(this.getCompetence(oeuvre.data.competence ?? artData.art))), + competence: duplicate(Misc.data(this.getCompetence(artData.compName ?? oeuvre.data.competence ?? artData.art))), diffLibre: - (oeuvre.data.niveau ?? 0), diffConditions: 0, use: { libre: false, conditions: true }, @@ -2402,8 +2402,8 @@ export class RdDActor extends Actor { async rollRecetteCuisine(id) { const oeuvre = Misc.data(this.getRecetteCuisine(id)); const artData = { - art: 'cuisine', verbe: 'Cuisiner', + compName: 'cuisine', proportions: 1, ajouterEquipement: false }; From fd42634b19c1fd47da64a4f9ca5d1104aeb8d7b9 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Fri, 23 Apr 2021 02:47:59 +0200 Subject: [PATCH 4/7] =?UTF-8?q?Sommeil=20pour=20le=20double-r=C3=AAve?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/actor.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/module/actor.js b/module/actor.js index 959e5797..18480bd0 100644 --- a/module/actor.js +++ b/module/actor.js @@ -541,9 +541,8 @@ export class RdDActor extends Actor { ChatMessage.create(message); } - /* -------------------------------------------- */ - async dormir(heures = 1) { + async dormir(heures) { let message = { whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name), content: `${this.name}: Vous dormez ${heures == 1 ? 'une' : heures} heure${heures == 1 ? '' : 's'}.` @@ -552,9 +551,9 @@ export class RdDActor extends Actor { for (let i = 0; i < heures; i++) { await this._recupererEthylisme(message); await this.recupererFatigue(message); - await this.recuperationReve(message); + await this.recuperationReve(message, 1); if (EffetsDraconiques.isDonDoubleReve(this)) { - await this.recuperationReve(message); + await this.recuperationReve(message, 2); } } ChatMessage.create(message); @@ -620,11 +619,13 @@ export class RdDActor extends Actor { } /* -------------------------------------------- */ - async recuperationReve(message) { + async recuperationReve(message, demiHeure) { const seuil = Misc.templateData(this).reve.seuil.value; const reveActuel = this.getReveActuel(); if (reveActuel >= seuil) { - message.content += `Vous avez suffisament rêvé, au delà de votre seuil. `; + if (demiHeure == 1) { + message.content += `Vous avez suffisament rêvé, au delà de votre seuil. `; + } } else { let deRecuperation = (await DeDraconique.ddr("selfroll")).total; From 79485e828a7b58e4fada8db08fb01af34a9bb14f Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Fri, 23 Apr 2021 02:48:38 +0200 Subject: [PATCH 5/7] =?UTF-8?q?Rework=20dialog=20R=C3=AAve=20de=20Dragon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/dialog-roll-reve-de-dragon.html | 25 ++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/templates/dialog-roll-reve-de-dragon.html b/templates/dialog-roll-reve-de-dragon.html index 16433150..4f7857a3 100644 --- a/templates/dialog-roll-reve-de-dragon.html +++ b/templates/dialog-roll-reve-de-dragon.html @@ -1,12 +1,27 @@

Rêve de Dragon de force {{rencontre.force}}!

-
+
+
+ {{competence.name}} +
+ + +
+
+
+
+ + +
+ {{>"systems/foundryvtt-reve-de-dragon/templates/partial-roll-diffCondition.html"}} +
+
-
+
- + - + \ No newline at end of file From 25c8c387225fa02a547db4132f1bcab0223e7bfc Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Fri, 23 Apr 2021 02:49:03 +0200 Subject: [PATCH 6/7] Reformat carac/comp --- templates/dialog-roll-carac.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/templates/dialog-roll-carac.html b/templates/dialog-roll-carac.html index e813a9bf..8d510bba 100644 --- a/templates/dialog-roll-carac.html +++ b/templates/dialog-roll-carac.html @@ -15,10 +15,8 @@
-
-
-
-
+
+
+ \ No newline at end of file diff --git a/templates/partial-description-sort.html b/templates/partial-description-sort.html new file mode 100644 index 00000000..1174e0c7 --- /dev/null +++ b/templates/partial-description-sort.html @@ -0,0 +1,10 @@ +
+ {{#if sort.data.cible}}{{/if}} + {{#if sort.data.JR}}{{/if}} + {{#if sort.data.portee}}{{/if}} + {{#if sort.data.duree}}{{/if}} + {{#if sort.data.coutseuil}}{{/if}} +
+
+ {{> "systems/foundryvtt-reve-de-dragon/templates/partial-description-overflow.html" sort.data}} +
\ No newline at end of file