From 170d3a2874776138398180451938a0aa0885f2df Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Thu, 6 Feb 2025 10:28:03 +0100 Subject: [PATCH] Fix defense rolls --- module/documents/roll.mjs | 3 ++- module/utils.mjs | 5 ++++- .../lf-equipment/{000149.log => 000153.log} | 0 packs-system/lf-equipment/CURRENT | 2 +- packs-system/lf-equipment/LOG | 16 ++++++++-------- packs-system/lf-equipment/LOG.old | 16 ++++++++-------- .../{MANIFEST-000147 => MANIFEST-000151} | Bin 176 -> 176 bytes .../lf-gifts/{000148.log => 000152.log} | 0 packs-system/lf-gifts/CURRENT | 2 +- packs-system/lf-gifts/LOG | 16 ++++++++-------- packs-system/lf-gifts/LOG.old | 16 ++++++++-------- packs-system/lf-gifts/MANIFEST-000146 | Bin 140 -> 0 bytes packs-system/lf-gifts/MANIFEST-000150 | Bin 0 -> 140 bytes .../lf-skills/{000148.log => 000152.log} | 0 packs-system/lf-skills/CURRENT | 2 +- packs-system/lf-skills/LOG | 16 ++++++++-------- packs-system/lf-skills/LOG.old | 16 ++++++++-------- packs-system/lf-skills/MANIFEST-000146 | Bin 141 -> 0 bytes packs-system/lf-skills/MANIFEST-000150 | Bin 0 -> 141 bytes .../{000148.log => 000152.log} | 0 packs-system/lf-vulnerabilities/CURRENT | 2 +- packs-system/lf-vulnerabilities/LOG | 16 ++++++++-------- packs-system/lf-vulnerabilities/LOG.old | 16 ++++++++-------- .../{MANIFEST-000146 => MANIFEST-000150} | Bin 141 -> 141 bytes system.json | 2 +- 25 files changed, 75 insertions(+), 71 deletions(-) rename packs-system/lf-equipment/{000149.log => 000153.log} (100%) rename packs-system/lf-equipment/{MANIFEST-000147 => MANIFEST-000151} (72%) rename packs-system/lf-gifts/{000148.log => 000152.log} (100%) delete mode 100644 packs-system/lf-gifts/MANIFEST-000146 create mode 100644 packs-system/lf-gifts/MANIFEST-000150 rename packs-system/lf-skills/{000148.log => 000152.log} (100%) delete mode 100644 packs-system/lf-skills/MANIFEST-000146 create mode 100644 packs-system/lf-skills/MANIFEST-000150 rename packs-system/lf-vulnerabilities/{000148.log => 000152.log} (100%) rename packs-system/lf-vulnerabilities/{MANIFEST-000146 => MANIFEST-000150} (71%) diff --git a/module/documents/roll.mjs b/module/documents/roll.mjs index c2c98be..d453e25 100644 --- a/module/documents/roll.mjs +++ b/module/documents/roll.mjs @@ -793,7 +793,7 @@ export default class LethalFantasyRoll extends Roll { diceResults.push({ dice: `${dice.toUpperCase()}`, value: diceResult }) let diceSum = diceResult while (diceResult === maxValue) { - let r = await new Roll(baseFormula).evaluate() + let r = await new Roll(dice).evaluate() diceResult = r.dice[0].results[0].result diceResults.push({ dice: `${dice.toUpperCase()}-1`, value: diceResult - 1 }) diceSum += (diceResult - 1) @@ -870,6 +870,7 @@ export default class LethalFantasyRoll extends Roll { /** @override */ async render(chatOptions = {}) { let chatData = await this._getChatCardData(chatOptions.isPrivate) + console.log("ChatData", chatData) return await renderTemplate(this.constructor.CHAT_TEMPLATE, chatData) } diff --git a/module/utils.mjs b/module/utils.mjs index e502544..57c5389 100644 --- a/module/utils.mjs +++ b/module/utils.mjs @@ -34,7 +34,10 @@ export default class LethalFantasyUtils { return val == null; }); Handlebars.registerHelper('match', function (val, search) { - return val.match(search); + if ( val && search) { + return val?.match(search); + } + return false }); Handlebars.registerHelper('exists', function (val) { diff --git a/packs-system/lf-equipment/000149.log b/packs-system/lf-equipment/000153.log similarity index 100% rename from packs-system/lf-equipment/000149.log rename to packs-system/lf-equipment/000153.log diff --git a/packs-system/lf-equipment/CURRENT b/packs-system/lf-equipment/CURRENT index 1021bdc..3f137c9 100644 --- a/packs-system/lf-equipment/CURRENT +++ b/packs-system/lf-equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000147 +MANIFEST-000151 diff --git a/packs-system/lf-equipment/LOG b/packs-system/lf-equipment/LOG index 136ef5d..6894efc 100644 --- a/packs-system/lf-equipment/LOG +++ b/packs-system/lf-equipment/LOG @@ -1,8 +1,8 @@ -2025/02/05-16:00:44.665557 7ffaecbf96c0 Recovering log #145 -2025/02/05-16:00:44.676229 7ffaecbf96c0 Delete type=3 #143 -2025/02/05-16:00:44.676286 7ffaecbf96c0 Delete type=0 #145 -2025/02/05-16:03:04.365822 7ffae6bff6c0 Level-0 table #150: started -2025/02/05-16:03:04.365862 7ffae6bff6c0 Level-0 table #150: 0 bytes OK -2025/02/05-16:03:04.371953 7ffae6bff6c0 Delete type=0 #148 -2025/02/05-16:03:04.372182 7ffae6bff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) -2025/02/05-16:03:04.372238 7ffae6bff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) +2025/02/06-10:14:34.569454 7ffae7fff6c0 Recovering log #149 +2025/02/06-10:14:34.654202 7ffae7fff6c0 Delete type=3 #147 +2025/02/06-10:14:34.654269 7ffae7fff6c0 Delete type=0 #149 +2025/02/06-10:23:45.931839 7ffae6bff6c0 Level-0 table #154: started +2025/02/06-10:23:45.931895 7ffae6bff6c0 Level-0 table #154: 0 bytes OK +2025/02/06-10:23:45.938070 7ffae6bff6c0 Delete type=0 #152 +2025/02/06-10:23:45.938269 7ffae6bff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) +2025/02/06-10:23:45.938320 7ffae6bff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-equipment/LOG.old b/packs-system/lf-equipment/LOG.old index 7a51a43..136ef5d 100644 --- a/packs-system/lf-equipment/LOG.old +++ b/packs-system/lf-equipment/LOG.old @@ -1,8 +1,8 @@ -2025/02/05-15:14:30.283748 7ffaed3fa6c0 Recovering log #141 -2025/02/05-15:14:30.293867 7ffaed3fa6c0 Delete type=3 #139 -2025/02/05-15:14:30.293934 7ffaed3fa6c0 Delete type=0 #141 -2025/02/05-15:37:27.604946 7ffae6bff6c0 Level-0 table #146: started -2025/02/05-15:37:27.604987 7ffae6bff6c0 Level-0 table #146: 0 bytes OK -2025/02/05-15:37:27.611715 7ffae6bff6c0 Delete type=0 #144 -2025/02/05-15:37:27.632111 7ffae6bff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) -2025/02/05-15:37:27.632163 7ffae6bff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) +2025/02/05-16:00:44.665557 7ffaecbf96c0 Recovering log #145 +2025/02/05-16:00:44.676229 7ffaecbf96c0 Delete type=3 #143 +2025/02/05-16:00:44.676286 7ffaecbf96c0 Delete type=0 #145 +2025/02/05-16:03:04.365822 7ffae6bff6c0 Level-0 table #150: started +2025/02/05-16:03:04.365862 7ffae6bff6c0 Level-0 table #150: 0 bytes OK +2025/02/05-16:03:04.371953 7ffae6bff6c0 Delete type=0 #148 +2025/02/05-16:03:04.372182 7ffae6bff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) +2025/02/05-16:03:04.372238 7ffae6bff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-equipment/MANIFEST-000147 b/packs-system/lf-equipment/MANIFEST-000151 similarity index 72% rename from packs-system/lf-equipment/MANIFEST-000147 rename to packs-system/lf-equipment/MANIFEST-000151 index 92117e3a74d7cd29e29cfd4cca6386bc4493c898..ce34e99899f925f9a7ced081379aec5089e47ff4 100644 GIT binary patch delta 41 scmdnMxPfs(pHlzvJBC~gj7&2aIT@H|GO~o-G4W#u3Csiu%mxYo0Qd+Ax&QzG delta 41 scmdnMxPfs(pVIBGd){y{FfvVH%*#H0l diff --git a/packs-system/lf-gifts/000148.log b/packs-system/lf-gifts/000152.log similarity index 100% rename from packs-system/lf-gifts/000148.log rename to packs-system/lf-gifts/000152.log diff --git a/packs-system/lf-gifts/CURRENT b/packs-system/lf-gifts/CURRENT index ffd4a01..939d9b8 100644 --- a/packs-system/lf-gifts/CURRENT +++ b/packs-system/lf-gifts/CURRENT @@ -1 +1 @@ -MANIFEST-000146 +MANIFEST-000150 diff --git a/packs-system/lf-gifts/LOG b/packs-system/lf-gifts/LOG index cc03443..f7bd4f4 100644 --- a/packs-system/lf-gifts/LOG +++ b/packs-system/lf-gifts/LOG @@ -1,8 +1,8 @@ -2025/02/05-16:00:44.678559 7ffaed3fa6c0 Recovering log #144 -2025/02/05-16:00:44.688648 7ffaed3fa6c0 Delete type=3 #142 -2025/02/05-16:00:44.688723 7ffaed3fa6c0 Delete type=0 #144 -2025/02/05-16:03:04.346867 7ffae6bff6c0 Level-0 table #149: started -2025/02/05-16:03:04.346914 7ffae6bff6c0 Level-0 table #149: 0 bytes OK -2025/02/05-16:03:04.352833 7ffae6bff6c0 Delete type=0 #147 -2025/02/05-16:03:04.372125 7ffae6bff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) -2025/02/05-16:03:04.372197 7ffae6bff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/02/06-10:14:34.672628 7ffae77fe6c0 Recovering log #148 +2025/02/06-10:14:34.785331 7ffae77fe6c0 Delete type=3 #146 +2025/02/06-10:14:34.785427 7ffae77fe6c0 Delete type=0 #148 +2025/02/06-10:23:45.924668 7ffae6bff6c0 Level-0 table #153: started +2025/02/06-10:23:45.924700 7ffae6bff6c0 Level-0 table #153: 0 bytes OK +2025/02/06-10:23:45.931703 7ffae6bff6c0 Delete type=0 #151 +2025/02/06-10:23:45.938255 7ffae6bff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/02/06-10:23:45.938308 7ffae6bff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-gifts/LOG.old b/packs-system/lf-gifts/LOG.old index 59a82eb..cc03443 100644 --- a/packs-system/lf-gifts/LOG.old +++ b/packs-system/lf-gifts/LOG.old @@ -1,8 +1,8 @@ -2025/02/05-15:14:30.299103 7ffae77fe6c0 Recovering log #140 -2025/02/05-15:14:30.310625 7ffae77fe6c0 Delete type=3 #138 -2025/02/05-15:14:30.310691 7ffae77fe6c0 Delete type=0 #140 -2025/02/05-15:37:27.625122 7ffae6bff6c0 Level-0 table #145: started -2025/02/05-15:37:27.625155 7ffae6bff6c0 Level-0 table #145: 0 bytes OK -2025/02/05-15:37:27.632000 7ffae6bff6c0 Delete type=0 #143 -2025/02/05-15:37:27.632141 7ffae6bff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) -2025/02/05-15:37:27.632176 7ffae6bff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/02/05-16:00:44.678559 7ffaed3fa6c0 Recovering log #144 +2025/02/05-16:00:44.688648 7ffaed3fa6c0 Delete type=3 #142 +2025/02/05-16:00:44.688723 7ffaed3fa6c0 Delete type=0 #144 +2025/02/05-16:03:04.346867 7ffae6bff6c0 Level-0 table #149: started +2025/02/05-16:03:04.346914 7ffae6bff6c0 Level-0 table #149: 0 bytes OK +2025/02/05-16:03:04.352833 7ffae6bff6c0 Delete type=0 #147 +2025/02/05-16:03:04.372125 7ffae6bff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/02/05-16:03:04.372197 7ffae6bff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-gifts/MANIFEST-000146 b/packs-system/lf-gifts/MANIFEST-000146 deleted file mode 100644 index 864215e3e68dff8bf1887d07fd9d5a08aad9706a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmZQ=x?Pvdz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PL2x}i)_F)cqQCAFwn zu`(dsy{y8+E6K&rBP=*Cl2L&H4CECvOHy--6|1t!+;g&ue6mf0i!+=pT^Ly)@`pgoS$2eSd>_jU&PL2x}i)_F)cqQCAFwn zu`(dsy{y8+E6K&rBP=*Cl2L&H4CECvOHy--6|1t!+;g&ue6mf0i!+=pT^Ly)@{Wqt f>0AtqOw$=T8JK4z%-x$08UOO>Hq)$ diff --git a/packs-system/lf-skills/MANIFEST-000150 b/packs-system/lf-skills/MANIFEST-000150 new file mode 100644 index 0000000000000000000000000000000000000000..87585f33157ca725099dcd489b2b578f3c5b3f6d GIT binary patch literal 141 zcmYdufBGqffss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfd5@L?mnqGDQpPD*M~ zv7&jFg@?IIQm#{yWoT8RQ3PW$0~p9FW|pMp7AsbjSQML^nwg{)82TidL~#U}T!k$jQJwgOMe9-QUkAKms#B0<(Yu0B=nwt^fc4 literal 0 HcmV?d00001 diff --git a/packs-system/lf-vulnerabilities/000148.log b/packs-system/lf-vulnerabilities/000152.log similarity index 100% rename from packs-system/lf-vulnerabilities/000148.log rename to packs-system/lf-vulnerabilities/000152.log diff --git a/packs-system/lf-vulnerabilities/CURRENT b/packs-system/lf-vulnerabilities/CURRENT index ffd4a01..939d9b8 100644 --- a/packs-system/lf-vulnerabilities/CURRENT +++ b/packs-system/lf-vulnerabilities/CURRENT @@ -1 +1 @@ -MANIFEST-000146 +MANIFEST-000150 diff --git a/packs-system/lf-vulnerabilities/LOG b/packs-system/lf-vulnerabilities/LOG index e9b3036..10e24f1 100644 --- a/packs-system/lf-vulnerabilities/LOG +++ b/packs-system/lf-vulnerabilities/LOG @@ -1,8 +1,8 @@ -2025/02/05-16:00:44.691071 7ffae77fe6c0 Recovering log #144 -2025/02/05-16:00:44.700879 7ffae77fe6c0 Delete type=3 #142 -2025/02/05-16:00:44.700946 7ffae77fe6c0 Delete type=0 #144 -2025/02/05-16:03:04.359059 7ffae6bff6c0 Level-0 table #149: started -2025/02/05-16:03:04.359084 7ffae6bff6c0 Level-0 table #149: 0 bytes OK -2025/02/05-16:03:04.365689 7ffae6bff6c0 Delete type=0 #147 -2025/02/05-16:03:04.372167 7ffae6bff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) -2025/02/05-16:03:04.372225 7ffae6bff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/02/06-10:14:34.802017 7ffaecbf96c0 Recovering log #148 +2025/02/06-10:14:34.896611 7ffaecbf96c0 Delete type=3 #146 +2025/02/06-10:14:34.896680 7ffaecbf96c0 Delete type=0 #148 +2025/02/06-10:23:45.911293 7ffae6bff6c0 Level-0 table #153: started +2025/02/06-10:23:45.911347 7ffae6bff6c0 Level-0 table #153: 0 bytes OK +2025/02/06-10:23:45.917684 7ffae6bff6c0 Delete type=0 #151 +2025/02/06-10:23:45.938219 7ffae6bff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/02/06-10:23:45.938282 7ffae6bff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-vulnerabilities/LOG.old b/packs-system/lf-vulnerabilities/LOG.old index da14740..e9b3036 100644 --- a/packs-system/lf-vulnerabilities/LOG.old +++ b/packs-system/lf-vulnerabilities/LOG.old @@ -1,8 +1,8 @@ -2025/02/05-15:14:30.313911 7ffaecbf96c0 Recovering log #140 -2025/02/05-15:14:30.324249 7ffaecbf96c0 Delete type=3 #138 -2025/02/05-15:14:30.324308 7ffaecbf96c0 Delete type=0 #140 -2025/02/05-15:37:27.611827 7ffae6bff6c0 Level-0 table #145: started -2025/02/05-15:37:27.611849 7ffae6bff6c0 Level-0 table #145: 0 bytes OK -2025/02/05-15:37:27.618366 7ffae6bff6c0 Delete type=0 #143 -2025/02/05-15:37:27.632123 7ffae6bff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) -2025/02/05-15:37:27.632191 7ffae6bff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/02/05-16:00:44.691071 7ffae77fe6c0 Recovering log #144 +2025/02/05-16:00:44.700879 7ffae77fe6c0 Delete type=3 #142 +2025/02/05-16:00:44.700946 7ffae77fe6c0 Delete type=0 #144 +2025/02/05-16:03:04.359059 7ffae6bff6c0 Level-0 table #149: started +2025/02/05-16:03:04.359084 7ffae6bff6c0 Level-0 table #149: 0 bytes OK +2025/02/05-16:03:04.365689 7ffae6bff6c0 Delete type=0 #147 +2025/02/05-16:03:04.372167 7ffae6bff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/02/05-16:03:04.372225 7ffae6bff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-vulnerabilities/MANIFEST-000146 b/packs-system/lf-vulnerabilities/MANIFEST-000150 similarity index 71% rename from packs-system/lf-vulnerabilities/MANIFEST-000146 rename to packs-system/lf-vulnerabilities/MANIFEST-000150 index f760bc674943abc2d3d85b97dd312ed37b9f5a8e..24c34aca5d94304afa954cc4b25f076e4cc8a2ee 100644 GIT binary patch delta 41 scmeBW>}8ygt;DcnZx$B=Bhz$7P6p-~j4U!UESAjx3CsWq%mNAk0NRcS{r~^~ delta 41 rcmeBW>}8ygtrQ&kvx|#?k!dm`Cj;{oMiv>L*27mp0#iT&(|`g1=ne^$ diff --git a/system.json b/system.json index 68f96b7..9c50f86 100644 --- a/system.json +++ b/system.json @@ -6,7 +6,7 @@ "download": "#{DOWNLOAD}#", "url": "#{URL}#", "license": "LICENSE", - "version": "12.0.32", + "version": "12.0.33", "authors": [ { "name": "Uberwald",