From 067d3d066baa15e71f736333d4816d61d9fcc354 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Wed, 8 Jan 2025 15:39:49 +0100 Subject: [PATCH] Fix damage rolls --- module/documents/roll.mjs | 22 ++++++++++++------- packs/lf-equipment/{000084.log => 000088.log} | 0 packs/lf-equipment/CURRENT | 2 +- packs/lf-equipment/LOG | 2 +- packs/lf-equipment/LOG.old | 2 +- packs/lf-equipment/MANIFEST-000082 | 3 --- packs/lf-equipment/MANIFEST-000086 | 3 +++ packs/{lf-skills => lf-gifts}/000084.log | 0 packs/lf-gifts/CURRENT | 2 +- packs/lf-gifts/LOG | 2 +- packs/lf-gifts/LOG.old | 2 +- packs/lf-gifts/MANIFEST-000078 | 3 --- packs/lf-gifts/MANIFEST-000082 | 3 +++ .../000080.log => lf-skills/000088.log} | 0 packs/lf-skills/CURRENT | 2 +- packs/lf-skills/LOG | 2 +- packs/lf-skills/LOG.old | 2 +- packs/lf-skills/MANIFEST-000082 | 3 --- packs/lf-skills/MANIFEST-000086 | 3 +++ .../{000080.log => 000084.log} | 0 packs/lf-vulnerabilities/CURRENT | 2 +- packs/lf-vulnerabilities/LOG | 2 +- packs/lf-vulnerabilities/LOG.old | 2 +- packs/lf-vulnerabilities/MANIFEST-000078 | 3 --- packs/lf-vulnerabilities/MANIFEST-000082 | 3 +++ 25 files changed, 38 insertions(+), 32 deletions(-) rename packs/lf-equipment/{000084.log => 000088.log} (100%) delete mode 100644 packs/lf-equipment/MANIFEST-000082 create mode 100644 packs/lf-equipment/MANIFEST-000086 rename packs/{lf-skills => lf-gifts}/000084.log (100%) delete mode 100644 packs/lf-gifts/MANIFEST-000078 create mode 100644 packs/lf-gifts/MANIFEST-000082 rename packs/{lf-gifts/000080.log => lf-skills/000088.log} (100%) delete mode 100644 packs/lf-skills/MANIFEST-000082 create mode 100644 packs/lf-skills/MANIFEST-000086 rename packs/lf-vulnerabilities/{000080.log => 000084.log} (100%) delete mode 100644 packs/lf-vulnerabilities/MANIFEST-000078 create mode 100644 packs/lf-vulnerabilities/MANIFEST-000082 diff --git a/module/documents/roll.mjs b/module/documents/roll.mjs index cd8cdee..a6cc02e 100644 --- a/module/documents/roll.mjs +++ b/module/documents/roll.mjs @@ -328,15 +328,21 @@ export default class LethalFantasyRoll extends Roll { let rollTotal = -1 let diceResults = [] let resultType + let diceSum = 0 - let diceResult = rollBase.dice[0].results[0].result - diceResults.push({ dice: `${dice}`, value: diceResult }) - let diceSum = diceResult - while (diceResult === maxValue) { - let r = await new Roll(baseFormula).evaluate() - diceResult = r.dice[0].results[0].result - diceResults.push({ dice: `${dice}-1`, value: diceResult - 1 }) - diceSum += (diceResult - 1) + let singleDice = `1D${maxValue}` + for (let i = 0; i < rollBase.dice.length; i++) { + for (let j = 0; j < rollBase.dice[i].results.length; j++) { + let diceResult = rollBase.dice[i].results[j].result + diceResults.push({ dice: `${singleDice}`, value: diceResult }) + diceSum += diceResult + while (diceResult === maxValue) { + let r = await new Roll(baseFormula).evaluate() + diceResult = r.dice[0].results[0].result + diceResults.push({ dice: `${singleDice}-1`, value: diceResult - 1 }) + diceSum += (diceResult - 1) + } + } } if (fullModifier !== 0) { diceResults.push({ dice: `${rollModifier.formula}`, value: rollModifier.total }) diff --git a/packs/lf-equipment/000084.log b/packs/lf-equipment/000088.log similarity index 100% rename from packs/lf-equipment/000084.log rename to packs/lf-equipment/000088.log diff --git a/packs/lf-equipment/CURRENT b/packs/lf-equipment/CURRENT index 50e566e..5d70c22 100644 --- a/packs/lf-equipment/CURRENT +++ b/packs/lf-equipment/CURRENT @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e94d01a544f0d82551f19e973a5ac9feb5f9d9984cb5eea8eb4dca0fc55610b +oid sha256:5bcb6c65ef32bb3ff4622a903d2bdc28facbf3cee5dfea01a6d1447068522534 size 16 diff --git a/packs/lf-equipment/LOG b/packs/lf-equipment/LOG index b58316c..5df0d17 100644 --- a/packs/lf-equipment/LOG +++ b/packs/lf-equipment/LOG @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9980dccdbf09ce54290dc77e11ed5b9ddf57630c073d6a1ead154df1e503c3bd +oid sha256:6bfdb8a3fcba5a8fe75e94d16836512d8eca7dce4c03507fdf282c5aaecc5f4b size 736 diff --git a/packs/lf-equipment/LOG.old b/packs/lf-equipment/LOG.old index 9d40a64..b58316c 100644 --- a/packs/lf-equipment/LOG.old +++ b/packs/lf-equipment/LOG.old @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fd1ddd89e964ce225bcb8c5aaca9954c6feb97d9f38b36874b97b41160d6aad +oid sha256:9980dccdbf09ce54290dc77e11ed5b9ddf57630c073d6a1ead154df1e503c3bd size 736 diff --git a/packs/lf-equipment/MANIFEST-000082 b/packs/lf-equipment/MANIFEST-000082 deleted file mode 100644 index 786a529..0000000 --- a/packs/lf-equipment/MANIFEST-000082 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1fe1bb1d3c8a9b5d69d4283ac8273b3632ada56001796acc0b348adacb3968db -size 137 diff --git a/packs/lf-equipment/MANIFEST-000086 b/packs/lf-equipment/MANIFEST-000086 new file mode 100644 index 0000000..94da508 --- /dev/null +++ b/packs/lf-equipment/MANIFEST-000086 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b4ebcd2282af2daec8815c11fb38bd02690476bdcd07ac1070068c8b88ab91f +size 137 diff --git a/packs/lf-skills/000084.log b/packs/lf-gifts/000084.log similarity index 100% rename from packs/lf-skills/000084.log rename to packs/lf-gifts/000084.log diff --git a/packs/lf-gifts/CURRENT b/packs/lf-gifts/CURRENT index e347af6..50e566e 100644 --- a/packs/lf-gifts/CURRENT +++ b/packs/lf-gifts/CURRENT @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cee53aaddae873a3860a7adc38b49c3e5efc19026a0aeda2694c61ba44cc3d82 +oid sha256:6e94d01a544f0d82551f19e973a5ac9feb5f9d9984cb5eea8eb4dca0fc55610b size 16 diff --git a/packs/lf-gifts/LOG b/packs/lf-gifts/LOG index aac65c6..6baff87 100644 --- a/packs/lf-gifts/LOG +++ b/packs/lf-gifts/LOG @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:70547da069cef8cdd801fb36c4a38a95a73c70151e9523561db76b0daa188314 +oid sha256:403f60ba629d213f7604feb0844af8bc4baba5122241677b1e22e1f15520069b size 732 diff --git a/packs/lf-gifts/LOG.old b/packs/lf-gifts/LOG.old index acc977f..aac65c6 100644 --- a/packs/lf-gifts/LOG.old +++ b/packs/lf-gifts/LOG.old @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:671b77888ba0f1769acaa2b76c59b6d1680ae089784435bd0ecc903f679d9cf7 +oid sha256:70547da069cef8cdd801fb36c4a38a95a73c70151e9523561db76b0daa188314 size 732 diff --git a/packs/lf-gifts/MANIFEST-000078 b/packs/lf-gifts/MANIFEST-000078 deleted file mode 100644 index 0d394f9..0000000 --- a/packs/lf-gifts/MANIFEST-000078 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e11bdf979f658b698726e2f31577f3e8a08da15684d37c9f6d81edbfd21aa35 -size 137 diff --git a/packs/lf-gifts/MANIFEST-000082 b/packs/lf-gifts/MANIFEST-000082 new file mode 100644 index 0000000..8e1e8aa --- /dev/null +++ b/packs/lf-gifts/MANIFEST-000082 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:166a7dca59e54052457c96e1d2022faf8e0a6ec5c2d5b11e31cc5bdeeadc573f +size 137 diff --git a/packs/lf-gifts/000080.log b/packs/lf-skills/000088.log similarity index 100% rename from packs/lf-gifts/000080.log rename to packs/lf-skills/000088.log diff --git a/packs/lf-skills/CURRENT b/packs/lf-skills/CURRENT index 50e566e..5d70c22 100644 --- a/packs/lf-skills/CURRENT +++ b/packs/lf-skills/CURRENT @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6e94d01a544f0d82551f19e973a5ac9feb5f9d9984cb5eea8eb4dca0fc55610b +oid sha256:5bcb6c65ef32bb3ff4622a903d2bdc28facbf3cee5dfea01a6d1447068522534 size 16 diff --git a/packs/lf-skills/LOG b/packs/lf-skills/LOG index 8385a96..bb0c14a 100644 --- a/packs/lf-skills/LOG +++ b/packs/lf-skills/LOG @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a95a671147e9d9742163a237d44628d28ec3200a83eb65830d27954428dde8a8 +oid sha256:c183c8597513768e39e8b0d44dcab932b47ef6292e06b542568ea42f512c5ac7 size 736 diff --git a/packs/lf-skills/LOG.old b/packs/lf-skills/LOG.old index 26c5d02..8385a96 100644 --- a/packs/lf-skills/LOG.old +++ b/packs/lf-skills/LOG.old @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7256970f4f2c3c4fd326e2c3bfd6b722e88c46db71f40807a4edbb743bcace9 +oid sha256:a95a671147e9d9742163a237d44628d28ec3200a83eb65830d27954428dde8a8 size 736 diff --git a/packs/lf-skills/MANIFEST-000082 b/packs/lf-skills/MANIFEST-000082 deleted file mode 100644 index 290b427..0000000 --- a/packs/lf-skills/MANIFEST-000082 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3549b1d778fffbdbb6f7361e4629435ce34c8ff3ec0cdd4b14e8b8848420294a -size 137 diff --git a/packs/lf-skills/MANIFEST-000086 b/packs/lf-skills/MANIFEST-000086 new file mode 100644 index 0000000..8b682f2 --- /dev/null +++ b/packs/lf-skills/MANIFEST-000086 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09f7b32da8aaf4ff2104511a508a76146af4930fc4611b4085cd23a24e0a6365 +size 137 diff --git a/packs/lf-vulnerabilities/000080.log b/packs/lf-vulnerabilities/000084.log similarity index 100% rename from packs/lf-vulnerabilities/000080.log rename to packs/lf-vulnerabilities/000084.log diff --git a/packs/lf-vulnerabilities/CURRENT b/packs/lf-vulnerabilities/CURRENT index e347af6..50e566e 100644 --- a/packs/lf-vulnerabilities/CURRENT +++ b/packs/lf-vulnerabilities/CURRENT @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cee53aaddae873a3860a7adc38b49c3e5efc19026a0aeda2694c61ba44cc3d82 +oid sha256:6e94d01a544f0d82551f19e973a5ac9feb5f9d9984cb5eea8eb4dca0fc55610b size 16 diff --git a/packs/lf-vulnerabilities/LOG b/packs/lf-vulnerabilities/LOG index 36fda00..c4765f9 100644 --- a/packs/lf-vulnerabilities/LOG +++ b/packs/lf-vulnerabilities/LOG @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08949d829db0f0db347d5ebdec2173a15a32072cd34b9bc831d8b1175fc2a3d4 +oid sha256:0fb77e9729834bbc7197fd3118a0dd5f75ed007ada32f416bdc6fdcc422d0e74 size 732 diff --git a/packs/lf-vulnerabilities/LOG.old b/packs/lf-vulnerabilities/LOG.old index 428c6ce..36fda00 100644 --- a/packs/lf-vulnerabilities/LOG.old +++ b/packs/lf-vulnerabilities/LOG.old @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a36ff5ee75d69bd979cebe4a5a3ca648f055f7700d8ce47d564c3446f9e00d0e +oid sha256:08949d829db0f0db347d5ebdec2173a15a32072cd34b9bc831d8b1175fc2a3d4 size 732 diff --git a/packs/lf-vulnerabilities/MANIFEST-000078 b/packs/lf-vulnerabilities/MANIFEST-000078 deleted file mode 100644 index 16c5e2c..0000000 --- a/packs/lf-vulnerabilities/MANIFEST-000078 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:56680da4e7c4d4d4b6e0ebb4a5d048776a9cbff6a341bf5d06c77bd162f89388 -size 137 diff --git a/packs/lf-vulnerabilities/MANIFEST-000082 b/packs/lf-vulnerabilities/MANIFEST-000082 new file mode 100644 index 0000000..0dba9e6 --- /dev/null +++ b/packs/lf-vulnerabilities/MANIFEST-000082 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98e946e5fb55da2654a6ccf64919d5a7bca90a4c0ac511c394b16339c1991921 +size 137