diff --git a/module/applications/dialogs/d20RollDialog.mjs b/module/applications/dialogs/d20RollDialog.mjs
index 067aa473..76b2e751 100644
--- a/module/applications/dialogs/d20RollDialog.mjs
+++ b/module/applications/dialogs/d20RollDialog.mjs
@@ -175,14 +175,14 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
this.disadvantage = advantage === -1;
this.config.roll.advantage = this.config.roll.advantage === advantage ? 0 : advantage;
+ if (this.config.roll.advantage === 0) return this.render();
- if (this.config.roll.advantage === 1 && this.config.data.rules.roll.defaultAdvantageDice) {
- const faces = Number.parseInt(this.config.data.rules.roll.defaultAdvantageDice);
- this.roll.advantageFaces = Number.isNaN(faces) ? this.roll.advantageFaces : faces;
- } else if (this.config.roll.advantage === -1 && this.config.data.rules.roll.defaultDisadvantageDice) {
- const faces = Number.parseInt(this.config.data.rules.roll.defaultDisadvantageDice);
- this.roll.advantageFaces = Number.isNaN(faces) ? this.roll.advantageFaces : faces;
- }
+ const defaultFaces =
+ this.config.roll.advantage === 1
+ ? this.config.data.rules.roll.defaultAdvantageDice
+ : this.config.data.rules.roll.defaultDisadvantageDice;
+ const faces = Number.parseInt(defaultFaces);
+ this.roll.advantageFaces = Number.isNaN(faces) ? this.roll.advantageFaces : faces;
this.render();
}
diff --git a/module/applications/sheets-configs/action-base-config.mjs b/module/applications/sheets-configs/action-base-config.mjs
index 7406b084..e83dfae4 100644
--- a/module/applications/sheets-configs/action-base-config.mjs
+++ b/module/applications/sheets-configs/action-base-config.mjs
@@ -204,7 +204,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
};
}
- if (this.action.parent.metadata?.isQuantifiable) {
+ if (this.action.parent.metadata.isInventoryItem) {
options.quantity = {
label: 'DAGGERHEART.GENERAL.itemQuantity',
group: 'Global'
diff --git a/module/applications/sheets-configs/activeEffectConfig.mjs b/module/applications/sheets-configs/activeEffectConfig.mjs
index 834a57a8..cb9f1701 100644
--- a/module/applications/sheets-configs/activeEffectConfig.mjs
+++ b/module/applications/sheets-configs/activeEffectConfig.mjs
@@ -175,6 +175,7 @@ export default class DhActiveEffectConfig extends foundry.applications.sheets.Ac
const partContext = await super._preparePartContext(partId, context);
switch (partId) {
case 'details':
+ partContext.isItemEffect = partContext.isItemEffect || this.options.isSetting;
const useGeneric = game.settings.get(
CONFIG.DH.id,
CONFIG.DH.SETTINGS.gameSettings.appearance
diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs
index 5f6c854b..19b82712 100644
--- a/module/applications/sheets/actors/character.mjs
+++ b/module/applications/sheets/actors/character.mjs
@@ -184,6 +184,9 @@ export default class CharacterSheet extends DHBaseActorSheet {
for (const input of form.querySelectorAll('input:not([type=search]), .editor.prosemirror')) {
input.disabled = disabled;
}
+ for (const element of form.querySelectorAll('.input[contenteditable]')) {
+ element.classList.toggle('disabled', disabled);
+ }
}
/** @inheritDoc */
@@ -368,7 +371,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
const doc = getDocFromElementSync(target);
return doc?.isOwner && !isItemWizardManaged(doc);
},
- callback: async (target, event) => {
+ onClick: async (event, target) => {
const doc = await getDocFromElement(target);
if (event.shiftKey) return doc.delete();
else return doc.deleteDialog();
@@ -393,7 +396,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
const doc = getDocFromElementSync(target);
return doc?.isOwner && doc.system.inVault;
},
- callback: async target => {
+ onClick: async (_, target) => {
const doc = await getDocFromElement(target);
const actorLoadout = doc.actor.system.loadoutSlot;
if (actorLoadout.available) return doc.update({ 'system.inVault': false });
@@ -407,7 +410,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
const doc = getDocFromElementSync(target);
return doc?.isOwner && doc.system.inVault;
},
- callback: async (target, event) => {
+ onClick: async (event, target) => {
const doc = await getDocFromElement(target);
const actorLoadout = doc.actor.system.loadoutSlot;
if (!actorLoadout.available) {
@@ -446,7 +449,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
const doc = getDocFromElementSync(target);
return doc?.isOwner && !doc.system.inVault;
},
- callback: async target => (await getDocFromElement(target)).update({ 'system.inVault': true })
+ onClick: async (_, target) => (await getDocFromElement(target)).update({ 'system.inVault': true })
}
].map(option => ({
...option,
@@ -472,7 +475,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
const doc = getDocFromElementSync(target);
return doc.isOwner && doc && !doc.system.equipped;
},
- callback: (target, event) => CharacterSheet.#toggleEquipItem.call(this, event, target)
+ onClick: (event, target) => CharacterSheet.#toggleEquipItem.call(this, event, target)
},
{
label: 'unequip',
@@ -481,7 +484,7 @@ export default class CharacterSheet extends DHBaseActorSheet {
const doc = getDocFromElementSync(target);
return doc.isOwner && doc && doc.system.equipped;
},
- callback: (target, event) => CharacterSheet.#toggleEquipItem.call(this, event, target)
+ onClick: (event, target) => CharacterSheet.#toggleEquipItem.call(this, event, target)
}
].map(option => ({
...option,
diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs
index c79db99b..2b0c3e55 100644
--- a/module/applications/sheets/api/application-mixin.mjs
+++ b/module/applications/sheets/api/application-mixin.mjs
@@ -424,7 +424,7 @@ export default function DHApplicationMixin(Base) {
const target = element.closest('[data-item-uuid]');
return !target.dataset.disabled && target.dataset.itemType !== 'beastform';
},
- callback: async target => (await getDocFromElement(target)).update({ disabled: true })
+ onClick: async (_, target) => (await getDocFromElement(target)).update({ disabled: true })
},
{
label: 'enableEffect',
@@ -433,7 +433,7 @@ export default function DHApplicationMixin(Base) {
const target = element.closest('[data-item-uuid]');
return target.dataset.disabled && target.dataset.itemType !== 'beastform';
},
- callback: async target => (await getDocFromElement(target)).update({ disabled: false })
+ onClick: async (_, target) => (await getDocFromElement(target)).update({ disabled: false })
}
].map(option => ({
...option,
@@ -478,7 +478,9 @@ export default function DHApplicationMixin(Base) {
(doc?.isOwner && (!doc?.hasOwnProperty('systemPath') || doc?.inCollection))
);
},
- callback: async target => (await getDocFromElement(target)).sheet.render({ force: true })
+ onClick: async (_, target) => {
+ return (await getDocFromElement(target)).sheet.render({ force: true });
+ }
}
];
@@ -493,7 +495,7 @@ export default function DHApplicationMixin(Base) {
!foundry.utils.isEmpty(doc?.damage?.parts);
return doc?.isOwner && hasDamage;
},
- callback: async (target, event) => {
+ onClick: async (event, target) => {
const doc = await getDocFromElement(target),
action = doc?.system?.attack ?? doc;
const config = action.prepareConfig(event);
@@ -513,7 +515,7 @@ export default function DHApplicationMixin(Base) {
const doc = getDocFromElementSync(target);
return doc?.isOwner && !(doc.type === 'domainCard' && doc.system.inVault);
},
- callback: async (target, event) => (await getDocFromElement(target)).use(event)
+ onClick: async (event, target) => (await getDocFromElement(target)).use(event)
});
}
@@ -521,7 +523,7 @@ export default function DHApplicationMixin(Base) {
options.push({
label: 'DAGGERHEART.APPLICATIONS.ContextMenu.sendToChat',
icon: 'fa-solid fa-message',
- callback: async target => (await getDocFromElement(target)).toChat(this.document.uuid)
+ onClick: async (_, target) => (await getDocFromElement(target)).toChat(this.document.uuid)
});
if (deletable)
@@ -533,7 +535,7 @@ export default function DHApplicationMixin(Base) {
const doc = getDocFromElementSync(target);
return doc?.isOwner !== false && target.dataset.itemType !== 'beastform';
},
- callback: async (target, event) => {
+ onClick: async (event, target) => {
const doc = await getDocFromElement(target);
if (event.shiftKey) return doc.delete();
else return doc.deleteDialog();
diff --git a/module/applications/sheets/api/base-actor.mjs b/module/applications/sheets/api/base-actor.mjs
index e23a4426..5cd0f6a5 100644
--- a/module/applications/sheets/api/base-actor.mjs
+++ b/module/applications/sheets/api/base-actor.mjs
@@ -166,6 +166,15 @@ export default class DHBaseActorSheet extends DHApplicationMixin(ActorSheetV2) {
}
}
+ /** Add support for input content editables */
+ _toggleDisabled(disabled) {
+ super._toggleDisabled(disabled);
+ const form = this.form;
+ for (const element of form.querySelectorAll('.input[contenteditable]')) {
+ element.classList.toggle('disabled', disabled);
+ }
+ }
+
/* -------------------------------------------- */
/* Context Menu */
/* -------------------------------------------- */
diff --git a/module/applications/sheets/api/base-item.mjs b/module/applications/sheets/api/base-item.mjs
index e3568b23..1e08fc05 100644
--- a/module/applications/sheets/api/base-item.mjs
+++ b/module/applications/sheets/api/base-item.mjs
@@ -126,7 +126,7 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
options.push({
name: 'CONTROLS.CommonDelete',
icon: '',
- callback: async target => {
+ onClick: async (_, target) => {
const feature = await getDocFromElement(target);
if (!feature) return;
const confirmed = await foundry.applications.api.DialogV2.confirm({
diff --git a/module/applications/ui/itemBrowser.mjs b/module/applications/ui/itemBrowser.mjs
index d98cf2da..8f38918a 100644
--- a/module/applications/ui/itemBrowser.mjs
+++ b/module/applications/ui/itemBrowser.mjs
@@ -1,3 +1,4 @@
+import { getDocFromElement } from '../../helpers/utils.mjs';
import { RefreshType, socketEvent } from '../../systemRegistration/socket.mjs';
const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
@@ -47,7 +48,8 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
expandContent: this.expandContent,
resetFilters: this.resetFilters,
sortList: this.sortList,
- openSettings: this.openSettings
+ openSettings: this.openSettings,
+ viewSheet: this.#onViewSheet
},
position: {
left: 100,
@@ -306,7 +308,8 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
{
items: this.items,
menu: this.selectedMenu,
- formatLabel: this.formatLabel
+ formatLabel: this.formatLabel,
+ viewSheet: this.items[0] instanceof Actor
}
);
@@ -568,6 +571,11 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
}
}
+ static async #onViewSheet(_, target) {
+ const document = await getDocFromElement(target);
+ document?.sheet?.render(true);
+ }
+
_createDragProcess() {
new foundry.applications.ux.DragDrop.implementation({
dragSelector: '.item-container',
@@ -606,7 +614,16 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
items: {
folder: 'equipments',
render: {
- noFolder: true
+ folders: [
+ 'equipments',
+ 'ancestries',
+ 'classes',
+ 'subclasses',
+ 'domains',
+ 'communities',
+ 'beastforms'
+ // excluded: features
+ ]
}
},
compendium: {}
diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs
index b3775dc9..acd104a7 100644
--- a/module/data/action/baseAction.mjs
+++ b/module/data/action/baseAction.mjs
@@ -148,10 +148,14 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
: null;
}
- /** Returns true if the action is usable */
+ /**
+ * Returns true if the action is usable.
+ * An action is usable on any actor type. For example, an adversary might have a base attack action.
+ */
get usable() {
const actor = this.actor;
- return this.isOwner && actor?.type === 'character';
+ const pack = actor?.pack ? game.packs.get(actor.pack) : null;
+ return !pack?.locked && this.isOwner;
}
static getRollType(parent) {
diff --git a/module/data/fields/action/costField.mjs b/module/data/fields/action/costField.mjs
index 9271f6b0..1928af41 100644
--- a/module/data/fields/action/costField.mjs
+++ b/module/data/fields/action/costField.mjs
@@ -103,7 +103,7 @@ export default class CostField extends fields.ArrayField {
static calcCosts(costs) {
const resources = CostField.getResources.call(this, costs);
let filteredCosts = costs;
- if (this.parent?.metadata.isQuantifiable && this.parent.consumeOnUse === false) {
+ if (this.parent?.isInventoryItem && this.parent.consumeOnUse === false) {
filteredCosts = filteredCosts.filter(c => c.key !== 'quantity');
}
diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs
index e4efc4f3..63f21667 100644
--- a/module/dice/dualityRoll.mjs
+++ b/module/dice/dualityRoll.mjs
@@ -150,14 +150,22 @@ export default class DualityRoll extends D20Roll {
}
applyAdvantage() {
- if (this.hasAdvantage || this.hasDisadvantage) {
- const dieFaces = this.advantageFaces,
- advDie = new foundry.dice.terms.Die({ faces: dieFaces, number: this.advantageNumber });
- if (this.advantageNumber > 1) advDie.modifiers = ['kh'];
- this.terms.push(
- new foundry.dice.terms.OperatorTerm({ operator: this.hasDisadvantage ? '-' : '+' }),
- advDie
- );
+ const advDieClass = this.hasAdvantage
+ ? game.system.api.dice.diceTypes.AdvantageDie
+ : this.hasDisadvantage
+ ? game.system.api.dice.diceTypes.DisadvantageDie
+ : null;
+ if (advDieClass) {
+ const advDie = new advDieClass({ faces: this.advantageFaces, number: this.advantageNumber });
+ if (this.terms.length < 4) {
+ if (this.advantageNumber > 1) advDie.modifiers = ['kh'];
+ this.terms.push(
+ new foundry.dice.terms.OperatorTerm({ operator: this.hasDisadvantage ? '-' : '+' }),
+ advDie
+ );
+ } else {
+ this.terms[4] = advDie;
+ }
}
if (this.rallyFaces)
this.terms.push(
diff --git a/module/documents/item.mjs b/module/documents/item.mjs
index 93aa3b28..603ca594 100644
--- a/module/documents/item.mjs
+++ b/module/documents/item.mjs
@@ -73,8 +73,10 @@ export default class DHItem extends foundry.documents.Item {
/** Returns true if the item can be used */
get usable() {
const actor = this.actor;
- const actionsList = this.system.actionsList;
- return this.isOwner && actor?.type === 'character' && (actionsList?.size || actionsList?.length);
+ const pack = actor?.pack ? game.packs.get(actor.pack) : null;
+ const hasActions = this.system.actionsList?.size || this.system.actionsList?.length;
+ const isValidType = actor?.type === 'character' || this.type === 'feature';
+ return !pack?.locked && this.isOwner && isValidType && hasActions;
}
/** @inheritdoc */
diff --git a/styles/less/dialog/tag-team-dialog/initialization.less b/styles/less/dialog/tag-team-dialog/initialization.less
index 2d015141..f53a7af4 100644
--- a/styles/less/dialog/tag-team-dialog/initialization.less
+++ b/styles/less/dialog/tag-team-dialog/initialization.less
@@ -1,3 +1,5 @@
+@import '../../utils/mixin.less';
+
.theme-light .daggerheart.dialog.dh-style.views.tag-team-dialog {
.initialization-container .members-container .member-container {
.member-name {
@@ -62,17 +64,7 @@
color: var(--color-text-primary);
text-shadow: 1px 1px 2px var(--shadow-color), 0 0 10px var(--shadow-color);
-
- // Basic "scrim" gradient
- background-image: linear-gradient(
- to top,
- var(--shadow-color),
- rgba(from var(--shadow-color) r g b / 0.834) 10.6%,
- rgba(from var(--shadow-color) r g b / 0.541) 34%,
- rgba(from var(--shadow-color) r g b / 0.382) 47%,
- rgba(from var(--shadow-color) r g b / 0.194) 65%,
- transparent 100%
- );
+ .smooth-gradient-ease-in-out(background-image, to bottom, var(--shadow-color), 100%);
}
img {
diff --git a/styles/less/sheets/actors/actor-sheet-shared.less b/styles/less/sheets/actors/actor-sheet-shared.less
index bd82ef83..6ef73035 100644
--- a/styles/less/sheets/actors/actor-sheet-shared.less
+++ b/styles/less/sheets/actors/actor-sheet-shared.less
@@ -34,7 +34,7 @@
.attribution-header-label {
font-style: italic;
font-family: @font-body;
- color: light-dark(@chat-blue-bg, @beige-50);
+ color: @color-text-subtle;
}
.tab.inventory {
diff --git a/styles/less/sheets/actors/companion/header.less b/styles/less/sheets/actors/companion/header.less
index 2a162a25..6cf886ab 100644
--- a/styles/less/sheets/actors/companion/header.less
+++ b/styles/less/sheets/actors/companion/header.less
@@ -11,7 +11,7 @@
.profile {
height: 235px;
cursor: pointer;
- mask-image: linear-gradient(0deg, transparent 0%, black 10%);
+ .smooth-gradient-ease-in-out(mask-image, to top, black, 2.25rem);
}
.actor-name {
@@ -24,11 +24,16 @@
margin-bottom: -30px;
input[type='text'] {
+ backdrop-filter: none;
+ border: none;
+ font-family: @font-title;
font-size: var(--font-size-24);
- height: 32px;
- text-align: center;
- border: 1px solid transparent;
outline: 2px solid transparent;
+ box-shadow: unset;
+ text-shadow: 0 0 4px light-dark(white, @dark-80), 0 0 8px light-dark(white, @dark-80), 0 0 14px light-dark(white, @dark-80);
+
+ height: 2rem;
+ text-align: center;
transition: all 0.3s ease;
&:hover {
@@ -243,7 +248,7 @@
.companion-navigation {
display: flex;
gap: 8px;
- align-items: center;
+ align-items: baseline;
width: 100%;
}
}
diff --git a/styles/less/sheets/actors/environment/header.less b/styles/less/sheets/actors/environment/header.less
index 670f6c92..ce7e6163 100644
--- a/styles/less/sheets/actors/environment/header.less
+++ b/styles/less/sheets/actors/environment/header.less
@@ -1,5 +1,6 @@
@import '../../../utils/colors.less';
@import '../../../utils/fonts.less';
+@import '../../../utils/mixin.less';
.application.sheet.daggerheart.actor.dh-style.environment {
.environment-header-sheet {
@@ -10,60 +11,83 @@
.profile {
height: 235px;
- mask-image: linear-gradient(0deg, transparent 0%, black 10%);
cursor: pointer;
+ .smooth-gradient-ease-in-out(mask-image, to top, black, 3.5rem);
}
.item-container {
- display: flex;
+ display: grid;
+ grid-auto-flow: row;
+ grid-template-columns: 1fr min-content;
+
align-items: center;
position: relative;
- top: -45px;
- gap: 20px;
+ top: -36px;
+ gap: 0 var(--spacer-12);
padding: 0 20px;
- margin-bottom: -30px;
+ margin-bottom: -26px;
- .item-info {
+ .item-name input[type='text'] {
+ backdrop-filter: none;
+ border: none;
+ font-family: @font-title;
+ font-size: var(--font-size-32);
+ text-align: start;
+ transition: all 0.3s ease;
+ outline: 2px solid transparent;
+ box-shadow: none;
+ text-shadow: 0 0 4px light-dark(white, @dark-80), 0 0 8px light-dark(white, @dark-80), 0 0 14px light-dark(white, @dark-80);
+
+ padding-left: 0;
+ height: 2.625rem;
+
+ &:hover[type='text'],
+ &:focus[type='text'] {
+ box-shadow: none;
+ outline: 2px solid light-dark(@dark-blue, @golden);
+ }
+ }
+
+ .flexrow {
+ align-items: baseline;
+ grid-column: span 2;
+ }
+
+ .tags {
display: flex;
- flex-direction: column;
- gap: 8px;
+ gap: 10px;
+ padding-bottom: 0;
+ flex: 0;
- .tags {
+ .tag {
display: flex;
- gap: 10px;
- padding-bottom: 0;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+ padding: 3px 5px;
+ font-size: var(--font-size-12);
+ font: @font-body;
+ white-space: nowrap;
- .tag {
- display: flex;
- flex-direction: row;
- justify-content: center;
- align-items: center;
- padding: 3px 5px;
- font-size: var(--font-size-12);
- font: @font-body;
-
- background: light-dark(@dark-15, @beige-15);
- border: 1px solid light-dark(@dark, @beige);
- border-radius: 3px;
- }
-
- .label {
- display: flex;
- flex-direction: row;
- justify-content: center;
- align-items: center;
- font-size: var(--font-size-12);
- }
+ background: light-dark(@dark-15, @beige-15);
+ border: 1px solid light-dark(@dark, @beige);
+ border-radius: 3px;
}
- .attribution-header-label {
- text-align: left;
- position: relative;
- top: 4px;
- margin-bottom: -6px;
+ .label {
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+ font-size: var(--font-size-12);
}
}
+ .attribution-header-label {
+ text-align: right;
+ position: relative;
+ }
+
.status-number {
display: flex;
align-items: center;
@@ -81,7 +105,7 @@
font-size: 1.2rem;
align-items: center;
justify-content: center;
- background: light-dark(transparent, @dark-blue);
+ background: light-dark(#e8e6e3, @dark-blue);
z-index: 2;
&.armor-slots {
@@ -93,7 +117,7 @@
.status-label {
padding: 2px 10px;
width: 100%;
- border-radius: 3px;
+ border-radius: 0 0 3px 3px;
background: light-dark(@dark-blue, @golden);
h4 {
@@ -105,37 +129,23 @@
}
}
}
-
- .item-name {
- input[type='text'] {
- font-size: var(--font-size-32);
- height: 42px;
- text-align: start;
- transition: all 0.3s ease;
- outline: 2px solid transparent;
- border: 1px solid transparent;
-
- &:hover[type='text'],
- &:focus[type='text'] {
- box-shadow: none;
- outline: 2px solid light-dark(@dark-blue, @golden);
- }
- }
- }
}
.environment-info {
display: flex;
flex-direction: column;
- gap: 12px;
+ gap: var(--spacer-8);
padding: 10px 20px;
}
.environment-navigation {
display: flex;
gap: 20px;
- align-items: center;
+ align-items: baseline;
padding: 0 20px;
+ .tab-navigation {
+ margin-top: 0;
+ }
}
}
}
diff --git a/styles/less/sheets/actors/environment/sheet.less b/styles/less/sheets/actors/environment/sheet.less
index a7c9605b..2d9cc188 100644
--- a/styles/less/sheets/actors/environment/sheet.less
+++ b/styles/less/sheets/actors/environment/sheet.less
@@ -5,10 +5,6 @@
.appTheme({
&.environment {
background-image: url('../assets/parchments/dh-parchment-dark.png');
-
- .attribution-header-label {
- background-image: url('../assets/parchments/dh-parchment-dark.png');
- }
}
}, {
&.environment {
diff --git a/styles/less/sheets/actors/party/header.less b/styles/less/sheets/actors/party/header.less
index 9a2c7350..18d69834 100644
--- a/styles/less/sheets/actors/party/header.less
+++ b/styles/less/sheets/actors/party/header.less
@@ -1,5 +1,6 @@
@import '../../../utils/colors.less';
@import '../../../utils/fonts.less';
+@import '../../../utils/mixin.less';
.party-header-sheet {
display: flex;
@@ -9,26 +10,30 @@
.profile {
height: 235px;
- mask-image: linear-gradient(0deg, transparent 0%, black 10%);
cursor: pointer;
+ .smooth-gradient-ease-in-out(mask-image, to top, black, 3.5rem);
}
.item-container {
- .item-name {
- padding: 0 20px;
- input[type='text'] {
- font-size: 32px;
- height: 42px;
- text-align: center;
- transition: all 0.3s ease;
- outline: 2px solid transparent;
- border: 1px solid transparent;
+ margin-top: -2rem;
+ z-index: 1;
+ input.item-name[type='text'] {
+ backdrop-filter: none;
+ border: none;
+ font-family: @font-title;
+ font-size: var(--font-size-32);
+ outline: 2px solid transparent;
+ box-shadow: unset;
+ text-shadow: 0 0 4px light-dark(white, @dark-80), 0 0 8px light-dark(white, @dark-80), 0 0 14px light-dark(white, @dark-80);
- &:hover[type='text'],
- &:focus[type='text'] {
- box-shadow: none;
- outline: 2px solid light-dark(@dark-blue, @golden);
- }
+ text-align: center;
+ transition: all 0.3s ease;
+ width: calc(100% - 40px);
+ height: 2.625rem;
+
+ &:hover[type='text'],
+ &:focus[type='text'] {
+ outline: 2px solid light-dark(@dark-blue, @golden);
}
}
diff --git a/styles/less/ui/item-browser/item-browser.less b/styles/less/ui/item-browser/item-browser.less
index 066da73b..a40c0fae 100644
--- a/styles/less/ui/item-browser/item-browser.less
+++ b/styles/less/ui/item-browser/item-browser.less
@@ -245,7 +245,7 @@
}
.item-list-header,
- .item-list [data-action='expandContent'] {
+ .item-list .item-info[data-action] {
display: flex;
> * {
diff --git a/styles/less/utils/colors.less b/styles/less/utils/colors.less
index 80519a5b..d35ad8b3 100755
--- a/styles/less/utils/colors.less
+++ b/styles/less/utils/colors.less
@@ -83,6 +83,8 @@
--gradient-stress: linear-gradient(15deg, rgb(130, 59, 1) 0%, rgb(252, 142, 69) 65%, rgb(190, 0, 0) 100%);
--primary-color-fear: rgba(9, 71, 179, 0.75);
+
+ --dh-color-text-subtle: light-dark(#555, #a29086);
}
@primary-blue: var(--primary-blue, #1488cc);
@@ -190,3 +192,5 @@
box-shadow: 0 0 2px 2px @dark-blue;
}
}
+
+@color-text-subtle: var(--dh-color-text-subtle);
\ No newline at end of file
diff --git a/styles/less/utils/mixin.less b/styles/less/utils/mixin.less
index 49e97a1f..b37bfc06 100644
--- a/styles/less/utils/mixin.less
+++ b/styles/less/utils/mixin.less
@@ -114,3 +114,48 @@
font-family: @font-body;
}
}
+
+
+// A simple ease-out mask
+.smooth-gradient-ease-out(@param, @to, @destination, @length) {
+ @{param}+: linear-gradient(
+ @to,
+ transparent 0%,
+ rgb(from @destination r g b / ~"calc(alpha * 0.013)") calc(0.008 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.049)") calc(0.029 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.104)") calc(0.064 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.259)") calc(0.166 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.45)") calc(0.304 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.741)") calc(0.554 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.825)") calc(0.644 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.896)") calc(0.735 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.951)") calc(0.825 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.987)") calc(0.914 * @length),
+ @destination @length
+ );
+}
+
+/**
+ * A simple ease in and out mask.
+ * @param - the parameter to add to
+ * @param - direction, such as "to top"
+ * @destination - the color at the destination. The origin is always transparent
+ * @length - the value at the destination
+ */
+.smooth-gradient-ease-in-out(@param, @to, @destination, @length: 100%) {
+ @{param}+: linear-gradient(
+ @to,
+ transparent 0%,
+ rgb(from @destination r g b / ~"calc(alpha * 0.013)") calc(0.081 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.049)") calc(0.155 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.104)") calc(0.225 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.259)") calc(0.353 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.45)") calc(0.471 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.741)") calc(0.647 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.825)") calc(0.71 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.896)") calc(0.775 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.951)") calc(0.845 * @length),
+ rgb(from @destination r g b / ~"calc(alpha * 0.987)") calc(0.914 * @length),
+ @destination @length
+ );
+}
diff --git a/templates/sheets/activeEffect/details.hbs b/templates/sheets/activeEffect/details.hbs
index dc19b3dc..8ab4b5cf 100644
--- a/templates/sheets/activeEffect/details.hbs
+++ b/templates/sheets/activeEffect/details.hbs
@@ -5,16 +5,9 @@
{{formGroup systemFields.targetDispositions value=source.system.targetDispositions name=(concat "system.targetDispositions") localize=true}}
{{#if isActorEffect}}
-
- {{/if}}
-
- {{#if isItemEffect}}
- {{formGroup fields.transfer value=source.transfer rootId=rootId label=legacyTransfer.label hint=(localize "DAGGERHEART.EFFECTS.Attachments.transferHint")}}
+ {{formGroup fields.origin value=source.origin rootId=rootId disabled=true}}
+ {{else if isItemEffect}}
+ {{formGroup fields.transfer value=source.transfer rootId=rootId}}
{{/if}}
{{formGroup fields.statuses value=source.statuses options=statuses rootId=rootId classes="statuses"}}
diff --git a/templates/sheets/actors/environment/header.hbs b/templates/sheets/actors/environment/header.hbs
index b7eab3db..2c6bbb5a 100644
--- a/templates/sheets/actors/environment/header.hbs
+++ b/templates/sheets/actors/environment/header.hbs
@@ -1,28 +1,7 @@
\ No newline at end of file
diff --git a/templates/sheets/global/partials/inventory-item-compact.hbs b/templates/sheets/global/partials/inventory-item-compact.hbs
index daba6721..78eaf087 100644
--- a/templates/sheets/global/partials/inventory-item-compact.hbs
+++ b/templates/sheets/global/partials/inventory-item-compact.hbs
@@ -5,7 +5,7 @@
(hasProperty item "toChat" ) "toChat" "editDoc" ) }}' {{#unless hideTooltip}} {{#if (eq type 'attack' )}}
data-tooltip="#attack#{{item.actor.uuid}}" {{else}} data-tooltip="#item#{{item.uuid}}" {{/if}} {{/unless}}>
- {{#if (or item.system.actionsList.size item.system.actionsList.length item.actionType)}}
+ {{#if item.usable}}
{{#if @root.isNPC}}
{{else}}
diff --git a/templates/ui/itemBrowser/itemContainer.hbs b/templates/ui/itemBrowser/itemContainer.hbs
index 8dd75156..a5f067e8 100644
--- a/templates/ui/itemBrowser/itemContainer.hbs
+++ b/templates/ui/itemBrowser/itemContainer.hbs
@@ -1,7 +1,7 @@
{{#each items}}
{{name}}
{{#each ../menu.data.columns}}
@@ -9,11 +9,13 @@
{{/each}}