From cb8bcfd9eab4c497ba30cce7d3e4e8f9a916a3be Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Fri, 19 Sep 2025 22:30:26 +0200 Subject: [PATCH] Ranged defense fixes again --- css/fvtt-lethal-fantasy.css | 17 ++++++--- .../applications/sheets/character-sheet.mjs | 2 +- module/documents/roll.mjs | 33 ++++++++++-------- .../lf-equipment/{000418.log => 000422.log} | 0 packs-system/lf-equipment/CURRENT | 2 +- packs-system/lf-equipment/LOG | 16 ++++----- packs-system/lf-equipment/LOG.old | 16 ++++----- .../{MANIFEST-000416 => MANIFEST-000420} | Bin 178 -> 178 bytes .../lf-gifts/{000418.log => 000422.log} | 0 packs-system/lf-gifts/CURRENT | 2 +- packs-system/lf-gifts/LOG | 16 ++++----- packs-system/lf-gifts/LOG.old | 16 ++++----- .../{MANIFEST-000416 => MANIFEST-000420} | Bin 177 -> 177 bytes .../lf-skills/{000418.log => 000422.log} | 0 packs-system/lf-skills/CURRENT | 2 +- packs-system/lf-skills/LOG | 16 ++++----- packs-system/lf-skills/LOG.old | 16 ++++----- .../{MANIFEST-000416 => MANIFEST-000420} | Bin 178 -> 178 bytes .../{000118.log => 000122.log} | 0 packs-system/lf-spells-miracles/CURRENT | 2 +- packs-system/lf-spells-miracles/LOG | 16 ++++----- packs-system/lf-spells-miracles/LOG.old | 16 ++++----- .../{MANIFEST-000116 => MANIFEST-000120} | Bin 173 -> 173 bytes .../{000417.log => 000421.log} | 0 packs-system/lf-vulnerabilities/CURRENT | 2 +- packs-system/lf-vulnerabilities/LOG | 16 ++++----- packs-system/lf-vulnerabilities/LOG.old | 16 ++++----- .../{MANIFEST-000415 => MANIFEST-000419} | Bin 176 -> 176 bytes styles/roll.less | 17 ++++++--- templates/chat-message.hbs | 18 +++++----- templates/range-defense-dialog.hbs | 8 +++-- templates/roll-dialog.hbs | 2 +- 32 files changed, 144 insertions(+), 123 deletions(-) rename packs-system/lf-equipment/{000418.log => 000422.log} (100%) rename packs-system/lf-equipment/{MANIFEST-000416 => MANIFEST-000420} (71%) rename packs-system/lf-gifts/{000418.log => 000422.log} (100%) rename packs-system/lf-gifts/{MANIFEST-000416 => MANIFEST-000420} (72%) rename packs-system/lf-skills/{000418.log => 000422.log} (100%) rename packs-system/lf-skills/{MANIFEST-000416 => MANIFEST-000420} (71%) rename packs-system/lf-spells-miracles/{000118.log => 000122.log} (100%) rename packs-system/lf-spells-miracles/{MANIFEST-000116 => MANIFEST-000120} (73%) rename packs-system/lf-vulnerabilities/{000417.log => 000421.log} (100%) rename packs-system/lf-vulnerabilities/{MANIFEST-000415 => MANIFEST-000419} (72%) diff --git a/css/fvtt-lethal-fantasy.css b/css/fvtt-lethal-fantasy.css index f6935a2..5a1cb67 100644 --- a/css/fvtt-lethal-fantasy.css +++ b/css/fvtt-lethal-fantasy.css @@ -2236,10 +2236,17 @@ i.lethalfantasy { .lethalfantasy-range-defense-dialog fieldset { padding: 4px; } +.lethalfantasy-range-defense-dialog .fieldset-centered { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + text-align: center; +} .lethalfantasy-range-defense-dialog select { margin-left: 0.5rem; - min-width: 10rem; - max-width: 10rem; + min-width: 12rem; + max-width: 12rem; } .lethalfantasy-range-defense-dialog .field-section { display: flex; @@ -2247,9 +2254,9 @@ i.lethalfantasy { justify-content: left; } .lethalfantasy-range-defense-dialog .field-name { - width: 4rem; - min-width: 4rem; - max-width: 4rem; + width: 5rem; + min-width: 5rem; + max-width: 5em; } .dialog-form .form-footer button { min-width: 14rem; diff --git a/module/applications/sheets/character-sheet.mjs b/module/applications/sheets/character-sheet.mjs index 67f2ca3..7c5ef20 100644 --- a/module/applications/sheets/character-sheet.mjs +++ b/module/applications/sheets/character-sheet.mjs @@ -143,7 +143,7 @@ export default class LethalFantasyCharacterSheet extends LethalFantasyActorSheet const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event) // Handle different data types - if (data.type === "Item") { + if (data.type === "Item") { const item = await fromUuid(data.uuid) return this._onDropItem(item) } diff --git a/module/documents/roll.mjs b/module/documents/roll.mjs index 47d0ba9..bfa1a6a 100644 --- a/module/documents/roll.mjs +++ b/module/documents/roll.mjs @@ -130,6 +130,7 @@ export default class LethalFantasyRoll extends Roll { let hasGrantedDice = false let pointBlank = false let letItFly = false + let saveSpell = false let beyondSkill = false let hasStaticModifier = false let hasExplode = true @@ -368,6 +369,9 @@ export default class LethalFantasyRoll extends Roll { "selectLetItFly": (event, button, dialog) => { letItFly = button.checked }, + "saveSpellCheck": (event, button, dialog) => { + saveSpell = button.checked + }, "gotoToken": (event, button, dialog) => { let tokenId = $(button).data("tokenId") let token = canvas.tokens?.get(tokenId) @@ -384,6 +388,7 @@ export default class LethalFantasyRoll extends Roll { // If the user cancels the dialog, exit if (rollContext === null) return console.log("rollContext", rollContext, hasGrantedDice) + rollContext.saveSpell = saveSpell // Update fucking flag let fullModifier = 0 let titleFormula = "" @@ -405,7 +410,6 @@ export default class LethalFantasyRoll extends Roll { if (hasStaticModifier) { modifierFormula += ` + ${options.rollTarget.staticModifier}` } - // modifierFormula += ` + ${options.rollTarget.charModifier}` let sign = fullModifier < 0 ? "-" : "+" if (hasExplode) { titleFormula = `${dice}E ${sign} ${modifierFormula}` @@ -440,10 +444,11 @@ export default class LethalFantasyRoll extends Roll { } // Specific pain/poison/contagion case - if (options.rollType === "save" && (options.rollTarget.rollKey === "pain" || options.rollTarget.rollKey === "paincourage" || options.rollTarget.rollKey === "poison" || options.rollTarget.rollKey === "contagion")) { + if (options.rollType === "save" && (options.rollTarget.rollKey === "poison" || options.rollTarget.rollKey === "contagion")) { hasD30 = false hasStaticModifier = true modifierFormula = ` + ${Math.abs(fullModifier)}` + titleFormula = `${dice}E + ${Math.abs(fullModifier)}` } if (letItFly) { @@ -622,7 +627,6 @@ export default class LethalFantasyRoll extends Roll { fieldRollMode, rollModes } - console.log("CTX", dialogContext) const content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-lethal-fantasy/templates/roll-initiative-dialog.hbs", dialogContext) @@ -657,7 +661,6 @@ export default class LethalFantasyRoll extends Roll { let combat = game.combats.get(options.combatId) combat.updateEmbeddedDocuments("Combatant", [{ _id: options.combatantId, initiative: initRoll.total, 'system.progressionCount': 0 }]); } - } /* ***********************************************************/ @@ -920,9 +923,9 @@ export default class LethalFantasyRoll extends Roll { } /* ***********************************************************/ - static async promptRangedDefense(rollTarget) { + static async promptRangedDefense(options = {}) { - const rollModes = foundry.utils.duplicate(CONFIG.Dice.rollModes); // v12 : Object.fromEntries(Object.entries(CONFIG.Dice.rollModes).map(([key, value]) => [key, game.i18n.localize(value)])) + const rollModes = foundry.utils.duplicate(CONFIG.Dice.rollModes); const fieldRollMode = new foundry.data.fields.StringField({ choices: rollModes, blank: false, @@ -937,13 +940,12 @@ export default class LethalFantasyRoll extends Roll { attackerAimChoices: SYSTEM.ATTACKER_AIM_CHOICES, movement: "none", moveDirection: "none", - size: "medium", + size: "+5", range: "short", attackerAim: "simple", fieldRollMode, rollModes } - console.log("CTX", dialogContext) const content = await foundry.applications.handlebars.renderTemplate("systems/fvtt-lethal-fantasy/templates/range-defense-dialog.hbs", dialogContext) @@ -990,18 +992,18 @@ export default class LethalFantasyRoll extends Roll { Number(rollContext.size) + Number(rollContext.range) + Number(rollContext?.attackerAim || 0) - console.log("Modifier", fullModifier, rollContext) let modifierFormula if (fullModifier === 0) { modifierFormula = "0" } else { let modAbs = Math.abs(fullModifier) - modifierFormula = `D${modAbs+1} -1` + modifierFormula = `D${modAbs + 1} -1` } let rollData = { ...rollContext } - let options = { ...rollContext } + // Merge rollContext object into options object + options = { ...options, ...rollContext } options.rollName = "Ranged Defense" const rollBase = new this(rollContext.movement, options.data, rollData) @@ -1011,13 +1013,15 @@ export default class LethalFantasyRoll extends Roll { let rollD30 = await new Roll("1D30").evaluate() options.D30result = rollD30.total + let badResult = 0 if (rollContext.movement.includes("kh")) { rollData.favor = "favor" + badResult = Math.min(rollBase.terms[0].results[0].result, rollBase.terms[0].results[1]?.result || 20) } if (rollContext.movement.includes("kl")) { rollData.favor = "disfavor" + badResult = Math.max(rollBase.terms[0].results[0].result, rollBase.terms[0].results[1]?.result || 1) } - let dice = rollContext.movement let maxValue = 20 // As per latest changes (was : Number(dice.match(/\d+$/)[0]) let rollTotal = -1 @@ -1043,14 +1047,15 @@ export default class LethalFantasyRoll extends Roll { } else { rollTotal = diceSum } - + rollBase.options = { ...rollBase.options, ...options } rollBase.options.resultType = resultType rollBase.options.rollTotal = rollTotal rollBase.options.diceResults = diceResults rollBase.options.rollTarget = options.rollTarget - rollBase.options.titleFormula = `${dice}E + ${modifierFormula}` + rollBase.options.titleFormula = `1D20E + ${modifierFormula}` rollBase.options.D30result = options.D30result rollBase.options.rollName = "Ranged Defense" + rollBase.options.badResult = badResult rollBase.options.rollData = foundry.utils.duplicate(rollData) /** * A hook event that fires after the roll has been made. diff --git a/packs-system/lf-equipment/000418.log b/packs-system/lf-equipment/000422.log similarity index 100% rename from packs-system/lf-equipment/000418.log rename to packs-system/lf-equipment/000422.log diff --git a/packs-system/lf-equipment/CURRENT b/packs-system/lf-equipment/CURRENT index 3de5209..accc45a 100644 --- a/packs-system/lf-equipment/CURRENT +++ b/packs-system/lf-equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000416 +MANIFEST-000420 diff --git a/packs-system/lf-equipment/LOG b/packs-system/lf-equipment/LOG index c7678f9..cce13a9 100644 --- a/packs-system/lf-equipment/LOG +++ b/packs-system/lf-equipment/LOG @@ -1,8 +1,8 @@ -2025/09/17-07:46:03.118742 7f3080dfa6c0 Recovering log #414 -2025/09/17-07:46:03.213578 7f3080dfa6c0 Delete type=3 #412 -2025/09/17-07:46:03.213653 7f3080dfa6c0 Delete type=0 #414 -2025/09/17-07:46:49.420076 7f307a7fc6c0 Level-0 table #419: started -2025/09/17-07:46:49.420100 7f307a7fc6c0 Level-0 table #419: 0 bytes OK -2025/09/17-07:46:49.429915 7f307a7fc6c0 Delete type=0 #417 -2025/09/17-07:46:49.430201 7f307a7fc6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end) -2025/09/17-07:46:49.430227 7f307a7fc6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end) +2025/09/19-21:01:58.948341 7f7cfaffd6c0 Recovering log #418 +2025/09/19-21:01:58.990053 7f7cfaffd6c0 Delete type=3 #416 +2025/09/19-21:01:58.990118 7f7cfaffd6c0 Delete type=0 #418 +2025/09/19-22:28:27.055322 7f7cf9fff6c0 Level-0 table #423: started +2025/09/19-22:28:27.055429 7f7cf9fff6c0 Level-0 table #423: 0 bytes OK +2025/09/19-22:28:27.062766 7f7cf9fff6c0 Delete type=0 #421 +2025/09/19-22:28:27.082558 7f7cf9fff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end) +2025/09/19-22:28:27.082605 7f7cf9fff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-equipment/LOG.old b/packs-system/lf-equipment/LOG.old index ab7e79c..c7678f9 100644 --- a/packs-system/lf-equipment/LOG.old +++ b/packs-system/lf-equipment/LOG.old @@ -1,8 +1,8 @@ -2025/09/16-23:16:29.221312 7f307affd6c0 Recovering log #410 -2025/09/16-23:16:29.232289 7f307affd6c0 Delete type=3 #408 -2025/09/16-23:16:29.232343 7f307affd6c0 Delete type=0 #410 -2025/09/16-23:47:50.382735 7f307a7fc6c0 Level-0 table #415: started -2025/09/16-23:47:50.383046 7f307a7fc6c0 Level-0 table #415: 0 bytes OK -2025/09/16-23:47:50.390243 7f307a7fc6c0 Delete type=0 #413 -2025/09/16-23:47:50.410779 7f307a7fc6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end) -2025/09/16-23:47:50.410810 7f307a7fc6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end) +2025/09/17-07:46:03.118742 7f3080dfa6c0 Recovering log #414 +2025/09/17-07:46:03.213578 7f3080dfa6c0 Delete type=3 #412 +2025/09/17-07:46:03.213653 7f3080dfa6c0 Delete type=0 #414 +2025/09/17-07:46:49.420076 7f307a7fc6c0 Level-0 table #419: started +2025/09/17-07:46:49.420100 7f307a7fc6c0 Level-0 table #419: 0 bytes OK +2025/09/17-07:46:49.429915 7f307a7fc6c0 Delete type=0 #417 +2025/09/17-07:46:49.430201 7f307a7fc6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end) +2025/09/17-07:46:49.430227 7f307a7fc6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zw9RQocTdz3HRjZK' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-equipment/MANIFEST-000416 b/packs-system/lf-equipment/MANIFEST-000420 similarity index 71% rename from packs-system/lf-equipment/MANIFEST-000416 rename to packs-system/lf-equipment/MANIFEST-000420 index 72f4cbeb2dcfbe6092df03e39ef51649ff27f8ec..d73b2045287306f797c24788027a87d0354f8ccf 100644 GIT binary patch delta 43 tcmdnQxQTH>pUN)zy(_pG7@3wbb22b5V`h2Av0SqJBuHc#NMr>_1OOc=3#0%5 delta 43 tcmdnQxQTH>pGx=K8%Ep=j7$reIT@H2F|$15(BQT90*NdFi7Ww$000Iw3PJz? diff --git a/packs-system/lf-gifts/000418.log b/packs-system/lf-gifts/000422.log similarity index 100% rename from packs-system/lf-gifts/000418.log rename to packs-system/lf-gifts/000422.log diff --git a/packs-system/lf-gifts/CURRENT b/packs-system/lf-gifts/CURRENT index 3de5209..accc45a 100644 --- a/packs-system/lf-gifts/CURRENT +++ b/packs-system/lf-gifts/CURRENT @@ -1 +1 @@ -MANIFEST-000416 +MANIFEST-000420 diff --git a/packs-system/lf-gifts/LOG b/packs-system/lf-gifts/LOG index 65edd62..427e627 100644 --- a/packs-system/lf-gifts/LOG +++ b/packs-system/lf-gifts/LOG @@ -1,8 +1,8 @@ -2025/09/17-07:46:03.218339 7f307bfff6c0 Recovering log #414 -2025/09/17-07:46:03.309130 7f307bfff6c0 Delete type=3 #412 -2025/09/17-07:46:03.309200 7f307bfff6c0 Delete type=0 #414 -2025/09/17-07:46:49.410790 7f307a7fc6c0 Level-0 table #419: started -2025/09/17-07:46:49.410814 7f307a7fc6c0 Level-0 table #419: 0 bytes OK -2025/09/17-07:46:49.419958 7f307a7fc6c0 Delete type=0 #417 -2025/09/17-07:46:49.430187 7f307a7fc6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) -2025/09/17-07:46:49.430218 7f307a7fc6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/09/19-21:01:58.995284 7f7cfbfff6c0 Recovering log #418 +2025/09/19-21:01:59.036400 7f7cfbfff6c0 Delete type=3 #416 +2025/09/19-21:01:59.036480 7f7cfbfff6c0 Delete type=0 #418 +2025/09/19-22:28:27.076046 7f7cf9fff6c0 Level-0 table #423: started +2025/09/19-22:28:27.076085 7f7cf9fff6c0 Level-0 table #423: 0 bytes OK +2025/09/19-22:28:27.082428 7f7cf9fff6c0 Delete type=0 #421 +2025/09/19-22:28:27.082612 7f7cf9fff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/09/19-22:28:27.082639 7f7cf9fff6c0 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 b8623cd..65edd62 100644 --- a/packs-system/lf-gifts/LOG.old +++ b/packs-system/lf-gifts/LOG.old @@ -1,8 +1,8 @@ -2025/09/16-23:16:29.238114 7f3080dfa6c0 Recovering log #409 -2025/09/16-23:16:29.248900 7f3080dfa6c0 Delete type=3 #407 -2025/09/16-23:16:29.248979 7f3080dfa6c0 Delete type=0 #409 -2025/09/16-23:47:50.397435 7f307a7fc6c0 Level-0 table #415: started -2025/09/16-23:47:50.397478 7f307a7fc6c0 Level-0 table #415: 0 bytes OK -2025/09/16-23:47:50.404058 7f307a7fc6c0 Delete type=0 #413 -2025/09/16-23:47:50.410801 7f307a7fc6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) -2025/09/16-23:47:50.410854 7f307a7fc6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/09/17-07:46:03.218339 7f307bfff6c0 Recovering log #414 +2025/09/17-07:46:03.309130 7f307bfff6c0 Delete type=3 #412 +2025/09/17-07:46:03.309200 7f307bfff6c0 Delete type=0 #414 +2025/09/17-07:46:49.410790 7f307a7fc6c0 Level-0 table #419: started +2025/09/17-07:46:49.410814 7f307a7fc6c0 Level-0 table #419: 0 bytes OK +2025/09/17-07:46:49.419958 7f307a7fc6c0 Delete type=0 #417 +2025/09/17-07:46:49.430187 7f307a7fc6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/09/17-07:46:49.430218 7f307a7fc6c0 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-000416 b/packs-system/lf-gifts/MANIFEST-000420 similarity index 72% rename from packs-system/lf-gifts/MANIFEST-000416 rename to packs-system/lf-gifts/MANIFEST-000420 index f6947384fb494e8d52aafc768a472d7d61f1a2cc..244bab3548eb3e183404d5bf0b22185903b70a3d 100644 GIT binary patch delta 43 tcmdnUxRG%}ugbTxk8QXa7@3wbb22b5V`kaK$o<4H79_F^B(ee|0stq33tRvI delta 43 tcmdnUxRG%}uZnuWq;=d3j7$reIT@H2F|+JqYpGr;ssakFZMy93AoD9s%m|3o{CU)}71BomHiL3yL000vg3jzQD delta 43 tcmdnQxQTH>pUT;{tKM@nFfuJ<=44=A#LRMq^<9mJEJ$P#NMs2}1OPr=3{C(5 diff --git a/packs-system/lf-spells-miracles/000118.log b/packs-system/lf-spells-miracles/000122.log similarity index 100% rename from packs-system/lf-spells-miracles/000118.log rename to packs-system/lf-spells-miracles/000122.log diff --git a/packs-system/lf-spells-miracles/CURRENT b/packs-system/lf-spells-miracles/CURRENT index 2b6390e..30eb131 100644 --- a/packs-system/lf-spells-miracles/CURRENT +++ b/packs-system/lf-spells-miracles/CURRENT @@ -1 +1 @@ -MANIFEST-000116 +MANIFEST-000120 diff --git a/packs-system/lf-spells-miracles/LOG b/packs-system/lf-spells-miracles/LOG index e066cc9..446d077 100644 --- a/packs-system/lf-spells-miracles/LOG +++ b/packs-system/lf-spells-miracles/LOG @@ -1,8 +1,8 @@ -2025/09/17-07:46:03.403212 7f307affd6c0 Recovering log #114 -2025/09/17-07:46:03.504394 7f307affd6c0 Delete type=3 #112 -2025/09/17-07:46:03.504449 7f307affd6c0 Delete type=0 #114 -2025/09/17-07:46:49.470775 7f307a7fc6c0 Level-0 table #119: started -2025/09/17-07:46:49.470837 7f307a7fc6c0 Level-0 table #119: 0 bytes OK -2025/09/17-07:46:49.482316 7f307a7fc6c0 Delete type=0 #117 -2025/09/17-07:46:49.503080 7f307a7fc6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end) -2025/09/17-07:46:49.523511 7f307a7fc6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end) +2025/09/19-21:01:59.113262 7f7cfaffd6c0 Recovering log #118 +2025/09/19-21:01:59.152822 7f7cfaffd6c0 Delete type=3 #116 +2025/09/19-21:01:59.152924 7f7cfaffd6c0 Delete type=0 #118 +2025/09/19-22:28:27.089546 7f7cf9fff6c0 Level-0 table #123: started +2025/09/19-22:28:27.089602 7f7cf9fff6c0 Level-0 table #123: 0 bytes OK +2025/09/19-22:28:27.095855 7f7cf9fff6c0 Delete type=0 #121 +2025/09/19-22:28:27.116632 7f7cf9fff6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end) +2025/09/19-22:28:27.145745 7f7cf9fff6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-spells-miracles/LOG.old b/packs-system/lf-spells-miracles/LOG.old index 36b58d9..e066cc9 100644 --- a/packs-system/lf-spells-miracles/LOG.old +++ b/packs-system/lf-spells-miracles/LOG.old @@ -1,8 +1,8 @@ -2025/09/16-23:16:29.263902 7f307affd6c0 Recovering log #109 -2025/09/16-23:16:29.274398 7f307affd6c0 Delete type=3 #107 -2025/09/16-23:16:29.274490 7f307affd6c0 Delete type=0 #109 -2025/09/16-23:47:50.437467 7f307a7fc6c0 Level-0 table #115: started -2025/09/16-23:47:50.437529 7f307a7fc6c0 Level-0 table #115: 0 bytes OK -2025/09/16-23:47:50.443898 7f307a7fc6c0 Delete type=0 #113 -2025/09/16-23:47:50.474392 7f307a7fc6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end) -2025/09/16-23:47:50.474456 7f307a7fc6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end) +2025/09/17-07:46:03.403212 7f307affd6c0 Recovering log #114 +2025/09/17-07:46:03.504394 7f307affd6c0 Delete type=3 #112 +2025/09/17-07:46:03.504449 7f307affd6c0 Delete type=0 #114 +2025/09/17-07:46:49.470775 7f307a7fc6c0 Level-0 table #119: started +2025/09/17-07:46:49.470837 7f307a7fc6c0 Level-0 table #119: 0 bytes OK +2025/09/17-07:46:49.482316 7f307a7fc6c0 Delete type=0 #117 +2025/09/17-07:46:49.503080 7f307a7fc6c0 Manual compaction at level-0 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end) +2025/09/17-07:46:49.523511 7f307a7fc6c0 Manual compaction at level-1 from '!folders!37mu4dxsSuftlnmP' @ 72057594037927935 : 1 .. '!items!zKOpU34oLziGJW6y' @ 0 : 0; will stop at (end) diff --git a/packs-system/lf-spells-miracles/MANIFEST-000116 b/packs-system/lf-spells-miracles/MANIFEST-000120 similarity index 73% rename from packs-system/lf-spells-miracles/MANIFEST-000116 rename to packs-system/lf-spells-miracles/MANIFEST-000120 index 4411898bfaecd961c155955f502463417aee42f2..59fe1ae78630622299241333f77ded0d9310efda 100644 GIT binary patch delta 39 qcmZ3>xR!B3ufkCo!;_p0j7*iB49rz5lQ@q3l3EYqR{{AoKt2HGPYP22 delta 39 qcmZ3>xR!B3uY${sJR?p9My66u2IexBNgVsNCbNL}Wk7xfkPiUUZ3!Cy diff --git a/packs-system/lf-vulnerabilities/000417.log b/packs-system/lf-vulnerabilities/000421.log similarity index 100% rename from packs-system/lf-vulnerabilities/000417.log rename to packs-system/lf-vulnerabilities/000421.log diff --git a/packs-system/lf-vulnerabilities/CURRENT b/packs-system/lf-vulnerabilities/CURRENT index 1e2b66c..45344b6 100644 --- a/packs-system/lf-vulnerabilities/CURRENT +++ b/packs-system/lf-vulnerabilities/CURRENT @@ -1 +1 @@ -MANIFEST-000415 +MANIFEST-000419 diff --git a/packs-system/lf-vulnerabilities/LOG b/packs-system/lf-vulnerabilities/LOG index fb9f5a2..445a4d5 100644 --- a/packs-system/lf-vulnerabilities/LOG +++ b/packs-system/lf-vulnerabilities/LOG @@ -1,8 +1,8 @@ -2025/09/17-07:46:03.312040 7f307b7fe6c0 Recovering log #413 -2025/09/17-07:46:03.400421 7f307b7fe6c0 Delete type=3 #411 -2025/09/17-07:46:03.400487 7f307b7fe6c0 Delete type=0 #413 -2025/09/17-07:46:49.390955 7f307a7fc6c0 Level-0 table #418: started -2025/09/17-07:46:49.391029 7f307a7fc6c0 Level-0 table #418: 0 bytes OK -2025/09/17-07:46:49.400683 7f307a7fc6c0 Delete type=0 #416 -2025/09/17-07:46:49.430144 7f307a7fc6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) -2025/09/17-07:46:49.430391 7f307a7fc6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/09/19-21:01:59.044069 7f7cfb7fe6c0 Recovering log #417 +2025/09/19-21:01:59.110180 7f7cfb7fe6c0 Delete type=3 #415 +2025/09/19-21:01:59.110282 7f7cfb7fe6c0 Delete type=0 #417 +2025/09/19-22:28:27.062900 7f7cf9fff6c0 Level-0 table #422: started +2025/09/19-22:28:27.062937 7f7cf9fff6c0 Level-0 table #422: 0 bytes OK +2025/09/19-22:28:27.069460 7f7cf9fff6c0 Delete type=0 #420 +2025/09/19-22:28:27.082570 7f7cf9fff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/09/19-22:28:27.082620 7f7cf9fff6c0 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 5ca2e82..fb9f5a2 100644 --- a/packs-system/lf-vulnerabilities/LOG.old +++ b/packs-system/lf-vulnerabilities/LOG.old @@ -1,8 +1,8 @@ -2025/09/16-23:16:29.250993 7f307bfff6c0 Recovering log #409 -2025/09/16-23:16:29.261540 7f307bfff6c0 Delete type=3 #407 -2025/09/16-23:16:29.261614 7f307bfff6c0 Delete type=0 #409 -2025/09/16-23:47:50.404206 7f307a7fc6c0 Level-0 table #414: started -2025/09/16-23:47:50.404257 7f307a7fc6c0 Level-0 table #414: 0 bytes OK -2025/09/16-23:47:50.410667 7f307a7fc6c0 Delete type=0 #412 -2025/09/16-23:47:50.410817 7f307a7fc6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) -2025/09/16-23:47:50.410847 7f307a7fc6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/09/17-07:46:03.312040 7f307b7fe6c0 Recovering log #413 +2025/09/17-07:46:03.400421 7f307b7fe6c0 Delete type=3 #411 +2025/09/17-07:46:03.400487 7f307b7fe6c0 Delete type=0 #413 +2025/09/17-07:46:49.390955 7f307a7fc6c0 Level-0 table #418: started +2025/09/17-07:46:49.391029 7f307a7fc6c0 Level-0 table #418: 0 bytes OK +2025/09/17-07:46:49.400683 7f307a7fc6c0 Delete type=0 #416 +2025/09/17-07:46:49.430144 7f307a7fc6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/09/17-07:46:49.430391 7f307a7fc6c0 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-000415 b/packs-system/lf-vulnerabilities/MANIFEST-000419 similarity index 72% rename from packs-system/lf-vulnerabilities/MANIFEST-000415 rename to packs-system/lf-vulnerabilities/MANIFEST-000419 index c85329066fd61391629f30c68c16ecfdf4d9d17d..f18be8ead3866906344680db8ce3a03320bff5c1 100644 GIT binary patch delta 41 scmdnMxPfs(pVIozK{vP<7@3wZb22b5WoF5;={(v15?BfnSPm2b01^KSC;$Ke delta 41 scmdnMxPfs(pVAZED
- {{actingCharName}} - {{upperFirst rollName}} + {{actingCharName}} - {{upperFirst rollName}} {{#if (match rollType "attack")}} Attack roll ! @@ -15,8 +15,14 @@ Defense roll ! {{/if}} + {{#if (eq rollData.favor "favor")}} + Favor roll + {{/if}} + {{#if (eq rollData.favor "disfavor")}} + Disfavor roll + {{/if}} {{#if badResult}} - {{localize "LETHALFANTASY.Label.otherResult"}} : {{badResult}} + {{localize "LETHALFANTASY.Label.otherResult"}} : {{badResult}} {{/if}} {{#if rollTarget.weapon}} @@ -32,14 +38,8 @@ {{#if rollData.beyondSkill}} Beyond Skill Range Attack ! {{/if}} - {{#if (eq rollData.favor "favor")}} - Favor roll - {{/if}} - {{#if (eq rollData.favor "disfavor")}} - Disfavor roll - {{/if}} - Formula : {{titleFormula}} + Formula : {{titleFormula}} {{#each diceResults as |result|}} {{result.dice}} : {{result.value}} diff --git a/templates/range-defense-dialog.hbs b/templates/range-defense-dialog.hbs index df728ca..8625933 100644 --- a/templates/range-defense-dialog.hbs +++ b/templates/range-defense-dialog.hbs @@ -36,9 +36,11 @@
{{localize "LETHALFANTASY.Roll.visibility"}} - + + +
\ No newline at end of file diff --git a/templates/roll-dialog.hbs b/templates/roll-dialog.hbs index 2f5b0b3..a2ed23c 100644 --- a/templates/roll-dialog.hbs +++ b/templates/roll-dialog.hbs @@ -92,7 +92,7 @@ {{#if rollTarget.magicUser}}
Save against spell (+{{rollTarget.actorModifiers.saveModifier}}) ? - +
{{/if}} {{/if}}