From d4c8a20d538d1cbdfce77b5194d14f39b8bf1e16 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnier Date: Tue, 10 Mar 2026 22:00:52 +0100 Subject: [PATCH] Message sur D20 impair dans le tchat et corrections diverses --- .gitignore | 1 + less/chat-styles.less | 15 +++++++++++++++ modules/wasteland-actor.js | 10 ++-------- modules/wasteland-commands.js | 2 +- modules/wasteland-main.js | 4 ++-- modules/wasteland-utility.js | 7 ++++--- packs/armes/{000232.log => 000236.log} | 0 packs/armes/MANIFEST-000230 | Bin 175 -> 0 bytes packs/artifex/{000093.log => 000097.log} | 0 packs/artifex/MANIFEST-000091 | Bin 168 -> 0 bytes packs/bestiaire/{000105.log => 000109.log} | 0 packs/bestiaire/MANIFEST-000103 | Bin 198 -> 0 bytes packs/capacreature/{000093.log => 000097.log} | 0 packs/capacreature/MANIFEST-000091 | Bin 168 -> 0 bytes packs/equipement/{000186.log => 000190.log} | 0 packs/equipement/MANIFEST-000184 | Bin 177 -> 0 bytes packs/heritages/{000256.log => 000260.log} | 0 packs/heritages/MANIFEST-000254 | Bin 173 -> 0 bytes packs/heros/{000093.log => 000097.log} | 0 packs/heros/MANIFEST-000091 | Bin 220 -> 0 bytes packs/metiers/{000256.log => 000260.log} | 0 packs/metiers/MANIFEST-000254 | Bin 174 -> 0 bytes packs/mutations/{000093.log => 000097.log} | 0 packs/mutations/MANIFEST-000091 | Bin 168 -> 0 bytes packs/origines/{000257.log => 000261.log} | 0 packs/origines/MANIFEST-000255 | Bin 176 -> 0 bytes packs/peuples/{000093.log => 000097.log} | 0 packs/peuples/MANIFEST-000091 | Bin 168 -> 0 bytes packs/pouvoirs/{000174.log => 000178.log} | 0 packs/pouvoirs/MANIFEST-000172 | Bin 178 -> 0 bytes packs/protection/{000293.log => 000297.log} | 0 packs/protection/MANIFEST-000291 | Bin 173 -> 0 bytes packs/scenes/{000233.log => 000237.log} | 0 packs/scenes/MANIFEST-000231 | Bin 176 -> 0 bytes packs/skills/{000294.log => 000298.log} | 0 packs/skills/MANIFEST-000292 | Bin 176 -> 0 bytes packs/tables/{000291.log => 000295.log} | 0 packs/tables/MANIFEST-000289 | Bin 226 -> 0 bytes packs/tourscharmes/{000201.log => 000205.log} | 0 packs/tourscharmes/MANIFEST-000199 | Bin 175 -> 0 bytes styles/wasteland.css | 17 +++++++++++++++++ styles/wasteland.css.map | 2 +- templates/chat-generic-result-v2.hbs | 12 +++++++++++- 43 files changed, 54 insertions(+), 16 deletions(-) rename packs/armes/{000232.log => 000236.log} (100%) delete mode 100644 packs/armes/MANIFEST-000230 rename packs/artifex/{000093.log => 000097.log} (100%) delete mode 100644 packs/artifex/MANIFEST-000091 rename packs/bestiaire/{000105.log => 000109.log} (100%) delete mode 100644 packs/bestiaire/MANIFEST-000103 rename packs/capacreature/{000093.log => 000097.log} (100%) delete mode 100644 packs/capacreature/MANIFEST-000091 rename packs/equipement/{000186.log => 000190.log} (100%) delete mode 100644 packs/equipement/MANIFEST-000184 rename packs/heritages/{000256.log => 000260.log} (100%) delete mode 100644 packs/heritages/MANIFEST-000254 rename packs/heros/{000093.log => 000097.log} (100%) delete mode 100644 packs/heros/MANIFEST-000091 rename packs/metiers/{000256.log => 000260.log} (100%) delete mode 100644 packs/metiers/MANIFEST-000254 rename packs/mutations/{000093.log => 000097.log} (100%) delete mode 100644 packs/mutations/MANIFEST-000091 rename packs/origines/{000257.log => 000261.log} (100%) delete mode 100644 packs/origines/MANIFEST-000255 rename packs/peuples/{000093.log => 000097.log} (100%) delete mode 100644 packs/peuples/MANIFEST-000091 rename packs/pouvoirs/{000174.log => 000178.log} (100%) delete mode 100644 packs/pouvoirs/MANIFEST-000172 rename packs/protection/{000293.log => 000297.log} (100%) delete mode 100644 packs/protection/MANIFEST-000291 rename packs/scenes/{000233.log => 000237.log} (100%) delete mode 100644 packs/scenes/MANIFEST-000231 rename packs/skills/{000294.log => 000298.log} (100%) delete mode 100644 packs/skills/MANIFEST-000292 rename packs/tables/{000291.log => 000295.log} (100%) delete mode 100644 packs/tables/MANIFEST-000289 rename packs/tourscharmes/{000201.log => 000205.log} (100%) delete mode 100644 packs/tourscharmes/MANIFEST-000199 diff --git a/.gitignore b/.gitignore index e8954d1..b537c57 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .history/ node_modules +.github/ diff --git a/less/chat-styles.less b/less/chat-styles.less index ce593a6..bf79d37 100644 --- a/less/chat-styles.less +++ b/less/chat-styles.less @@ -148,6 +148,21 @@ line-height: 1.2; } + .dice-value.d20-impair { + text-decoration: line-through; + color: #c46b4e; + text-shadow: 1px 1px 3px rgba(0, 0, 0, 0.9); + } + + .dice-odd-label { + font-size: 0.7rem; + color: #c46b4e; + font-weight: bold; + text-transform: uppercase; + text-shadow: 0 1px 2px rgba(0, 0, 0, 0.8); + line-height: 1.1; + } + .total-label, .difficulty-label { font-size: 0.75rem; diff --git a/modules/wasteland-actor.js b/modules/wasteland-actor.js index 525ba36..845a70b 100644 --- a/modules/wasteland-actor.js +++ b/modules/wasteland-actor.js @@ -220,14 +220,8 @@ export class WastelandActor extends Actor { prepareDerivedData() { if (this.type == 'personnage') { - let newSante = this.system.sante.bonus + (this.system.attributs.pui.value + this.system.attributs.tre.value) * 2 + 5 - if (this.system.sante.base != newSante) { - this.update({ 'system.sante.base': newSante }) - } - let newPsyche = ((this.system.attributs.cla.value + this.system.attributs.tre.value) * 2) + 5 - if (this.system.psyche.fullmax != newPsyche) { - this.update({ 'system.psyche.fullmax': newPsyche }) - } + this.system.sante.base = this.system.sante.bonus + (this.system.attributs.pui.value + this.system.attributs.tre.value) * 2 + 5 + this.system.psyche.fullmax = ((this.system.attributs.cla.value + this.system.attributs.tre.value) * 2) + 5 } super.prepareDerivedData() diff --git a/modules/wasteland-commands.js b/modules/wasteland-commands.js index 8f916c5..33934e9 100644 --- a/modules/wasteland-commands.js +++ b/modules/wasteland-commands.js @@ -89,7 +89,7 @@ export class WastelandCommands { if (command && command.func) { const result = command.func(content, msg, params); if (result == false) { - RdDCommands._chatAnswer(msg, command.descr); + WastelandCommands._chatAnswer(msg, command.descr); } return true; } diff --git a/modules/wasteland-main.js b/modules/wasteland-main.js index e12df33..afe7cd2 100644 --- a/modules/wasteland-main.js +++ b/modules/wasteland-main.js @@ -180,14 +180,14 @@ Hooks.once("ready", function () { ui.notifications.info("Attention ! Aucun personnage n'est relié au joueur !"); ChatMessage.create({ content: "ATTENTION Le joueur " + game.user.name + " n'est relié à aucun personnage !", - user: game.user._id + user: game.user.id }); } if (!game.user.isGM && game.user.character && !game.user.character.prototypeToken.actorLink) { ui.notifications.info("Le token de du joueur n'est pas connecté à l'acteur !"); ChatMessage.create({ content: "ATTENTION Le token du joueur " + game.user.name + " n'est pas connecté à l'acteur !", - user: game.user._id + user: game.user.id }); } diff --git a/modules/wasteland-utility.js b/modules/wasteland-utility.js index 6185c7d..ba0af17 100644 --- a/modules/wasteland-utility.js +++ b/modules/wasteland-utility.js @@ -358,6 +358,7 @@ export class WastelandUtility { //console.log("PAIR/IMP", diceValue) if (diceValue % 2 == 1) { //console.log("PAIR/IMP2", diceValue) + rollData.d20IsOdd = true rollData.finalResult -= rollData.roll.terms[0].results[0].result // Substract value if (diceValue == 1 || diceValue == 11) { rollData.isDramatique = true @@ -616,7 +617,7 @@ export class WastelandUtility { /* -------------------------------------------- */ static getUsers(filter) { - return game.users.filter(filter).map(user => user.data._id); + return game.users.filter(filter).map(user => user.id); } /* -------------------------------------------- */ @@ -891,7 +892,7 @@ export class WastelandUtility { let message = game.messages.get($(li).attr("data-message-id")) let rollData = message.getFlag("world", "wasteland-roll") if (rollData.competence) { - let nbPred = rollData.competence.data.predilections.filter(pred => !pred.used).length + let nbPred = rollData.competence.system.predilections.filter(pred => !pred.used).length return (!rollData.isReroll && rollData.competence && nbPred > 0) } return false @@ -900,7 +901,7 @@ export class WastelandUtility { let message = game.messages.get($(li).attr("data-message-id")) let rollData = message.getFlag("world", "wasteland-roll") if (rollData.competence) { - return rollData.competence.data.doublebonus + return rollData.competence.system.doublebonus } return false } diff --git a/packs/armes/000232.log b/packs/armes/000236.log similarity index 100% rename from packs/armes/000232.log rename to packs/armes/000236.log diff --git a/packs/armes/MANIFEST-000230 b/packs/armes/MANIFEST-000230 deleted file mode 100644 index c6192b1e4ade67f98c499d5a0e4d7456bb2ba08f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 175 zcmdPDA#L2kz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&P8Nub5eqnp><`US{f= znHrEA5K>U+R$5ZRc#HuI*qJUfZgz*MGAJ(3bhXGftx5~^EX<84Wt`pgoS$2eSd>_jU&P8Nub5eqnp>=xS>)`Wf(xL}F`3IoiY!d3;vz7gfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfF5Trn{j$SBs!EJ@8R zR;-FlOAGXI^UkU8GWE%{FxD&cD=1DW^GJ6wEp&>E3@Bkd&j1GOOd%T{FeyNFD+Zgp zWjG~f1)6$$XLuH5nK3SdC{t8S%g;$kEh<)Y^6(803G#3=%JIu_^tLEvWQ3@&F_hcM b$-u~z!O6g!$#Ru()znBo5I+;h&j#`V6m&Pt diff --git a/packs/capacreature/000093.log b/packs/capacreature/000097.log similarity index 100% rename from packs/capacreature/000093.log rename to packs/capacreature/000097.log diff --git a/packs/capacreature/MANIFEST-000091 b/packs/capacreature/MANIFEST-000091 deleted file mode 100644 index df215997bf1db534186dd49d62363c1c6245908a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcma!Fk|EK|z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&P8Nub5eqnp>>slbGpI z8f9$YZIbC#WR{%D$iV;x>`Wf5>@Y=MRqlR?iRoT0Mp-_YmL(pH><~pTd0d7Rww)E= aU|?j5;bdTrW#N!K;A{rs#sazVEF1u|rzx}m diff --git a/packs/equipement/000186.log b/packs/equipement/000190.log similarity index 100% rename from packs/equipement/000186.log rename to packs/equipement/000190.log diff --git a/packs/equipement/MANIFEST-000184 b/packs/equipement/MANIFEST-000184 deleted file mode 100644 index e6817395ab015660f80ede89bbd11a7072acc99f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmbPrd~;eG10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAei199ykcfaYHqP&RhF+y zX@$3kx0gwot7&K$<03`|5MXCo%D6sTQ86t)CndG0SkWsdz|x>9JD@Be*~_KSppbDn oSQ!H$bAIWUmUA;OGVNsKWMJOK$g+re=7B}6Ady`lkv$+006RW1%K!iX diff --git a/packs/heritages/000256.log b/packs/heritages/000260.log similarity index 100% rename from packs/heritages/000256.log rename to packs/heritages/000260.log diff --git a/packs/heritages/MANIFEST-000254 b/packs/heritages/MANIFEST-000254 deleted file mode 100644 index 24a9e03644b93644924ad19ac51af5d0d63a81c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmWIJ^{;7RU}TiaNi9pwNlDUksw_z@&n!-L&d)7KEJ`fNFJfhsSIjI)%`H~Ui;Rpg zFDeQ4b$9bOsR)Z?G-3b)cBa>iS3F^=jLgjf9K8+0f=qq9O^T9S88soQVDh+3Ijs`% fi;IDg=|3YU19JltixGRRn>@ diff --git a/packs/heros/000093.log b/packs/heros/000097.log similarity index 100% rename from packs/heros/000093.log rename to packs/heros/000097.log diff --git a/packs/heros/MANIFEST-000091 b/packs/heros/MANIFEST-000091 deleted file mode 100644 index be4f086efacd5384e7aa1c80c3c579eba54cd2ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 220 zcmaFvyHI#510$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAei199xng26kWs9cS(2Jt zteD}IWRh9p6YNxI9tLEj>QyGXIpz6!r8`pgoS$2eSd>_jU&P8Nub5eqnp><`Y2a=U z=37~rUg4Q#5^3(n7|#F(>`bp2C(LJpDKo4}^7Hca&n+qr$w>5e3uW|$D1*u4GKMYR gw3~~8k?B7pCj)Z>6HELlDdjYfKm!v{pb01d0L5A^82|tP diff --git a/packs/mutations/000093.log b/packs/mutations/000097.log similarity index 100% rename from packs/mutations/000093.log rename to packs/mutations/000097.log diff --git a/packs/mutations/MANIFEST-000091 b/packs/mutations/MANIFEST-000091 deleted file mode 100644 index c743949d8cb946dfdd11d1a6a549d00336739c76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmbPhT)M59fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfDlUNN&IHMdwXEUzHV zEZIBEqcX*~G(9hpk%a*a*qJ;oun`pgoS$2eSd>_jU&P8Nub5eqnp><`kzZjR zWFA^tT4j*x?qg8E*unq?>`ZSMfBb_hGpI-jEH*Ru3MdXM3aukNjZ7>pjK}z;XMjW+K_bl{5dhjmF$w?x diff --git a/packs/peuples/000093.log b/packs/peuples/000097.log similarity index 100% rename from packs/peuples/000093.log rename to packs/peuples/000097.log diff --git a/packs/peuples/MANIFEST-000091 b/packs/peuples/MANIFEST-000091 deleted file mode 100644 index 5e03ae42babdafd246c494742ee3b37bdfbffbbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmZqw%d6YWz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&P8Nub5eqnp><`=$KpV zV&dzOURfTQWfl>}D8K*)>`WdXG+>HM^YhY5ouhKAO4Fl^1AL1ac_E5m^0*Aio7wl7 bgMpDLhLeFgmPJ7AG>boo8w=#dvj_kHnpZ5b diff --git a/packs/pouvoirs/000174.log b/packs/pouvoirs/000178.log similarity index 100% rename from packs/pouvoirs/000174.log rename to packs/pouvoirs/000178.log diff --git a/packs/pouvoirs/MANIFEST-000172 b/packs/pouvoirs/MANIFEST-000172 deleted file mode 100644 index 57505ed3b3175c88e58e580fa038658089ac4154..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 178 zcmaE^kn7&gz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&P8Nub5eqnp><`m7D17 z@9bQV?r$7f;+kj1xQ2-V1lXBoGH$ucrl^>fpOcbWRIF&|m6KQ!Wf`7UYET&JVHU~w p53G)XkU|-sj7)18IT@JOF|w>-of&9!93-+1B(eb{0ssM9F|Ggr diff --git a/packs/protection/000293.log b/packs/protection/000297.log similarity index 100% rename from packs/protection/000293.log rename to packs/protection/000297.log diff --git a/packs/protection/MANIFEST-000291 b/packs/protection/MANIFEST-000291 deleted file mode 100644 index 30077bad9c7b0f9dae453abaf131a14ff36f21d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmaDjZ6oU}TiaNi9pwNlDUksw_z@&n!-L&d)7KEJ`fNFJfg>P%KVP%}Xs-EY5LB zEHDT)Dlw`wF0#z>X5?i619qlojK_H4%8WfS{0$P*3PXY;%qjydjT!kM%HRqx%;AS9 iIIJ?Cg^Pia=>;Pv1M^Ep7Jh?Sf;u39mmq=HKmh`W7xy7$7B8TjN>xl}rr7I~$n6sA_XGd4q%5i;ia-UT
- {{diceResult}} + {{diceResult}} + {{#if d20IsOdd}} + impair → 0 + {{/if}}
Total @@ -108,6 +111,13 @@ {{diceFormula}}
+ {{#if d20IsOdd}} +
+ D20 impair : + compte pour 0 +
+ {{/if}} +
{{attr.label}}: {{attr.value}}