From 148f1db3bf5334ec934ebb4803d6e9b7b4535766 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Mon, 20 Jan 2025 07:29:31 +0100 Subject: [PATCH] Update sheet again... --- lang/en.json | 12 +++++++++++- module/documents/roll.mjs | 2 +- packs-system/lf-equipment/000088.log | 0 packs-system/lf-equipment/CURRENT | 2 +- packs-system/lf-equipment/LOG | 16 ++++++++-------- packs-system/lf-equipment/LOG.old | 16 ++++++++-------- packs-system/lf-equipment/MANIFEST-000086 | Bin 137 -> 0 bytes packs-system/lf-gifts/000088.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-000086 | Bin 136 -> 0 bytes packs-system/lf-skills/000088.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-000086 | Bin 137 -> 0 bytes packs-system/lf-vulnerabilities/000088.log | 0 packs-system/lf-vulnerabilities/CURRENT | 2 +- packs-system/lf-vulnerabilities/LOG | 16 ++++++++-------- packs-system/lf-vulnerabilities/LOG.old | 16 ++++++++-------- packs-system/lf-vulnerabilities/MANIFEST-000086 | Bin 137 -> 0 bytes system.json | 2 +- templates/monster-main.hbs | 2 +- templates/roll-dialog.hbs | 4 ++-- 25 files changed, 84 insertions(+), 74 deletions(-) delete mode 100644 packs-system/lf-equipment/000088.log delete mode 100644 packs-system/lf-equipment/MANIFEST-000086 delete mode 100644 packs-system/lf-gifts/000088.log delete mode 100644 packs-system/lf-gifts/MANIFEST-000086 delete mode 100644 packs-system/lf-skills/000088.log delete mode 100644 packs-system/lf-skills/MANIFEST-000086 delete mode 100644 packs-system/lf-vulnerabilities/000088.log delete mode 100644 packs-system/lf-vulnerabilities/MANIFEST-000086 diff --git a/lang/en.json b/lang/en.json index 53d0f27..6478241 100644 --- a/lang/en.json +++ b/lang/en.json @@ -281,12 +281,20 @@ } }, "Label": { + "will":"Will", + "dodge":"Dodge", + "toughness":"Toughness", + "contagion":"Contagion", + "poison":"Poison", + "pain":"Pain", + "paincourage":"Pain/Courage", "granted": "Granted Dice", "shields": "Shields", "armorHitPoints": "Armor hit points", "grantedAttackDice": "Granted attack", "grantedDamageDice": "Granted damage", "grantedDefenseDice": "Granted defense", + "damageResistance": "Damage resistance", "damageResistanceShort": "DR", "stealth": "Stealth", "progressionDice": "Progression dice", @@ -465,7 +473,9 @@ "rollTypeNotFound": "Roll type not found", "skillNotFound": "Skill not found", "messageProgressionOK": "{name} can attack this second with {weapon}.", - "messageProgressionKO": "{name} can't attack this second." + "messageProgressionKO": "{name} can't attack this second.", + "messageProgressionOKMonster": "{name} can attack this second with {weapon}.", + "messageProgressionNOKMonster": "{name} can't attack this second." }, "Opponent": { "FIELDS": {} diff --git a/module/documents/roll.mjs b/module/documents/roll.mjs index 74c3ced..5598606 100644 --- a/module/documents/roll.mjs +++ b/module/documents/roll.mjs @@ -126,7 +126,7 @@ export default class LethalFantasyRoll extends Roll { let hasGrantedDice = false if (options.rollType === "challenge" || options.rollType === "save") { - options.rollName = options.rollTarget.rollKey + options.rollName = game.i18n.localize( `LETHALFANTASY.Label.${options.rollTarget.rollKey}` ) hasD30 = options.rollType === "save" if (options.rollTarget.rollKey === "dying") { dice = options.rollTarget.value diff --git a/packs-system/lf-equipment/000088.log b/packs-system/lf-equipment/000088.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs-system/lf-equipment/CURRENT b/packs-system/lf-equipment/CURRENT index a43fb19..2f2c868 100644 --- a/packs-system/lf-equipment/CURRENT +++ b/packs-system/lf-equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000086 +MANIFEST-000090 diff --git a/packs-system/lf-equipment/LOG b/packs-system/lf-equipment/LOG index af82383..306eb2b 100644 --- a/packs-system/lf-equipment/LOG +++ b/packs-system/lf-equipment/LOG @@ -1,8 +1,8 @@ -2025/01/19-20:28:04.294851 7f6e76ffd6c0 Recovering log #84 -2025/01/19-20:28:04.332992 7f6e76ffd6c0 Delete type=3 #82 -2025/01/19-20:28:04.333048 7f6e76ffd6c0 Delete type=0 #84 -2025/01/19-22:33:17.587402 7f6e753ff6c0 Level-0 table #89: started -2025/01/19-22:33:17.587446 7f6e753ff6c0 Level-0 table #89: 0 bytes OK -2025/01/19-22:33:17.593554 7f6e753ff6c0 Delete type=0 #87 -2025/01/19-22:33:17.612509 7f6e753ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) -2025/01/19-22:33:17.612553 7f6e753ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) +2025/01/20-07:20:09.509287 7f6e777fe6c0 Recovering log #88 +2025/01/20-07:20:09.519035 7f6e777fe6c0 Delete type=3 #86 +2025/01/20-07:20:09.519121 7f6e777fe6c0 Delete type=0 #88 +2025/01/20-07:28:47.827329 7f6e753ff6c0 Level-0 table #93: started +2025/01/20-07:28:47.827358 7f6e753ff6c0 Level-0 table #93: 0 bytes OK +2025/01/20-07:28:47.833248 7f6e753ff6c0 Delete type=0 #91 +2025/01/20-07:28:47.833416 7f6e753ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) +2025/01/20-07:28:47.833441 7f6e753ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-equipment/LOG.old b/packs-system/lf-equipment/LOG.old index 4abe1d9..af82383 100644 --- a/packs-system/lf-equipment/LOG.old +++ b/packs-system/lf-equipment/LOG.old @@ -1,8 +1,8 @@ -2025/01/18-18:45:51.397204 7f3b8bfff6c0 Recovering log #80 -2025/01/18-18:45:51.459450 7f3b8bfff6c0 Delete type=3 #78 -2025/01/18-18:45:51.459524 7f3b8bfff6c0 Delete type=0 #80 -2025/01/18-19:25:39.662101 7f3b8b3ff6c0 Level-0 table #85: started -2025/01/18-19:25:39.662133 7f3b8b3ff6c0 Level-0 table #85: 0 bytes OK -2025/01/18-19:25:39.686749 7f3b8b3ff6c0 Delete type=0 #83 -2025/01/18-19:25:39.734023 7f3b8b3ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) -2025/01/18-19:25:39.734056 7f3b8b3ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) +2025/01/19-20:28:04.294851 7f6e76ffd6c0 Recovering log #84 +2025/01/19-20:28:04.332992 7f6e76ffd6c0 Delete type=3 #82 +2025/01/19-20:28:04.333048 7f6e76ffd6c0 Delete type=0 #84 +2025/01/19-22:33:17.587402 7f6e753ff6c0 Level-0 table #89: started +2025/01/19-22:33:17.587446 7f6e753ff6c0 Level-0 table #89: 0 bytes OK +2025/01/19-22:33:17.593554 7f6e753ff6c0 Delete type=0 #87 +2025/01/19-22:33:17.612509 7f6e753ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) +2025/01/19-22:33:17.612553 7f6e753ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-equipment/MANIFEST-000086 b/packs-system/lf-equipment/MANIFEST-000086 deleted file mode 100644 index daf6f7611400530e266de55511d1681a9846325d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmaEU;D&1o10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAei1v9>GB7Rii&CZIVq_{ z#fpw0MV94J8R@2_Az>le#lDPU3}7Iym|2pVTdY{+R#chpWfYQERFRzFl$gn=36a-$ eem01MfsrYklYu#c#r50zbR!Tq0?3VGaRmT5Qzzm8 diff --git a/packs-system/lf-gifts/000088.log b/packs-system/lf-gifts/000088.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs-system/lf-gifts/CURRENT b/packs-system/lf-gifts/CURRENT index a43fb19..2f2c868 100644 --- a/packs-system/lf-gifts/CURRENT +++ b/packs-system/lf-gifts/CURRENT @@ -1 +1 @@ -MANIFEST-000086 +MANIFEST-000090 diff --git a/packs-system/lf-gifts/LOG b/packs-system/lf-gifts/LOG index 500ae51..d0fe9c9 100644 --- a/packs-system/lf-gifts/LOG +++ b/packs-system/lf-gifts/LOG @@ -1,8 +1,8 @@ -2025/01/19-20:28:04.336215 7f6e767fc6c0 Recovering log #84 -2025/01/19-20:28:04.372498 7f6e767fc6c0 Delete type=3 #82 -2025/01/19-20:28:04.372572 7f6e767fc6c0 Delete type=0 #84 -2025/01/19-22:33:17.593695 7f6e753ff6c0 Level-0 table #89: started -2025/01/19-22:33:17.593726 7f6e753ff6c0 Level-0 table #89: 0 bytes OK -2025/01/19-22:33:17.600149 7f6e753ff6c0 Delete type=0 #87 -2025/01/19-22:33:17.612522 7f6e753ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) -2025/01/19-22:33:17.612568 7f6e753ff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/01/20-07:20:09.522029 7f6e76ffd6c0 Recovering log #88 +2025/01/20-07:20:09.532119 7f6e76ffd6c0 Delete type=3 #86 +2025/01/20-07:20:09.532210 7f6e76ffd6c0 Delete type=0 #88 +2025/01/20-07:28:47.807697 7f6e753ff6c0 Level-0 table #93: started +2025/01/20-07:28:47.807747 7f6e753ff6c0 Level-0 table #93: 0 bytes OK +2025/01/20-07:28:47.813633 7f6e753ff6c0 Delete type=0 #91 +2025/01/20-07:28:47.833369 7f6e753ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/01/20-07:28:47.833424 7f6e753ff6c0 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 e0436ef..500ae51 100644 --- a/packs-system/lf-gifts/LOG.old +++ b/packs-system/lf-gifts/LOG.old @@ -1,8 +1,8 @@ -2025/01/18-18:45:51.461997 7f3b919fa6c0 Recovering log #80 -2025/01/18-18:45:51.515007 7f3b919fa6c0 Delete type=3 #78 -2025/01/18-18:45:51.515089 7f3b919fa6c0 Delete type=0 #80 -2025/01/18-19:25:39.714194 7f3b8b3ff6c0 Level-0 table #85: started -2025/01/18-19:25:39.714225 7f3b8b3ff6c0 Level-0 table #85: 0 bytes OK -2025/01/18-19:25:39.733891 7f3b8b3ff6c0 Delete type=0 #83 -2025/01/18-19:25:39.734043 7f3b8b3ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) -2025/01/18-19:25:39.734069 7f3b8b3ff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/01/19-20:28:04.336215 7f6e767fc6c0 Recovering log #84 +2025/01/19-20:28:04.372498 7f6e767fc6c0 Delete type=3 #82 +2025/01/19-20:28:04.372572 7f6e767fc6c0 Delete type=0 #84 +2025/01/19-22:33:17.593695 7f6e753ff6c0 Level-0 table #89: started +2025/01/19-22:33:17.593726 7f6e753ff6c0 Level-0 table #89: 0 bytes OK +2025/01/19-22:33:17.600149 7f6e753ff6c0 Delete type=0 #87 +2025/01/19-22:33:17.612522 7f6e753ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/01/19-22:33:17.612568 7f6e753ff6c0 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-000086 b/packs-system/lf-gifts/MANIFEST-000086 deleted file mode 100644 index 1c96668151b501161719e88d269cb681a4ef5773..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 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)^5XWE ci5v`!OyQgi%n>XKo)NQ^LEH!+H;P38076kCs{jB1 diff --git a/packs-system/lf-skills/000088.log b/packs-system/lf-skills/000088.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs-system/lf-skills/CURRENT b/packs-system/lf-skills/CURRENT index a43fb19..2f2c868 100644 --- a/packs-system/lf-skills/CURRENT +++ b/packs-system/lf-skills/CURRENT @@ -1 +1 @@ -MANIFEST-000086 +MANIFEST-000090 diff --git a/packs-system/lf-skills/LOG b/packs-system/lf-skills/LOG index 89995d0..e4faef3 100644 --- a/packs-system/lf-skills/LOG +++ b/packs-system/lf-skills/LOG @@ -1,8 +1,8 @@ -2025/01/19-20:28:04.243940 7f6e777fe6c0 Recovering log #84 -2025/01/19-20:28:04.287892 7f6e777fe6c0 Delete type=3 #82 -2025/01/19-20:28:04.287949 7f6e777fe6c0 Delete type=0 #84 -2025/01/19-22:33:17.600271 7f6e753ff6c0 Level-0 table #89: started -2025/01/19-22:33:17.600297 7f6e753ff6c0 Level-0 table #89: 0 bytes OK -2025/01/19-22:33:17.606219 7f6e753ff6c0 Delete type=0 #87 -2025/01/19-22:33:17.612535 7f6e753ff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) -2025/01/19-22:33:17.612561 7f6e753ff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/01/20-07:20:09.494321 7f6e75ffb6c0 Recovering log #88 +2025/01/20-07:20:09.505058 7f6e75ffb6c0 Delete type=3 #86 +2025/01/20-07:20:09.505116 7f6e75ffb6c0 Delete type=0 #88 +2025/01/20-07:28:47.813759 7f6e753ff6c0 Level-0 table #93: started +2025/01/20-07:28:47.813783 7f6e753ff6c0 Level-0 table #93: 0 bytes OK +2025/01/20-07:28:47.820354 7f6e753ff6c0 Delete type=0 #91 +2025/01/20-07:28:47.833389 7f6e753ff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/01/20-07:28:47.833433 7f6e753ff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-skills/LOG.old b/packs-system/lf-skills/LOG.old index c966443..89995d0 100644 --- a/packs-system/lf-skills/LOG.old +++ b/packs-system/lf-skills/LOG.old @@ -1,8 +1,8 @@ -2025/01/18-18:45:51.345613 7f3b911f96c0 Recovering log #80 -2025/01/18-18:45:51.394393 7f3b911f96c0 Delete type=3 #78 -2025/01/18-18:45:51.394460 7f3b911f96c0 Delete type=0 #80 -2025/01/18-19:25:39.686886 7f3b8b3ff6c0 Level-0 table #85: started -2025/01/18-19:25:39.686918 7f3b8b3ff6c0 Level-0 table #85: 0 bytes OK -2025/01/18-19:25:39.714065 7f3b8b3ff6c0 Delete type=0 #83 -2025/01/18-19:25:39.734034 7f3b8b3ff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) -2025/01/18-19:25:39.734062 7f3b8b3ff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/01/19-20:28:04.243940 7f6e777fe6c0 Recovering log #84 +2025/01/19-20:28:04.287892 7f6e777fe6c0 Delete type=3 #82 +2025/01/19-20:28:04.287949 7f6e777fe6c0 Delete type=0 #84 +2025/01/19-22:33:17.600271 7f6e753ff6c0 Level-0 table #89: started +2025/01/19-22:33:17.600297 7f6e753ff6c0 Level-0 table #89: 0 bytes OK +2025/01/19-22:33:17.606219 7f6e753ff6c0 Delete type=0 #87 +2025/01/19-22:33:17.612535 7f6e753ff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/01/19-22:33:17.612561 7f6e753ff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-skills/MANIFEST-000086 b/packs-system/lf-skills/MANIFEST-000086 deleted file mode 100644 index 72d0462ad1fffc7a6e87ffd9488947e09e12d2cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmYdufBGqffss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfd5@L?mnqGDQpPD*M~ zv7&jFg@?IIQm#{yWoT8RQ3PW$0~p9FW|pMp7AsbjSQML^nwg{)82TidL d`X0i;z{nKN$-o@JBE!)bYXIU#0J%{tG5~G!Bw+vm diff --git a/system.json b/system.json index 52dfaa4..6dc69e7 100644 --- a/system.json +++ b/system.json @@ -6,7 +6,7 @@ "download": "#{DOWNLOAD}#", "url": "#{URL}#", "license": "LICENSE", - "version": "12.0.21", + "version": "12.0.22", "authors": [ { "name": "Uberwald", diff --git a/templates/monster-main.hbs b/templates/monster-main.hbs index f1c5196..7e0e1ec 100644 --- a/templates/monster-main.hbs +++ b/templates/monster-main.hbs @@ -79,7 +79,7 @@ disabled=isPlayMode }} - {{localize "LETHALFANTASY.Label.saves.paincourage"}} diff --git a/templates/roll-dialog.hbs b/templates/roll-dialog.hbs index fc11f54..25a7c7d 100644 --- a/templates/roll-dialog.hbs +++ b/templates/roll-dialog.hbs @@ -11,9 +11,9 @@ {{/if}} {{#if hasModifier}} -
{{upperCase rollName}} : {{baseFormula}} + {{baseValue}}
+
{{upperFirst rollName}} : {{baseFormula}} + {{baseValue}}
{{else}} -
{{upperCase rollName}} : {{baseFormula}}
+
{{upperFirst rollName}} : {{baseFormula}}
{{/if}} {{#if rollTarget.weapon}}
{{localize "LETHALFANTASY.Label.baseModifier"}} : {{rollTarget.charModifier}}