Merge branch 'development' into feature/party-sheet

templates/settings/automation-settings/rules.hbs

@@ -13,5 +13,9 @@
         {{formGroup settingFields.schema.fields.defeated.fields.characterDefault value=settingFields._source.defeated.characterDefault labelAttr="name" localize=true}}  
         {{formGroup settingFields.schema.fields.defeated.fields.adversaryDefault value=settingFields._source.defeated.adversaryDefault labelAttr="name" localize=true}}  
         {{formGroup settingFields.schema.fields.defeated.fields.companionDefault value=settingFields._source.defeated.companionDefault labelAttr="name" localize=true}}  
+
+        {{formGroup settingFields.schema.fields.defeated.fields.deadIcon value=settingFields._source.defeated.deadIcon localize=true}}  
+        {{formGroup settingFields.schema.fields.defeated.fields.defeatedIcon value=settingFields._source.defeated.defeatedIcon localize=true}}  
+        {{formGroup settingFields.schema.fields.defeated.fields.unconsciousIcon value=settingFields._source.defeated.unconsciousIcon localize=true}}  
     </fieldset>
 </section>

templates/sheets/actors/adversary/limited.hbs

@@ -0,0 +1,23 @@
+<div class="limited-container">
+    <header>
+        <img class="profile" src="{{document.img}}" alt="{{document.name}}" data-action='editImage' data-edit="img">
+        <h1 class="title-name">{{document.name}}</h1>
+    </header>
+    <div class="tags">
+        <div class="tag">
+            <span>
+                {{localize (concat 'DAGGERHEART.GENERAL.Tiers.' source.system.tier)}}
+            </span>
+        </div>
+        <div class="tag">
+            <span>{{adversaryType}}</span>
+        </div>
+        {{#if (eq source.system.type 'horde')}}
+            <div class="tag">
+                <span>{{source.system.hordeHp}}</span>
+                <span>/{{localize "DAGGERHEART.GENERAL.HitPoints.short"}}</span>
+            </div>
+        {{/if}}
+    </div>
+    <div class="description">{{{document.system.description}}}</div>
+</div>

templates/sheets/actors/adversary/sidebar.hbs

@@ -8,10 +8,10 @@
         <div class="resources-section">
             <div class="status-bar">
                 <div class='status-value'>
-                    <p><input class="bar-input" name="system.resources.hitPoints.value" min="0" max='{{source.system.resources.hitPoints.max}}'
-                            value="{{source.system.resources.hitPoints.value}}" type="number"></p>
-                    <p>/</p>
-                    <p class="bar-label">{{source.system.resources.hitPoints.max}}</p>
+                    <input class="bar-input" name="system.resources.hitPoints.value" min="0" max='{{source.system.resources.hitPoints.max}}'
+                            value="{{source.system.resources.hitPoints.value}}" type="number">
+                    <span>/</span>
+                    <span class="bar-label">{{source.system.resources.hitPoints.max}}</span>
                 </div>
                 <progress class='progress-bar' value='{{source.system.resources.hitPoints.value}}'
                     max='{{source.system.resources.hitPoints.max}}'></progress>
@@ -22,10 +22,10 @@
             </div>
             <div class="status-bar">
                 <div class='status-value'>
-                    <p><input class="bar-input" name="system.resources.stress.value" min="0" max='{{source.system.resources.stress.max}}'
-                            value="{{source.system.resources.stress.value}}" type="number"></p>
-                    <p>/</p>
-                    <p class="bar-label">{{source.system.resources.stress.max}}</p>
+                    <input class="bar-input" name="system.resources.stress.value" min="0" max='{{source.system.resources.stress.max}}'
+                            value="{{source.system.resources.stress.value}}" type="number">
+                    <span>/</span>
+                    <span class="bar-label">{{source.system.resources.stress.max}}</span>
                 </div>
                 <progress class='progress-bar stress-color' value='{{source.system.resources.stress.value}}'
                     max='{{source.system.resources.stress.max}}'></progress>
@@ -78,13 +78,9 @@
                 <side-line-div></side-line-div>
             </div>
             <ul class="items-sidebar-list">
-                {{> 'daggerheart.inventory-item'
+                {{> 'daggerheart.inventory-item-compact'
                 item=document.system.attack
                 type='action'
-                hideTags=true
-                hideDescription=true
-                hideResources=true
-                noExtensible=true
                 noCompendiumEdit=true
                 }}
             </ul>

templates/sheets/actors/character/limited.hbs

@@ -0,0 +1,97 @@
+<div class="limited-container">
+    <header>
+        <img class="profile" src="{{document.img}}" alt="{{document.name}}" data-action='editImage' data-edit="img">
+        <h1 class="title-name">{{document.name}}</h1>
+    </header>
+    <div class="character-details">
+        <div class="basic-info">
+            {{#if document.system.class.value}}
+                <span data-action="editDoc" data-item-uuid="{{document.system.class.value.uuid}}">{{document.system.class.value.name}}</span>
+            {{else}}
+                <span class="missing-header-feature" data-action="openPack" data-key="classes">{{localize 'TYPES.Item.class'}}</span>
+            {{/if}}
+            <span class="dot">•</span>
+            {{#if document.system.class.subclass}}
+                <span data-action="editDoc" data-item-uuid="{{document.system.class.subclass.uuid}}">{{document.system.class.subclass.name}}</span>
+            {{else}}
+                <span class="missing-header-feature" data-action="openPack" data-key="subclasses">{{localize 'TYPES.Item.subclass'}}</span>
+            {{/if}}
+            <span class="dot">•</span>
+            {{#if document.system.community}}
+                <span data-action="editDoc" data-item-uuid="{{document.system.community.uuid}}">{{document.system.community.name}}</span>
+            {{else}}
+                <span class="missing-header-feature" data-action="openPack" data-key="communities">{{localize 'TYPES.Item.community'}}</span>
+            {{/if}}
+            <span class="dot">•</span>
+            {{#if document.system.ancestry}}
+                <span data-action="editDoc" data-item-uuid="{{document.system.ancestry.uuid}}">{{document.system.ancestry.name}}</span>
+            {{else}}
+                <span class="missing-header-feature" data-action="openPack" data-key="ancestries">{{localize 'TYPES.Item.ancestry'}}</span>
+            {{/if}}
+        </div>
+
+        {{#if document.system.multiclass.value}}
+            <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>
+                {{else}}
+                    <span data-action="openPack" data-key="classes">{{localize 'DAGGERHEART.GENERAL.multiclass'}}</span>
+                {{/if}}
+                <span class="dot">•</span>
+                {{#if document.system.multiclass.subclass}}
+                    <span data-action="editDoc" data-item-uuid="{{document.system.multiclass.subclass.uuid}}">{{document.system.multiclass.subclass.name}}</span>
+                {{else}}
+                    <span class="missing-header-feature" data-action="openPack" data-key="subclasses">{{localize 'TYPES.Item.subclass'}}</span>
+                {{/if}}
+            </div>
+        {{/if}}
+    </div>
+    <h3 class="level-details">
+        {{localize 'DAGGERHEART.GENERAL.level'}} 
+        {{document.system.levelData.level.changed}}
+    </h3>
+    <div class="domain-details">
+        <div class="domain-header">
+            <side-line-div class="invert"></side-line-div>
+                <h3>{{localize "DAGGERHEART.GENERAL.Domain.plural"}}</h3>
+            <side-line-div></side-line-div>
+        </div>
+        {{#if document.system.class.value}}
+            <div class="domains-section">
+                {{#each document.system.domainData as |data|}}
+                    <div class="domain">
+                        <img src="{{data.src}}" alt="" data-tooltip="{{data.description}}" />
+                        <span>{{data.label}}</span>
+                    </div>
+                {{/each}}
+            </div>
+        {{/if}}
+    </div>
+    <div class="bio-details">
+        <div class="bio-header">
+            <side-line-div class="invert"></side-line-div>
+                <h3>{{localize "DAGGERHEART.GENERAL.Tabs.biography"}}</h3>
+            <side-line-div></side-line-div>
+        </div>
+        <div class="bio-list">
+            {{#if source.system.biography.characteristics.pronouns}}
+                <div class="bio-info">
+                    <span>{{localize 'DAGGERHEART.ACTORS.Character.pronouns'}}</span>
+                    <span>{{source.system.biography.characteristics.pronouns}}</span>
+                </div>
+            {{/if}}
+            {{#if source.system.biography.characteristics.age}}
+                <div class="bio-info">
+                    <span>{{localize 'DAGGERHEART.ACTORS.Character.age'}}</span>
+                    <span>{{source.system.biography.characteristics.age}}</span>
+                </div>
+            {{/if}}
+            {{#if source.system.biography.characteristics.faith}}
+                <div class="bio-info">
+                    <span>{{localize 'DAGGERHEART.ACTORS.Character.faith'}}</span>
+                    <span>{{source.system.biography.characteristics.faith}}</span>
+                </div>
+            {{/if}}
+        </div>
+    </div>
+</div>

templates/sheets/actors/character/sidebar.hbs

@@ -19,10 +19,10 @@
         <div class="resources-section">
             <div class="status-bar">
                 <div class='status-value'>
-                    <p><input class="bar-input" name="system.resources.hitPoints.value" min="0" max='{{document.system.resources.hitPoints.max}}'
-                            value="{{document.system.resources.hitPoints.value}}" type="number"></p>
-                    <p>/</p>
-                    <p class="bar-label">{{document.system.resources.hitPoints.max}}</p>
+                    <input class="bar-input" name="system.resources.hitPoints.value" min="0" max='{{document.system.resources.hitPoints.max}}'
+                            value="{{document.system.resources.hitPoints.value}}" type="number">
+                    <span>/</span>
+                    <span class="bar-label">{{document.system.resources.hitPoints.max}}</span>
                 </div>
                 <progress
                     class='progress-bar'
@@ -36,10 +36,10 @@
             </div>
             <div class="status-bar">
                 <div class='status-value'>
-                    <p><input class="bar-input" name="system.resources.stress.value" min="0" max='{{document.system.resources.stress.max}}'
-                            value="{{document.system.resources.stress.value}}" type="number"></p>
-                    <p>/</p>
-                    <p class="bar-label">{{document.system.resources.stress.max}}</p>
+                    <input class="bar-input" name="system.resources.stress.value" min="0" max='{{document.system.resources.stress.max}}'
+                            value="{{document.system.resources.stress.value}}" type="number">
+                    <span>/</span>
+                    <span class="bar-label">{{document.system.resources.stress.max}}</span>
                 </div>
                 <progress
                     class='progress-bar stress-color'
@@ -116,24 +116,16 @@
             </div>
             <ul class="items-sidebar-list">
                 {{#if document.system.usedUnarmed}}
-                    {{> 'daggerheart.inventory-item'
+                    {{> 'daggerheart.inventory-item-compact'
                     item=document.system.usedUnarmed
                     type='action'
-                    hideTags=true
-                    hideDescription=true
-                    hideResources=true
-                    noExtensible=true
                     }}
                 {{/if}}
                 {{#each document.items as |item|}}
                 {{#if item.system.equipped}}
-                {{> 'daggerheart.inventory-item'
+                {{> 'daggerheart.inventory-item-compact'
                 item=item
                 type=item.type
-                hideTags=true
-                hideDescription=true
-                hideResources=true
-                noExtensible=true
                 }}
                 {{/if}}
                 {{/each}}
@@ -147,13 +139,9 @@
             </div>
             <ul class="items-sidebar-list">
                 {{#each document.system.domainCards.loadout as |card|}}
-                {{> 'daggerheart.inventory-item'
+                {{> 'daggerheart.inventory-item-compact'
                     item=card
                     type='domainCard'
-                    hideTags=true
-                    hideDescription=true
-                    hideResources=true
-                    noExtensible=true
                 }}
 
                 {{/each}}

templates/sheets/actors/companion/details.hbs

@@ -8,11 +8,9 @@
         </div>
         {{#if document.system.partner}}
         <ul class="items-list">
-            {{> 'daggerheart.inventory-item'
+            {{> 'daggerheart.inventory-item-compact'
             item=document.system.partner
             type='companion'
-            hideTags=true
-            hideDescription=true
             isActor=true
             hideTooltip=true
             }}
@@ -28,11 +26,9 @@
             <side-line-div></side-line-div>
         </div>
         <ul class="items-list">
-            {{> 'daggerheart.inventory-item'
+            {{> 'daggerheart.inventory-item-compact'
             item=document.system.attack
             type='action'
-            hideTags=true
-            hideDescription=true
             hideTooltip=true
             }}
         </ul>

templates/sheets/actors/companion/header.hbs

@@ -19,9 +19,9 @@
         </div>
         <div class="status-bar">
             <div class='status-value'>
-                <p><input class="bar-input" name="system.resources.stress.value" value="{{document.system.resources.stress.value}}" min="0" max='{{document.system.resources.stress.max}}' type="number"></p>
-                <p>/</p>
-                <p class="bar-label">{{document.system.resources.stress.max}}</p>
+                <input class="bar-input" name="system.resources.stress.value" value="{{document.system.resources.stress.value}}" min="0" max='{{document.system.resources.stress.max}}' type="number">
+                <span>/</span>
+                <span class="bar-label">{{document.system.resources.stress.max}}</span>
             </div>
             <progress
                 class='progress-bar stress-color'

templates/sheets/actors/companion/limited.hbs

@@ -0,0 +1,31 @@
+<div class="limited-container">
+    <header>
+        <img class="profile" src="{{document.img}}" alt="{{document.name}}" data-action='editImage' data-edit="img">
+        <h1 class="title-name">{{document.name}}</h1>
+    </header>
+    <h3 class="level-details">
+        {{localize 'DAGGERHEART.GENERAL.level'}} 
+        {{document.system.levelData.level.changed}}
+    </h3>
+    <div class="partner-details">
+        <div class="partner-header">
+            <side-line-div class="invert"></side-line-div>
+                <h3>{{localize "DAGGERHEART.GENERAL.partner"}}</h3>
+            <side-line-div></side-line-div>
+        </div>
+        {{#if document.system.partner}}
+        <ul class="items-list">
+            {{> 'daggerheart.inventory-item'
+            item=document.system.partner
+            type='companion'
+            hideTags=true
+            hideDescription=true
+            isActor=true
+            hideTooltip=true
+            }}
+        </ul>
+        {{else}}
+        <span class="partner-placeholder">{{localize "DAGGERHEART.ACTORS.Companion.noPartner"}}</span>
+        {{/if}}
+    </div>
+</div>

templates/sheets/actors/environment/limited.hbs

@@ -0,0 +1,21 @@
+<div class="limited-container">
+    <header>
+        <img class="profile" src="{{document.img}}" alt="{{document.name}}" data-action='editImage' data-edit="img">
+        <h1 class="title-name">{{document.name}}</h1>
+    </header>
+    <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>
+    <div class="description">{{{document.system.description}}}</div>
+</div>

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

@@ -49,20 +49,6 @@ Parameters:
         </div>
         {{/each}}
       </div>
-      {{else if (not ../hideLabels)}}
-      <div class="item-labels">
-        <div class="label">
-          {{#each this._getLabels as |label|}}
-          {{ifThen label.value label.value label}}
-          {{#each label.icons as |icon|}}
-          <i class="fa-solid {{icon}}"></i>
-          {{/each}}
-          {{#if (not @last)}}
-          <span>-</span>
-          {{/if}}
-          {{/each}}
-        </div>
-      </div>
       {{/if}}
       {{/with}}
       {{!--Tags End --}}

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

@@ -0,0 +1,85 @@
+<li class="inventory-item inventory-item-compact" data-item-id="{{item.id}}" {{#if (or (eq type 'action' ) (eq type 'attack' ))}}
+  data-action-id="{{item.id}}" {{/if}} data-item-uuid="{{item.uuid}}" data-type="{{type}}" data-no-compendium-edit="{{noCompendiumEdit}}" draggable="true">
+    {{!-- Image --}}
+    <div class="img-portait" data-action='{{ifThen (or (hasProperty item "use") (eq type "attack")) "useItem" (ifThen
+    (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 @root.isNPC}}
+                <img class="roll-img d20" src="systems/daggerheart/assets/icons/dice/default/d20.svg" alt="d20">
+            {{else}}
+                <img class="roll-img duality" src="systems/daggerheart/assets/icons/dice/duality/DualityBW.svg" alt="2d12">
+            {{/if}}
+        {{/if}}
+    </div>
+
+    {{!-- Item Name --}}
+    <span class="item-name">{{localize item.name}}</span>
+
+    {{!-- Tags Start --}}
+    {{#with item}}
+        <div class="item-labels">
+            <div class="label">
+                {{#each this._getLabels as |label|}}
+                    {{ifThen label.value label.value label}}
+                    {{#each label.icons as |icon|}}
+                        <i class="fa-solid {{icon}}"></i>
+                    {{/each}}
+                    {{#if (not @last)}}
+                        <span>-</span>
+                    {{/if}}
+                {{/each}}
+            </div>
+        </div>
+    {{/with}}
+    {{!--Tags End --}}
+
+    {{!-- Controls --}}
+    {{#unless hideControls}}
+    <div class="controls">
+        {{#if isActor}}
+            <a data-action="editDoc" data-tooltip="DAGGERHEART.UI.Tooltip.openActorWorld">
+                <i class="fa-solid fa-fw fa-globe"></i>
+            </a>
+            {{#if (eq type 'adversary')}}
+                <a data-action='deleteAdversary' data-category="{{categoryAdversary}}" data-tooltip="CONTROLS.CommonDelete">
+                    <i class='fas fa-fw fa-trash'></i>
+                </a>
+            {{/if}}
+        {{else}}
+            {{#if (eq type 'weapon')}}
+            <a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem"
+                data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.equipped 'unequip' 'equip' }}">
+                <i class="fa-solid fa-fw fa-hands"></i>
+            </a>
+            {{else if (eq type 'armor')}}
+            <a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem"
+                data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.equipped 'unequip' 'equip' }}">
+                <i class="fa-solid fa-fw fa-shield"></i>
+            </a>
+            {{else if (eq type 'domainCard')}}
+            <a data-action="toggleVault"
+                data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.inVault 'sendToLoadout' 'sendToVault' }}">
+                <i class="fa-solid fa-fw {{ifThen item.system.inVault 'fa-arrow-up' 'fa-arrow-down'}}"></i>
+            </a>
+            {{else if (eq type 'effect')}}
+            <a data-action="toggleEffect"
+                data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.disabled 'enableEffect' 'disableEffect' }}">
+                <i class="fa-solid fa-fw {{ifThen item.disabled 'fa-toggle-off' 'fa-toggle-on'}}"></i>
+            </a>
+            {{/if}}
+            {{#if (hasProperty item "toChat")}}
+            <a data-action="toChat" data-tooltip="DAGGERHEART.UI.Tooltip.sendToChat">
+                <i class="fa-regular fa-fw fa-message"></i>
+            </a>
+            {{/if}}
+            {{#unless hideContextMenu}}
+            <a data-action="triggerContextMenu" data-tooltip="DAGGERHEART.UI.Tooltip.moreOptions">
+                <i class="fa-solid fa-ellipsis-vertical"></i>
+            </a>
+            {{/unless}}
+        {{/if}}
+    </div>
+    {{/unless}}
+</li>

templates/sidebar/daggerheart-menu/main.hbs

@@ -21,6 +21,4 @@
             <button data-action="refreshActors" {{disabled disableRefresh}}>{{localize "DAGGERHEART.GENERAL.refresh"}}</button>
         </div>
     </fieldset>
-
-    <button data-action="editCountdowns">{{localize "DAGGERHEART.APPLICATIONS.DaggerheartMenu.countdowns"}}</button>
 </div>