From 9a6fb1a850b5986788cfe39640a5530d1cb7252f Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Wed, 31 Mar 2021 21:31:15 +0200 Subject: [PATCH 1/5] =?UTF-8?q?Fix=20ref=C3=A9rence=20de=20recette=20de=20?= =?UTF-8?q?cuisine?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/item-recettecuisine-sheet.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/item-recettecuisine-sheet.html b/templates/item-recettecuisine-sheet.html index 2d64730c..759da558 100644 --- a/templates/item-recettecuisine-sheet.html +++ b/templates/item-recettecuisine-sheet.html @@ -24,16 +24,16 @@ +
+ + +
{{editor content=data.ingredients target="data.ingredients" button=true owner=owner editable=editable}}
-
- - -
From 43acbfb4438b5a64110343068f7b2c08f6026a54 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Wed, 31 Mar 2021 22:51:32 +0200 Subject: [PATCH 2/5] =?UTF-8?q?Simplification=20calcul=20de=20difficult?= =?UTF-8?q?=C3=A9=20alchimie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/rdd-alchimie.js | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/module/rdd-alchimie.js b/module/rdd-alchimie.js index 4028bc1d..9cdc8f64 100644 --- a/module/rdd-alchimie.js +++ b/module/rdd-alchimie.js @@ -49,20 +49,13 @@ export class RdDAlchimie { } /* -------------------------------------------- */ - static getDifficulte( aspects ) { - let aspectsArray = aspects.split('-'); - let diff = 0; - let nbDifferent = 0; - let aspectsHash = {} - for (let colconst of aspectsArray) { - if ( aspectsHash[colconst] ){ // Deja present, augmente difficulté de 1 - diff -= 1; - } else { - nbDifferent++; - aspectsHash[colconst] = colconst; // Keep track - } + static getDifficulte(aspects) { + let elements = aspects.split('-'); + let composantes = elements.length; + let distincts = Object.keys(Misc.classifyFirst(elements, it => it)).length; + if (distincts == 1) { + composantes--; } - diff = diff - ((nbDifferent>1) ? nbDifferent : 0); // Ca doit marcher .... - return Math.min(0, diff); // Pour être sur + return Math.min(0, -composantes); } } From 4925cee756957b9391d9210ea53b87247a5cacd7 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Wed, 31 Mar 2021 23:59:31 +0200 Subject: [PATCH 3/5] Fix changement jour --- module/rdd-calendrier.js | 4 ++-- styles/simple.css | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/module/rdd-calendrier.js b/module/rdd-calendrier.js index 15f69467..91cf416c 100644 --- a/module/rdd-calendrier.js +++ b/module/rdd-calendrier.js @@ -199,7 +199,7 @@ export class RdDCalendrier extends Application { /* -------------------------------------------- */ syncPlayerTime(calendrier) { this.calendrier = duplicate(calendrier); // Local copy update - this.updateDisplay(); // Then update + this.updateDisplay(); } /* -------------------------------------------- */ @@ -338,7 +338,7 @@ export class RdDCalendrier extends Application { if (game.user.isGM) { dateHTML = dateHTML + " - NA: " + this.getCurrentNombreAstral(); } - for (let handle of document.getElementsByClassName("calendar-move-handle")) { + for (let handle of document.getElementsByClassName("calendar-date-rdd")) { handle.innerHTML = dateHTML; } for (let heure of document.getElementsByClassName("calendar-heure-texte")) { diff --git a/styles/simple.css b/styles/simple.css index 8f14b3aa..7b875ce2 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -1093,12 +1093,7 @@ ul, li { .calendar-date-rdd { font-family: "GoudyAcc"; color: #CCC; - font-weight: bold; - font-size: 1.10rem; opacity: 90; -} -#calendar-move-handle { - font-family: "GoudyAcc"; font-size: 13px; line-height: 1; text-align: center; From 08cf1f49e1b543cc7339a4939679145035216cb0 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Thu, 1 Apr 2021 00:05:46 +0200 Subject: [PATCH 4/5] Fix Chanter la chanson --- templates/chat-resultat-chant.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/chat-resultat-chant.html b/templates/chat-resultat-chant.html index 4ebcacbc..eb2b072e 100644 --- a/templates/chat-resultat-chant.html +++ b/templates/chat-resultat-chant.html @@ -1,6 +1,6 @@ {{oeuvre.data.competence}}

- {{alias}} tente de chanter la chanson : {{oeuvre.name}} (niveau {{oeuvre.data.niveau}}) + {{alias}} tente de chanter : {{oeuvre.name}} (niveau {{oeuvre.data.niveau}})

{{> "systems/foundryvtt-reve-de-dragon/templates/chat-infojet.html"}}
From ac8610cd6c1a9ab2995cc104aafda8875ea55c89 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Thu, 1 Apr 2021 00:01:37 +0200 Subject: [PATCH 5/5] =?UTF-8?q?Fix=20d=C3=A9termination=20nombre=20astral?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixé, déplacé dans les savoirs # Conflicts: # module/rdd-calendrier.js # templates/actor-sheet.html --- module/rdd-calendrier.js | 16 +++++++--------- templates/actor-sheet.html | 37 ++++++++++++++++++------------------- 2 files changed, 25 insertions(+), 28 deletions(-) diff --git a/module/rdd-calendrier.js b/module/rdd-calendrier.js index 91cf416c..2fe78f6b 100644 --- a/module/rdd-calendrier.js +++ b/module/rdd-calendrier.js @@ -247,21 +247,19 @@ export class RdDCalendrier extends Application { console.log(request); let jourDiff = this.getLectureAstrologieDifficulte(request.date); let niveau = Number(request.astrologie.data.niveau) + Number(request.conditions) + Number(jourDiff) + Number(request.etat); - let rolled = await RdDResolutionTable.rollData({ + let rollData= { caracValue: request.carac_vue, finalLevel: niveau, showDice: false - }); + }; + await RdDResolutionTable.rollData(rollData); let nbAstral = this.getNombreAstral(request.date); - let nbAstralFaux = nbAstral; + request.rolled = rollData.rolled; request.isValid = true; - request.rolled = rolled; - if (!rolled.isSuccess) { + if (!request.rolled.isSuccess) { request.isValid = false; - while (nbAstralFaux == nbAstral) { - nbAstralFaux = new Roll("1d12").roll().total; - } - nbAstral = nbAstralFaux; + let nbAstralFaux = new Roll("1d11").evaluate().total; + nbAstral = nbAstral==nbAstralFaux ? 12 : nbAstralFaux; // Mise à jour des nombres astraux du joueur let astralData = this.listeNombreAstral.find((nombreAstral, i) => nombreAstral.index == request.date); astralData.valeursFausses.push({ actorId: request.id, nombreAstral: nbAstralFaux }); diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index e3b57b5c..89d92f4a 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -461,8 +461,19 @@ {{!-- Connaissances Tab --}}
- Créer une oeuvre -

Oeuvres diverses :

+

Tâches

Créer une nouvelle Tâche + +
+

Oeuvres diverses :

Créer une oeuvre

Recettes Alchimiques

- +
+

Astrologie

+ Astrologie : Nombres Astraux
{{!-- hautreve Tab --}} @@ -576,9 +578,6 @@ {{/if}} -
  • - Astrologie : Nombres Astraux -