diff --git a/lang/en.json b/lang/en.json index e5f09217..7f9d80e6 100755 --- a/lang/en.json +++ b/lang/en.json @@ -1934,6 +1934,7 @@ "itemResource": "Item Resource", "label": "Label", "level": "Level", + "levelShort": "Lv", "levelUp": "Level Up", "loadout": "Loadout", "max": "Max", @@ -2081,7 +2082,9 @@ "FIELDS": { "displayFear": { "label": "Fear Display" }, "dualityColorScheme": { "label": "Chat Style" }, - "showGenericStatusEffects": { "label": "Show Foundry Status Effects" } + "showGenericStatusEffects": { "label": "Show Foundry Status Effects" }, + "expandedCharacterDescriptions": { "label": "Auto-expand Descriptions from Characters" }, + "expandedAdversaryDescriptions": { "label": "Auto-expand Descriptions from Adversaries" } }, "fearDisplay": { "token": "Tokens", diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs index 18a5ac91..603e7f00 100644 --- a/module/applications/sheets/api/application-mixin.mjs +++ b/module/applications/sheets/api/application-mixin.mjs @@ -395,6 +395,9 @@ export default function DHApplicationMixin(Base) { context.source = this.document; context.fields = this.document.schema.fields; context.systemFields = this.document.system.schema.fields; + context.settings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance); + // settings.expandedCharacterDescriptions + // settings.expandedAdversaryDescriptions return context; } diff --git a/module/data/item/domainCard.mjs b/module/data/item/domainCard.mjs index 4cf986db..5c471ca1 100644 --- a/module/data/item/domainCard.mjs +++ b/module/data/item/domainCard.mjs @@ -77,6 +77,7 @@ export default class DHDomainCard extends BaseDataItem { const tags = [ game.i18n.localize(`DAGGERHEART.CONFIG.DomainCardTypes.${this.type}`), this.domainLabel, + `${game.i18n.localize('DAGGERHEART.GENERAL.levelShort')}: ${this.level}`, `${game.i18n.localize('DAGGERHEART.ITEMS.DomainCard.recallCost')}: ${this.recallCost}` ]; diff --git a/module/data/settings/Appearance.mjs b/module/data/settings/Appearance.mjs index e215f956..a9673d40 100644 --- a/module/data/settings/Appearance.mjs +++ b/module/data/settings/Appearance.mjs @@ -55,6 +55,14 @@ export default class DhAppearance extends foundry.abstract.DataModel { showGenericStatusEffects: new fields.BooleanField({ initial: true, label: 'DAGGERHEART.SETTINGS.Appearance.FIELDS.showGenericStatusEffects.label' + }), + expandedCharacterDescriptions: new fields.BooleanField({ + initial: false, + label: 'DAGGERHEART.SETTINGS.Appearance.FIELDS.expandedCharacterDescriptions.label' + }), + expandedAdversaryDescriptions: new fields.BooleanField({ + initial: false, + label: 'DAGGERHEART.SETTINGS.Appearance.FIELDS.expandedAdversaryDescriptions.label' }) }; } diff --git a/styles/less/global/inventory-item.less b/styles/less/global/inventory-item.less index e79a88c7..c4239d27 100644 --- a/styles/less/global/inventory-item.less +++ b/styles/less/global/inventory-item.less @@ -35,6 +35,37 @@ } } } + + &:hover { + .inventory-item-header .item-label .item-name .expanded-icon { + margin-left: 10px; + display: inline-block; + } + &:has(.inventory-item-content.extensible) { + .inventory-item-header, + .inventory-item-content { + background: light-dark(@dark-blue-40, @golden-40); + } + } + &:has(.inventory-item-content.extended) { + .inventory-item-header .item-label .item-name .expanded-icon { + display: none; + } + } + } + + &:has(.inventory-item-content.extensible) { + .inventory-item-header { + border-radius: 5px 5px 0 0; + } + .inventory-item-content { + border-radius: 0 0 5px 5px; + } + } + + &:not(:has(.inventory-item-content.extensible)) .inventory-item-header { + border-radius: 5px; + } } .inventory-item-header { @@ -42,6 +73,7 @@ align-items: center; gap: 10px; cursor: pointer; + border-radius: 3px; .img-portait { flex: 0 0 40px; @@ -75,6 +107,10 @@ .item-name { font-size: 14px; + + .expanded-icon { + display: none; + } } .item-tags, @@ -118,6 +154,11 @@ justify-content: end; gap: 8px; + a { + width: 15px; + text-align: center; + } + .unequipped { opacity: 0.5; } diff --git a/templates/settings/appearance-settings.hbs b/templates/settings/appearance-settings.hbs index ab30eefd..ef74ed45 100644 --- a/templates/settings/appearance-settings.hbs +++ b/templates/settings/appearance-settings.hbs @@ -4,6 +4,8 @@ {{formGroup settingFields.schema.fields.displayFear value=settingFields._source.displayFear localize=true}} {{formGroup settingFields.schema.fields.showGenericStatusEffects value=settingFields._source.showGenericStatusEffects localize=true}} + {{formGroup settingFields.schema.fields.expandedCharacterDescriptions value=settingFields._source.expandedCharacterDescriptions localize=true}} + {{formGroup settingFields.schema.fields.expandedAdversaryDescriptions value=settingFields._source.expandedAdversaryDescriptions localize=true}} {{#if showDiceSoNice}}