From ebb7bfe3d6c78b927de6b9532f64e63a5e76f0f5 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Wed, 23 Apr 2025 16:05:01 +0200 Subject: [PATCH] Fix prayer roll --- module/documents/roll.mjs | 9 +++++---- module/models/character.mjs | 13 +++++++++++-- .../lf-equipment/{000241.log => 000245.log} | 0 packs-system/lf-equipment/CURRENT | 2 +- packs-system/lf-equipment/LOG | 16 ++++++++-------- packs-system/lf-equipment/LOG.old | 16 ++++++++-------- .../{MANIFEST-000239 => MANIFEST-000243} | Bin 176 -> 176 bytes .../lf-gifts/{000240.log => 000244.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-000238 | Bin 140 -> 0 bytes packs-system/lf-gifts/MANIFEST-000242 | Bin 0 -> 140 bytes .../lf-skills/{000240.log => 000244.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-000238 | Bin 141 -> 0 bytes packs-system/lf-skills/MANIFEST-000242 | Bin 0 -> 141 bytes .../{000240.log => 000244.log} | 0 packs-system/lf-vulnerabilities/CURRENT | 2 +- packs-system/lf-vulnerabilities/LOG | 16 ++++++++-------- packs-system/lf-vulnerabilities/LOG.old | 16 ++++++++-------- .../{MANIFEST-000238 => MANIFEST-000242} | Bin 141 -> 141 bytes 24 files changed, 84 insertions(+), 74 deletions(-) rename packs-system/lf-equipment/{000241.log => 000245.log} (100%) rename packs-system/lf-equipment/{MANIFEST-000239 => MANIFEST-000243} (72%) rename packs-system/lf-gifts/{000240.log => 000244.log} (100%) delete mode 100644 packs-system/lf-gifts/MANIFEST-000238 create mode 100644 packs-system/lf-gifts/MANIFEST-000242 rename packs-system/lf-skills/{000240.log => 000244.log} (100%) delete mode 100644 packs-system/lf-skills/MANIFEST-000238 create mode 100644 packs-system/lf-skills/MANIFEST-000242 rename packs-system/lf-vulnerabilities/{000240.log => 000244.log} (100%) rename packs-system/lf-vulnerabilities/{MANIFEST-000238 => MANIFEST-000242} (71%) diff --git a/module/documents/roll.mjs b/module/documents/roll.mjs index 7011282..9cb4066 100644 --- a/module/documents/roll.mjs +++ b/module/documents/roll.mjs @@ -743,14 +743,15 @@ export default class LethalFantasyRoll extends Roll { if (currentAction) { if (rollContext === "rollLethargyDice") { if (currentAction.spellStatus === "castingTime") { - if (currentAction.castingTime < currentAction.system.castingTime) { - let message = `Casting time : ${currentAction.name}, count : ${currentAction.castingTime}/${currentAction.system.castingTime}` + let time = currentAction.type === "spell" ? currentAction.system.castingTime : currentAction.system.prayerTime + if (currentAction.castingTime < time) { + let message = `Casting time : ${currentAction.name}, count : ${currentAction.castingTime}/${time}` ChatMessage.create({ content: message, speaker: ChatMessage.getSpeaker({ actor: combatant.actor }) }) currentAction.castingTime += 1 await combatant.setFlag(SYSTEM.id, "currentAction", foundry.utils.duplicate(currentAction)) return } else { - let message = `Spell ${currentAction.name} ready to be cast on next second !` + let message = `Spell/Miracle ${currentAction.name} ready to be cast on next second !` ChatMessage.create({ content: message, speaker: ChatMessage.getSpeaker({ actor: combatant.actor }) }) currentAction.castingTime = 1 currentAction.spellStatus = "toBeCasted" @@ -890,7 +891,7 @@ export default class LethalFantasyRoll extends Roll { }, { action: "cast", - label: "Cast a spell", + label: "Cast a spell/Miracle", callback: (event, button, dialog) => { return "casting" }, diff --git a/module/models/character.mjs b/module/models/character.mjs index 567ca3a..93fb685 100644 --- a/module/models/character.mjs +++ b/module/models/character.mjs @@ -298,8 +298,17 @@ export default class LethalFantasyCharacter extends foundry.abstract.TypeDataMod if (this.biodata.magicUser || this.biodata.clericUser) { let spells = this.parent.items.filter(i => i.type === "spell" || i.type === "miracle") for (let s of spells) { - let dice = LethalFantasyUtils.getLethargyDice(s.system.level) - weaponsChoices.push({ id: s.id, name: `${s.name} (Time: ${s.system.castingTime}, Lethargy: ${dice})`, combatProgressionDice: `${s.system.castingTime}+${dice}` }) + let title = "" + let formula = "" + if (s.type === "spell") { + let dice = LethalFantasyUtils.getLethargyDice(s.system.level) + title = `${s.name} (Casting time: ${s.system.castingTime}, Lethargy: ${dice})` + formula = `${s.system.castingTime}+${dice}` + } else { + title = `${s.name} (Prayer time: ${s.system.prayerTime})` + formula = `${s.system.prayerTime}` + } + weaponsChoices.push({ id: s.id, name: title, combatProgressionDice: formula }) } } diff --git a/packs-system/lf-equipment/000241.log b/packs-system/lf-equipment/000245.log similarity index 100% rename from packs-system/lf-equipment/000241.log rename to packs-system/lf-equipment/000245.log diff --git a/packs-system/lf-equipment/CURRENT b/packs-system/lf-equipment/CURRENT index 8b5a82f..7635e11 100644 --- a/packs-system/lf-equipment/CURRENT +++ b/packs-system/lf-equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000239 +MANIFEST-000243 diff --git a/packs-system/lf-equipment/LOG b/packs-system/lf-equipment/LOG index c2f166c..fcdae95 100644 --- a/packs-system/lf-equipment/LOG +++ b/packs-system/lf-equipment/LOG @@ -1,8 +1,8 @@ -2025/04/22-23:31:24.238771 7f31457fa6c0 Recovering log #237 -2025/04/22-23:31:24.249942 7f31457fa6c0 Delete type=3 #235 -2025/04/22-23:31:24.250077 7f31457fa6c0 Delete type=0 #237 -2025/04/22-23:43:44.737443 7f2ea7fff6c0 Level-0 table #242: started -2025/04/22-23:43:44.737479 7f2ea7fff6c0 Level-0 table #242: 0 bytes OK -2025/04/22-23:43:44.744412 7f2ea7fff6c0 Delete type=0 #240 -2025/04/22-23:43:44.750880 7f2ea7fff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) -2025/04/22-23:43:44.750915 7f2ea7fff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) +2025/04/23-16:02:07.087054 7f3145ffb6c0 Recovering log #241 +2025/04/23-16:02:07.096981 7f3145ffb6c0 Delete type=3 #239 +2025/04/23-16:02:07.097039 7f3145ffb6c0 Delete type=0 #241 +2025/04/23-16:04:44.893831 7f2ea7fff6c0 Level-0 table #246: started +2025/04/23-16:04:44.893889 7f2ea7fff6c0 Level-0 table #246: 0 bytes OK +2025/04/23-16:04:44.900365 7f2ea7fff6c0 Delete type=0 #244 +2025/04/23-16:04:44.921865 7f2ea7fff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) +2025/04/23-16:04:44.921936 7f2ea7fff6c0 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 dce673f..c2f166c 100644 --- a/packs-system/lf-equipment/LOG.old +++ b/packs-system/lf-equipment/LOG.old @@ -1,8 +1,8 @@ -2025/04/22-16:10:04.887355 7f31467fc6c0 Recovering log #233 -2025/04/22-16:10:04.897170 7f31467fc6c0 Delete type=3 #231 -2025/04/22-16:10:04.897273 7f31467fc6c0 Delete type=0 #233 -2025/04/22-16:24:56.381376 7f2ea7fff6c0 Level-0 table #238: started -2025/04/22-16:24:56.381413 7f2ea7fff6c0 Level-0 table #238: 0 bytes OK -2025/04/22-16:24:56.387438 7f2ea7fff6c0 Delete type=0 #236 -2025/04/22-16:24:56.393346 7f2ea7fff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) -2025/04/22-16:24:56.393372 7f2ea7fff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) +2025/04/22-23:31:24.238771 7f31457fa6c0 Recovering log #237 +2025/04/22-23:31:24.249942 7f31457fa6c0 Delete type=3 #235 +2025/04/22-23:31:24.250077 7f31457fa6c0 Delete type=0 #237 +2025/04/22-23:43:44.737443 7f2ea7fff6c0 Level-0 table #242: started +2025/04/22-23:43:44.737479 7f2ea7fff6c0 Level-0 table #242: 0 bytes OK +2025/04/22-23:43:44.744412 7f2ea7fff6c0 Delete type=0 #240 +2025/04/22-23:43:44.750880 7f2ea7fff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!znm6T1ef4qQI8BX7' @ 0 : 0; will stop at (end) +2025/04/22-23:43:44.750915 7f2ea7fff6c0 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-000239 b/packs-system/lf-equipment/MANIFEST-000243 similarity index 72% rename from packs-system/lf-equipment/MANIFEST-000239 rename to packs-system/lf-equipment/MANIFEST-000243 index 7041e2d658abd067fd465f54ca92e656123dd675..593eb361363a57b25d5a6cc50e426360dba3dc1e 100644 GIT binary patch delta 41 scmdnMxPfs(pHh1PdovdUBhwc~P6p<$j4WYa{?1qn68H)d_zn~R01QA382|tP delta 41 scmdnMxPfs(pOVkcj+I;tj7%RGIT@HgGO~otcb4i0348`pgoS$2eSd>_jU&PL2x}i)_F)cqQCAFwn zu`(dsy{y8+E6K&rBP=*Cl2L&H4CECvOHy--6|1t!+;g&ue6mf0i!+=pT^Ly)@>6%t f<>g{vWO~oY$-w-9kwrnO-$4{4@Bt+72`B&n3`!=t diff --git a/packs-system/lf-gifts/MANIFEST-000242 b/packs-system/lf-gifts/MANIFEST-000242 new file mode 100644 index 0000000000000000000000000000000000000000..382badf66dd8878eabf798070a8d739f12ef9470 GIT binary patch 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)@_Agn fAGjD8nLaaeGBAH(WKk%*wci{h@C79B4JZHr9=<3F literal 0 HcmV?d00001 diff --git a/packs-system/lf-skills/000240.log b/packs-system/lf-skills/000244.log similarity index 100% rename from packs-system/lf-skills/000240.log rename to packs-system/lf-skills/000244.log diff --git a/packs-system/lf-skills/CURRENT b/packs-system/lf-skills/CURRENT index 4846f49..d3ee291 100644 --- a/packs-system/lf-skills/CURRENT +++ b/packs-system/lf-skills/CURRENT @@ -1 +1 @@ -MANIFEST-000238 +MANIFEST-000242 diff --git a/packs-system/lf-skills/LOG b/packs-system/lf-skills/LOG index eec478b..39afd33 100644 --- a/packs-system/lf-skills/LOG +++ b/packs-system/lf-skills/LOG @@ -1,8 +1,8 @@ -2025/04/22-23:31:24.225117 7f31467fc6c0 Recovering log #236 -2025/04/22-23:31:24.235493 7f31467fc6c0 Delete type=3 #234 -2025/04/22-23:31:24.235550 7f31467fc6c0 Delete type=0 #236 -2025/04/22-23:43:44.724728 7f2ea7fff6c0 Level-0 table #241: started -2025/04/22-23:43:44.724783 7f2ea7fff6c0 Level-0 table #241: 0 bytes OK -2025/04/22-23:43:44.730920 7f2ea7fff6c0 Delete type=0 #239 -2025/04/22-23:43:44.750847 7f2ea7fff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) -2025/04/22-23:43:44.750890 7f2ea7fff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/04/23-16:02:07.071305 7f31457fa6c0 Recovering log #240 +2025/04/23-16:02:07.081459 7f31457fa6c0 Delete type=3 #238 +2025/04/23-16:02:07.081639 7f31457fa6c0 Delete type=0 #240 +2025/04/23-16:04:44.907842 7f2ea7fff6c0 Level-0 table #245: started +2025/04/23-16:04:44.907895 7f2ea7fff6c0 Level-0 table #245: 0 bytes OK +2025/04/23-16:04:44.913971 7f2ea7fff6c0 Delete type=0 #243 +2025/04/23-16:04:44.921908 7f2ea7fff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/04/23-16:04:44.921963 7f2ea7fff6c0 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 ebca847..eec478b 100644 --- a/packs-system/lf-skills/LOG.old +++ b/packs-system/lf-skills/LOG.old @@ -1,8 +1,8 @@ -2025/04/22-16:10:04.874243 7f3145ffb6c0 Recovering log #232 -2025/04/22-16:10:04.884436 7f3145ffb6c0 Delete type=3 #230 -2025/04/22-16:10:04.884505 7f3145ffb6c0 Delete type=0 #232 -2025/04/22-16:24:56.387518 7f2ea7fff6c0 Level-0 table #237: started -2025/04/22-16:24:56.387539 7f2ea7fff6c0 Level-0 table #237: 0 bytes OK -2025/04/22-16:24:56.393264 7f2ea7fff6c0 Delete type=0 #235 -2025/04/22-16:24:56.393353 7f2ea7fff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) -2025/04/22-16:24:56.393378 7f2ea7fff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/04/22-23:31:24.225117 7f31467fc6c0 Recovering log #236 +2025/04/22-23:31:24.235493 7f31467fc6c0 Delete type=3 #234 +2025/04/22-23:31:24.235550 7f31467fc6c0 Delete type=0 #236 +2025/04/22-23:43:44.724728 7f2ea7fff6c0 Level-0 table #241: started +2025/04/22-23:43:44.724783 7f2ea7fff6c0 Level-0 table #241: 0 bytes OK +2025/04/22-23:43:44.730920 7f2ea7fff6c0 Delete type=0 #239 +2025/04/22-23:43:44.750847 7f2ea7fff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/04/22-23:43:44.750890 7f2ea7fff6c0 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-000238 b/packs-system/lf-skills/MANIFEST-000238 deleted file mode 100644 index a67bc36c1dffa3b109ae8089978fb39cbc390542..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmYdufBGqffss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfd5@L?mnqGDQpPD*M~ zv7&jFg@?IIQm#{yWoT8RQ3PW$0~p9FW|pMp7AsbjSQML^nwg{)82TidL}8ygt+f8U_fswgMyAh}8ygt#m~pnv08pk?B1nCj;{bMi!ado=l1$fe#>oPe1_x)k6sp