diff --git a/lang/en.json b/lang/en.json index 017d542d..fc51a610 100755 --- a/lang/en.json +++ b/lang/en.json @@ -756,7 +756,7 @@ }, "SelectAction": { "selectType": "Select Action Type", - "selectAction": "Select Action" + "selectAction": "Action Selection" }, "Traits": { "agility": { @@ -1519,6 +1519,7 @@ } }, "Menu": { + "title": "Daggerheart Game Settings", "automation": { "name": "Automation Settings", "label": "Configure Automation", diff --git a/module/applications/dialogs/_module.mjs b/module/applications/dialogs/_module.mjs index 0722c747..bbffb791 100644 --- a/module/applications/dialogs/_module.mjs +++ b/module/applications/dialogs/_module.mjs @@ -1,5 +1,4 @@ export { default as BeastformDialog } from './beastformDialog.mjs'; -export { default as costSelectionDialog } from './costSelectionDialog.mjs'; export { default as d20RollDialog } from './d20RollDialog.mjs'; export { default as DamageDialog } from './damageDialog.mjs'; export { default as DamageReductionDialog } from './damageReductionDialog.mjs'; diff --git a/module/applications/dialogs/beastformDialog.mjs b/module/applications/dialogs/beastformDialog.mjs index 1d6725ad..3c35b542 100644 --- a/module/applications/dialogs/beastformDialog.mjs +++ b/module/applications/dialogs/beastformDialog.mjs @@ -1,9 +1,11 @@ const { ApplicationV2, HandlebarsApplicationMixin } = foundry.applications.api; export default class BeastformDialog extends HandlebarsApplicationMixin(ApplicationV2) { - constructor(configData) { + constructor(configData, item) { super(); + this.item = item; + this.configData = configData; this.selected = null; this.evolved = { form: null }; @@ -14,11 +16,14 @@ export default class BeastformDialog extends HandlebarsApplicationMixin(Applicat static DEFAULT_OPTIONS = { tag: 'form', - classes: ['daggerheart', 'views', 'dh-style', 'beastform-selection'], + classes: ['daggerheart', 'views', 'dialog', 'dh-style', 'beastform-selection'], position: { width: 600, height: 'auto' }, + window: { + icon: 'fa-solid fa-paw' + }, actions: { selectBeastform: this.selectBeastform, toggleHybridFeature: this.toggleHybridFeature, @@ -34,11 +39,12 @@ export default class BeastformDialog extends HandlebarsApplicationMixin(Applicat }; get title() { - return game.i18n.localize('DAGGERHEART.ITEMS.Beastform.dialogTitle'); + return this.item.name; } /** @override */ static PARTS = { + header: { template: 'systems/daggerheart/templates/dialogs/beastform/header.hbs' }, tabs: { template: 'systems/daggerheart/templates/dialogs/beastform/tabs.hbs' }, beastformTier: { template: 'systems/daggerheart/templates/dialogs/beastform/beastformTier.hbs' }, advanced: { template: 'systems/daggerheart/templates/dialogs/beastform/advanced.hbs' }, @@ -262,12 +268,13 @@ export default class BeastformDialog extends HandlebarsApplicationMixin(Applicat if (!options.submitted) this.selected = null; } - static async configure(configData) { + static async configure(configData, item) { return new Promise(resolve => { - const app = new this(configData); + const app = new this(configData, item); + const featureItem = item; app.addEventListener( 'close', - () => resolve({ selected: app.selected, evolved: app.evolved, hybrid: app.hybrid }), + () => resolve({ selected: app.selected, evolved: app.evolved, hybrid: app.hybrid, item: featureItem }), { once: true } ); app.render({ force: true }); diff --git a/module/applications/dialogs/costSelectionDialog.mjs b/module/applications/dialogs/costSelectionDialog.mjs deleted file mode 100644 index abb79e6a..00000000 --- a/module/applications/dialogs/costSelectionDialog.mjs +++ /dev/null @@ -1,66 +0,0 @@ -const { ApplicationV2, HandlebarsApplicationMixin } = foundry.applications.api; - -export default class CostSelectionDialog extends HandlebarsApplicationMixin(ApplicationV2) { - constructor(costs, uses, action, resolve) { - super({}); - this.costs = costs; - this.uses = uses; - this.action = action; - this.resolve = resolve; - } - - static DEFAULT_OPTIONS = { - tag: 'form', - classes: ['daggerheart', 'dialog', 'dh-style', 'views', 'damage-selection'], - position: { - width: 400, - height: 'auto' - }, - actions: { - sendCost: this.sendCost - }, - form: { - handler: this.updateForm, - submitOnChange: true, - closeOnSubmit: false - } - }; - - /** @override */ - static PARTS = { - costSelection: { - id: 'costSelection', - template: 'systems/daggerheart/templates/dialogs/dice-roll/costSelection.hbs' - } - }; - - /* -------------------------------------------- */ - - /** @inheritDoc */ - get title() { - return `Cost Options`; - } - - async _prepareContext(_options) { - const updatedCosts = this.action.calcCosts(this.costs), - updatedUses = this.action.calcUses(this.uses); - return { - costs: updatedCosts, - uses: updatedUses, - canUse: this.action.hasCost(updatedCosts) && this.action.hasUses(updatedUses) - }; - } - - static async updateForm(event, _, formData) { - const data = foundry.utils.expandObject(formData.object); - this.costs = foundry.utils.mergeObject(this.costs, data.costs); - this.uses = foundry.utils.mergeObject(this.uses, data.uses); - this.render(true); - } - - static sendCost(event) { - event.preventDefault(); - this.resolve({ costs: this.action.getRealCosts(this.costs), uses: this.uses }); - this.close(); - } -} diff --git a/module/applications/dialogs/d20RollDialog.mjs b/module/applications/dialogs/d20RollDialog.mjs index 67ca77e6..53fc9d69 100644 --- a/module/applications/dialogs/d20RollDialog.mjs +++ b/module/applications/dialogs/d20RollDialog.mjs @@ -22,7 +22,7 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio id: 'roll-selection', classes: ['daggerheart', 'dialog', 'dh-style', 'views', 'roll-selection'], position: { - width: 550 + width: 'auto' }, window: { icon: 'fa-solid fa-dice' @@ -52,10 +52,6 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio rollSelection: { id: 'rollSelection', template: 'systems/daggerheart/templates/dialogs/dice-roll/rollSelection.hbs' - }, - costSelection: { - id: 'costSelection', - template: 'systems/daggerheart/templates/dialogs/dice-roll/costSelection.hbs' } }; diff --git a/module/applications/settings/appearanceSettings.mjs b/module/applications/settings/appearanceSettings.mjs index 006bab78..78f067c7 100644 --- a/module/applications/settings/appearanceSettings.mjs +++ b/module/applications/settings/appearanceSettings.mjs @@ -12,14 +12,17 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App } get title() { - return game.i18n.localize('DAGGERHEART.SETTINGS.Menu.appearance.name'); + return game.i18n.localize('DAGGERHEART.SETTINGS.Menu.title'); } static DEFAULT_OPTIONS = { tag: 'form', id: 'daggerheart-appearance-settings', - classes: ['daggerheart', 'setting', 'dh-style'], + classes: ['daggerheart', 'dialog', 'dh-style', 'setting'], position: { width: '600', height: 'auto' }, + window: { + icon: 'fa-solid fa-gears' + }, actions: { reset: this.reset, save: this.save diff --git a/module/applications/settings/automationSettings.mjs b/module/applications/settings/automationSettings.mjs index 75105b16..489bae02 100644 --- a/module/applications/settings/automationSettings.mjs +++ b/module/applications/settings/automationSettings.mjs @@ -12,14 +12,17 @@ export default class DhAutomationSettings extends HandlebarsApplicationMixin(App } get title() { - return game.i18n.localize('DAGGERHEART.SETTINGS.Menu.automation.name'); + return game.i18n.localize('DAGGERHEART.SETTINGS.Menu.title'); } static DEFAULT_OPTIONS = { tag: 'form', id: 'daggerheart-automation-settings', - classes: ['daggerheart', 'setting', 'dh-style'], + classes: ['daggerheart', 'dh-style', 'dialog', 'setting'], position: { width: '600', height: 'auto' }, + window: { + icon: 'fa-solid fa-gears' + }, actions: { reset: this.reset, save: this.save diff --git a/module/applications/settings/homebrewSettings.mjs b/module/applications/settings/homebrewSettings.mjs index e516be03..d2861595 100644 --- a/module/applications/settings/homebrewSettings.mjs +++ b/module/applications/settings/homebrewSettings.mjs @@ -13,14 +13,17 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli } get title() { - return game.i18n.localize('DAGGERHEART.SETTINGS.Menu.homebrew.name'); + return game.i18n.localize('DAGGERHEART.SETTINGS.Menu.title'); } static DEFAULT_OPTIONS = { tag: 'form', id: 'daggerheart-homebrew-settings', - classes: ['daggerheart', 'setting', 'dh-style'], + classes: ['daggerheart', 'dh-style', 'dialog', 'setting'], position: { width: '600', height: 'auto' }, + window: { + icon: 'fa-solid fa-gears' + }, actions: { addItem: this.addItem, editItem: this.editItem, diff --git a/module/applications/settings/rangeMeasurementSettings.mjs b/module/applications/settings/rangeMeasurementSettings.mjs index e9fd332e..410b2cbe 100644 --- a/module/applications/settings/rangeMeasurementSettings.mjs +++ b/module/applications/settings/rangeMeasurementSettings.mjs @@ -12,14 +12,17 @@ export default class DhRangeMeasurementSettings extends HandlebarsApplicationMix } get title() { - return game.i18n.localize('DAGGERHEART.SETTINGS.Menu.automation.name'); + return game.i18n.localize('DAGGERHEART.SETTINGS.Menu.title'); } static DEFAULT_OPTIONS = { tag: 'form', id: 'daggerheart-automation-settings', - classes: ['daggerheart', 'setting', 'dh-style'], + classes: ['daggerheart', 'dialog', 'dh-style', 'setting'], position: { width: '600', height: 'auto' }, + window: { + icon: 'fa-solid fa-gears' + }, actions: { reset: this.reset, save: this.save diff --git a/module/applications/settings/variantRuleSettings.mjs b/module/applications/settings/variantRuleSettings.mjs index 059e1726..3bc11a68 100644 --- a/module/applications/settings/variantRuleSettings.mjs +++ b/module/applications/settings/variantRuleSettings.mjs @@ -12,14 +12,17 @@ export default class DHVariantRuleSettings extends HandlebarsApplicationMixin(Ap } get title() { - return game.i18n.localize('DAGGERHEART.SETTINGS.Menu.variantRules.name'); + return game.i18n.localize('DAGGERHEART.SETTINGS.Menu.title'); } static DEFAULT_OPTIONS = { tag: 'form', id: 'daggerheart-appearance-settings', - classes: ['daggerheart', 'setting', 'dh-style'], + classes: ['daggerheart', 'dialog', 'dh-style', 'setting'], position: { width: '600', height: 'auto' }, + window: { + icon: 'fa-solid fa-gears' + }, actions: { reset: this.reset, save: this.save diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs index 65a43123..6597f130 100644 --- a/module/applications/sheets/api/application-mixin.mjs +++ b/module/applications/sheets/api/application-mixin.mjs @@ -441,9 +441,13 @@ export default function DHApplicationMixin(Base) { const { type: actionType } = (await foundry.applications.api.DialogV2.input({ window: { title: 'Select Action Type' }, + classes: ['daggerheart', 'dh-style'], content: await foundry.applications.handlebars.renderTemplate( 'systems/daggerheart/templates/actionTypes/actionType.hbs', - { types: CONFIG.DH.ACTIONS.actionTypes } + { + types: CONFIG.DH.ACTIONS.actionTypes, + itemName: game.i18n.localize('DAGGERHEART.CONFIG.SelectAction.selectAction') + } ), ok: { label: game.i18n.format('DOCUMENT.Create', { @@ -581,7 +585,7 @@ export default function DHApplicationMixin(Base) { const { actionId } = target.closest('[data-action-id]').dataset; const { actions, attack } = doc.system; const action = attack?.id === actionId ? attack : actions?.find(a => a.id === actionId); - await action.use(event); + await action.use(event, doc); } /** diff --git a/module/data/action/beastformAction.mjs b/module/data/action/beastformAction.mjs index 2116662c..bb926dac 100644 --- a/module/data/action/beastformAction.mjs +++ b/module/data/action/beastformAction.mjs @@ -10,7 +10,9 @@ export default class DhBeastformAction extends DHBaseAction { const abort = await this.handleActiveTransformations(); if (abort) return; - const { selected, evolved, hybrid } = await BeastformDialog.configure(beastformConfig); + const item = args[0]; + + const { selected, evolved, hybrid } = await BeastformDialog.configure(beastformConfig, item); if (!selected) return; await this.transform(selected, evolved, hybrid); diff --git a/module/systemRegistration/handlebars.mjs b/module/systemRegistration/handlebars.mjs index b15bf820..fc6decd3 100644 --- a/module/systemRegistration/handlebars.mjs +++ b/module/systemRegistration/handlebars.mjs @@ -30,6 +30,7 @@ export const preloadHandlebarsTemplates = async function () { 'systems/daggerheart/templates/ui/chat/parts/target-chat.hbs', 'systems/daggerheart/templates/ui/tooltip/parts/tooltipChips.hbs', 'systems/daggerheart/templates/ui/tooltip/parts/tooltipTags.hbs', - 'systems/daggerheart/templates/dialogs/downtime/activities.hbs' + 'systems/daggerheart/templates/dialogs/downtime/activities.hbs', + 'systems/daggerheart/templates/dialogs/dice-roll/costSelection.hbs' ]); }; diff --git a/styles/less/dialog/beastform/sheet.less b/styles/less/dialog/beastform/sheet.less index ce2e990d..26b6072a 100644 --- a/styles/less/dialog/beastform/sheet.less +++ b/styles/less/dialog/beastform/sheet.less @@ -1,5 +1,6 @@ @import '../../utils/colors.less'; @import '../../utils/mixin.less'; +@import '../../utils/fonts.less'; .theme-light .application.daggerheart.dh-style.views.beastform-selection .beastforms-outer-container { .beastform-title { @@ -209,6 +210,9 @@ button { flex: 1; + font-family: @font-body; + font-weight: bold; + height: 40px; } } } diff --git a/styles/less/dialog/dice-roll/roll-selection.less b/styles/less/dialog/dice-roll/roll-selection.less index 5e36990e..4ee2ee1f 100644 --- a/styles/less/dialog/dice-roll/roll-selection.less +++ b/styles/less/dialog/dice-roll/roll-selection.less @@ -13,6 +13,7 @@ display: flex; flex-direction: column; gap: 12px; + max-width: 550px; .dices-section { display: flex; @@ -141,6 +142,7 @@ button { flex: 1; height: 100%; + font-weight: bold; font-family: @font-body; } } diff --git a/styles/less/global/elements.css b/styles/less/global/elements.css new file mode 100644 index 00000000..2644d93f --- /dev/null +++ b/styles/less/global/elements.css @@ -0,0 +1,607 @@ +@keyframes glow { + 0% { + box-shadow: 0 0 1px 1px #f3c267; + } + 100% { + box-shadow: 0 0 2px 2px #f3c267; + } +} +@keyframes glow-dark { + 0% { + box-shadow: 0 0 1px 1px #18162e; + } + 100% { + box-shadow: 0 0 2px 2px #18162e; + } +} +@font-face { + font-family: 'Cinzel'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(https://fonts.gstatic.com/s/cinzel/v25/8vIU7ww63mVu7gtR-kwKxNvkNOjw-tbnTYo.ttf) format('truetype'); +} +@font-face { + font-family: 'Cinzel'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url(https://fonts.gstatic.com/s/cinzel/v25/8vIU7ww63mVu7gtR-kwKxNvkNOjw-jHgTYo.ttf) format('truetype'); +} +@font-face { + font-family: 'Cinzel Decorative'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: url(https://fonts.gstatic.com/s/cinzeldecorative/v18/daaHSScvJGqLYhG8nNt8KPPswUAPniZoaelD.ttf) format('truetype'); +} +@font-face { + font-family: 'Montserrat'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(https://fonts.gstatic.com/s/montserrat/v30/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCtr6Ew-.ttf) format('truetype'); +} +@font-face { + font-family: 'Montserrat'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: url(https://fonts.gstatic.com/s/montserrat/v30/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCu170w-.ttf) format('truetype'); +} +.application.sheet.daggerheart.dh-style h1 { + font-family: 'Cinzel Decorative', serif; + margin: 0; + border: none; + font-weight: normal; +} +.application.sheet.daggerheart.dh-style h2, +.application.sheet.daggerheart.dh-style h3 { + font-family: 'Cinzel', serif; + margin: 0; + border: none; + font-weight: normal; +} +.application.sheet.daggerheart.dh-style h4 { + font-family: 'Montserrat', sans-serif; + font-size: 14px; + border: none; + font-weight: 700; + margin: 0; + text-shadow: none; + color: #f3c267; + font-weight: normal; +} +.application.sheet.daggerheart.dh-style h5 { + font-size: 14px; + color: #f3c267; + margin: 0; + font-weight: normal; +} +.application.sheet.daggerheart.dh-style p, +.application.sheet.daggerheart.dh-style span { + font-family: 'Montserrat', sans-serif; +} +.application.sheet.daggerheart.dh-style small { + font-family: 'Montserrat', sans-serif; + opacity: 0.8; +} +.application.dh-style { + border: 1px solid light-dark(#18162e, #f3c267); +} +.application.dh-style input[type='text'], +.application.dh-style input[type='number'] { + background: light-dark(transparent, transparent); + border-radius: 6px; + box-shadow: 0 4px 30px rgba(0, 0, 0, 0.05); + backdrop-filter: blur(9.5px); + -webkit-backdrop-filter: blur(9.5px); + outline: none; + color: light-dark(#18162e, #f3c267); + border: 1px solid light-dark(#222, #efe6d8); +} +.application.dh-style input[type='text']:hover[type='text'], +.application.dh-style input[type='number']:hover[type='text'], +.application.dh-style input[type='text']:hover[type='number'], +.application.dh-style input[type='number']:hover[type='number'], +.application.dh-style input[type='text']:focus[type='text'], +.application.dh-style input[type='number']:focus[type='text'], +.application.dh-style input[type='text']:focus[type='number'], +.application.dh-style input[type='number']:focus[type='number'] { + background: light-dark(rgba(0, 0, 0, 0.05), rgba(24, 22, 46, 0.33)); + box-shadow: none; + outline: 2px solid light-dark(#222, #efe6d8); +} +.application.dh-style input[type='text']:disabled[type='text'], +.application.dh-style input[type='number']:disabled[type='text'], +.application.dh-style input[type='text']:disabled[type='number'], +.application.dh-style input[type='number']:disabled[type='number'] { + outline: 2px solid transparent; + cursor: not-allowed; +} +.application.dh-style input[type='text']:disabled[type='text']:hover, +.application.dh-style input[type='number']:disabled[type='text']:hover, +.application.dh-style input[type='text']:disabled[type='number']:hover, +.application.dh-style input[type='number']:disabled[type='number']:hover { + background: transparent; +} +.application.dh-style input[type='checkbox']:checked::after, +.application.dh-style input[type='radio']:checked::after { + color: light-dark(#222, #f3c267); +} +.application.dh-style input[type='checkbox']:checked::before, +.application.dh-style input[type='radio']:checked::before { + color: light-dark(#22222240, #f3c26740); +} +.application.dh-style input[type='checkbox']::before, +.application.dh-style input[type='radio']::before { + color: light-dark(#22222240, #f3c26740); +} +.application.dh-style button { + background: light-dark(transparent, #f3c267); + border: 1px solid light-dark(#18162e, #18162e); + color: light-dark(#18162e, #18162e); + outline: none; + box-shadow: none; +} +.application.dh-style button:hover { + background: light-dark(rgba(0, 0, 0, 0.3), #18162e); + color: light-dark(#18162e, #f3c267); +} +.application.dh-style button.glow { + animation: glow 0.75s infinite alternate; +} +.application.dh-style button:disabled { + background: light-dark(transparent, #f3c267); + color: light-dark(#18162e, #18162e); + opacity: 0.6; + cursor: not-allowed; +} +.application.dh-style button:disabled:hover { + background: light-dark(transparent, #f3c267); + color: light-dark(#18162e, #18162e); +} +.application.dh-style select { + background: light-dark(transparent, transparent); + color: light-dark(#222, #efe6d8); + font-family: 'Montserrat', sans-serif; + outline: 2px solid transparent; + border: 1px solid light-dark(#222, #efe6d8); +} +.application.dh-style select:focus, +.application.dh-style select:hover { + outline: 2px solid light-dark(#222, #efe6d8); + box-shadow: none; +} +.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 multi-select { + position: relative; + height: 34px; +} +.application.dh-style multi-select .tags { + justify-content: flex-start; + margin: 4px; + height: inherit; +} +.application.dh-style multi-select .tags .tag { + padding: 0.3rem 0.5rem; + color: light-dark(#18162e, #f3c267); + background-color: light-dark(#18162e10, #f3c26740); + font-family: 'Montserrat', sans-serif; + border-radius: 3px; + transition: 0.13s ease-out; + gap: 0.5rem; + z-index: 1; +} +.application.dh-style multi-select .tags .tag .remove { + font-size: 10px; +} +.application.dh-style multi-select select { + position: absolute; + height: inherit; + outline: initial; +} +.application.dh-style p { + margin: 0; +} +.application.dh-style ul { + margin: 0; + padding: 0; + list-style: none; +} +.application.dh-style li { + margin: 0; +} +.application.dh-style a:hover, +.application.dh-style a.active { + font-weight: bold; + text-shadow: 0 0 8px light-dark(#18162e, #f3c267); +} +.application.dh-style fieldset { + align-items: center; + margin-top: 5px; + border-radius: 6px; + border-color: light-dark(#18162e, #f3c267); +} +.application.dh-style fieldset.glassy { + background-color: light-dark(#18162e10, #f3c26710); + border-color: transparent; +} +.application.dh-style fieldset.glassy legend { + padding: 2px 12px; + border-radius: 3px; + background-color: light-dark(#18162e, #f3c267); + color: light-dark(#efe6d8, #18162e); +} +.application.dh-style fieldset.fit-height { + height: 95%; +} +.application.dh-style fieldset.flex { + display: flex; + gap: 20px; +} +.application.dh-style fieldset.flex.wrap { + flex-wrap: wrap; + gap: 10px 20px; +} +.application.dh-style fieldset.flex .inline-child { + flex: 1; +} +.application.dh-style fieldset .list-w-img { + padding: 5px; +} +.application.dh-style fieldset .list-w-img label { + flex: 1; +} +.application.dh-style fieldset .list-w-img img { + width: 2rem; + height: 2rem; +} +.application.dh-style fieldset.one-column { + display: flex; + flex-direction: column; + align-items: start; + gap: 10px; + min-height: 64px; + flex: 1; +} +.application.dh-style fieldset.one-column > .one-column { + width: 100%; +} +.application.dh-style fieldset.two-columns { + display: grid; + grid-template-columns: 1fr 2fr; + gap: 10px; +} +.application.dh-style fieldset.two-columns.even { + grid-template-columns: 1fr 1fr; +} +.application.dh-style fieldset.two-columns .full-width { + grid-column: span 2; +} +.application.dh-style fieldset legend { + font-family: 'Montserrat', sans-serif; + font-weight: bold; + color: light-dark(#18162e, #f3c267); +} +.application.dh-style fieldset input[type='text'], +.application.dh-style fieldset input[type='number'] { + color: light-dark(#222, #efe6d8); + font-family: 'Montserrat', sans-serif; + transition: all 0.3s ease; + outline: 2px solid transparent; +} +.application.dh-style fieldset input[type='text']:focus, +.application.dh-style fieldset input[type='number']:focus, +.application.dh-style fieldset input[type='text']:hover, +.application.dh-style fieldset input[type='number']:hover { + outline: 2px solid light-dark(#222, #efe6d8); +} +.application.dh-style fieldset[disabled], +.application.dh-style fieldset.child-disabled .form-group, +.application.dh-style fieldset select[disabled], +.application.dh-style fieldset input[disabled] { + opacity: 0.5; +} +.application.dh-style fieldset.child-disabled .form-group { + pointer-events: none; +} +.application.dh-style fieldset .nest-inputs { + display: flex; + align-items: center; + 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 .nest-inputs > .checkbox { + align-self: end; +} +.application.dh-style fieldset .form-group { + width: 100%; +} +.application.dh-style fieldset .form-group label { + font-family: 'Montserrat', sans-serif; + font-weight: bold; + font-size: smaller; +} +.application.dh-style fieldset .form-group.checkbox { + width: fit-content; + display: flex; + align-items: center; +} +.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 .two-columns { + display: grid; + grid-template-columns: 1fr 2fr; + gap: 10px; +} +.application.dh-style .two-columns.even { + grid-template-columns: 1fr 1fr; +} +.application.dh-style line-div { + display: block; + height: 1px; + width: 100%; + border-bottom: 1px solid light-dark(#18162e, #f3c267); + mask-image: linear-gradient(270deg, transparent 0%, black 50%, transparent 100%); +} +.application.dh-style side-line-div { + display: block; + height: 1px; + width: 100%; + border-bottom: 1px solid light-dark(#18162e, #f3c267); + mask-image: linear-gradient(270deg, transparent 0%, black 100%); +} +.application.dh-style side-line-div.invert { + mask-image: linear-gradient(270deg, black 0%, transparent 100%); +} +.application.dh-style .item-description { + opacity: 1; + transform: translateY(0); + grid-column: 1/-1; + transition: opacity 0.3s ease-out, transform 0.3s ease-out; +} +.application.dh-style .item-description.invisible { + height: 0; + opacity: 0; + overflow: hidden; + transform: translateY(-20px); + transform-origin: top; +} +.application.dh-style .item-buttons { + grid-column: span 3; + display: flex; + gap: 8px; + flex-wrap: wrap; +} +.application.dh-style .item-buttons button { + white-space: nowrap; +} +.application.setting.dh-style fieldset h2, +.application.setting.dh-style fieldset h3, +.application.setting.dh-style fieldset h4 { + margin: 8px 0 4px; + text-align: center; +} +.application.setting.dh-style fieldset .title-hint { + font-size: 12px; + font-variant: small-caps; + text-align: center; +} +.application.setting.dh-style fieldset .field-section .split-section { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 10px; +} +.application.setting.dh-style fieldset .label-container { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 10px; +} +.application.setting.dh-style fieldset .label-container label { + align-self: center; + text-align: center; +} +.application.setting.dh-style footer { + margin-top: 8px; + display: flex; + gap: 8px; +} +.application.setting.dh-style footer button { + flex: 1; +} +.application.setting.dh-style .form-group { + display: flex; + justify-content: space-between; + align-items: center; +} +.application.setting.dh-style .form-group label { + font-size: 16px; + font-family: 'Montserrat', sans-serif; +} +.application.setting.dh-style .form-group .form-fields { + display: flex; + gap: 4px; + align-items: center; +} +.system-daggerheart .tagify { + background: light-dark(transparent, transparent); + border: 1px solid light-dark(#222, #efe6d8); + height: 34px; + --tags-disabled-bg: none; + --tags-border-color: none; + --tags-hover-border-color: none; + --tags-focus-border-color: none; + --tag-border-radius: 3px; + --tag-bg: light-dark(#18162e, #f3c267); + --tag-remove-btn-color: light-dark(#18162e, #f3c267); + --tag-hover: light-dark(#18162e, #f3c267); + --tag-text-color: light-dark(#efe6d8, #222); + --tag-text-color--edit: light-dark(#efe6d8, #222); + --tag-pad: 0.3em 0.5em; + --tag-inset-shadow-size: 1.2em; + --tag-invalid-color: #d39494; + --tag-invalid-bg: rgba(211, 148, 148, 0.5); + --tag--min-width: 1ch; + --tag--max-width: 100%; + --tag-hide-transition: 0.3s; + --tag-remove-bg: light-dark(#18162e40, #f3c26740); + --tag-remove-btn-color: light-dark(#efe6d8, #222); + --tag-remove-btn-bg: none; + --tag-remove-btn-bg--hover: light-dark(#efe6d8, #222); + --input-color: inherit; + --placeholder-color: light-dark(#efe6d815, #22222215); + --placeholder-color-focus: light-dark(#efe6d815, #22222215); + --loader-size: 0.8em; + --readonly-striped: 1; + border-radius: 3px; + margin-right: 1px; +} +.system-daggerheart .tagify tag div { + display: flex; + justify-content: space-between; + align-items: center; + height: 22px; +} +.system-daggerheart .tagify tag div span { + font-weight: 400; +} +.system-daggerheart .tagify tag div img { + margin-left: 8px; + height: 20px; + width: 20px; +} +.system-daggerheart .tagify__dropdown { + border: 1px solid light-dark(#222, #efe6d8) !important; + font-family: 'Montserrat', sans-serif; + color: light-dark(#222, #efe6d8); +} +.system-daggerheart .tagify__dropdown .tagify__dropdown__wrapper { + background-image: url(../assets/parchments/dh-parchment-dark.png); + background-color: transparent; + border: 0; + color: light-dark(#222, #efe6d8); +} +.system-daggerheart .tagify__dropdown .tagify__dropdown__wrapper .tagify__dropdown__item--active { + background-color: light-dark(#222, #efe6d8); + color: light-dark(#efe6d8, #222); +} +.system-daggerheart.theme-light .tagify__dropdown .tagify__dropdown__wrapper { + background-image: url(../assets/parchments/dh-parchment-light.png); +} +.theme-light .application.sheet.dh-style button.glow { + animation: glow-dark 0.75s infinite alternate; +} +.theme-light .application .component.dh-style.card-preview-container { + background-image: url('../assets/parchments/dh-parchment-light.png'); +} +.theme-light .application .component.dh-style.card-preview-container .preview-text-container { + background-image: url(../assets/parchments/dh-parchment-dark.png); +} +.theme-light .application .component.dh-style.card-preview-container .preview-selected-icon-container { + background-image: url(../assets/parchments/dh-parchment-dark.png); + color: var(--color-light-5); +} +.application .component.dh-style.card-preview-container { + position: relative; + border-radius: 6px; + border: 2px solid var(--color-tabs-border); + display: flex; + flex-direction: column; + aspect-ratio: 0.75; + background-image: url('../assets/parchments/dh-parchment-dark.png'); +} +.application .component.dh-style.card-preview-container.selectable { + cursor: pointer; +} +.application .component.dh-style.card-preview-container.disabled { + pointer-events: none; + opacity: 0.4; +} +.application .component.dh-style.card-preview-container .preview-image-outer-container { + position: relative; + display: flex; + align-items: center; + justify-content: center; +} +.application .component.dh-style.card-preview-container .preview-image-container { + flex: 1; + border-radius: 4px 4px 0 0; +} +.application .component.dh-style.card-preview-container .preview-text-container { + flex: 1; + border-radius: 0 0 4px 4px; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + font-size: 18px; + text-align: center; + color: var(--color-text-selection-bg); + background-image: url(../assets/parchments/dh-parchment-light.png); +} +.application .component.dh-style.card-preview-container .preview-empty-container { + pointer-events: none; + position: relative; + display: flex; + align-items: center; + justify-content: center; + flex: 1; +} +.application .component.dh-style.card-preview-container .preview-empty-container .preview-empty-inner-container { + width: 100%; + display: flex; + justify-content: center; +} +.application .component.dh-style.card-preview-container .preview-empty-container .preview-empty-inner-container .preview-add-icon { + font-size: 48px; +} +.application .component.dh-style.card-preview-container .preview-empty-container .preview-empty-inner-container .preview-empty-subtext { + position: absolute; + top: 10%; + font-size: 18px; + font-variant: small-caps; + text-align: center; +} +.application .component.dh-style.card-preview-container .preview-selected-icon-container { + position: absolute; + height: 54px; + width: 54px; + border-radius: 50%; + border: 2px solid; + font-size: 48px; + display: flex; + align-items: center; + justify-content: center; + background-image: url(../assets/parchments/dh-parchment-light.png); + color: var(--color-dark-5); +} +.application .component.dh-style.card-preview-container .preview-selected-icon-container i { + position: relative; + right: 2px; +} diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less index b9509b38..29a2c1dd 100755 --- a/styles/less/global/elements.less +++ b/styles/less/global/elements.less @@ -15,6 +15,10 @@ color: light-dark(@dark-blue, @golden); border: 1px solid light-dark(@dark, @beige); + &::placeholder { + color: light-dark(@dark-40, @beige-50); + } + &:hover[type='text'], &:hover[type='number'], &:focus[type='text'], @@ -48,6 +52,24 @@ } } + input[type='range'] { + &::-webkit-slider-runnable-track { + background: light-dark(@dark-blue-40, @golden-40); + } + &::-moz-range-track { + background: light-dark(@dark-blue-40, @golden-40); + } + &::-webkit-slider-thumb { + background: light-dark(@dark-blue, @golden); + border: none; + border-radius: 50%; + + &:hover { + box-shadow: 0 0 8px light-dark(@dark-blue, @golden); + } + } + } + button { background: light-dark(transparent, @golden); border: 1px solid light-dark(@dark-blue, @dark-blue); @@ -296,6 +318,31 @@ } } + .scalable-input { + display: flex; + align-items: center; + justify-content: space-between; + gap: 10px; + + .form-group { + width: fit-content; + .nest-inputs { + width: fit-content; + } + } + + label { + font-family: @font-body; + font-size: 14px; + font-weight: 400; + + &.modifier-label { + width: 6ch; + text-align: end; + } + } + } + &:has(.list-w-img) { gap: 0; } @@ -413,6 +460,7 @@ label { font-size: 16px; + font-family: @font-body; } .form-fields { diff --git a/styles/less/sheets/actors/character/features.less b/styles/less/sheets/actors/character/features.less index 767544c1..c2feb6b1 100644 --- a/styles/less/sheets/actors/character/features.less +++ b/styles/less/sheets/actors/character/features.less @@ -11,7 +11,7 @@ mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%); padding: 20px 0; padding-top: 10px; - height: 95%; + height: 84%; scrollbar-width: thin; scrollbar-color: light-dark(@dark-blue, @golden) transparent; diff --git a/styles/less/sheets/actors/character/inventory.less b/styles/less/sheets/actors/character/inventory.less index 43669d7f..eac1065d 100644 --- a/styles/less/sheets/actors/character/inventory.less +++ b/styles/less/sheets/actors/character/inventory.less @@ -56,7 +56,7 @@ overflow-y: auto; mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 95%, transparent 100%); padding: 20px 0; - height: 80%; + height: 73%; scrollbar-width: thin; scrollbar-color: light-dark(@dark-blue, @golden) transparent; @@ -65,6 +65,11 @@ .currency-section { display: flex; gap: 10px; + padding: 10px 10px 0; + + input { + color: light-dark(@dark, @beige); + } } } } diff --git a/styles/less/sheets/actors/character/loadout.less b/styles/less/sheets/actors/character/loadout.less index cdf0e2e4..b7863e77 100644 --- a/styles/less/sheets/actors/character/loadout.less +++ b/styles/less/sheets/actors/character/loadout.less @@ -97,7 +97,7 @@ overflow-y: auto; mask-image: linear-gradient(0deg, transparent 0%, black 10%, black 98%, transparent 100%); padding: 20px 0; - height: 90%; + height: 84%; scrollbar-width: thin; scrollbar-color: light-dark(@dark-blue, @golden) transparent; diff --git a/styles/less/sheets/actors/character/sheet.less b/styles/less/sheets/actors/character/sheet.less index 8afd7404..3d19a3b2 100644 --- a/styles/less/sheets/actors/character/sheet.less +++ b/styles/less/sheets/actors/character/sheet.less @@ -10,7 +10,7 @@ height: 100%; width: 100%; padding-bottom: 0; - overflow: auto; + overflow-x: auto; .character-sidebar-sheet { grid-row: 1 / span 2; diff --git a/styles/less/ui/settings/settings.less b/styles/less/ui/settings/settings.less index 3bd200a2..580c79ca 100644 --- a/styles/less/ui/settings/settings.less +++ b/styles/less/ui/settings/settings.less @@ -15,6 +15,10 @@ grid-template-columns: 1fr 1fr; } } + + &.start-align { + align-self: flex-start; + } } .setting-group-field { diff --git a/templates/dialogs/beastform/header.hbs b/templates/dialogs/beastform/header.hbs new file mode 100644 index 00000000..ac92d14c --- /dev/null +++ b/templates/dialogs/beastform/header.hbs @@ -0,0 +1,3 @@ +
+

{{localize 'DAGGERHEART.ITEMS.Beastform.dialogTitle'}}

+
\ No newline at end of file diff --git a/templates/dialogs/beastform/tabs.hbs b/templates/dialogs/beastform/tabs.hbs index 25bb2180..0a252dd6 100644 --- a/templates/dialogs/beastform/tabs.hbs +++ b/templates/dialogs/beastform/tabs.hbs @@ -1,11 +1,15 @@
- +
+ + + +
\ No newline at end of file diff --git a/templates/dialogs/dice-roll/costSelection.hbs b/templates/dialogs/dice-roll/costSelection.hbs index 91d0229f..d376c749 100644 --- a/templates/dialogs/dice-roll/costSelection.hbs +++ b/templates/dialogs/dice-roll/costSelection.hbs @@ -1,21 +1,30 @@ -
- {{#if uses}} -
-
- - +
+ {{localize 'DAGGERHEART.GENERAL.Cost.single'}} +
    + {{#if uses}} +
  • +
    +
    + + +
    +
    + +
    • + {{/if}} + {{#each costs as | cost index |}} +
  • +
    +
    + + +
    -
- {{/if}} - {{#each costs as | cost index |}} -
-
- - - {{#if scalable}} - - {{/if}} -
-
- {{/each}} -
\ No newline at end of file + {{#if scalable}} + + {{/if}} + + + {{/each}} + + \ No newline at end of file diff --git a/templates/dialogs/dice-roll/rollSelection.hbs b/templates/dialogs/dice-roll/rollSelection.hbs index e3129e30..995be022 100644 --- a/templates/dialogs/dice-roll/rollSelection.hbs +++ b/templates/dialogs/dice-roll/rollSelection.hbs @@ -135,6 +135,9 @@ {{#if (eq @root.rollType 'DualityRoll')}}{{localize "DAGGERHEART.GENERAL.situationalBonus"}}{{/if}} + {{#if (or costs uses)}} + {{> 'systems/daggerheart/templates/dialogs/dice-roll/costSelection.hbs'}} + {{/if}} {{/unless}} {{localize "DAGGERHEART.GENERAL.formula"}}: {{@root.formula}} @@ -155,9 +158,14 @@
{{else}} - + {{#if (or costs uses)}} + {{> 'systems/daggerheart/templates/dialogs/dice-roll/costSelection.hbs'}} + {{/if}} +
+ +
{{/if}} \ No newline at end of file diff --git a/templates/settings/appearance-settings.hbs b/templates/settings/appearance-settings.hbs index da435c75..f297a28f 100644 --- a/templates/settings/appearance-settings.hbs +++ b/templates/settings/appearance-settings.hbs @@ -1,4 +1,7 @@
+
+

{{localize 'DAGGERHEART.SETTINGS.Menu.appearance.name'}}

+
{{formGroup settingFields.schema.fields.displayFear value=settingFields._source.displayFear localize=true}} {{formGroup settingFields.schema.fields.showGenericStatusEffects value=settingFields._source.showGenericStatusEffects localize=true}} diff --git a/templates/settings/automation-settings.hbs b/templates/settings/automation-settings.hbs index 910ace56..9ffe5049 100644 --- a/templates/settings/automation-settings.hbs +++ b/templates/settings/automation-settings.hbs @@ -1,4 +1,7 @@
+
+

{{localize 'DAGGERHEART.SETTINGS.Menu.automation.name'}}

+
{{formGroup settingFields.schema.fields.hopeFear.fields.gm value=settingFields._source.hopeFear.gm localize=true}} diff --git a/templates/settings/homebrew-settings.hbs b/templates/settings/homebrew-settings.hbs index 07ae0c1f..ada2c7a9 100644 --- a/templates/settings/homebrew-settings.hbs +++ b/templates/settings/homebrew-settings.hbs @@ -1,4 +1,7 @@
+
+

{{localize 'DAGGERHEART.SETTINGS.Menu.homebrew.name'}}

+
{{formGroup settingFields.schema.fields.maxFear value=settingFields._source.maxFear localize=true}}

{{localize "DAGGERHEART.SETTINGS.Homebrew.FIELDS.traitArray.label"}}

@@ -27,7 +30,7 @@
{{localize "DAGGERHEART.SETTINGS.Homebrew.downtimeMoves"}} -
+
{{localize "DAGGERHEART.APPLICATIONS.Downtime.longRest.title"}} @@ -48,7 +51,7 @@
-
+
{{localize "DAGGERHEART.APPLICATIONS.Downtime.shortRest.title"}} diff --git a/templates/settings/range-measurement-settings.hbs b/templates/settings/range-measurement-settings.hbs index 36357d57..617d1899 100644 --- a/templates/settings/range-measurement-settings.hbs +++ b/templates/settings/range-measurement-settings.hbs @@ -1,4 +1,7 @@
+
+

{{localize 'DAGGERHEART.SETTINGS.Menu.range.name'}}

+
{{formGroup settingFields.schema.fields.enabled value=settingFields._source.enabled localize=true}} {{formGroup settingFields.schema.fields.melee value=settingFields._source.melee localize=true}} diff --git a/templates/settings/variant-rules.hbs b/templates/settings/variant-rules.hbs index 1ee18b99..75a5534b 100644 --- a/templates/settings/variant-rules.hbs +++ b/templates/settings/variant-rules.hbs @@ -1,4 +1,8 @@
+
+

{{localize 'DAGGERHEART.SETTINGS.Menu.variantRules.name'}}

+
+
diff --git a/templates/sheets/actors/character/inventory.hbs b/templates/sheets/actors/character/inventory.hbs index 9610d8e2..24f7836f 100644 --- a/templates/sheets/actors/character/inventory.hbs +++ b/templates/sheets/actors/character/inventory.hbs @@ -12,6 +12,30 @@
+
+
+ {{localize this.inventory.currency.coins}} + {{formInput systemFields.gold.fields.coins value=source.system.gold.coins enriched=source.system.gold.coins + localize=true toggled=true}} +
+
+ {{localize this.inventory.currency.handfulls}} + {{formInput systemFields.gold.fields.handfulls value=source.system.gold.handfulls + enriched=source.system.gold.handfulls localize=true toggled=true}} +
+
+ {{localize this.inventory.currency.bags}} + {{formInput systemFields.gold.fields.bags value=source.system.gold.bags enriched=source.system.gold.bags + localize=true toggled=true}} +
+
+ {{localize this.inventory.currency.chests}} + {{formInput systemFields.gold.fields.chests value=source.system.gold.chests + enriched=source.system.gold.chests localize=true toggled=true}} +
+ +
+
{{> 'daggerheart.inventory-items' title='TYPES.Item.weapon' @@ -44,28 +68,4 @@ canCreate=true }}
- -
-
- {{localize this.inventory.currency.coins}} - {{formInput systemFields.gold.fields.coins value=source.system.gold.coins enriched=source.system.gold.coins - localize=true toggled=true}} -
-
- {{localize this.inventory.currency.handfulls}} - {{formInput systemFields.gold.fields.handfulls value=source.system.gold.handfulls - enriched=source.system.gold.handfulls localize=true toggled=true}} -
-
- {{localize this.inventory.currency.bags}} - {{formInput systemFields.gold.fields.bags value=source.system.gold.bags enriched=source.system.gold.bags - localize=true toggled=true}} -
-
- {{localize this.inventory.currency.chests}} - {{formInput systemFields.gold.fields.chests value=source.system.gold.chests - enriched=source.system.gold.chests localize=true toggled=true}} -
- -
\ No newline at end of file diff --git a/templates/sheets/actors/character/sidebar.hbs b/templates/sheets/actors/character/sidebar.hbs index b9ac28a6..6ed47fc7 100644 --- a/templates/sheets/actors/character/sidebar.hbs +++ b/templates/sheets/actors/character/sidebar.hbs @@ -142,7 +142,7 @@ {{#each document.system.experiences as |experience id|}}
- +{{experience.total}} + +{{experience.value}}