Merge branch 'epic/granular-action-outcomes' into feature/granular-action-outcomes

templates/dialogs/compendiumBrowserSettingsDialog/packs.hbs

@@ -22,7 +22,7 @@
                             <div class="checks-container {{#unless source.checked}}collapsed{{/unless}}">
                                 {{#each source.packs as |pack|}}
                                     <div class="check-container">
-                                        <input type="checkbox" class="pack-checkbox" data-type="{{pack.type}}" data-pack="{{pack.pack}}" {{checked pack.checked}} />
+                                        <input type="checkbox" class="pack-checkbox" data-type="{{pack.type}}" data-source="{{@../key}}" data-pack-name="{{pack.name}}" {{checked pack.checked}} />
                                         <label>{{pack.label}}</label>
                                     </div>
                                 {{/each}}

templates/dialogs/rerollDialog/damage/main.hbs

@@ -1,35 +0,0 @@
-<div class="reroll-outer-container">
-    {{#each damage}}
-        <h2>{{localize (concat 'DAGGERHEART.CONFIG.HealingType.' @key '.name')}}</h2>
-        {{#each this}}
-            <div class="dices-container">
-                {{#each this}}
-                    <fieldset class="dice-outer-container">
-                        <legend>
-                            <input class="to-reroll-input" type="checkbox" data-type="{{@../../key}}" data-part="{{@../key}}" data-dice="{{@key}}" {{checked this.toReroll}} />
-                            <i class="fa-solid fa-dice"></i>
-                            <span>{{this.selectedResults}}/{{this.maxSelected}} Selected</span>
-                        </legend>
-
-                        <div class="dice-container">
-                            {{#each this.results}}
-                                <div 
-                                    class="result-container {{../dice}} {{#if this.active}}selected{{/if}}" 
-                                    data-action="selectRoll" data-type="{{@../../../key}}" data-part="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}"
-                                >
-                                    {{this.result}}
-                                    {{#if this.active}}
-                                    <a class="to-reroll-result" data-action="toggleResult" data-type="{{@../../../key}}" data-part="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}">
-                                        <input class="to-reroll-result-input" type="checkbox" {{checked this.toReroll}} />
-                                        <i class="fa-solid fa-dice"></i>
-                                    </a>
-                                    {{/if}}
-                                </div>
-                            {{/each}}
-                        </div>
-                    </fieldset>
-                {{/each}}
-            </div>
-        {{/each}}
-    {{/each}}
-</div>

templates/dialogs/rerollDialog/footer.hbs

@@ -1,4 +0,0 @@
-<footer>
-    <button type="button" data-action="doReroll" {{disabled disabledReroll}}>{{localize "DAGGERHEART.GENERAL.reroll"}} <i class="fa-solid fa-dice"></i></button>
-    <button type="button" data-action="save" {{disabled saveDisabled}}>{{localize "DAGGERHEART.APPLICATIONS.RerollDialog.acceptCurrentRolls"}}</button>
-</footer>

templates/dialogs/rerollDialog/main.hbs

@@ -1,35 +0,0 @@
-<div class="reroll-outer-container">
-    {{#each damage}}
-        <h2>{{localize (concat 'DAGGERHEART.CONFIG.HealingType.' @key '.name')}}</h2>
-        {{#each this}}
-            <div class="dices-container">
-                {{#each this}}
-                    <fieldset class="dice-outer-container">
-                        <legend>
-                            <input class="to-reroll-input" type="checkbox" data-type="{{@../../key}}" data-part="{{@../key}}" data-dice="{{@key}}" {{checked this.toReroll}} />
-                            <i class="fa-solid fa-dice"></i>
-                            <span>{{this.selectedResults}}/{{this.results.length}} Selected</span>
-                        </legend>
-
-                        <div class="dice-container">
-                            {{#each this.results}}
-                                    <div 
-                                        class="result-container {{../dice}} {{#if this.active}}selected{{/if}}" 
-                                        data-action="selectRoll" data-type="{{@../../../key}}" data-part="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}"
-                                    >
-                                        {{this.result}}
-                                        {{#if this.active}}
-                                        <a class="to-reroll-result" data-action="toggleResult" data-type="{{@../../../key}}" data-part="{{@../../key}}" data-dice="{{@../key}}" data-result="{{@key}}">
-                                            <input class="to-reroll-result-input" type="checkbox" {{checked this.toReroll}} />
-                                            <i class="fa-solid fa-dice"></i>
-                                        </a>
-                                        {{/if}}
-                                    </div>
-                            {{/each}}
-                        </div>
-                    </fieldset>
-                {{/each}}
-            </div>
-        {{/each}}
-    {{/each}}
-</div>

templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs

@@ -16,7 +16,7 @@
                     {{/unless}}
                 {{/each}}
                 {{#if part.modifierTotal}}
-                    <span class="roll-operator">{{#if (gte part.modifierTotal 0)}}+{{else}}-{{/if}}</span>
+                    {{#if part.dice.length}}<span class="roll-operator">{{#if (gte part.modifierTotal 0)}}+{{else}}-{{/if}}</span>{{/if}}
                     <span class="roll-value">{{positive part.modifierTotal}}</span>
                 {{/if}}
             </div>

templates/hud/tokenHUD.hbs

@@ -4,10 +4,6 @@
         <input type="text" name="elevation" value="{{elevation}}" {{disabled (or locked (and isGamePaused (not isGM)))}}>
     </div>
 
-    <button type="button" class="control-icon" data-action="sort" data-tooltip="HUD.ToFrontOrBack">
-        <i class="fa-solid fa-arrow-down-arrow-up" inert></i>
-    </button>
-
     {{#if canChangeLevel}}
     <button type="button" class="control-icon" data-action="togglePalette" data-palette="levels"
             aria-label="{{ localize "HUD.ChangeLevel" }}" data-tooltip>
@@ -20,14 +16,25 @@
     </div>
     {{/if}}
 
+    <button type="button" class="control-icon" data-action="sort" data-tooltip aria-label="HUD.ToFrontOrBack">
+        <i class="fa-solid fa-bring-forward" inert></i>
+    </button>
+
     {{#if hasCompanion}}
         <button type="button" class="control-icon clown-car" data-action="toggleCompanions" data-tooltip="{{#if companionOnCanvas}}{{localize "DAGGERHEART.APPLICATIONS.HUD.tokenHUD.retrieveCompanionTokens"}}{{else}}{{localize "DAGGERHEART.APPLICATIONS.HUD.tokenHUD.depositCompanionTokens"}}{{/if}}">
             <img {{#if companionOnCanvas}}class="flipped"{{/if}} src="{{icons.toggleClowncar}}">
         </button>
     {{/if}}
 
+    {{#if isGM}}
+        <button type="button" class="control-icon {{lockedClass}}" data-action="locked"
+            data-tooltip aria-label="{{localize (ifThen lockedClass "HUD.Unlock" "HUD.Lock")}}">
+            <i class="fa-solid {{ifThen lockedClass "fa-lock" "fa-lock-open"}}" inert></i>
+        </button>
+    {{/if}}
+
     {{#if canConfigure}}
-    <button type="button" class="control-icon" data-action="config" data-tooltip="HUD.OpenConfig">
+    <button type="button" class="control-icon" data-action="config" data-tooltip aria-label="HUD.OpenConfig">
         <i class="fa-solid fa-gear" inert></i>
     </button>
     {{/if}}
@@ -49,8 +56,9 @@
 
 <div class="col right">
     {{#if isGM}}
-    <button type="button" class="control-icon {{visibilityClass}}" data-action="visibility" data-tooltip="HUD.ToggleVis">
-        <img src="{{icons.visibility}}">
+    <button type="button" class="control-icon {{visibilityClass}}" data-action="visibility"
+        data-tooltip aria-label="{{localize (ifThen visibilityClass "HUD.Show" "HUD.Hide")}}">
+        <i class="fa-solid {{ifThen hidden "fa-eye-slash" "fa-eye"}}" inert></i>
     </button>
     {{/if}}
 
@@ -119,13 +127,15 @@
         {{/each}}
     </div>
 
-    <button type="button" class="control-icon {{targetClass}}" data-action="target" data-tooltip="HUD.ToggleTargetState">
+    <button type="button" class="control-icon {{targetClass}}" data-action="target"
+        data-tooltip aria-label="{{localize (ifThen targetClass "HUD.Untarget" "HUD.Target")}}">
         <i class="fa-solid fa-bullseye" inert></i>
     </button>
 
     {{#if canToggleCombat}}
-    <button type="button" class="control-icon {{combatClass}}" data-action="combat" data-tooltip="HUD.ToggleCombatState">
-        <img src="{{icons.combat}}">
+    <button type="button" class="control-icon {{combatClass}}" data-action="combat"
+        data-tooltip aria-label="{{localize (ifThen combatClass "HUD.ExitCombat" "HUD.EnterCombat")}}">
+        <i class="fa-solid fa-swords" inert></i>
     </button>
     {{/if}}
 </div>

templates/settings/metagaming-settings/general.hbs

@@ -1,4 +1,4 @@
-<div>
+<div class="standard-form">
     {{formGroup settingFields.schema.fields.hideObserverPermissionInChat value=settingFields._source.hideObserverPermissionInChat localize=true}}
-     {{formGroup settingFields.schema.fields.hidePartyStats value=settingFields._source.hidePartyStats localize=true}}
-</div>
+    {{formGroup settingFields.schema.fields.hidePartyStats value=settingFields._source.hidePartyStats localize=true}}
+</div>

templates/sheets-settings/adversary-settings/details.hbs

@@ -18,6 +18,12 @@
         {{formField systemFields.motivesAndTactics value=document._source.system.motivesAndTactics label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.motivesAndTactics.label")}}
     </fieldset>
 
+    <fieldset class="flex">
+        <legend>{{localize "DAGGERHEART.GENERAL.DamageThresholds.title"}}</legend>
+        {{formGroup systemFields.damageThresholds.fields.major value=document._source.system.damageThresholds.major label=(localize "DAGGERHEART.GENERAL.DamageThresholds.majorThreshold")}}
+        {{formGroup systemFields.damageThresholds.fields.severe value=document._source.system.damageThresholds.severe label=(localize "DAGGERHEART.GENERAL.DamageThresholds.severeThreshold")}}
+    </fieldset>
+    
     <div class="fieldsets-section">
         <fieldset class="flex">
             <legend>{{localize "DAGGERHEART.GENERAL.Resource.plural"}}</legend>
@@ -26,10 +32,4 @@
             {{/each}}
          </fieldset>
     </div>
-
-    <fieldset class="flex">
-        <legend>{{localize "DAGGERHEART.GENERAL.DamageThresholds.title"}}</legend>
-        {{formGroup systemFields.damageThresholds.fields.major value=document._source.system.damageThresholds.major label=(localize "DAGGERHEART.GENERAL.DamageThresholds.majorThreshold")}}
-        {{formGroup systemFields.damageThresholds.fields.severe value=document._source.system.damageThresholds.severe label=(localize "DAGGERHEART.GENERAL.DamageThresholds.severeThreshold")}}
-    </fieldset>
 </section>

templates/sheets-settings/npc-settings/details.hbs

@@ -0,0 +1,13 @@
+<section
+    class='tab {{tabs.details.cssClass}} {{tabs.details.id}}'
+    data-tab='{{tabs.details.id}}'
+    data-group='{{tabs.details.group}}'
+>
+    <fieldset>
+        <legend>{{localize "DAGGERHEART.GENERAL.description"}}</legend>
+        {{formInput systemFields.description value=document._source.system.description}}
+    </fieldset>
+
+    {{formGroup systemFields.motives value=document._source.system.motives}}
+    {{formGroup systemFields.difficulty value=document._source.system.difficulty localize=true}}
+</section>

templates/sheets-settings/npc-settings/features.hbs

@@ -0,0 +1,29 @@
+<section
+    class='tab {{tabs.features.cssClass}} {{tabs.features.id}}'
+    data-tab='{{tabs.features.id}}'
+    data-group='{{tabs.features.group}}'
+>
+    <button type="button" class="add-feature-btn" data-action="createDoc" data-document-class="Item" data-type="feature">
+        {{localize "DOCUMENT.New" type=(localize "TYPES.Item.feature")}}
+    </button>
+    <fieldset>
+        <legend>{{localize tabs.features.label}}</legend>
+        <ul class="feature-list">
+            {{#each @root.features as |feature|}}
+                <li class="feature-item" id="{{feature.id}}" draggable="true">
+                    <img src="{{feature.img}}" alt="">
+                    <div class="label">
+                        <span>{{feature.name}}</span>
+                    </div>
+                    <div class="controls">
+                        <a data-action="editDoc" data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonEdit'}}"><i class="fa-solid fa-pen-to-square"></i></a>
+                        <a data-action="deleteDoc"  data-item-uuid="{{feature.uuid}}" data-tooltip="{{localize 'CONTROLS.CommonDelete'}}"><i class="fa-solid fa-trash"></i></a>
+                    </div>
+                </li>
+            {{/each}}
+        </ul>
+        <div class="features-dragger">
+            <span>{{localize "DAGGERHEART.GENERAL.dropFeaturesHere"}}</span>
+        </div>
+    </fieldset>
+</section>

templates/sheets-settings/npc-settings/header.hbs

@@ -0,0 +1,3 @@
+<header class="dialog-header">
+    <h1>{{document.name}}</h1>
+</header>

templates/sheets-settings/token-config/appearance.hbs

@@ -1,20 +1,43 @@
 <div class="tab scrollable{{#if tab.active}} active{{/if}}" data-group="{{tab.group}}" data-tab="{{tab.id}}">
-    {{formGroup fields.texture.fields.src value=source.texture.src rootId=rootId}}
-    {{#if randomImgEnabled}}
-    {{formGroup fields.randomImg value=source.randomImg classes="slim" rootId=rootId}}
-    {{else if hasAlternates}}
-    <div class="form-group">
-        <label for="{{rootId}}-alternateImages">{{localize "TOKEN.ImageAlts"}}</label>
-        <select id="{{rootId}}-alternateImages" class="alternate-images" name="alternateImages">
-            {{selectOptions alternateImages selected=source.texture.src blank=""}}
-        </select>
+    <div class="token-image-group">
+        {{formGroup fields.texture.fields.src value=source.texture.src rootId=rootId}}
+        {{#if randomImgEnabled}}
+        {{formGroup fields.randomImg value=source.randomImg classes="slim" rootId=rootId}}
+        {{else if hasAlternates}}
+        <div class="form-group">
+            <label for="{{rootId}}-alternateImages">{{localize "TOKEN.ImageAlts"}}</label>
+            <select id="{{rootId}}-alternateImages" class="alternate-images" name="alternateImages">
+                {{selectOptions alternateImages selected=source.texture.src blank=""}}
+            </select>
+        </div>
+        {{/if}}
+
+        {{#if imagePreview}}
+            <div class="{{imagePreview.cls}}">
+                {{#if imagePreview.isVideo}}
+                <video class="token-image-thumb" src="{{imagePreview.src}}" autoplay muted loop playsinline
+                    disablepictureinpicture></video>
+                {{else}}
+                <img class="token-image-thumb" src="{{imagePreview.src}}" alt="{{localize "TOKEN.ImagePreview"}}">
+                {{/if}}
+                <div class="token-image-controls">
+                    <button type="button" class="cycle-prev icon fa-solid fa-chevron-left" data-action="cycleImage"
+                            data-delta="-1" aria-label="{{localize "TOKEN.ImageCyclePrev"}}"
+                            {{#unless imagePreview.hasPrev}} disabled{{/unless}}></button>
+                    <span class="counter">{{imagePreview.current}} / {{imagePreview.total}}</span>
+                    <button type="button" class="cycle-next icon fa-solid fa-chevron-right" data-action="cycleImage"
+                            data-delta="1" aria-label="{{localize "TOKEN.ImageCycleNext"}}"
+                            {{#unless imagePreview.hasNext}} disabled{{/unless}}></button>
+                </div>
+            </div>
+        {{/if}}
     </div>
-    {{/if}}
+
     <fieldset>
-        <legend>{{localize "Token Size"}}</legend>
+        <legend>{{localize "DAGGERHEART.APPLICATIONS.TokenConfig.tokenSize"}}</legend>
         {{#if usesActorSize}}
-            <div class="form-group lim">
-                <label>{{localize "Size Category"}}</label>
+            <div class="form-group slim">
+                <label>{{localize "DAGGERHEART.APPLICATIONS.TokenConfig.sizeCategory"}}</label>
 
                 <select id="dhTokenSize">
                     {{selectOptions tokenSizes selected=tokenSize valueAttr="id" labelAttr="label" localize=true}}
@@ -23,15 +46,17 @@
         {{/if}}
 
         <div id="tokenSizeDimensions" class="form-group slim" {{#if actorSizeDisable}}data-tooltip="{{localize "DAGGERHEART.APPLICATIONS.TokenConfig.actorSizeUsed"}}"{{/if}}>
-            <label>
-                {{localize "TOKEN.Dimensions"}} <span class="units">({{localize "GridSpaces"}})</span>
-                <i class="fa-solid fa-lock" {{#unless actorSizeDisable}}style="opacity: 0%;"{{/unless}}></i>
-            </label>
-            <div class="form-fields">
+            <span class="label">
+                {{localize "TOKEN.Size"}}
+                <span class="units">({{localize "MEASUREMENT.GridSpaces"}})</span>
+            </span>
+            <div class="form-group slim">
                 <label for="{{rootId}}-width">{{localize "DOCUMENT.FIELDS.width.label"}}</label>
                 {{formInput fields.width value=source.width id=(concat rootId "-width") disabled=actorSizeDisable}}
                 <label for="{{rootId}}-height">{{localize "DOCUMENT.FIELDS.height.label"}}</label>
                 {{formInput fields.height value=source.height id=(concat rootId "-height") disabled=actorSizeDisable}}
+                <label for="{{rootId}}-depth">Z</label>
+                {{formInput fields.depth value=source.depth id=(concat rootId "-depth") disabled=actorSizeDisable}}
             </div>
         </div>
     </fieldset>

templates/sheets/activeEffect/details.hbs

@@ -5,16 +5,9 @@
     {{formGroup systemFields.targetDispositions value=source.system.targetDispositions name=(concat "system.targetDispositions") localize=true}}
 
     {{#if isActorEffect}}
-        <div class="form-group">
-            <label>{{localize "EFFECT.FIELDS.origin.label"}}</label>
-            <div class="form-fields">
-                <input type="text" value="{{source.origin}}" disabled />
-            </div>
-        </div>
-    {{/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"}}

templates/sheets/actors/adversary/features.hbs

@@ -6,6 +6,7 @@
             type='feature'
             collection=@root.features
             hideContextMenu=true
+            hideModifyControls=true
             canCreate=@root.editable
             showActions=@root.editable
         }}

templates/sheets/actors/adversary/header.hbs

@@ -44,10 +44,9 @@
         </span>
     </div>
 
-    <div class="adversary-navigation">
-        {{> 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}
+    {{#> 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}
         <button type="button" data-action="openSettings" data-tooltip-text="{{localize "DAGGERHEART.UI.Tooltip.openSheetSettings"}}">
             <i class="fa-solid fa-wrench"></i>
         </button>
-    </div>
+    {{/ 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}
 </header>

templates/sheets/actors/character/header.hbs

@@ -64,7 +64,7 @@
             {{/if}}
         </div>
 
-        {{#if document.system.multiclass.value}}
+        {{#if (or document.system.multiclass.value document.system.multiclass.subclass)}}
             <div class="multiclass">
                 {{#if document.system.multiclass.value}}
                     <span data-action="editDoc"data-item-uuid="{{document.system.multiclass.value.uuid}}">{{document.system.multiclass.value.name}}</span>

templates/sheets/actors/character/sidebar.hbs

@@ -44,7 +44,7 @@
                     </div>
                     {{else}}
                     <div class='status-value'>
-                        <input class="bar-input armor-marks-input" value="{{document.system.armorScore.value}}" type="number">
+                        <input class="bar-input armor-marks-input" value="{{document.system.armorScore.value}}" type="number" id="{{document.uuid}}-armor-slots">
                         <span>/</span>
                         <span class="bar-label">{{document.system.armorScore.max}}</span>
                     </div>

templates/sheets/actors/companion/header.hbs

@@ -50,9 +50,10 @@
         </div>
     </div>
     <div class="companion-navigation">
-        {{> 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}
-        <button type="button" data-action="openSettings" data-tooltip-text="{{localize "DAGGERHEART.UI.Tooltip.openSheetSettings"}}">
-            <i class="fa-solid fa-wrench"></i>
-        </button>
+        {{#> 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}
+            <button type="button" data-action="openSettings" data-tooltip-text="{{localize "DAGGERHEART.UI.Tooltip.openSheetSettings"}}">
+                <i class="fa-solid fa-wrench"></i>
+            </button>
+        {{/ 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}
     </div>
 </header>

templates/sheets/actors/environment/features.hbs

@@ -9,6 +9,7 @@
         type='feature'
         collection=@root.features
         hideContextMenu=true
+        hideModifyControls=true
         canCreate=@root.editable
         showActions=@root.editable
         }}

templates/sheets/actors/environment/header.hbs

@@ -1,28 +1,7 @@
 <header class='environment-header-sheet'>
     <img class='profile' src='{{source.img}}' data-action='editImage' data-edit='img' />
     <div class='item-container'>
-        <div class="item-info">
-            <h1 class='item-name'><input type='text' name='name' value='{{source.name}}' /></h1>
-            <div class="flexcol">
-                <div class="tags">
-                    <div class="tag">
-                        <span>
-                            {{localize (concat 'DAGGERHEART.GENERAL.Tiers.' source.system.tier)}}
-                        </span>
-                    </div>
-                    {{#if source.system.type}}
-                        <div class="tag">
-                            <span>
-                                {{localize (concat 'DAGGERHEART.CONFIG.EnvironmentType.' source.system.type '.label')}}
-                            </span>
-                        </div>
-                    {{/if}}
-                </div>
-                {{#if (and showAttribution document.system.attributionLabel)}}
-                    <label class="attribution-header-label">{{document.system.attributionLabel}}</label>
-                {{/if}}
-            </div> 
-        </div>
+        <h1 class='item-name'><input type='text' name='name' value='{{source.name}}' /></h1>
         <div class="status-number">
             <div class='status-value armor-slots'>
                 {{#if source.system.difficulty}}
@@ -35,6 +14,25 @@
                 <h4>{{localize "DAGGERHEART.GENERAL.difficulty"}}</h4>
             </div>
         </div>
+        <div class="flexrow">
+            <div class="tags">
+                <div class="tag">
+                    <span>
+                        {{localize (concat 'DAGGERHEART.GENERAL.Tiers.' source.system.tier)}}
+                    </span>
+                </div>
+                {{#if source.system.type}}
+                    <div class="tag">
+                        <span>
+                            {{localize (concat 'DAGGERHEART.CONFIG.EnvironmentType.' source.system.type '.label')}}
+                        </span>
+                    </div>
+                {{/if}}
+            </div>
+            {{#if (and showAttribution document.system.attributionLabel)}}
+                <label class="attribution-header-label">{{document.system.attributionLabel}}</label>
+            {{/if}}
+        </div>
     </div>
     <line-div></line-div>
     <div class="environment-info">
@@ -46,9 +44,10 @@
         </span>
     </div>
     <div class="environment-navigation">
-        {{> 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}
-        <button type="button" data-action="openSettings">
-            <i class="fa-solid fa-wrench"></i>
-        </button>
+        {{#> 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}
+            <button type="button" data-action="openSettings">
+                <i class="fa-solid fa-wrench"></i>
+            </button>
+        {{/ 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}
     </div>
 </header>

templates/sheets/actors/npc/features.hbs

@@ -0,0 +1,14 @@
+<section class='tab {{tabs.features.cssClass}} {{tabs.features.id}}' data-tab='{{tabs.features.id}}'
+    data-group='{{tabs.features.group}}'>
+    <div class="feature-section">
+        {{> 'daggerheart.inventory-items'
+            title=tabs.features.label
+            type='feature'
+            collection=@root.features
+            hideContextMenu=true
+            hideModifyControls=true
+            canCreate=@root.editable
+            showActions=@root.editable
+        }}
+    </div>
+</section>

templates/sheets/actors/npc/header.hbs

@@ -0,0 +1,42 @@
+<header class='npc-header-sheet'>
+    <div class="portrait">
+        <img src="{{source.img}}" alt="{{source.name}}" data-action='editImage' data-edit="img">
+    </div>
+    <div class="info-section">
+        <line-div></line-div>
+
+        <div class="name-row">
+            <h1
+                class="input actor-name"
+                contenteditable="plaintext-only"
+                data-property="name"
+                placeholder="{{localize "DAGGERHEART.GENERAL.actorName"}}"
+                autocomplete="off"
+                spellcheck="false"
+            >{{source.name}}</h1>
+        </div>
+
+        {{#if source.system.difficulty}} 
+            <div class="tags">
+                <div class="tag">
+                    <span>{{localize "DAGGERHEART.GENERAL.difficulty"}}</span>
+                    <span>{{source.system.difficulty}}</span>
+                </div>
+            </div>
+        {{/if}}
+
+        <line-div></line-div>
+
+        <div class="npc-info">
+            <span class="description">
+                <i>{{{description}}}</i>
+            </span>
+            {{#if source.system.motives}}
+                <div class="motives-and-tactics">
+                    <b>{{localize 'DAGGERHEART.ACTORS.NPC.FIELDS.motives.label'}}: </b>
+                    {{source.system.motives}}
+                </div>
+            {{/if}}
+        </div>
+    </div>
+</header>

templates/sheets/actors/npc/navigation.hbs

@@ -0,0 +1,7 @@
+<div class="npc-navigation">
+    {{#> 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}
+        <button type="button" data-action="openSettings" data-tooltip-text="{{localize "DAGGERHEART.UI.Tooltip.openSheetSettings"}}">
+            <i class="fa-solid fa-wrench"></i>
+        </button>
+    {{/'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}
+</div>

templates/sheets/actors/npc/notes.hbs

@@ -0,0 +1,11 @@
+<section
+    class='tab {{tabs.notes.cssClass}} {{tabs.notes.id}}'
+    data-tab='{{tabs.notes.id}}'
+    data-group='{{tabs.notes.group}}'
+>
+    {{formInput notes.field value=notes.value enriched=notes.enriched toggled=true}}
+
+    {{#if (and showAttribution document.system.attribution.artist)}}
+        <label class="artist-attribution">{{localize "DAGGERHEART.GENERAL.artistAttribution" artist=document.system.attribution.artist}}</label>
+    {{/if}}
+</section>

templates/sheets/actors/party/header.hbs

@@ -2,9 +2,7 @@
     <img class='profile' src='{{source.img}}' data-action='editImage' data-edit='img' />
     <div class='item-container'>
         <div class="item-info">
-            <h1 class='item-name'>
-                <input type='text' name='name' value='{{source.name}}' autocomplete="off" spellcheck="false"/>
-            </h1>
+            <input class="item-name" type='text' name='name' value='{{source.name}}' autocomplete="off" spellcheck="false"/>
         </div>
     </div>
 </header>

templates/sheets/actors/party/party-members.hbs

@@ -42,7 +42,7 @@
                         {{#if member.difficulty includeZero=true}}
                             <div class="evasion" data-tooltip="DAGGERHEART.GENERAL.difficulty">{{member.difficulty}}</div>
                         {{/if}}
-                        {{#unless (eq member.type 'companion')}}
+                        {{#unless (or (eq member.type 'companion') (eq member.type 'npc'))}}
                             <div class="threshold-section">
                                 <h4 class="threshold-label">{{localize "DAGGERHEART.ACTORS.Party.Thresholds.minor"}}</h4>
                                 <h4 class="threshold-value">{{member.damageThresholds.major}}</h4>
@@ -58,7 +58,7 @@
                             <a class="delete-icon" data-action="deletePartyMember" data-uuid="{{member.uuid}}"><i class="fa-regular fa-times" inert></i></a>
                         </h2>
                         <div>
-                            {{#unless (or (eq member.type 'companion') (eq member.type 'adversary')) }}
+                            {{#unless (or (eq member.type 'companion') (eq member.type 'adversary') (eq member.type 'npc')) }}
                                 <div class="hope-section">
                                     <h4>{{localize "DAGGERHEART.GENERAL.hope"}}</h4>
                                     {{#times member.resources.hope.max}}
@@ -79,7 +79,7 @@
                     </header>
                     <section class="body">
                         <section class="resources">
-                            {{#unless (eq member.type 'companion') }}
+                            {{#unless (or (eq member.type 'companion') (eq member.type 'npc')) }}
                                 <div class="slot-section">
                                     <div class="slot-label" data-tooltip="DAGGERHEART.GENERAL.HitPoints.plural">
                                         <span class="label">
@@ -101,25 +101,27 @@
                                 </div>
                             {{/unless}}
 
-                            <div class="slot-section">
-                                <div class="slot-label" data-tooltip="DAGGERHEART.GENERAL.stress">
-                                    <span class="label">
-                                        <i class="fa-solid fa-bolt" inert></i>
-                                    </span>
-                                    <span class="value">
-                                        <span class="current">{{member.resources.stress.value}}</span>
-                                        / 
-                                        <span class="max">{{member.resources.stress.max}}</span>
-                                    </span>
-                                </div>
-                                <div class="slot-bar">
-                                    {{#times member.resources.stress.max}}
-                                        <span class='slot {{#if (gte member.resources.stress.value (add this 1))}}filled{{/if}}'
-                                        data-action='toggleStress' data-actor-id="{{member.uuid}}" data-value="{{add this 1}}">
+                            {{#unless (eq member.type 'npc')}}
+                                <div class="slot-section">
+                                    <div class="slot-label" data-tooltip="DAGGERHEART.GENERAL.stress">
+                                        <span class="label">
+                                            <i class="fa-solid fa-bolt" inert></i>
                                         </span>
-                                    {{/times}}
+                                        <span class="value">
+                                            <span class="current">{{member.resources.stress.value}}</span>
+                                            / 
+                                            <span class="max">{{member.resources.stress.max}}</span>
+                                        </span>
+                                    </div>
+                                    <div class="slot-bar">
+                                        {{#times member.resources.stress.max}}
+                                            <span class='slot {{#if (gte member.resources.stress.value (add this 1))}}filled{{/if}}'
+                                            data-action='toggleStress' data-actor-id="{{member.uuid}}" data-value="{{add this 1}}">
+                                            </span>
+                                        {{/times}}
+                                    </div>
                                 </div>
-                            </div>
+                            {{/unless}}
 
                             {{#if member.armorScore.max}}
                                 <div class="slot-section">

templates/sheets/global/partials/inventory-fieldset-items-V2.hbs

@@ -19,6 +19,8 @@ Parameters:
 - showLabels {boolean} : If true, show label-tags else show simple tags.
 - hideTooltip {boolean} : If true, disables the tooltip on the item image.
 - hideControls {boolean} : If true, hides the controls inside inventory-item partials.
+- hideContextMenu {boolean}: If true, hides the context menu dropdown button
+- hideModifyControls {boolean}: If true, hides the edit and delete options
 - hideDescription {boolean} : If true, hides the item's description.
 - hideResources {boolean} : If true, hides the item's resources.
 - showActions {boolean} : If true show feature's actions. 
@@ -59,6 +61,7 @@ Parameters:
     actorType=(ifThen ../actorType ../actorType @root.document.type)
     hideControls=../hideControls
     hideContextMenu=../hideContextMenu
+    hideModifyControls=../hideModifyControls
     isActor=../isActor
     categoryAdversary=../categoryAdversary
     hideTooltip=../hideTooltip

templates/sheets/global/partials/inventory-item-V2.hbs

@@ -12,6 +12,8 @@ Parameters:
 - hideTags {boolean} : If true, hide simple-tags else show simple-tags.
 - hideTooltip {boolean} : If true, disables the tooltip on the item image.
 - hideControls {boolean} : If true, hides the controls inside inventory-item partials.
+- hideContextMenu {boolean}: If true, hides the context menu dropdown button
+- hideModifyControls {boolean}: If true, hides the edit and delete options (todo: swap to show, only party cares to show this)
 - hideDescription {boolean} : If true, hides the item's description.
 - hideResources {boolean} : If true, hides the item's resources.
 - showActions {boolean} : If true show feature's actions.
@@ -112,12 +114,12 @@ Parameters:
                 <a data-action="triggerContextMenu" data-tooltip="DAGGERHEART.UI.Tooltip.moreOptions">
                     <i class="fa-solid fa-fw fa-ellipsis-vertical" inert></i>
                 </a>
-            {{else if @root.editable}}
+            {{else if (and @root.editable (not hideModifyControls))}}
                 <a data-action="editDoc" data-tooltip="DAGGERHEART.UI.Tooltip.edit">
                     <i class="fa-solid fa-edit" inert></i>
                 </a>
                 {{#if (not isActor)}}
-                    <a data-action="deleteItem" data-tooltip="DAGGERHEART.UI.Tooltip.deleteItem">
+                    <a data-action="deleteDoc" data-tooltip="DAGGERHEART.UI.Tooltip.deleteItem">
                         <i class="fa-solid fa-trash" inert></i>
                     </a>
                 {{else if (eq type 'adversary')}}

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}}>
         <img src="{{item.img}}" class="item-img {{#if isActor}}actor-img{{/if}}" />
-        {{#if (or item.system.actionsList.size item.system.actionsList.length item.actionType)}}
+        {{#if item.usable}}
             {{#if @root.isNPC}}
                 <img class="roll-img d20" src="systems/daggerheart/assets/icons/dice/default/d20.svg" alt="d20">
             {{else}}

templates/sheets/global/tabs/tab-navigation.hbs

@@ -4,7 +4,7 @@
             <line-div></line-div>
             <nav class='feature-tab sheet-tabs tabs' data-group='primary'>
                 {{#each tabs as |tab|}}
-                    <a class='{{tab.id}} {{tab.cssClass}}' data-action='tab' data-group='{{tab.group}}' data-tab='{{tab.id}}'>
+                    <a class='{{tab.id}} {{tab.cssClass}} {{#if tab.empty}}empty{{/if}}' data-action='tab' data-group='{{tab.group}}' data-tab='{{tab.id}}'>
                         <span>{{localize tab.label}}</span>
                     </a>
                 {{/each}}

templates/sheets/items/beastform/settings.hbs

@@ -46,6 +46,13 @@
                     placeholder=(localize (ifThen dimensionsDisabled "DAGGERHEART.ITEMS.Beastform.FIELDS.tokenSize.disabledPlaceholder" "DAGGERHEART.ITEMS.Beastform.FIELDS.tokenSize.placeholder")) 
                     disabled=dimensionsDisabled 
                 }}
+                {{formGroup 
+                    systemFields.tokenSize.fields.depth 
+                    value=source.system.tokenSize.depth 
+                    localize=true 
+                    placeholder=(localize (ifThen dimensionsDisabled "DAGGERHEART.ITEMS.Beastform.FIELDS.tokenSize.disabledPlaceholder" "DAGGERHEART.ITEMS.Beastform.FIELDS.tokenSize.placeholder")) 
+                    disabled=dimensionsDisabled 
+                }}
             </div>
             <div class="full-width">
                 {{formGroup systemFields.tokenSize.fields.scale value=source.system.tokenSize.scale localize=true }}

templates/ui/chat/parts/roll-part.hbs

@@ -6,19 +6,15 @@
                 {{#if roll.isCritical}}
                     <span>{{localize "DAGGERHEART.GENERAL.criticalShort"}}</span>
                 {{else}}
-                    {{#if (and roll.dHope (not (eq roll.type "reaction")))}}
+                    {{#if (and roll.dHope (not (eq roll.options.roll.type "reaction")))}}
                         <span>{{localize "DAGGERHEART.GENERAL.withThing" thing=roll.totalLabel}}</span>
                     {{/if}}
                 {{/if}}
             </span>
         </div>
-        {{#if roll.difficulty}}
-            <span class="roll-difficulty{{#unless roll.success}} is-miss{{/unless}}">
-                {{!-- {{#if canViewSecret}} --}}
-                    difficulty {{roll.difficulty}}
-                {{!-- {{else}}
-                    {{localize (ifThen roll.success "DAGGERHEART.GENERAL.success" "DAGGERHEART.GENERAL.failure")}}
-                {{/if}} --}}
+        {{#if roll.options.roll.difficulty}}
+            <span class="roll-difficulty{{#unless roll.options.roll.success}} is-miss{{/unless}}">
+                {{localize "DAGGERHEART.GENERAL.difficulty"}} {{roll.options.roll.difficulty}}
             </span>
         {{/if}}
     </div>

templates/ui/combatTracker/combatTrackerHeader.hbs

@@ -50,6 +50,11 @@
     </nav>
     {{/if}}
 
+    {{!-- Encounter Name --}}
+    {{#if combat.name}}
+    <h2 class="encounter-name">{{ combat.name }}</h2>
+    {{/if}}
+
     <div class="encounter-controls {{#if hasCombat}}combat{{/if}}">
         {{!-- Combat Status --}}
         <strong class="encounter-title">

templates/ui/combatTracker/combatTrackerSection.hbs

@@ -13,20 +13,20 @@
                         <div class="combatant-controls flex-0">
                             {{#if @root.user.isGM}}
                             <button type="button" class="inline-control combatant-control icon fa-solid fa-eye-slash {{#if hidden}}active{{/if}}"
-                                    data-action="toggleHidden" data-tooltip aria-label="{{ localize "COMBAT.ToggleVis" }}"></button>
+                                    data-action="toggleHidden" data-tooltip aria-label="{{ localize (ifThen hidden "COMBATANT.Show" "COMBATANT.Hide") }}"></button>
                             <button type="button" class="inline-control combatant-control icon fa-solid fa-skull {{#if isDefeated}}active{{/if}}"
                                     data-action="toggleDefeated" data-tooltip
-                                    aria-label="{{ localize "COMBAT.ToggleDead" }}"></button>
+                                    aria-label="{{ localize (ifThen isDefeated "COMBATANT.UnmarkDefeated" "COMBATANT.MarkDefeated") }}"></button>
                             {{/if}}
                             {{#if canPing}}
                             <button type="button" class="inline-control combatant-control icon fa-solid fa-bullseye-arrow"
                                     data-action="pingCombatant" data-tooltip
-                                    aria-label="{{ localize "COMBAT.PingCombatant" }}"></button>
+                                    aria-label="{{ localize "COMBATANT.Ping" }}"></button>
                             {{/if}}
                             {{#unless @root.user.isGM}}
                             <button type="button" class="inline-control combatant-control icon fa-solid fa-arrows-to-eye"
                                     data-action="panToCombatant" data-tooltip
-                                    aria-label="{{ localize "COMBAT.PanToCombatant" }}"></button>
+                                    aria-label="{{ localize "COMBATANT.PanTo" }}"></button>
                             {{/unless}}
                         </div>
 

templates/ui/itemBrowser/itemContainer.hbs

@@ -1,7 +1,7 @@
 {{#each items}}
     <div class="item-container" data-item-uuid="{{uuid}}" draggable="true">
         <div class="item-header">
-            <div class="item-info" data-action="expandContent">
+            <div class="item-info" {{#if @root.viewSheet}}data-action="viewSheet"{{else}}data-action="expandContent"{{/if}}>
                 <img src="{{img}}" data-item-key="img" class="item-list-img">
                 <span data-item-key="name" class="item-list-name">{{name}}</span>
                 {{#each ../menu.data.columns}}
@@ -9,11 +9,13 @@
                 {{/each}}
             </div>
         </div>
-        <div class="item-desc extensible">
-            <span class="wrapper">
-                {{{system.enrichedTags}}}
-                {{{system.enrichedDescription}}}
-            </span>
-        </div>
+        {{#unless viewSheet}}
+            <div class="item-desc extensible">
+                <span class="wrapper">
+                    {{{system.enrichedTags}}}
+                    {{{system.enrichedDescription}}}
+                </span>
+            </div>
+        {{/unless}}
     </div>
 {{/each}}

templates/ui/sceneNavigation/scene-navigation.hbs

@@ -12,15 +12,20 @@
         </menu>
     {{/with}}
     {{#if scenes.levels}}
-        <menu id="scene-navigation-levels" class="scene-levels scene-navigation-menu flexcol" style="--max-levels: {{ scenes.levels.length }}">
+        <menu id="scene-navigation-levels" class="scene-levels scene-navigation-menu flexcol" 
+            style="--max-levels: {{ scenes.levels.length }}">
             {{#each scenes.levels}}
             <li class="level-row">
-                {{#with button}}
-                <button type="button" class="ui-control icon fa-solid {{ css }}" data-action="cycleLevel"
-                        data-direction="{{ direction }}" aria-label="{{ label }}"></button>
-                {{/with}}
                 <div class="ui-control scene scene-level {{ css }}" data-scene-id="{{ sceneId }}" data-level-id="{{ id }}" data-action="viewLevel">
                     <span class="ellipsis">{{ name }}</span>
+                    {{#if users}}
+                    <ul class="scene-players">
+                        {{#each users}}
+                        <li class="scene-player" style="--color-bg: {{ color }}; --color-border: {{ border }}" data-tooltip
+                            aria-label="{{ name }}">{{ letter }}</li>
+                        {{/each}}
+                    </ul>
+                    {{/if}}
                 </div>
             </li>
             {{/each}}
@@ -40,7 +45,8 @@
 
 {{#*inline ".scene"}}
 <li class="scene-wrapper">
-    <div class="ui-control scene {{ cssClass }}" data-scene-id="{{ id }}" data-action="viewScene" {{#if tooltip}}data-tooltip-text="{{ tooltip }}"{{/if}}>
+    <div class="ui-control scene {{ cssClass }}" data-scene-id="{{ id }}" data-action="viewScene" 
+        {{#if tooltip}}data-tooltip-text="{{ tooltip }}"{{/if}}>
         <span class="scene-name ellipsis">{{ name }}</span>
         {{#if users}}
         <ul class="scene-players">

templates/ui/sidebar/actor-document-partial.hbs

@@ -6,6 +6,8 @@
         <span>{{name}}</span>
         {{#if (or (eq type "adversary") (eq type "environment"))}}
             <span class="entry-subtitle">{{localize "DAGGERHEART.UI.Sidebar.actorDirectory.tier" tier=system.tier type=(@root.getTypeLabel this)}}</span>
+        {{else if (eq type "npc")}}
+            <span class="entry-subtitle">{{localize "TYPES.Actor.npc"}}</span>
         {{else if (eq type "character")}}
             <span class="entry-subtitle">{{localize "DAGGERHEART.UI.Sidebar.actorDirectory.character" level=system.levelData.level.current}}</span>
         {{else if (eq type "companion")}}