From 440e5c0b667d8aa4bc3a21d5b8ec6e8c7ee01223 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Sat, 1 Feb 2025 21:17:27 +0100 Subject: [PATCH] Sync with wfrp 4, v8.4.0 --- lang/en.json | 3 ++- module/documents/roll.mjs | 2 +- packs-system/skills/CURRENT | 2 +- packs-system/skills/LOG | 11 +++-------- packs-system/skills/LOG.old | 16 ++++++++-------- 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/lang/en.json b/lang/en.json index 859ac8a..ed40156 100644 --- a/lang/en.json +++ b/lang/en.json @@ -442,7 +442,8 @@ "skill": "Skill", "roll": "Roll", "applyNudge": "Apply", - "cancel": "Cancel" + "cancel": "Cancel", + "nudgeRoll": "Nudge Roll" }, "Tooltip": { "sanBP": ">5 SAN lost in one roll, temporary insanity. If SAN less reaches BP = a Disorder unconscious Breaking and AND reset BP.", diff --git a/module/documents/roll.mjs b/module/documents/roll.mjs index ce7cef9..a4b1280 100644 --- a/module/documents/roll.mjs +++ b/module/documents/roll.mjs @@ -317,7 +317,7 @@ export default class CthulhuEternalRoll extends Roll { } } else { // Detect if decimal == unit in the dire total result - if (dec === unit || roll.total === 100) { + if (dec === unit || this.total === 100) { resultType = "failureCritical" } } diff --git a/packs-system/skills/CURRENT b/packs-system/skills/CURRENT index 6274e55..d7ae20e 100644 --- a/packs-system/skills/CURRENT +++ b/packs-system/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000096 +MANIFEST-000100 diff --git a/packs-system/skills/LOG b/packs-system/skills/LOG index eb4a895..aaf0d8e 100644 --- a/packs-system/skills/LOG +++ b/packs-system/skills/LOG @@ -1,8 +1,3 @@ -2025/02/01-13:04:37.403980 7fd1c9ffb6c0 Recovering log #94 -2025/02/01-13:04:37.414560 7fd1c9ffb6c0 Delete type=3 #92 -2025/02/01-13:04:37.414616 7fd1c9ffb6c0 Delete type=0 #94 -2025/02/01-21:09:42.547683 7fd1c93ff6c0 Level-0 table #99: started -2025/02/01-21:09:42.547729 7fd1c93ff6c0 Level-0 table #99: 0 bytes OK -2025/02/01-21:09:42.554673 7fd1c93ff6c0 Delete type=0 #97 -2025/02/01-21:09:42.570630 7fd1c93ff6c0 Manual compaction at level-0 from '!folders!DD8331Hda4rhvEf9' @ 72057594037927935 : 1 .. '!items!zplzTG30QXHURusr' @ 0 : 0; will stop at (end) -2025/02/01-21:09:42.570661 7fd1c93ff6c0 Manual compaction at level-1 from '!folders!DD8331Hda4rhvEf9' @ 72057594037927935 : 1 .. '!items!zplzTG30QXHURusr' @ 0 : 0; will stop at (end) +2025/02/01-21:14:17.990919 7fd1caffd6c0 Recovering log #98 +2025/02/01-21:14:18.007782 7fd1caffd6c0 Delete type=3 #96 +2025/02/01-21:14:18.007839 7fd1caffd6c0 Delete type=0 #98 diff --git a/packs-system/skills/LOG.old b/packs-system/skills/LOG.old index 2d6b47c..eb4a895 100644 --- a/packs-system/skills/LOG.old +++ b/packs-system/skills/LOG.old @@ -1,8 +1,8 @@ -2025/01/28-13:40:46.388286 7fc73affd6c0 Recovering log #90 -2025/01/28-13:40:46.486338 7fc73affd6c0 Delete type=3 #88 -2025/01/28-13:40:46.486413 7fc73affd6c0 Delete type=0 #90 -2025/01/28-14:21:23.579080 7fc738ff96c0 Level-0 table #95: started -2025/01/28-14:21:23.579113 7fc738ff96c0 Level-0 table #95: 0 bytes OK -2025/01/28-14:21:23.585685 7fc738ff96c0 Delete type=0 #93 -2025/01/28-14:21:23.595091 7fc738ff96c0 Manual compaction at level-0 from '!folders!DD8331Hda4rhvEf9' @ 72057594037927935 : 1 .. '!items!zplzTG30QXHURusr' @ 0 : 0; will stop at (end) -2025/01/28-14:21:23.607394 7fc738ff96c0 Manual compaction at level-1 from '!folders!DD8331Hda4rhvEf9' @ 72057594037927935 : 1 .. '!items!zplzTG30QXHURusr' @ 0 : 0; will stop at (end) +2025/02/01-13:04:37.403980 7fd1c9ffb6c0 Recovering log #94 +2025/02/01-13:04:37.414560 7fd1c9ffb6c0 Delete type=3 #92 +2025/02/01-13:04:37.414616 7fd1c9ffb6c0 Delete type=0 #94 +2025/02/01-21:09:42.547683 7fd1c93ff6c0 Level-0 table #99: started +2025/02/01-21:09:42.547729 7fd1c93ff6c0 Level-0 table #99: 0 bytes OK +2025/02/01-21:09:42.554673 7fd1c93ff6c0 Delete type=0 #97 +2025/02/01-21:09:42.570630 7fd1c93ff6c0 Manual compaction at level-0 from '!folders!DD8331Hda4rhvEf9' @ 72057594037927935 : 1 .. '!items!zplzTG30QXHURusr' @ 0 : 0; will stop at (end) +2025/02/01-21:09:42.570661 7fd1c93ff6c0 Manual compaction at level-1 from '!folders!DD8331Hda4rhvEf9' @ 72057594037927935 : 1 .. '!items!zplzTG30QXHURusr' @ 0 : 0; will stop at (end)