Merge branch 'main' into feature/Character-Setup-Rework

templates/actionTypes/actionType.hbs

@@ -1,13 +1,12 @@
 <form id="action-type-select">
-    <ul class="unlist list-select">
+    <header class="dialog-header">
+        <h1>{{itemName}}</h1>
+    </header>
+    <ul class="actions-list">
     {{#each types}}
-        <li>
-            <label>
-                {{! TODO: remove dh-icon}}
-                <dh-icon class="dh-icon fas {{icon}}"></dh-icon>
-                <span>{{localize name}}</span>
-                <input type="radio" name="type" value="{{id}}" {{#if (eq @index 0)}}checked{{/if}}>
-            </label>
+        <li class="action-item">
+            <input type="radio" name="type" value="{{id}}" {{#if (eq @index 0)}}checked{{/if}}>
+            <span class="label">{{localize name}}</span>
         </li>
     {{/each}}
     </ul>

templates/actionTypes/damage.hbs

@@ -46,7 +46,7 @@
                                 {{> formula fields=../../fields.value.fields type=../fields.type dmg=dmg source=dmg.value target="value" realIndex=realIndex}}
                             </fieldset>
                         {{/if}}
-                        {{formField ../../fields.type value=dmg.type name=(concat "damage.parts." realIndex ".type") localize=true}}
+                        {{formField ../../fields.type value=dmg.type name=(concat "damage.parts." realIndex ".type") localize=true}} 
                         <input type="hidden" name="damage.parts.{{realIndex}}.base" value="{{dmg.base}}">
                     </fieldset>
                     {{#unless dmg.base}}<div class="fas fa-trash" data-action="removeDamage" data-index="{{realIndex}}"></div>{{/unless}}

templates/dialogs/actionSelect.hbs

@@ -1,12 +1,12 @@
 <form id="item-action-select">
-    <ul class="unlist list-select">
+    <header class="dialog-header">
+        <h1>{{itemName}}</h1>
+    </header>
+    <ul class="actions-list">
     {{#each actions}}
-        <li>
-            <label>
-                <dh-icon><img src="{{ img }}"></dh-icon>
-                <span>{{ name }}</span>
-                <input type="radio" name="actionId" value="{{_id}}" {{#if (eq @index 0)}}checked{{/if}}>
-            </label>
+        <li class="action-item">
+            <input type="radio" name="actionId" value="{{_id}}" {{#if (eq @index 0)}}checked{{/if}}>
+            <span class="label">{{ name }}</span>
         </li>
     {{/each}}
     </ul>

templates/dialogs/dice-roll/damageSelection.hbs

@@ -1,33 +1,13 @@
-<div>
+<section class="damage-section-container">
+    <header class="dialog-header">
+        <h1>{{title}}</h1>
+    </header>
+    <span class="formula-label"><b>Formula:</b> {{@root.formula}}</span>
     <div class="form-group">
-        <label><strong>{{title}}</strong></label>
-        <div class="form-fields">
-            {{!-- <input type="text" value="{{formula}}" disabled /> --}}
-            <div>{{@root.formula}}</div>
-        </div>
-        <div>
-            <input type="text" value="{{extraFormula}}" name="extraFormula" placeholder="Situational Bonus">
-        </div>
+        <input type="text" value="{{extraFormula}}" name="extraFormula" placeholder="Situational Bonus">
     </div>
-    {{!-- {{#each bonusDamage as |damage index|}}
-        <div class="form-group">
-            <label><strong>{{damage.description}}</strong></label>
-            <div class="form-fields">
-                <label>Enabled</label>
-                <input style="align-self: baseline;" type="checkbox" name="bonusDamage.{{index}}.initiallySelected" {{checked damage.initiallySelected}} />
-                {{#if (and damage.initiallySelected damage.hopeIncrease)}}
-
-                    <label>Hope</label>
-                    <div class="hope-container">
-                        <i data-action="decreaseHopeUse" data-index="{{index}}" class="fa-solid fa-caret-left icon-button {{#if (eq damage.hopeUses 0)}}disabled{{/if}}"></i>
-                        <div>{{damage.hopeUses}}</div>
-                        <i data-action="increaseHopeUse" data-index="{{index}}" class="fa-solid fa-caret-right icon-button {{#if (eq ../hopeUsed ../hope)}}disabled{{/if}}"></i>
-                    </div>
-                {{/if}}
-            </div>
-        </div>
-    {{/each}} --}}
-    <footer>
-        <button data-action="submitRoll">Roll</button>
-    </footer>
-</div>
+    <button class="submit-btn" data-action="submitRoll">
+        <i class="fa-solid fa-dice"></i>
+        <span class="label">Roll</span>
+    </button>
+</section>

templates/sheets/activeEffect/details.hbs

@@ -7,7 +7,7 @@
     {{formGroup fields.origin value=source.origin rootId=rootId disabled=true}}
     {{/if}}
     {{#if isItemEffect}}
-    {{formGroup fields.transfer value=source.transfer rootId=rootId label=legacyTransfer.label hint=legacyTransfer.hint}}
+    {{formGroup fields.transfer value=source.transfer rootId=rootId label=legacyTransfer.label hint=(localize "DAGGERHEART.EFFECTS.Attachments.transferHint")}}
     {{/if}}
 
     {{formGroup fields.statuses value=source.statuses options=statuses rootId=rootId classes="statuses"}}

templates/sheets/actors/adversary/sidebar.hbs

@@ -10,12 +10,12 @@
                 <div class='status-value'>
                     <p><input class="bar-input" name="system.resources.hitPoints.value" value="{{source.system.resources.hitPoints.value}}" type="number"></p>
                     <p>/</p>
-                    <p class="bar-label">{{source.system.resources.hitPoints.max}}</p>
+                    <p class="bar-label">{{source.system.resources.hitPoints.maxTotal}}</p>
                 </div>
                 <progress
                     class='progress-bar'
                     value='{{source.system.resources.hitPoints.value}}'
-                    max='{{source.system.resources.hitPoints.max}}'
+                    max='{{source.system.resources.hitPoints.maxTotal}}'
                 ></progress>
                 <div class="status-label">
                     <h4>HP</h4>
@@ -26,12 +26,12 @@
                 <div class='status-value'>
                     <p><input class="bar-input" name="system.resources.stress.value" value="{{source.system.resources.stress.value}}" type="number"></p>
                     <p>/</p>
-                    <p class="bar-label">{{source.system.resources.stress.max}}</p>
+                    <p class="bar-label">{{source.system.resources.stress.maxTotal}}</p>
                 </div>
                 <progress
                     class='progress-bar stress-color'
                     value='{{source.system.resources.stress.value}}'
-                    max='{{source.system.resources.stress.max}}'
+                    max='{{source.system.resources.stress.maxTotal}}'
                 ></progress>
                 <div class="status-label">
                     <h4>Stress</h4>

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

@@ -1,4 +1,4 @@
-<li class="inventory-item" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-type="{{type}}">
+<li class="inventory-item" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-type="{{type}}" draggable="true">
     <img src="{{item.img}}" class="item-img {{#if isActor}}actor-img{{/if}}" data-action="useItem" {{#if (not noTooltip)}}data-tooltip="{{concat "#item#" item.uuid}}"{{/if}} />
     <div class="item-label">
         {{#if isCompanion}}
@@ -6,7 +6,7 @@
         {{else}}
             <div class="item-name">{{item.name}}</div>
         {{/if}}
-        {{#if  (eq type 'weapon')}}
+        {{#if  (eq type 'weapon')}} 
             <div class="item-tags">
                 {{#if isSidebar}}
                     <div class="item-labels">
@@ -16,11 +16,11 @@
                             <span> - </span>
                             {{item.system.attack.damage.parts.0.value.dice}}{{#if item.system.attack.damage.parts.0.value.bonus}} + {{item.system.attack.damage.parts.0.value.bonus}}{{/if}}
                             {{!-- ({{localize (concat 'DAGGERHEART.CONFIG.DamageType.' item.system.attack.damage.parts.0.type '.abbreviation')}}) --}}
-                            {{#with (lookup @root.config.GENERAL.damageTypes item.system.attack.damage.parts.0.type)}}
-                                {{#each icon}}
-                                    <i class="fa-solid {{this}}"></i>
-                                {{/each}}
-                            {{/with}}
+                            {{#each item.system.attack.damage.parts.0.type as | type | }}
+                                {{#with (lookup @root.config.GENERAL.damageTypes type)}}
+                                    <i class="fa-solid {{icon}}"></i>
+                                {{/with}}
+                            {{/each}}
                         </div>
                     </div>
                 {{else}}
@@ -32,7 +32,11 @@
                     </div>
                     <div class="tag">
                         {{item.system.attack.damage.parts.0.value.dice}}{{#if item.system.attack.damage.parts.0.value.bonus}} + {{item.system.attack.damage.parts.0.value.bonus}}{{/if}}
-                        ({{localize (concat 'DAGGERHEART.CONFIG.DamageType.' item.system.attack.damage.parts.0.type '.abbreviation')}})
+                        (
+                            {{#each item.system.attack.damage.parts.0.type}}
+                                {{localize (concat 'DAGGERHEART.CONFIG.DamageType.' this '.abbreviation')}}
+                            {{/each}}
+                        )
                     </div>
                     <div class="tag">
                         {{localize (concat 'DAGGERHEART.CONFIG.Burden.' item.system.burden)}}

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

@@ -0,0 +1,29 @@
+<section
+    class='tab {{tabs.attachments.cssClass}} {{tabs.attachments.id}}'
+    data-tab='{{tabs.attachments.id}}'
+    data-group='{{tabs.attachments.group}}'
+>
+    <fieldset class="one-column drop-section attachments-section">
+        <legend>{{localize tabs.attachments.label}}</legend>
+        
+        {{#if attachedItems}}
+            <div class="attached-items">
+                {{#each attachedItems as |item|}}
+                    <div class="inventory-item attached-item" data-uuid="{{item.uuid}}">
+                        <img src="{{item.img}}" alt="{{item.name}}" class="item-img">
+                        <div class="item-label">
+                            <div class="item-name">{{item.name}}</div>
+                        </div>
+                        <div class="controls">
+                            <a data-action="removeAttachment" data-uuid="{{item.uuid}}"><i class="fa-solid fa-trash remove-attachment"></i></a>
+                        </div>
+                    </div>
+                {{/each}}
+            </div>
+        {{/if}}
+        
+        <div class="drop-area" data-drop-type="Item" style="width: 100%;">
+            <span>{{localize "DAGGERHEART.EFFECTS.Attachments.attachHint"}}</span>
+        </div>
+    </fieldset>
+</section>

templates/sheets/items/weapon/header.hbs

@@ -15,7 +15,11 @@
                 {{localize (concat 'DAGGERHEART.CONFIG.Range.' source.system.attack.range '.name')}}
                 <span>-</span>
                 {{source.system.attack.damage.parts.0.value.dice}}{{#if source.system.attack.damage.parts.0.value.bonus}} + {{source.system.attack.damage.parts.0.value.bonus}}{{/if}}
-                ({{localize (concat 'DAGGERHEART.CONFIG.DamageType.' source.system.attack.damage.parts.0.type '.abbreviation')}})
+                (
+                    {{#each source.system.attack.damage.parts.0.type}}
+                        {{localize (concat 'DAGGERHEART.CONFIG.DamageType.' this '.abbreviation')}}
+                    {{/each}}
+                )
                 <span>-</span>
                 {{localize (concat 'DAGGERHEART.CONFIG.Burden.' source.system.burden)}}
             </h3>