'
})
);
}
diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs
index 1cfed094..e2d967a3 100644
--- a/module/dice/dualityRoll.mjs
+++ b/module/dice/dualityRoll.mjs
@@ -1,6 +1,6 @@
import D20RollDialog from '../applications/dialogs/d20RollDialog.mjs';
import D20Roll from './d20Roll.mjs';
-import { parseRallyDice, setDiceSoNiceForDualityRoll } from '../helpers/utils.mjs';
+import { parseRallyDice, setDiceSoNiceForDualityRoll, shouldUseHopeFearAutomation } from '../helpers/utils.mjs';
import { getDiceSoNicePresets } from '../config/generalConfig.mjs';
import { updateResourcesForDualityReroll } from './helpers.mjs';
@@ -312,11 +312,9 @@ export default class DualityRoll extends D20Roll {
}
static async addDualityResourceUpdates(config) {
- const automationSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
- const hopeFearAutomation = automationSettings.hopeFear;
if (
!config.source?.actor ||
- (game.user.isGM ? !hopeFearAutomation.gm : !hopeFearAutomation.players) ||
+ !shouldUseHopeFearAutomation() ||
config.actionType === 'reaction' ||
config.skips?.resources
)
@@ -334,15 +332,15 @@ export default class DualityRoll extends D20Roll {
const fear =
(config.roll.result.duality === -1 ? 1 : 0) - (config.rerolledRoll.result.duality === -1 ? 1 : 0);
- if (hope !== 0) updates.push({ key: 'hope', value: hope, total: -1 * hope, enabled: true });
- if (stress !== 0) updates.push({ key: 'stress', value: -1 * stress, total: stress, enabled: true });
- if (fear !== 0) updates.push({ key: 'fear', value: fear, total: -1 * fear, enabled: true });
+ if (hope !== 0) updates.push({ key: 'hope', value: hope, enabled: true });
+ if (stress !== 0) updates.push({ key: 'stress', value: -1 * stress, enabled: true });
+ if (fear !== 0) updates.push({ key: 'fear', value: fear, enabled: true });
}
} else {
if (config.roll.isCritical || config.roll.result.duality === 1)
- updates.push({ key: 'hope', value: 1, total: -1, enabled: true });
- if (config.roll.isCritical) updates.push({ key: 'stress', value: -1, total: 1, enabled: true });
- if (config.roll.result.duality === -1) updates.push({ key: 'fear', value: 1, total: -1, enabled: true });
+ updates.push({ key: 'hope', value: 1, enabled: true });
+ if (config.roll.isCritical) updates.push({ key: 'stress', value: -1, enabled: true });
+ if (config.roll.result.duality === -1) updates.push({ key: 'fear', value: 1, enabled: true });
}
if (updates.length) {
diff --git a/module/dice/helpers.mjs b/module/dice/helpers.mjs
index 35adb8b7..5f8a7bbb 100644
--- a/module/dice/helpers.mjs
+++ b/module/dice/helpers.mjs
@@ -9,9 +9,9 @@ export function updateResourcesForDualityReroll(oldDuality, newDuality, actor) {
const stress = (newDuality === 0 ? 1 : 0) - (oldDuality === 0 ? 1 : 0);
const fear = (newDuality === -1 ? 1 : 0) - (oldDuality === -1 ? 1 : 0);
- if (hope !== 0) updates.push({ key: 'hope', value: hope, total: -1 * hope, enabled: true });
- if (stress !== 0) updates.push({ key: 'stress', value: -1 * stress, total: stress, enabled: true });
- if (fear !== 0) updates.push({ key: 'fear', value: fear, total: -1 * fear, enabled: true });
+ if (hope !== 0) updates.push({ key: 'hope', value: hope, enabled: true });
+ if (stress !== 0) updates.push({ key: 'stress', value: -1 * stress, enabled: true });
+ if (fear !== 0) updates.push({ key: 'fear', value: fear, enabled: true });
const resourceUpdates = new ResourceUpdateMap(actor);
resourceUpdates.addResources(updates);
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index 3c5192be..6467edd7 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -885,3 +885,8 @@ export async function triggerChatRollFx(rolls, options = { whisper: false, blind
foundry.audio.AudioHelper.play({ src: CONFIG.sounds.dice });
}
}
+
+export function shouldUseHopeFearAutomation(options = { gmAsPlayer: true }) {
+ const { hopeFear } = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation);
+ return (!game.user.isGM || options.gmAsPlayer) ? hopeFear.players : hopeFear.gm;
+}
\ No newline at end of file
diff --git a/styles/less/dialog/tag-team-dialog/initialization.less b/styles/less/dialog/tag-team-dialog/initialization.less
index d6f7ad29..e79ed65c 100644
--- a/styles/less/dialog/tag-team-dialog/initialization.less
+++ b/styles/less/dialog/tag-team-dialog/initialization.less
@@ -88,9 +88,21 @@
grid-template-columns: 1fr 1fr;
gap: 8px;
- &.inactive {
+ .inactive {
opacity: 0.4;
}
+
+ .initiator-cost-fields {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+
+ .initiator-cost-inputs {
+ display: grid;
+ grid-template-columns: auto 1fr;
+ align-items: center;
+ }
+ }
}
footer {
diff --git a/styles/less/global/elements.less b/styles/less/global/elements.less
index e57ba50d..9c074fb5 100755
--- a/styles/less/global/elements.less
+++ b/styles/less/global/elements.less
@@ -501,7 +501,7 @@
height: 1px;
width: 100%;
border-bottom: 1px solid @color-border;
- mask-image: linear-gradient(270deg, transparent 0%, black 50%, transparent 100%);
+ mask-image: linear-gradient(270deg, transparent 0%, black 35%,black 50%, black 65%, transparent 100%);
}
side-line-div {
diff --git a/styles/less/global/sheet.less b/styles/less/global/sheet.less
index e3072da1..8381c7c3 100755
--- a/styles/less/global/sheet.less
+++ b/styles/less/global/sheet.less
@@ -54,7 +54,7 @@ body.game:is(.performance-low, .noblur) {
position: relative;
min-height: -webkit-fill-available;
transition: opacity 0.3s ease;
- padding-bottom: 20px;
+ padding-bottom: 16px;
.tab {
padding: 0 10px;
diff --git a/styles/less/sheets/actors/actor-sheet-shared.less b/styles/less/sheets/actors/actor-sheet-shared.less
index 89617103..6015047b 100644
--- a/styles/less/sheets/actors/actor-sheet-shared.less
+++ b/styles/less/sheets/actors/actor-sheet-shared.less
@@ -39,6 +39,7 @@
.window-header > .attribution-header-label {
margin-right: var(--spacer-4);
+ pointer-events: none;
}
.tab.inventory {
@@ -46,7 +47,7 @@
display: grid;
grid-template-columns: 1fr 1fr 1fr 1fr;
gap: 10px;
- padding: 10px 10px 0;
+ padding: 12px 12px 0 10px;
.input {
color: light-dark(@dark, @beige);
diff --git a/styles/less/sheets/actors/adversary/effects.less b/styles/less/sheets/actors/adversary/effects.less
index 4aa44e51..ce843b35 100644
--- a/styles/less/sheets/actors/adversary/effects.less
+++ b/styles/less/sheets/actors/adversary/effects.less
@@ -8,7 +8,7 @@
flex-direction: column;
gap: 10px;
overflow-y: auto;
- padding-bottom: 20px;
+ scrollbar-gutter: stable;
.with-scroll-shadows();
}
}
diff --git a/styles/less/sheets/actors/adversary/features.less b/styles/less/sheets/actors/adversary/features.less
index 447d050e..f5bbd8aa 100644
--- a/styles/less/sheets/actors/adversary/features.less
+++ b/styles/less/sheets/actors/adversary/features.less
@@ -3,13 +3,17 @@
@import '../../../utils/mixin.less';
.application.sheet.daggerheart.actor.dh-style.adversary {
- .tab.features {
+ .tab.features.active {
+ position: relative;
+ padding-left: 12px;
.feature-section {
display: flex;
flex-direction: column;
gap: 10px;
+ padding-top: 4px;
+ padding-right: 2px;
overflow-y: auto;
- padding-bottom: 20px;
+ scrollbar-gutter: stable;
.with-scroll-shadows();
}
}
diff --git a/styles/less/sheets/actors/adversary/index.less b/styles/less/sheets/actors/adversary/index.less
index 28ff9d22..a05af854 100644
--- a/styles/less/sheets/actors/adversary/index.less
+++ b/styles/less/sheets/actors/adversary/index.less
@@ -1,7 +1,6 @@
-@import './features.less';
-@import './header.less';
@import './sheet.less';
+@import './header.less';
+@import './features.less';
@import './sidebar.less';
@import './effects.less';
@import './notes.less';
-
diff --git a/styles/less/sheets/actors/adversary/notes.less b/styles/less/sheets/actors/adversary/notes.less
index a95d070e..006f7865 100644
--- a/styles/less/sheets/actors/adversary/notes.less
+++ b/styles/less/sheets/actors/adversary/notes.less
@@ -1,3 +1,7 @@
.application.sheet.daggerheart.actor.dh-style.adversary .tab.notes.active {
- padding-bottom: 20px;
+ padding-top: 6px;
+ .editor-content {
+ scrollbar-gutter: stable;
+ .with-scroll-shadows();
+ }
}
diff --git a/styles/less/sheets/actors/adversary/sheet.less b/styles/less/sheets/actors/adversary/sheet.less
index 0bd845fa..ec6a3879 100644
--- a/styles/less/sheets/actors/adversary/sheet.less
+++ b/styles/less/sheets/actors/adversary/sheet.less
@@ -9,28 +9,31 @@
height: 100%;
width: 100%;
padding-bottom: 0;
+ }
- .adversary-sidebar-sheet {
- grid-row: 1 / span 2;
- grid-column: 1;
+ .adversary-sidebar-sheet {
+ grid-row: 1 / span 2;
+ grid-column: 1;
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+ }
+
+ .adversary-header-sheet {
+ grid-row: 1;
+ grid-column: 2;
+ }
+
+ .tab {
+ grid-row: 2;
+ grid-column: 2;
+ &.active {
overflow: hidden;
display: flex;
flex-direction: column;
- }
-
- .adversary-header-sheet {
- grid-row: 1;
- grid-column: 2;
- }
-
- .tab {
- grid-row: 2;
- grid-column: 2;
- &.active {
- overflow: hidden;
- display: flex;
- flex-direction: column;
- }
+ padding-right: 0;
+ margin-right: 1px;
+ margin-bottom: 12px;
}
}
}
diff --git a/styles/less/sheets/actors/character/biography.less b/styles/less/sheets/actors/character/biography.less
index 8548a2fb..ce52c5af 100644
--- a/styles/less/sheets/actors/character/biography.less
+++ b/styles/less/sheets/actors/character/biography.less
@@ -11,8 +11,9 @@
height: 100%;
overflow-y: auto;
padding-top: 8px;
- padding-bottom: 20px;
+ padding-bottom: 4px;
height: 100%;
+ scrollbar-gutter: stable;
.with-scroll-shadows();
}
diff --git a/styles/less/sheets/actors/character/features.less b/styles/less/sheets/actors/character/features.less
index 52b41826..f81f0e32 100644
--- a/styles/less/sheets/actors/character/features.less
+++ b/styles/less/sheets/actors/character/features.less
@@ -10,6 +10,7 @@
gap: 10px;
overflow-y: auto;
padding-bottom: 20px;
+ scrollbar-gutter: stable;
.with-scroll-shadows();
}
}
diff --git a/styles/less/sheets/actors/character/index.less b/styles/less/sheets/actors/character/index.less
index edefe0a1..f196d5bf 100644
--- a/styles/less/sheets/actors/character/index.less
+++ b/styles/less/sheets/actors/character/index.less
@@ -1,8 +1,8 @@
+@import './sheet.less';
@import './biography.less';
@import './effects.less';
@import './features.less';
@import './header.less';
@import './inventory.less';
@import './loadout.less';
-@import './sheet.less';
@import './sidebar.less';
diff --git a/styles/less/sheets/actors/character/inventory.less b/styles/less/sheets/actors/character/inventory.less
index fcfbbee9..b07bb6fe 100644
--- a/styles/less/sheets/actors/character/inventory.less
+++ b/styles/less/sheets/actors/character/inventory.less
@@ -4,13 +4,18 @@
.application.sheet.daggerheart.actor.dh-style.character {
.tab.inventory {
+ padding-right: 0;
+ .search-section {
+ padding-right: 14px;
+ }
.items-section {
display: flex;
flex-direction: column;
gap: 10px;
overflow-y: auto;
+ scrollbar-gutter: stable;
margin-top: 20px;
- padding-bottom: 20px;
+ padding-bottom: 4px;
.with-scroll-shadows();
}
}
diff --git a/styles/less/sheets/actors/character/loadout.less b/styles/less/sheets/actors/character/loadout.less
index fa3e0176..67b2914b 100644
--- a/styles/less/sheets/actors/character/loadout.less
+++ b/styles/less/sheets/actors/character/loadout.less
@@ -5,6 +5,7 @@
.application.sheet.daggerheart.actor.dh-style.character {
.tab.loadout {
.search-section {
+ padding-right: 14px;
.btn-toggle-view {
background: light-dark(@dark-blue-10, @dark-blue);
border: 1px solid @color-border;
@@ -52,8 +53,9 @@
gap: 10px;
height: 100%;
overflow-y: auto;
+ scrollbar-gutter: stable;
margin-top: 20px;
- padding-bottom: 20px;
+ padding-bottom: 4px;
.with-scroll-shadows();
}
}
diff --git a/styles/less/sheets/actors/character/sheet.less b/styles/less/sheets/actors/character/sheet.less
index 68792c99..aebcb9b9 100644
--- a/styles/less/sheets/actors/character/sheet.less
+++ b/styles/less/sheets/actors/character/sheet.less
@@ -10,28 +10,31 @@
width: 100%;
padding-bottom: 0;
overflow-x: auto;
+ }
+
+ .character-sidebar-sheet {
+ grid-row: 1 / span 2;
+ grid-column: 1;
+ display: flex;
+ flex-direction: column;
+ }
- .character-sidebar-sheet {
- grid-row: 1 / span 2;
- grid-column: 1;
+ .character-header-sheet {
+ position: relative;
+ grid-row: 1;
+ grid-column: 2;
+ }
+
+ .tab {
+ grid-row: 2;
+ grid-column: 2;
+ padding-right: 0;
+ margin-right: 2px;
+ margin-bottom: 12px;
+ &.active {
display: flex;
flex-direction: column;
- }
-
- .character-header-sheet {
- position: relative;
- grid-row: 1;
- grid-column: 2;
- }
-
- .tab {
- grid-row: 2;
- grid-column: 2;
- &.active {
- display: flex;
- flex-direction: column;
- overflow: hidden;
- }
+ overflow: hidden;
}
}
}
diff --git a/styles/less/sheets/actors/companion/effects.less b/styles/less/sheets/actors/companion/effects.less
index c0cac669..40973196 100644
--- a/styles/less/sheets/actors/companion/effects.less
+++ b/styles/less/sheets/actors/companion/effects.less
@@ -1,13 +1,17 @@
@import '../../../utils/colors.less';
+@import '../../../utils/mixin.less';
.application.sheet.daggerheart.actor.dh-style.companion {
.tab.effects {
+ margin-right: 2px;
+ padding-right: 0;
.effects-sections {
display: flex;
flex-direction: column;
gap: 10px;
overflow-y: auto;
- padding-bottom: 20px;
+ padding-bottom: 4px;
+ scrollbar-gutter: stable;
.with-scroll-shadows();
}
}
diff --git a/styles/less/sheets/actors/environment/features.less b/styles/less/sheets/actors/environment/features.less
index 84cf26f8..295636a7 100644
--- a/styles/less/sheets/actors/environment/features.less
+++ b/styles/less/sheets/actors/environment/features.less
@@ -4,12 +4,14 @@
.application.sheet.daggerheart.actor.dh-style.environment {
.tab.features {
+ position: relative;
.feature-section {
display: flex;
flex-direction: column;
gap: 10px;
overflow-y: auto;
- padding-bottom: 4px;
+ padding: 4px 8px;
+ scrollbar-gutter: stable;
.with-scroll-shadows();
}
}
diff --git a/styles/less/sheets/actors/environment/index.less b/styles/less/sheets/actors/environment/index.less
index 211c8e60..db35eabc 100644
--- a/styles/less/sheets/actors/environment/index.less
+++ b/styles/less/sheets/actors/environment/index.less
@@ -1,4 +1,5 @@
+@import './sheet.less';
@import './features.less';
@import './header.less';
@import './potentialAdversaries.less';
-@import './sheet.less';
+@import './notes.less';
diff --git a/styles/less/sheets/actors/environment/notes.less b/styles/less/sheets/actors/environment/notes.less
new file mode 100644
index 00000000..58447c88
--- /dev/null
+++ b/styles/less/sheets/actors/environment/notes.less
@@ -0,0 +1,11 @@
+@import '../../../utils/mixin.less';
+
+.application.sheet.daggerheart.actor.dh-style.environment {
+ .tab.notes {
+ padding: 6px 0 4px 15px;
+ .editor-content {
+ scrollbar-gutter: stable;
+ .with-scroll-shadows();
+ }
+ }
+}
\ No newline at end of file
diff --git a/styles/less/sheets/actors/environment/potentialAdversaries.less b/styles/less/sheets/actors/environment/potentialAdversaries.less
index f112c0d2..e66ff34d 100644
--- a/styles/less/sheets/actors/environment/potentialAdversaries.less
+++ b/styles/less/sheets/actors/environment/potentialAdversaries.less
@@ -1,4 +1,5 @@
@import '../../../utils/colors.less';
+@import '../../../utils/mixin.less';
.application.sheet.daggerheart.actor.dh-style.environment {
.tab.potentialAdversaries {
@@ -7,7 +8,8 @@
flex-direction: column;
gap: 10px;
overflow-y: auto;
- padding-bottom: 4px;
+ padding: 0 4px 4px 4px;
+ scrollbar-gutter: stable;
.with-scroll-shadows();
}
}
diff --git a/styles/less/sheets/actors/environment/sheet.less b/styles/less/sheets/actors/environment/sheet.less
index 2d9cc188..02489cac 100644
--- a/styles/less/sheets/actors/environment/sheet.less
+++ b/styles/less/sheets/actors/environment/sheet.less
@@ -16,6 +16,8 @@
.tab {
flex: 1;
overflow-y: auto;
+ padding-right: 0;
+ margin-right: 2px;
&.active {
overflow: hidden;
diff --git a/styles/less/sheets/actors/party/index.less b/styles/less/sheets/actors/party/index.less
index 56f7a457..279c9db2 100644
--- a/styles/less/sheets/actors/party/index.less
+++ b/styles/less/sheets/actors/party/index.less
@@ -1,4 +1,5 @@
+@import './sheet.less';
@import './header.less';
@import './party-members.less';
-@import './sheet.less';
@import './inventory.less';
+@import './notes.less';
\ No newline at end of file
diff --git a/styles/less/sheets/actors/party/inventory.less b/styles/less/sheets/actors/party/inventory.less
index 444c6a57..4b14e112 100644
--- a/styles/less/sheets/actors/party/inventory.less
+++ b/styles/less/sheets/actors/party/inventory.less
@@ -4,11 +4,17 @@
.application.sheet.daggerheart.actor.dh-style.party {
.tab.inventory {
+ padding-right: 0;
+ .search-section {
+ padding-right: 14px;
+ }
+
.items-section {
display: flex;
flex-direction: column;
gap: 10px;
overflow-y: auto;
+ scrollbar-gutter: stable;
margin-top: 20px;
padding-bottom: 4px;
.with-scroll-shadows();
diff --git a/styles/less/sheets/actors/party/notes.less b/styles/less/sheets/actors/party/notes.less
new file mode 100644
index 00000000..4ef51caa
--- /dev/null
+++ b/styles/less/sheets/actors/party/notes.less
@@ -0,0 +1,12 @@
+@import '../../../utils/mixin.less';
+
+.application.sheet.daggerheart.actor.dh-style.party {
+ .tab.notes {
+ padding: 16px 0 4px 15px;
+ .editor-content {
+ scrollbar-gutter: stable;
+ padding-left: 8px;
+ .with-scroll-shadows();
+ }
+ }
+}
\ No newline at end of file
diff --git a/styles/less/sheets/actors/party/party-members.less b/styles/less/sheets/actors/party/party-members.less
index dc464291..7b85eb35 100644
--- a/styles/less/sheets/actors/party/party-members.less
+++ b/styles/less/sheets/actors/party/party-members.less
@@ -4,6 +4,7 @@
.application.sheet.daggerheart.actor.dh-style.party .tab.partyMembers {
overflow: auto;
+ .with-scroll-shadows();
.actors-list {
display: flex;
diff --git a/styles/less/sheets/actors/party/sheet.less b/styles/less/sheets/actors/party/sheet.less
index 852b6cfc..33aa64a3 100644
--- a/styles/less/sheets/actors/party/sheet.less
+++ b/styles/less/sheets/actors/party/sheet.less
@@ -21,6 +21,8 @@
flex: 1;
overflow-y: auto;
scrollbar-gutter: stable;
+ margin-right: 2px;
+ padding-right: 8px;
&.active {
overflow: auto;
diff --git a/styles/less/ui/game-pause/game-pause.less b/styles/less/ui/game-pause/game-pause.less
index 60d08bec..daf9a1e4 100644
--- a/styles/less/ui/game-pause/game-pause.less
+++ b/styles/less/ui/game-pause/game-pause.less
@@ -1,23 +1,34 @@
@import '../../utils/mixin.less';
#pause.dh-style {
+ animation: none;
+
+ img {
+ width: 125px;
+ height: 125px;
+ }
+
figcaption {
+ --base-shadow: drop-shadow(2px 2px 2px black);
position: absolute;
margin-top: 24px;
animation: pause-pulse 3s ease-in-out infinite;
+ font-size: var(--font-size-30);
+ letter-spacing: 0.18em;
+ filter: var(--base-shadow);
}
@keyframes pause-pulse {
0% {
- filter: drop-shadow(0 0 5px @secondary-blue);
+ filter: var(--base-shadow) drop-shadow(0 0 5px @secondary-blue);
}
50% {
- filter: drop-shadow(0 0 5px @golden);
+ filter: var(--base-shadow) drop-shadow(0 0 5px @golden-secondary);
}
100% {
- filter: drop-shadow(0 0 5px @secondary-blue);
+ filter: var(--base-shadow) drop-shadow(0 0 5px @secondary-blue);
}
}
}
\ No newline at end of file
diff --git a/styles/less/utils/fonts.less b/styles/less/utils/fonts.less
index 07da3389..72ee1a85 100755
--- a/styles/less/utils/fonts.less
+++ b/styles/less/utils/fonts.less
@@ -10,6 +10,7 @@
--font-size-8: 0.5rem;
--font-size-9: 0.5625rem;
--font-size-22: 1.375rem;
+ --font-size-30: 1.875rem;
}
@font-title: ~"var(--dh-font-title, 'Cinzel Decorative'), serif";
diff --git a/templates/dialogs/tagTeamDialog/initialization.hbs b/templates/dialogs/tagTeamDialog/initialization.hbs
index 0b92e68e..40491e1b 100644
--- a/templates/dialogs/tagTeamDialog/initialization.hbs
+++ b/templates/dialogs/tagTeamDialog/initialization.hbs
@@ -26,11 +26,16 @@
-
diff --git a/templates/sheets-settings/adversary-settings/features.hbs b/templates/sheets-settings/adversary-settings/features.hbs
index 2f2f5f47..1cab8cfe 100644
--- a/templates/sheets-settings/adversary-settings/features.hbs
+++ b/templates/sheets-settings/adversary-settings/features.hbs
@@ -3,27 +3,31 @@
data-tab='{{tabs.features.id}}'
data-group='{{tabs.features.group}}'
>
-
- {{localize "DOCUMENT.New" type=(localize "TYPES.Item.feature")}}
-
-
- {{localize tabs.features.label}}
-
- {{#each @root.features as |feature|}}
-
-
- {{feature.name}}
-
-
-
- {{/each}}
-
-
- {{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}
-
-
+ {{#each featureGroups as |group|}}
+
+
+ {{group.label}}
+
+
+
+
+ {{#each group.features as |feature|}}
+ {{> 'daggerheart.inventory-item'
+ item=feature
+ type='feature'
+ actorType=@root.document.type
+ hideTags=true
+ hideContextMenu=true
+ hideResources=true
+ showActions=false
+ hideTooltip=true
+ }}
+ {{/each}}
+
+
+ {{/each}}
+
+ {{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}
+
\ No newline at end of file
diff --git a/templates/sheets-settings/environment-settings/features.hbs b/templates/sheets-settings/environment-settings/features.hbs
index 579fe74e..1cab8cfe 100644
--- a/templates/sheets-settings/environment-settings/features.hbs
+++ b/templates/sheets-settings/environment-settings/features.hbs
@@ -3,24 +3,31 @@
data-tab='{{tabs.features.id}}'
data-group='{{tabs.features.group}}'
>
-
- {{localize "DOCUMENT.New" type=(localize "TYPES.Item.feature")}}
-
-
- {{localize tabs.features.label}}
-
- {{#each @root.features as |feature|}}
-
-
- {{feature.name}}
-
-
-
- {{/each}}
-
-
+ {{#each featureGroups as |group|}}
+
+
+ {{group.label}}
+
+
+
+
+ {{#each group.features as |feature|}}
+ {{> 'daggerheart.inventory-item'
+ item=feature
+ type='feature'
+ actorType=@root.document.type
+ hideTags=true
+ hideContextMenu=true
+ hideResources=true
+ showActions=false
+ hideTooltip=true
+ }}
+ {{/each}}
+
+
+ {{/each}}
+
+ {{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}
+
\ No newline at end of file
diff --git a/templates/sheets-settings/npc-settings/features.hbs b/templates/sheets-settings/npc-settings/features.hbs
index 2f2f5f47..1cab8cfe 100644
--- a/templates/sheets-settings/npc-settings/features.hbs
+++ b/templates/sheets-settings/npc-settings/features.hbs
@@ -3,27 +3,31 @@
data-tab='{{tabs.features.id}}'
data-group='{{tabs.features.group}}'
>
-
- {{localize "DOCUMENT.New" type=(localize "TYPES.Item.feature")}}
-
-
- {{localize tabs.features.label}}
-
- {{#each @root.features as |feature|}}
-
-
- {{feature.name}}
-
-
-
- {{/each}}
-
-
- {{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}
-
-
+ {{#each featureGroups as |group|}}
+
+
+ {{group.label}}
+
+
+
+
+ {{#each group.features as |feature|}}
+ {{> 'daggerheart.inventory-item'
+ item=feature
+ type='feature'
+ actorType=@root.document.type
+ hideTags=true
+ hideContextMenu=true
+ hideResources=true
+ showActions=false
+ hideTooltip=true
+ }}
+ {{/each}}
+
+
+ {{/each}}
+
+ {{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}
+
\ No newline at end of file
diff --git a/templates/sheets/actors/adversary/features.hbs b/templates/sheets/actors/adversary/features.hbs
index 3b495e74..8430d454 100644
--- a/templates/sheets/actors/adversary/features.hbs
+++ b/templates/sheets/actors/adversary/features.hbs
@@ -1,14 +1,15 @@
- {{> 'daggerheart.inventory-items'
- title=tabs.features.label
- type='feature'
- collection=@root.features
- hideContextMenu=true
- hideModifyControls=true
- canCreate=@root.editable
- showActions=@root.editable
- }}
+ {{#each @root.features as |item|}}
+ {{> 'daggerheart.inventory-item'
+ item=item
+ type='feature'
+ actorType=@root.document.type
+ hideContextMenu=true
+ hideModifyControls=true
+ showActions=@root.editable
+ }}
+ {{/each}}
-
\ No newline at end of file
+
diff --git a/templates/sheets/actors/adversary/notes.hbs b/templates/sheets/actors/adversary/notes.hbs
index a5c3f706..28df7f8e 100644
--- a/templates/sheets/actors/adversary/notes.hbs
+++ b/templates/sheets/actors/adversary/notes.hbs
@@ -3,10 +3,7 @@
data-tab='{{tabs.notes.id}}'
data-group='{{tabs.notes.group}}'
>
-
- {{localize tabs.notes.label}}
- {{formInput notes.field value=notes.value enriched=notes.enriched toggled=true}}
-
+ {{formInput notes.field value=notes.value enriched=notes.enriched class="aaa" toggled=true}}
{{#if (and showAttribution document.system.attribution.artist)}}
{{localize "DAGGERHEART.GENERAL.artistAttribution" artist=document.system.attribution.artist}}
diff --git a/templates/sheets/actors/environment/features.hbs b/templates/sheets/actors/environment/features.hbs
index 35fcb038..264d6bf5 100644
--- a/templates/sheets/actors/environment/features.hbs
+++ b/templates/sheets/actors/environment/features.hbs
@@ -4,14 +4,15 @@
data-group='{{tabs.features.group}}'
>
- {{> 'daggerheart.inventory-items'
- title=tabs.features.label
- type='feature'
- collection=@root.features
- hideContextMenu=true
- hideModifyControls=true
- canCreate=@root.editable
- showActions=@root.editable
- }}
+ {{#each @root.features as |item|}}
+ {{> 'daggerheart.inventory-item'
+ item=item
+ type='feature'
+ actorType=@root.document.type
+ hideContextMenu=true
+ hideModifyControls=true
+ showActions=@root.editable
+ }}
+ {{/each}}
\ No newline at end of file
diff --git a/templates/sheets/actors/environment/notes.hbs b/templates/sheets/actors/environment/notes.hbs
index 4f6b131e..1acf0e93 100644
--- a/templates/sheets/actors/environment/notes.hbs
+++ b/templates/sheets/actors/environment/notes.hbs
@@ -3,10 +3,7 @@
data-tab='{{tabs.notes.id}}'
data-group='{{tabs.notes.group}}'
>
-
- {{localize tabs.notes.label}}
- {{formInput notes.field value=notes.value enriched=notes.value toggled=true}}
-
+ {{formInput notes.field value=notes.value enriched=notes.value toggled=true}}
{{#if (and showAttribution document.system.attribution.artist)}}
{{localize "DAGGERHEART.GENERAL.artistAttribution" artist=document.system.attribution.artist}}
diff --git a/templates/sheets/actors/party/notes.hbs b/templates/sheets/actors/party/notes.hbs
index 663a484a..0972bee9 100644
--- a/templates/sheets/actors/party/notes.hbs
+++ b/templates/sheets/actors/party/notes.hbs
@@ -3,8 +3,5 @@
data-tab='{{tabs.notes.id}}'
data-group='{{tabs.notes.group}}'
>
-
- {{localize tabs.notes.label}}
- {{formInput notes.field value=notes.value enriched=notes.value toggled=true}}
-
+ {{formInput notes.field value=notes.value enriched=notes.value toggled=true}}
\ No newline at end of file
diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs
index 523e9304..f7d22a30 100644
--- a/templates/sheets/global/partials/inventory-item-V2.hbs
+++ b/templates/sheets/global/partials/inventory-item-V2.hbs
@@ -27,17 +27,17 @@ Parameters:
>
- {{else}}
- 
+