diff --git a/daggerheart.mjs b/daggerheart.mjs index c6e686eb..efd93387 100644 --- a/daggerheart.mjs +++ b/daggerheart.mjs @@ -265,6 +265,40 @@ Hooks.on('renderJournalDirectory', async (tab, html, _, options) => { } }); -Hooks.on(`${CONFIG.DH.id}.postRollDuality`, async(roll, config, message) => { - console.log(roll, config, message) +Hooks.on(`daggerheart.postRollDuality`, async(config, message) => { + if(config.roll.type !== 'action') return; + /* const actor = fromUuid(config.source.actor), + rollResult = config.roll.result || config.targets.some(t => t.hit), + actorResources = {}, + looseSpotlight = false; + if(config.roll.isCritical || config.roll.result.duality === 1) + actorResources.resources.hope.value += 1; + if(config.roll.isCritical) + actorResources.resources.stress.value -= 1; + if(config.roll.result.duality === -1) fear.value += 1; + if(!rollResult || config.roll.result.duality === -1) looseSpotlight = true; + + if(Object.keys(actorResources).length) actor.update(); + if(looseSpotlight) + looseSpotlight(); + + if(config.roll.isCritical) { + // Gain Hope + // Clear Stress + } else if(rollResult) { + if(config.roll.result.duality === 1) { + // Gain Hope + } else { + // GM Gain Fear + // Loose Spotlight + } + } else { + if(config.roll.result.duality === 1) { + // Gain Hope + // Loose Spotlight + } else { + // GM Gain Fear + // Loose Spotlight + } + } */ }); \ No newline at end of file diff --git a/module/dice/dhRoll.mjs b/module/dice/dhRoll.mjs index 15dd8ca2..c180bc54 100644 --- a/module/dice/dhRoll.mjs +++ b/module/dice/dhRoll.mjs @@ -51,6 +51,7 @@ export default class DHRoll extends Roll { static async buildPost(roll, config, message) { for (const hook of config.hooks) { + console.log(hook) if (Hooks.call(`${CONFIG.DH.id}.postRoll${hook.capitalize()}`, config, message) === false) return null; } diff --git a/styles/daggerheart.css b/styles/daggerheart.css index 116a34d3..40e711c9 100755 --- a/styles/daggerheart.css +++ b/styles/daggerheart.css @@ -5667,11 +5667,17 @@ body.theme-light.application.daggerheart.dialog { outline: 2px solid light-dark(#222, #efe6d8); box-shadow: none; } -.application.dh-style select option { +.application.dh-style select option, +.application.dh-style select optgroup { color: #efe6d8; background-color: #18162e; border-radius: 6px; } +.application.dh-style select:disabled { + opacity: 0.6; + outline: 2px solid transparent; + cursor: not-allowed; +} .application.dh-style p { margin: 0; } @@ -5728,15 +5734,6 @@ body.theme-light.application.daggerheart.dialog { width: 2rem; height: 2rem; } -.application.dh-style fieldset .checkbox { - display: flex; - align-items: center; - gap: 20px; - align-self: end; -} -.application.dh-style fieldset .fas.fa-trash { - align-self: end; -} .application.dh-style fieldset.one-column { display: flex; flex-direction: column; @@ -5748,10 +5745,6 @@ body.theme-light.application.daggerheart.dialog { .application.dh-style fieldset.one-column > .one-column { width: 100%; } -.application.dh-style fieldset.one-column .nest-inputs fieldset { - flex: 1; - width: 100%; -} .application.dh-style fieldset.two-columns { display: grid; grid-template-columns: 1fr 2fr; @@ -5792,6 +5785,16 @@ body.theme-light.application.daggerheart.dialog { width: 100%; gap: 5px; } +.application.dh-style fieldset .nest-inputs .btn { + padding-top: 15px; +} +.application.dh-style fieldset .nest-inputs .image { + height: 40px; + width: 40px; + object-fit: cover; + border-radius: 6px; + border: none; +} .application.dh-style fieldset .form-group { width: 100%; } @@ -5800,22 +5803,16 @@ body.theme-light.application.daggerheart.dialog { font-weight: bold; font-size: smaller; } +.application.dh-style fieldset .form-group.checkbox { + width: fit-content; +} +.application.dh-style fieldset .form-group.checkbox .form-fields { + height: 32px; + align-content: center; +} .application.dh-style fieldset:has(.list-w-img) { gap: 0; } -.application.dh-style fieldset:has(+ .fas.fa-trash) { - border-bottom-right-radius: 0; -} -.application.dh-style fieldset .fas.fa-trash { - color: darkred; - border-radius: 0 6px 6px 0; - border-color: light-dark(#18162e, #f3c267); - border-width: 2px; - border-style: groove; - border-left-width: 0; - padding: 5px; - margin-left: -7px; -} .application.dh-style .two-columns { display: grid; grid-template-columns: 1fr 2fr; @@ -6048,8 +6045,6 @@ body.theme-light.application.daggerheart.dialog { .sheet.daggerheart.dh-style .tab-form-footer { display: flex; padding: 0 10px; - position: relative; - bottom: -32px; } .sheet.daggerheart.dh-style .tab-form-footer button { flex: 1; @@ -6455,6 +6450,7 @@ body.theme-light.application.daggerheart.dialog { flex-direction: column; gap: 10px; align-items: center; + width: 100%; } .application.daggerheart.dh-style .card-list { display: flex;