diff --git a/assets/ui/lf_logo_02.webp b/assets/ui/lf_logo_02.webp deleted file mode 100644 index 624065d..0000000 Binary files a/assets/ui/lf_logo_02.webp and /dev/null differ diff --git a/assets/ui/lf_logo_small_02.webp b/assets/ui/lf_logo_small_02.webp index 134402b..97e31b8 100644 Binary files a/assets/ui/lf_logo_small_02.webp and b/assets/ui/lf_logo_small_02.webp differ diff --git a/lang/en.json b/lang/en.json index ae4979c..4c42485 100644 --- a/lang/en.json +++ b/lang/en.json @@ -281,6 +281,10 @@ } }, "Label": { + "spell-power": "Spell - Power", + "spell-attack": "Spell - Attack", + "miracle-power": "Miracle - Power", + "miracle-attack": "Miracle - Attack", "will":"Will", "dodge":"Dodge", "toughness":"Toughness", @@ -415,6 +419,12 @@ }, "Miracle": { "FIELDS": { + "attackRoll": { + "label": "Attack roll" + }, + "powerRoll": { + "label": "Power roll" + }, "materialComponent": { "label": "Material component" }, @@ -636,6 +646,12 @@ }, "Spell": { "FIELDS": { + "attackRoll": { + "label": "Attack roll" + }, + "powerRoll": { + "label": "Power roll" + }, "areaAffected": { "label": "Area affected" }, diff --git a/module/applications/sheets/character-sheet.mjs b/module/applications/sheets/character-sheet.mjs index a7ee211..10b6f93 100644 --- a/module/applications/sheets/character-sheet.mjs +++ b/module/applications/sheets/character-sheet.mjs @@ -315,6 +315,16 @@ export default class LethalFantasyCharacterSheet extends LethalFantasyActorSheet return } break + case "miracle-attack": + case "miracle-power": + rollTarget = this.actor.items.find((i) => i.type === "miracle" && i.id === rollKey) + rollTarget.rollKey = rollKey + break + case "spell-attack": + case "spell-power": + rollTarget = this.actor.items.find((i) => i.type === "spell" && i.id === rollKey) + rollTarget.rollKey = rollKey + break case "weapon-damage-small": case "weapon-damage-medium": case "weapon-attack": @@ -371,6 +381,7 @@ export default class LethalFantasyCharacterSheet extends LethalFantasyActorSheet // In all cases rollTarget.magicUser = this.actor.system.biodata.magicUser rollTarget.actorModifiers = foundry.utils.duplicate(this.actor.system.modifiers) + rollTarget.actorLevel = this.actor.system.biodata.level console.log("ROLLTARGET", rollTarget) await this.document.system.roll(rollType, rollTarget) } diff --git a/module/documents/roll.mjs b/module/documents/roll.mjs index 3b93faa..d409fb6 100644 --- a/module/documents/roll.mjs +++ b/module/documents/roll.mjs @@ -117,13 +117,14 @@ export default class LethalFantasyRoll extends Roll { let dice = "1D20" let maxValue = 20 let baseFormula = "1D20" - let modifierFormula = "1d0" + let modifierFormula = "1D0" let hasModifier = true let hasChangeDice = false let hasD30 = false let hasFavor = false let hasMaxValue = true let hasGrantedDice = false + let hasStaticModifier = false if (options.rollType === "challenge" || options.rollType === "save") { options.rollName = game.i18n.localize(`LETHALFANTASY.Label.${options.rollTarget.rollKey}`) @@ -204,7 +205,7 @@ export default class LethalFantasyRoll extends Roll { options.rollTarget.charModifier = options.rollTarget.combat.defenseModifier } - } else if (options.rollType === "spell") { + } else if (options.rollType === "spell" || options.rollType === "spell-attack" || options.rollType === "spell-power") { hasD30 = true options.rollName = options.rollTarget.name dice = "1D20" @@ -214,8 +215,10 @@ export default class LethalFantasyRoll extends Roll { hasChangeDice = false options.rollTarget.value = options.rollTarget.actorModifiers.levelSpellModifier + options.rollTarget.actorModifiers.intSpellModifier options.rollTarget.charModifier = options.rollTarget.actorModifiers.intSpellModifier + hasStaticModifier = options.rollType === "spell-power" + options.rollTarget.staticModifier = options.rollTarget.actorLevel - } else if (options.rollType === "miracle") { + } else if (options.rollType === "miracle" || options.rollType === "miracle-attack" || options.rollType === "spell-power") { hasD30 = true options.rollName = options.rollTarget.name dice = "1D20" @@ -225,6 +228,8 @@ export default class LethalFantasyRoll extends Roll { hasChangeDice = false options.rollTarget.value = options.rollTarget.actorModifiers.levelMiracleModifier + options.rollTarget.actorModifiers.chaMiracleModifier options.rollTarget.charModifier = options.rollTarget.actorModifiers.chaMiracleModifier + hasStaticModifier = options.rollType === "spell-power" + options.rollTarget.staticModifier = options.rollTarget.actorLevel } else if (options.rollType.includes("weapon-damage")) { options.rollName = options.rollTarget.name @@ -343,9 +348,12 @@ export default class LethalFantasyRoll extends Roll { modifierFormula = `${fullModifier}` } else { let modAbs = Math.abs(fullModifier) - modifierFormula = `d${modAbs + 1} - 1` + modifierFormula = `D${modAbs + 1} - 1` } } + if (hasStaticModifier) { + modifierFormula += ` + ${options.rollTarget.staticModifier}` + } let sign = fullModifier < 0 ? "-" : "+" titleFormula = `${dice}E ${sign} ${modifierFormula}` } else { @@ -407,7 +415,7 @@ export default class LethalFantasyRoll extends Roll { rollFavor = new this(baseFormula, options.data, rollData) await rollFavor.evaluate() if (game?.dice3d) { - await game.dice3d.showForRoll(rollFavor, game.user, true) + game.dice3d.showForRoll(rollFavor, game.user, true) } if (rollFavor.result > rollBase.result) { badResult = rollBase.result @@ -421,7 +429,7 @@ export default class LethalFantasyRoll extends Roll { rollFavor = new this(baseFormula, options.data, rollData) await rollFavor.evaluate() if (game?.dice3d) { - await game.dice3d.showForRoll(rollFavor, game.user, true) + game.dice3d.showForRoll(rollFavor, game.user, true) } if (rollFavor.result < rollBase.result) { badResult = rollBase.result @@ -434,7 +442,7 @@ export default class LethalFantasyRoll extends Roll { if (hasD30) { let rollD30 = await new Roll("1D30").evaluate() if (game?.dice3d) { - await game.dice3d.showForRoll(rollD30, game.user, true) + game.dice3d.showForRoll(rollD30, game.user, true) } options.D30result = rollD30.total } @@ -448,7 +456,7 @@ export default class LethalFantasyRoll extends Roll { 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 }) + diceResults.push({ dice: `${singleDice.toUpperCase()}`, value: diceResult }) diceSum += diceResult if (hasMaxValue) { while (diceResult === maxValue) { @@ -457,7 +465,7 @@ export default class LethalFantasyRoll extends Roll { await game.dice3d.showForRoll(r, game.user, true) } diceResult = r.dice[0].results[0].result - diceResults.push({ dice: `${singleDice}-1`, value: diceResult - 1 }) + diceResults.push({ dice: `${singleDice.toUpperCase()}-1`, value: diceResult - 1 }) diceSum += (diceResult - 1) } } @@ -470,12 +478,12 @@ export default class LethalFantasyRoll extends Roll { if (game?.dice3d) { await game.dice3d.showForRoll(grantedRoll, game.user, true) } - diceResults.push({ dice: `${options.rollTarget.grantedDice}`, value: grantedRoll.total }) + diceResults.push({ dice: `${options.rollTarget.grantedDice.toUpperCase()}`, value: grantedRoll.total }) rollTotal += grantedRoll.total } if (fullModifier !== 0) { - diceResults.push({ dice: `${rollModifier.formula}`, value: rollModifier.total }) + diceResults.push({ dice: `${rollModifier.formula.toUpperCase()}`, value: rollModifier.total }) if (fullModifier < 0) { rollTotal = Math.max(diceSum - rollModifier.total, 0) } else { @@ -713,7 +721,7 @@ export default class LethalFantasyRoll extends Roll { modifierFormula = "0" } else { let modAbs = Math.abs(fullModifier) - modifierFormula = `d${modAbs + 1} - 1` + modifierFormula = `D${modAbs + 1} - 1` } // If the user cancels the dialog, exit @@ -737,16 +745,16 @@ export default class LethalFantasyRoll extends Roll { let resultType let diceResult = rollBase.dice[0].results[0].result - diceResults.push({ dice: `${dice}`, value: diceResult }) + diceResults.push({ dice: `${dice.toUpperCase()}`, 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 }) + diceResults.push({ dice: `${dice.toUpperCase()}-1`, value: diceResult - 1 }) diceSum += (diceResult - 1) } if (fullModifier !== 0) { - diceResults.push({ dice: `${rollModifier.formula}`, value: rollModifier.total }) + diceResults.push({ dice: `${rollModifier.formula.toUpperCase()}`, value: rollModifier.total }) if (fullModifier < 0) { rollTotal = Math.max(diceSum - rollModifier.total, 0) } else { @@ -802,7 +810,13 @@ export default class LethalFantasyRoll extends Roll { case "weapon-damage-medium": return `${game.i18n.localize("LETHALFANTASY.Label.weapon-damage-medium")}` case "spell": + case "spell-attack": + case "spell-power": return `${game.i18n.localize("LETHALFANTASY.Label.spell")}` + case "miracle": + case "miracle-attack": + case "miracle-power": + return `${game.i18n.localize("LETHALFANTASY.Label.miracle")}` default: return game.i18n.localize("LETHALFANTASY.Label.titleStandard") } diff --git a/module/models/character.mjs b/module/models/character.mjs index cf0b524..0560fef 100644 --- a/module/models/character.mjs +++ b/module/models/character.mjs @@ -280,7 +280,7 @@ export default class LethalFantasyCharacter extends foundry.abstract.TypeDataMod // Get all weapons from the actor let weapons = this.parent.items.filter(i => i.type === "weapon") - let weaponsChoices = weapons.map(w => { return { id: w.id, name: `${w.name} (${w.system.combatProgressionDice})`, combatProgressionDice: w.system.combatProgressionDice } }) + let weaponsChoices = weapons.map(w => { return { id: w.id, name: `${w.name} (${w.system.combatProgressionDice.toUpperCase()})`, combatProgressionDice: w.system.combatProgressionDice.toUpperCase() } }) let roll = await LethalFantasyRoll.promptProgressionDice({ actorId: this.parent.id, diff --git a/module/models/miracle.mjs b/module/models/miracle.mjs index cdad9e2..aa9fa3d 100644 --- a/module/models/miracle.mjs +++ b/module/models/miracle.mjs @@ -32,6 +32,9 @@ export default class LethalFantasyMiracle extends foundry.abstract.TypeDataModel schema.materialComponent = new fields.StringField({ required: true, initial: "" }) schema.catalyst = new fields.StringField({ required: true, initial: "" }) + schema.attackRoll = new fields.StringField({ required: true, initial: "" }) + schema.powerRoll = new fields.StringField({ required: true, initial: "" }) + return schema } diff --git a/module/models/spell.mjs b/module/models/spell.mjs index 968fd4f..2b8ddc8 100644 --- a/module/models/spell.mjs +++ b/module/models/spell.mjs @@ -15,7 +15,7 @@ export default class LethalFantasySpell extends foundry.abstract.TypeDataModel { ...requiredInteger, initial: 1, min: 1, - max: 20, + max: 25, }) schema.cost = new fields.NumberField({ ...requiredInteger, required: true, initial: 0, min: 0 }) @@ -31,6 +31,9 @@ export default class LethalFantasySpell extends foundry.abstract.TypeDataModel { schema.savingThrow = new fields.StringField({ required: true, initial: "" }) schema.extraAetherPoints = new fields.StringField({ required: true, initial: "" }) schema.materialComponent = new fields.StringField({ required: true, initial: "" }) + + schema.attackRoll = new fields.StringField({ required: true, initial: "" }) + schema.powerRoll = new fields.StringField({ required: true, initial: "" }) return schema } diff --git a/packs-system/lf-equipment/000112.log b/packs-system/lf-equipment/000124.log similarity index 100% rename from packs-system/lf-equipment/000112.log rename to packs-system/lf-equipment/000124.log diff --git a/packs-system/lf-equipment/CURRENT b/packs-system/lf-equipment/CURRENT index a451d53..d9766b1 100644 --- a/packs-system/lf-equipment/CURRENT +++ b/packs-system/lf-equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000110 +MANIFEST-000122 diff --git a/packs-system/lf-equipment/LOG b/packs-system/lf-equipment/LOG index 0f32a95..ddb47dd 100644 --- a/packs-system/lf-equipment/LOG +++ b/packs-system/lf-equipment/LOG @@ -1,8 +1,8 @@ -2025/01/22-20:17:58.203511 7f6e75ffb6c0 Recovering log #108 -2025/01/22-20:17:58.226399 7f6e75ffb6c0 Delete type=3 #106 -2025/01/22-20:17:58.226464 7f6e75ffb6c0 Delete type=0 #108 -2025/01/22-20:20:23.551087 7f6e753ff6c0 Level-0 table #113: started -2025/01/22-20:20:23.551124 7f6e753ff6c0 Level-0 table #113: 0 bytes OK -2025/01/22-20:20:23.603743 7f6e753ff6c0 Delete type=0 #111 -2025/01/22-20:20:23.663905 7f6e753ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) -2025/01/22-20:20:23.663958 7f6e753ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) +2025/01/30-13:15:14.918312 7ff407fff6c0 Recovering log #120 +2025/01/30-13:15:14.929657 7ff407fff6c0 Delete type=3 #118 +2025/01/30-13:15:14.929719 7ff407fff6c0 Delete type=0 #120 +2025/01/30-13:39:44.181843 7ff4077fe6c0 Level-0 table #125: started +2025/01/30-13:39:44.181878 7ff4077fe6c0 Level-0 table #125: 0 bytes OK +2025/01/30-13:39:44.188409 7ff4077fe6c0 Delete type=0 #123 +2025/01/30-13:39:44.188600 7ff4077fe6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) +2025/01/30-13:39:44.188646 7ff4077fe6c0 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 31bdad0..8ebaf71 100644 --- a/packs-system/lf-equipment/LOG.old +++ b/packs-system/lf-equipment/LOG.old @@ -1,8 +1,8 @@ -2025/01/22-15:26:10.159662 7f6e75ffb6c0 Recovering log #104 -2025/01/22-15:26:10.260006 7f6e75ffb6c0 Delete type=3 #102 -2025/01/22-15:26:10.260101 7f6e75ffb6c0 Delete type=0 #104 -2025/01/22-15:29:24.725949 7f6e753ff6c0 Level-0 table #109: started -2025/01/22-15:29:24.725997 7f6e753ff6c0 Level-0 table #109: 0 bytes OK -2025/01/22-15:29:24.739763 7f6e753ff6c0 Delete type=0 #107 -2025/01/22-15:29:24.770273 7f6e753ff6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) -2025/01/22-15:29:24.770310 7f6e753ff6c0 Manual compaction at level-1 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) +2025/01/30-07:59:30.631841 7ff40cdf86c0 Recovering log #116 +2025/01/30-07:59:30.841049 7ff40cdf86c0 Delete type=3 #114 +2025/01/30-07:59:30.841132 7ff40cdf86c0 Delete type=0 #116 +2025/01/30-08:19:17.497882 7ff4077fe6c0 Level-0 table #121: started +2025/01/30-08:19:17.497911 7ff4077fe6c0 Level-0 table #121: 0 bytes OK +2025/01/30-08:19:17.504198 7ff4077fe6c0 Delete type=0 #119 +2025/01/30-08:19:17.504366 7ff4077fe6c0 Manual compaction at level-0 from '!folders!ATr9wZhg5uTVTksM' @ 72057594037927935 : 1 .. '!items!zFrygJ2TnrxchBai' @ 0 : 0; will stop at (end) +2025/01/30-08:19:17.504391 7ff4077fe6c0 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-000110 b/packs-system/lf-equipment/MANIFEST-000110 deleted file mode 100644 index 1969889..0000000 Binary files a/packs-system/lf-equipment/MANIFEST-000110 and /dev/null differ diff --git a/packs-system/lf-equipment/MANIFEST-000122 b/packs-system/lf-equipment/MANIFEST-000122 new file mode 100644 index 0000000..daad4b1 Binary files /dev/null and b/packs-system/lf-equipment/MANIFEST-000122 differ diff --git a/packs-system/lf-gifts/000112.log b/packs-system/lf-gifts/000124.log similarity index 100% rename from packs-system/lf-gifts/000112.log rename to packs-system/lf-gifts/000124.log diff --git a/packs-system/lf-gifts/CURRENT b/packs-system/lf-gifts/CURRENT index a451d53..d9766b1 100644 --- a/packs-system/lf-gifts/CURRENT +++ b/packs-system/lf-gifts/CURRENT @@ -1 +1 @@ -MANIFEST-000110 +MANIFEST-000122 diff --git a/packs-system/lf-gifts/LOG b/packs-system/lf-gifts/LOG index 812a0e3..89255c8 100644 --- a/packs-system/lf-gifts/LOG +++ b/packs-system/lf-gifts/LOG @@ -1,8 +1,8 @@ -2025/01/22-20:17:58.229999 7f6e767fc6c0 Recovering log #108 -2025/01/22-20:17:58.251255 7f6e767fc6c0 Delete type=3 #106 -2025/01/22-20:17:58.251323 7f6e767fc6c0 Delete type=0 #108 -2025/01/22-20:20:23.603868 7f6e753ff6c0 Level-0 table #113: started -2025/01/22-20:20:23.603893 7f6e753ff6c0 Level-0 table #113: 0 bytes OK -2025/01/22-20:20:23.663694 7f6e753ff6c0 Delete type=0 #111 -2025/01/22-20:20:23.663919 7f6e753ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) -2025/01/22-20:20:23.663967 7f6e753ff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/01/30-13:15:14.932713 7ff40cdf86c0 Recovering log #120 +2025/01/30-13:15:14.942469 7ff40cdf86c0 Delete type=3 #118 +2025/01/30-13:15:14.942527 7ff40cdf86c0 Delete type=0 #120 +2025/01/30-13:39:44.163166 7ff4077fe6c0 Level-0 table #125: started +2025/01/30-13:39:44.163210 7ff4077fe6c0 Level-0 table #125: 0 bytes OK +2025/01/30-13:39:44.169687 7ff4077fe6c0 Delete type=0 #123 +2025/01/30-13:39:44.188551 7ff4077fe6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/01/30-13:39:44.188611 7ff4077fe6c0 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 4ec8618..c4a0230 100644 --- a/packs-system/lf-gifts/LOG.old +++ b/packs-system/lf-gifts/LOG.old @@ -1,8 +1,8 @@ -2025/01/22-15:26:10.272525 7f6e777fe6c0 Recovering log #104 -2025/01/22-15:26:10.364666 7f6e777fe6c0 Delete type=3 #102 -2025/01/22-15:26:10.364744 7f6e777fe6c0 Delete type=0 #104 -2025/01/22-15:29:24.750046 7f6e753ff6c0 Level-0 table #109: started -2025/01/22-15:29:24.750088 7f6e753ff6c0 Level-0 table #109: 0 bytes OK -2025/01/22-15:29:24.760308 7f6e753ff6c0 Delete type=0 #107 -2025/01/22-15:29:24.770296 7f6e753ff6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) -2025/01/22-15:29:24.770331 7f6e753ff6c0 Manual compaction at level-1 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/01/30-07:59:30.844287 7ff40ddfa6c0 Recovering log #116 +2025/01/30-07:59:30.958513 7ff40ddfa6c0 Delete type=3 #114 +2025/01/30-07:59:30.958598 7ff40ddfa6c0 Delete type=0 #116 +2025/01/30-08:19:17.484154 7ff4077fe6c0 Level-0 table #121: started +2025/01/30-08:19:17.484188 7ff4077fe6c0 Level-0 table #121: 0 bytes OK +2025/01/30-08:19:17.490585 7ff4077fe6c0 Delete type=0 #119 +2025/01/30-08:19:17.504345 7ff4077fe6c0 Manual compaction at level-0 from '!folders!yPWGvxHJbDNHVSnY' @ 72057594037927935 : 1 .. '!items!zjvGljrLk5SshC9D' @ 0 : 0; will stop at (end) +2025/01/30-08:19:17.504400 7ff4077fe6c0 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-000110 b/packs-system/lf-gifts/MANIFEST-000110 deleted file mode 100644 index 5597c73..0000000 Binary files a/packs-system/lf-gifts/MANIFEST-000110 and /dev/null differ diff --git a/packs-system/lf-gifts/MANIFEST-000122 b/packs-system/lf-gifts/MANIFEST-000122 new file mode 100644 index 0000000..aa90b77 Binary files /dev/null and b/packs-system/lf-gifts/MANIFEST-000122 differ diff --git a/packs-system/lf-skills/000112.log b/packs-system/lf-skills/000124.log similarity index 100% rename from packs-system/lf-skills/000112.log rename to packs-system/lf-skills/000124.log diff --git a/packs-system/lf-skills/CURRENT b/packs-system/lf-skills/CURRENT index a451d53..d9766b1 100644 --- a/packs-system/lf-skills/CURRENT +++ b/packs-system/lf-skills/CURRENT @@ -1 +1 @@ -MANIFEST-000110 +MANIFEST-000122 diff --git a/packs-system/lf-skills/LOG b/packs-system/lf-skills/LOG index e9abaac..7a88408 100644 --- a/packs-system/lf-skills/LOG +++ b/packs-system/lf-skills/LOG @@ -1,8 +1,8 @@ -2025/01/22-20:17:58.174718 7f6e777fe6c0 Recovering log #108 -2025/01/22-20:17:58.198159 7f6e777fe6c0 Delete type=3 #106 -2025/01/22-20:17:58.198223 7f6e777fe6c0 Delete type=0 #108 -2025/01/22-20:20:23.484866 7f6e753ff6c0 Level-0 table #113: started -2025/01/22-20:20:23.484900 7f6e753ff6c0 Level-0 table #113: 0 bytes OK -2025/01/22-20:20:23.550920 7f6e753ff6c0 Delete type=0 #111 -2025/01/22-20:20:23.663891 7f6e753ff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) -2025/01/22-20:20:23.663932 7f6e753ff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/01/30-13:15:14.903736 7ff40ddfa6c0 Recovering log #120 +2025/01/30-13:15:14.914198 7ff40ddfa6c0 Delete type=3 #118 +2025/01/30-13:15:14.914248 7ff40ddfa6c0 Delete type=0 #120 +2025/01/30-13:39:44.169809 7ff4077fe6c0 Level-0 table #125: started +2025/01/30-13:39:44.169838 7ff4077fe6c0 Level-0 table #125: 0 bytes OK +2025/01/30-13:39:44.175750 7ff4077fe6c0 Delete type=0 #123 +2025/01/30-13:39:44.188573 7ff4077fe6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/01/30-13:39:44.188620 7ff4077fe6c0 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 5b88efd..3fc957f 100644 --- a/packs-system/lf-skills/LOG.old +++ b/packs-system/lf-skills/LOG.old @@ -1,8 +1,8 @@ -2025/01/22-15:26:10.036702 7f6e767fc6c0 Recovering log #104 -2025/01/22-15:26:10.147392 7f6e767fc6c0 Delete type=3 #102 -2025/01/22-15:26:10.147498 7f6e767fc6c0 Delete type=0 #104 -2025/01/22-15:29:24.739913 7f6e753ff6c0 Level-0 table #109: started -2025/01/22-15:29:24.739952 7f6e753ff6c0 Level-0 table #109: 0 bytes OK -2025/01/22-15:29:24.749878 7f6e753ff6c0 Delete type=0 #107 -2025/01/22-15:29:24.770286 7f6e753ff6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) -2025/01/22-15:29:24.770317 7f6e753ff6c0 Manual compaction at level-1 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/01/30-07:59:30.483984 7ff407fff6c0 Recovering log #116 +2025/01/30-07:59:30.627999 7ff407fff6c0 Delete type=3 #114 +2025/01/30-07:59:30.628097 7ff407fff6c0 Delete type=0 #116 +2025/01/30-08:19:17.477906 7ff4077fe6c0 Level-0 table #121: started +2025/01/30-08:19:17.477957 7ff4077fe6c0 Level-0 table #121: 0 bytes OK +2025/01/30-08:19:17.484025 7ff4077fe6c0 Delete type=0 #119 +2025/01/30-08:19:17.504332 7ff4077fe6c0 Manual compaction at level-0 from '!folders!7j8H7DbmBb9Uza2X' @ 72057594037927935 : 1 .. '!items!zt8s7564ep1La4XQ' @ 0 : 0; will stop at (end) +2025/01/30-08:19:17.504375 7ff4077fe6c0 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-000110 b/packs-system/lf-skills/MANIFEST-000110 deleted file mode 100644 index 32bde30..0000000 Binary files a/packs-system/lf-skills/MANIFEST-000110 and /dev/null differ diff --git a/packs-system/lf-skills/MANIFEST-000122 b/packs-system/lf-skills/MANIFEST-000122 new file mode 100644 index 0000000..740ebef Binary files /dev/null and b/packs-system/lf-skills/MANIFEST-000122 differ diff --git a/packs-system/lf-vulnerabilities/000112.log b/packs-system/lf-vulnerabilities/000124.log similarity index 100% rename from packs-system/lf-vulnerabilities/000112.log rename to packs-system/lf-vulnerabilities/000124.log diff --git a/packs-system/lf-vulnerabilities/CURRENT b/packs-system/lf-vulnerabilities/CURRENT index a451d53..d9766b1 100644 --- a/packs-system/lf-vulnerabilities/CURRENT +++ b/packs-system/lf-vulnerabilities/CURRENT @@ -1 +1 @@ -MANIFEST-000110 +MANIFEST-000122 diff --git a/packs-system/lf-vulnerabilities/LOG b/packs-system/lf-vulnerabilities/LOG index c584fef..38e4a58 100644 --- a/packs-system/lf-vulnerabilities/LOG +++ b/packs-system/lf-vulnerabilities/LOG @@ -1,8 +1,8 @@ -2025/01/22-20:17:58.254488 7f6e76ffd6c0 Recovering log #108 -2025/01/22-20:17:58.277962 7f6e76ffd6c0 Delete type=3 #106 -2025/01/22-20:17:58.278083 7f6e76ffd6c0 Delete type=0 #108 -2025/01/22-20:20:23.910111 7f6e753ff6c0 Level-0 table #113: started -2025/01/22-20:20:23.910147 7f6e753ff6c0 Level-0 table #113: 0 bytes OK -2025/01/22-20:20:24.027490 7f6e753ff6c0 Delete type=0 #111 -2025/01/22-20:20:24.027658 7f6e753ff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) -2025/01/22-20:20:24.027694 7f6e753ff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/01/30-13:15:14.945218 7ff40d5f96c0 Recovering log #120 +2025/01/30-13:15:14.955687 7ff40d5f96c0 Delete type=3 #118 +2025/01/30-13:15:14.955744 7ff40d5f96c0 Delete type=0 #120 +2025/01/30-13:39:44.200949 7ff4077fe6c0 Level-0 table #125: started +2025/01/30-13:39:44.200977 7ff4077fe6c0 Level-0 table #125: 0 bytes OK +2025/01/30-13:39:44.206854 7ff4077fe6c0 Delete type=0 #123 +2025/01/30-13:39:44.214246 7ff4077fe6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/01/30-13:39:44.214303 7ff4077fe6c0 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 5de79aa..5ea80a5 100644 --- a/packs-system/lf-vulnerabilities/LOG.old +++ b/packs-system/lf-vulnerabilities/LOG.old @@ -1,8 +1,8 @@ -2025/01/22-15:26:10.370654 7f6e76ffd6c0 Recovering log #104 -2025/01/22-15:26:10.468522 7f6e76ffd6c0 Delete type=3 #102 -2025/01/22-15:26:10.468644 7f6e76ffd6c0 Delete type=0 #104 -2025/01/22-15:29:24.760416 7f6e753ff6c0 Level-0 table #109: started -2025/01/22-15:29:24.760440 7f6e753ff6c0 Level-0 table #109: 0 bytes OK -2025/01/22-15:29:24.770164 7f6e753ff6c0 Delete type=0 #107 -2025/01/22-15:29:24.770304 7f6e753ff6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) -2025/01/22-15:29:24.770324 7f6e753ff6c0 Manual compaction at level-1 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/01/30-07:59:30.961782 7ff40d5f96c0 Recovering log #116 +2025/01/30-07:59:31.068433 7ff40d5f96c0 Delete type=3 #114 +2025/01/30-07:59:31.068492 7ff40d5f96c0 Delete type=0 #116 +2025/01/30-08:19:17.490778 7ff4077fe6c0 Level-0 table #121: started +2025/01/30-08:19:17.490810 7ff4077fe6c0 Level-0 table #121: 0 bytes OK +2025/01/30-08:19:17.497744 7ff4077fe6c0 Delete type=0 #119 +2025/01/30-08:19:17.504356 7ff4077fe6c0 Manual compaction at level-0 from '!folders!mnO9OzE7BEE2KDfh' @ 72057594037927935 : 1 .. '!items!zkK6ixtCsCw3RH9X' @ 0 : 0; will stop at (end) +2025/01/30-08:19:17.504383 7ff4077fe6c0 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-000110 b/packs-system/lf-vulnerabilities/MANIFEST-000122 similarity index 73% rename from packs-system/lf-vulnerabilities/MANIFEST-000110 rename to packs-system/lf-vulnerabilities/MANIFEST-000122 index a5e2606..0daa7eb 100644 Binary files a/packs-system/lf-vulnerabilities/MANIFEST-000110 and b/packs-system/lf-vulnerabilities/MANIFEST-000122 differ diff --git a/templates/character-miracles.hbs b/templates/character-miracles.hbs index 75ebc54..918fc9c 100644 --- a/templates/character-miracles.hbs +++ b/templates/character-miracles.hbs @@ -25,11 +25,17 @@
- - {{item.name}} -
+ + + + + + + + +
diff --git a/templates/character-spells.hbs b/templates/character-spells.hbs index b0c8f66..bcb3654 100644 --- a/templates/character-spells.hbs +++ b/templates/character-spells.hbs @@ -25,11 +25,17 @@
+ + + + + + + + +
diff --git a/templates/miracle.hbs b/templates/miracle.hbs index 690e227..59b5610 100644 --- a/templates/miracle.hbs +++ b/templates/miracle.hbs @@ -15,6 +15,9 @@ {{formField systemFields.components.fields.religious value=system.components.religious}}
+ + {{formField systemFields.prayerTime value=system.prayerTime}} {{formField systemFields.miracleRange value=system.miracleRange}} {{formField systemFields.areaAffected value=system.areaAffected}} diff --git a/templates/roll-dialog.hbs b/templates/roll-dialog.hbs index 25a7c7d..781564c 100644 --- a/templates/roll-dialog.hbs +++ b/templates/roll-dialog.hbs @@ -38,6 +38,10 @@
{{/if}} + {{#if rollTarget.staticModifier}} +
Static modifier : +{{rollTarget.staticModifier}}
+ {{/if}} + diff --git a/templates/spell.hbs b/templates/spell.hbs index 5d82704..f9abc63 100644 --- a/templates/spell.hbs +++ b/templates/spell.hbs @@ -14,6 +14,9 @@ {{formField systemFields.components.fields.material value=system.components.material}}
+ + {{formField systemFields.castingTime value=system.castingTime}} {{formField systemFields.spellRange value=system.spellRange}} {{formField systemFields.areaAffected value=system.areaAffected}}