diff --git a/module/data/item/armor.mjs b/module/data/item/armor.mjs index 7a8b06c0..8522c8fc 100644 --- a/module/data/item/armor.mjs +++ b/module/data/item/armor.mjs @@ -10,7 +10,6 @@ export default class DHArmor extends AttachableItem { label: 'TYPES.Item.armor', type: 'armor', hasDescription: true, - isQuantifiable: true, isInventoryItem: true }); } diff --git a/module/data/item/weapon.mjs b/module/data/item/weapon.mjs index 29e05fd9..9fbb3eba 100644 --- a/module/data/item/weapon.mjs +++ b/module/data/item/weapon.mjs @@ -9,7 +9,6 @@ export default class DHWeapon extends AttachableItem { label: 'TYPES.Item.weapon', type: 'weapon', hasDescription: true, - isQuantifiable: true, isInventoryItem: true // hasInitialAction: true }); diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less index c83e8dfe..39f0d1f1 100755 --- a/styles/less/global/elements.less +++ b/styles/less/global/elements.less @@ -112,7 +112,7 @@ margin: 5px; height: inherit; .tag { - box-shadow: 0 0 0 1.1em #e5e5e5 inset; + box-shadow: 0 0 0 1.1em @beige inset; vertical-align: top; box-sizing: border-box; max-width: 100%; diff --git a/templates/dialogs/dice-roll/resourceDice.hbs b/templates/dialogs/dice-roll/resourceDice.hbs index 1b4976d4..33c93386 100644 --- a/templates/dialogs/dice-roll/resourceDice.hbs +++ b/templates/dialogs/dice-roll/resourceDice.hbs @@ -1,4 +1,4 @@ -
+
{{#times (rollParsed item.system.resource.max actor item numerical=true)}} {{#with (ifThen (lookup ../diceStates this) (lookup ../diceStates this) this) as | state |}} @@ -13,4 +13,4 @@ -
\ No newline at end of file +
\ No newline at end of file diff --git a/templates/sheets/global/partials/inventory-item.hbs b/templates/sheets/global/partials/inventory-item.hbs index ec579800..a6373c08 100644 --- a/templates/sheets/global/partials/inventory-item.hbs +++ b/templates/sheets/global/partials/inventory-item.hbs @@ -12,11 +12,10 @@ {{#if isSidebar}}
- {{!-- {{localize (concat 'DAGGERHEART.CONFIG.Traits.' item.system.attack.roll.trait '.short')}} --}} + {{localize (concat 'DAGGERHEART.CONFIG.Traits.' item.system.attack.roll.trait '.short')}} {{localize (concat 'DAGGERHEART.CONFIG.Range.' item.system.attack.range '.short')}} - {{item.system.attack.damage.parts.0.value.dice}}{{#if item.system.attack.damage.parts.0.value.bonus}} + {{item.system.attack.damage.parts.0.value.bonus}}{{/if}} - {{!-- ({{localize (concat 'DAGGERHEART.CONFIG.DamageType.' item.system.attack.damage.parts.0.type '.abbreviation')}}) --}} {{#each item.system.attack.damage.parts.0.type as | type | }} {{#with (lookup @root.config.GENERAL.damageTypes type)}}