From eea83aa10efc929dc32b0a691911f1125e693cc9 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Sun, 15 Jun 2025 16:32:47 +0200 Subject: [PATCH] Various fixes --- css/fvtt-hellborn.css | 19 +++++++++++++++++++ fvtt-hellborn.mjs | 5 +++++ module/config/system.mjs | 4 ++-- module/documents/roll.mjs | 3 ++- styles/roll.less | 16 ++++++++++++++++ styles/tarot.less | 3 +++ templates/character-maleficas.hbs | 2 +- templates/chat-message.hbs | 16 ++++++++-------- templates/chat-tarot.hbs | 7 ++++++- 9 files changed, 62 insertions(+), 13 deletions(-) diff --git a/css/fvtt-hellborn.css b/css/fvtt-hellborn.css index c547ad3..994dc16 100644 --- a/css/fvtt-hellborn.css +++ b/css/fvtt-hellborn.css @@ -1965,6 +1965,9 @@ i.fvtt-hellborn { .fvtt-hellborn .tarot-content fieldset { margin-top: 8px; } +.fvtt-hellborn .tarot-content fieldset legend { + margin-top: 1rem; +} .fvtt-hellborn .tarot-content fieldset .form-group { display: flex; align-items: center; @@ -2446,12 +2449,22 @@ i.fvtt-hellborn { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1); } +.item-to-chat ul li p { + margin: 0; +} .flavor-text-damage { font-family: var(--font-secondary); font-size: calc(var(--font-size-standard) * 1.2); color: var(--color-dark-2); margin-top: 5px; } +.flavor-text-damage .chat-damage-type { + font-weight: bold; + display: flex; + justify-content: center; + align-items: center; + margin-bottom: 0.5rem; +} .flavor-text-damage h2 { margin-top: 10px; margin-left: 10px; @@ -2513,6 +2526,12 @@ i.fvtt-hellborn { font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1); } +.dice-roll .intro-chat .intro-right ul .chat-roll-label { + margin-right: 2rem; +} +.dice-roll .intro-chat .intro-right ul .chat-results-spacing { + margin-bottom: 0.5rem; +} .dice-roll .intro-chat .intro-right ul .nudge-roll { font-size: calc(var(--font-size-standard) * 1); margin-left: 4rem; diff --git a/fvtt-hellborn.mjs b/fvtt-hellborn.mjs index 742c4f1..6ceb4f8 100644 --- a/fvtt-hellborn.mjs +++ b/fvtt-hellborn.mjs @@ -30,6 +30,11 @@ Hooks.once("init", function () { documents, } + CONFIG.Combat.initiative = { + formula: '3d6 + @stats.mind.value', + decimals: 0 + }; + CONFIG.Actor.documentClass = documents.HellbornActor CONFIG.Actor.dataModels = { character: models.HellbornCharacter, diff --git a/module/config/system.mjs b/module/config/system.mjs index f8c4053..ed4e9d0 100644 --- a/module/config/system.mjs +++ b/module/config/system.mjs @@ -53,24 +53,24 @@ export const CHOICE_ADVANTAGES_DISADVANTAGES ={ export const PERK_ROLES = { "abbetor": { id: "abbetor", label: "Abbetor" }, "blade": { id: "blade", label: "Blade" }, - "other": { id: "other", label: "Other" }, "gunslinger": { id: "gunslinger", label: "Gunslinger" }, "malefic": { id: "malefic", label: "Malefic" }, "mastermind": { id: "mastermind", label: "Mastermind" }, "sentinel": { id: "sentinel", label: "Sentinel" }, "slayer": { id: "slayer", label: "Slayer" }, "wretch": { id: "wretch", label: "Wretch" }, + "other": { id: "other", label: "Other" }, } export const MALEFICA_DOMAINS = { "adfectus": { id: "adfectus", label: "Adfectus" }, - "other": { id: "other", label: "Other" }, "divinus": { id: "divinus", label: "Divinus" }, "ignis": { id: "ignis", label: "Ignis" }, "iunctio": { id: "iunctio", label: "Iunctio" }, "speculo": { id: "speculo", label: "Speculo" }, "vinculum": { id: "vinculum", label: "Vinculum" }, "vita": { id: "vita", label: "Vita" }, + "other": { id: "other", label: "Other" }, } export const PERK_LEVELS = { diff --git a/module/documents/roll.mjs b/module/documents/roll.mjs index cd72718..9f2c10a 100644 --- a/module/documents/roll.mjs +++ b/module/documents/roll.mjs @@ -99,7 +99,8 @@ export default class HellbornRoll extends Roll { let damageRoll = new Roll(formula) await damageRoll.evaluate() await damageRoll.toMessage({ - flavor: `

Damage Roll : ${options.rollItem.name}


${options.rollItem.system.damageType}
`, + flavor: `

${options.rollItem.name}

+
${options.rollItem.system.damageType}
`, }); return } diff --git a/styles/roll.less b/styles/roll.less index 70f4af6..f05194a 100644 --- a/styles/roll.less +++ b/styles/roll.less @@ -73,6 +73,9 @@ margin: 0 10px; font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1); + p { + margin: 0; + } } } } @@ -82,6 +85,13 @@ font-size: calc(var(--font-size-standard) * 1.2); color: var(--color-dark-2); margin-top: 5px; + .chat-damage-type { + font-weight: bold; + display: flex; + justify-content: center; + align-items: center; + margin-bottom:0.5rem; + } h2 { margin-top: 10px; margin-left: 10px; @@ -143,6 +153,12 @@ font-family: var(--font-primary); font-size: calc(var(--font-size-standard) * 1); } + .chat-roll-label { + margin-right: 2rem; + } + .chat-results-spacing { + margin-bottom: 0.5rem; + } .nudge-roll { font-size: calc(var(--font-size-standard) * 1); margin-left: 4rem; diff --git a/styles/tarot.less b/styles/tarot.less index 0749cae..599cdaa 100644 --- a/styles/tarot.less +++ b/styles/tarot.less @@ -4,6 +4,9 @@ fieldset { margin-top: 8px; + legend { + margin-top: 1rem; + } .form-group { display: flex; align-items: center; diff --git a/templates/character-maleficas.hbs b/templates/character-maleficas.hbs index 116b8eb..be5eae4 100644 --- a/templates/character-maleficas.hbs +++ b/templates/character-maleficas.hbs @@ -12,7 +12,7 @@ -
+
{{item.name}}
{{upperFirst item.system.domain}} diff --git a/templates/chat-message.hbs b/templates/chat-message.hbs index 90b69c8..a370935 100644 --- a/templates/chat-message.hbs +++ b/templates/chat-message.hbs @@ -10,7 +10,7 @@

{{localize "HELLBORN.Label.statRoll"}}

{{/if}} {{#if weapon}} -

Weapon : {{weapon.name}}

+

{{weapon.name}}

{{/if}}