Merge branch 'development' into feature/673-weapon-custom-formula

templates/sheets/actors/adversary/effects.hbs

@@ -1,20 +1,22 @@
 <section class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}' data-tab='{{tabs.effects.id}}'
     data-group='{{tabs.effects.group}}'>
-    {{> 'daggerheart.inventory-items'
-    title='DAGGERHEART.GENERAL.activeEffects'
-    type='effect'
-    isGlassy=true
-    collection=effects.actives
-    canCreate=true
-    hideResources=true
-    }}
+    <div class="effects-sections">
+        {{> 'daggerheart.inventory-items'
+        title='DAGGERHEART.GENERAL.activeEffects'
+        type='effect'
+        isGlassy=true
+        collection=effects.actives
+        canCreate=true
+        hideResources=true
+        }}
 
-    {{> 'daggerheart.inventory-items'
-    title='DAGGERHEART.GENERAL.inactiveEffects'
-    type='effect'
-    isGlassy=true
-    collection=effects.inactives
-    canCreate=true
-    hideResources=true
-    }}
+        {{> 'daggerheart.inventory-items'
+        title='DAGGERHEART.GENERAL.inactiveEffects'
+        type='effect'
+        isGlassy=true
+        collection=effects.inactives
+        canCreate=true
+        hideResources=true
+        }}
+    </div>
 </section>

templates/sheets/actors/adversary/header.hbs

@@ -13,9 +13,7 @@
             </span>
         </div>
         <div class="tag">
-            <span>
-                {{localize (concat 'DAGGERHEART.CONFIG.AdversaryType.' source.system.type '.label')}}
-            </span>
+            <span>{{adversaryType}}</span>
         </div>
         {{#if (eq source.system.type 'horde')}}
             <div class="tag">
@@ -26,12 +24,12 @@
     </div>
     <line-div></line-div>
     <div class="adversary-info">
-        <div class="description">
+        <span class="description">
             <i>{{{description}}}</i>
-        </div>
-        <div class="motives-and-tatics">
+        </span>
+        <span class="motives-and-tatics">
             <b>{{localize 'DAGGERHEART.ACTORS.Adversary.FIELDS.motivesAndTactics.label'}}: </b>{{{source.system.motivesAndTactics}}}
-        </div>
+        </span>
     </div>
 
     <div class="adversary-navigation">

templates/sheets/actors/adversary/notes.hbs

@@ -7,4 +7,8 @@
         <legend>{{localize tabs.notes.label}}</legend>
         {{formInput notes.field value=notes.value enriched=notes.enriched toggled=true}}
     </fieldset>
+
+    {{#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/adversary/sidebar.hbs

@@ -49,8 +49,8 @@
             </div>
             <div class="status-number">
                 <div class='status-value armor-slots'>
-                    {{#if source.system.attack.roll.bonus}}
-                    <p>{{source.system.attack.roll.bonus}}</p>
+                    {{#if source.system.attack.roll.bonus includeZero=true}}
+                    <p>{{numberFormat source.system.attack.roll.bonus sign=true}}</p>
                     {{else}}
                     <p>-</p>
                     {{/if}}
@@ -98,9 +98,9 @@
             <div class="experience-list">
                 {{#each source.system.experiences as |experience id|}}
                     <div class="experience-row" data-tooltip-text="{{experience.description}}">
-                        <div class="experience-value">
+                        <span class="experience-value">
                             +{{experience.value}}
-                        </div>
+                        </span>
                         <span class="experience-name">{{experience.name}}</span>
                         <div class="controls">
                             <a data-action="sendExpToChat" data-id="{{id}}">

templates/sheets/actors/character/header.hbs

@@ -6,7 +6,7 @@
                 type='text'
                 name='name'
                 value='{{document.name}}'
-                placeholder='Actor Name'
+                placeholder='{{localize "DAGGERHEART.GENERAL.actorName"}}'
             />
         </h1>
 

templates/sheets/actors/character/sidebar.hbs

@@ -168,9 +168,9 @@
             <div class="experience-list">
                 {{#each document.system.experiences as |experience id|}}
                     <div class="experience-row" data-tooltip-text="{{experience.description}}">
-                        <div class="experience-value">
+                        <span class="experience-value">
                             +{{experience.value}}
-                        </div>
+                        </span>
                         <span>{{experience.name}}</span>
                         <div class="controls">
                             <a data-action="sendExpToChat" data-type="experience" data-id="{{id}}">

templates/sheets/actors/companion/details.hbs

@@ -45,9 +45,9 @@
         </div>
         {{#each source.system.experiences as |experience id|}}
         <div class="experience-row" data-tooltip-text="{{experience.description}}">
-            <div class="experience-value">
+            <span class="experience-value">
                 +{{experience.value}}
-            </div>
+            </span>
             <span class="experience-name">{{experience.name}}</span>
             <div class="controls">
                 <a data-action="sendExpToChat" data-type="experience" data-id="{{id}}">

templates/sheets/actors/companion/effects.hbs

@@ -1,20 +1,22 @@
 <section class='tab {{tabs.effects.cssClass}} {{tabs.effects.id}}' data-tab='{{tabs.effects.id}}'
     data-group='{{tabs.effects.group}}'>
-    {{> 'daggerheart.inventory-items'
-    title='DAGGERHEART.GENERAL.activeEffects'
-    type='effect'
-    isGlassy=true
-    collection=effects.actives
-    canCreate=true
-    hideResources=true
-    }}
+    <div class="effects-sections">
+        {{> 'daggerheart.inventory-items'
+        title='DAGGERHEART.GENERAL.activeEffects'
+        type='effect'
+        isGlassy=true
+        collection=effects.actives
+        canCreate=true
+        hideResources=true
+        }}
 
-    {{> 'daggerheart.inventory-items'
-    title='DAGGERHEART.GENERAL.inactiveEffects'
-    type='effect'
-    isGlassy=true
-    collection=effects.inactives
-    canCreate=true
-    hideResources=true
-    }}
+        {{> 'daggerheart.inventory-items'
+        title='DAGGERHEART.GENERAL.inactiveEffects'
+        type='effect'
+        isGlassy=true
+        collection=effects.inactives
+        canCreate=true
+        hideResources=true
+        }}
+    </div>
 </section>

templates/sheets/actors/environment/header.hbs

@@ -3,20 +3,25 @@
     <div class='item-container'>
         <div class="item-info">
             <h1 class='item-name'><input type='text' name='name' value='{{source.name}}' /></h1>
-            <div class="tags">
-                <div class="tag">
-                    <span>
-                        {{localize (concat 'DAGGERHEART.GENERAL.Tiers.' source.system.tier)}}
-                    </span>
-                </div>
-                {{#if source.system.type}}
+            <div class="flexcol">
+                <div class="tags">
                     <div class="tag">
                         <span>
-                            {{localize (concat 'DAGGERHEART.CONFIG.EnvironmentType.' source.system.type '.label')}}
+                            {{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> 
         </div>
         <div class="status-number">
             <div class='status-value armor-slots'>
@@ -33,12 +38,12 @@
     </div>
     <line-div></line-div>
     <div class="environment-info">
-        <div class="description">
+        <span class="description">
             <i>{{{description}}}</i>
-        </div>
-        <div class="impulses">
+        </span>
+        <span class="impulses">
             <b>{{localize 'DAGGERHEART.ACTORS.Environment.FIELDS.impulses.label'}}: </b>{{{source.system.impulses}}}
-        </div>
+        </span>
     </div>
     <div class="environment-navigation">
         {{> 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs'}}

templates/sheets/actors/environment/notes.hbs

@@ -7,4 +7,8 @@
         <legend>{{localize tabs.notes.label}}</legend>
         {{formInput notes.field value=notes.value enriched=notes.value toggled=true}}
     </fieldset>
+
+    {{#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/environment/potentialAdversaries.hbs

@@ -3,7 +3,7 @@
     data-tab='{{tabs.potentialAdversaries.id}}'
     data-group='{{tabs.potentialAdversaries.group}}'
 >    
-    <div class="action-section">
+    <div class="items-section">
         {{#each document.system.potentialAdversaries as |category categoryId|}}
             {{> 'daggerheart.inventory-items'
             title=category.label

templates/sheets/global/partials/domain-card-item.hbs

@@ -19,6 +19,6 @@
                 </a>
             </div>
         </div>
-        <div class="card-name">{{item.name}}</div>
+        <span class="card-name">{{item.name}}</span>
     </div>
 </li>

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

@@ -30,7 +30,7 @@ Parameters:
     <div class="item-label">
 
       {{!-- Item Name --}}
-      <div class="item-name">{{localize item.name}} {{#unless noExtensible}}<span class="expanded-icon"><i class="fa-solid fa-expand"></i></span>{{/unless}}</div>
+      <span class="item-name">{{localize item.name}} {{#unless noExtensible}}<span class="expanded-icon"><i class="fa-solid fa-expand"></i></span>{{/unless}}</span>
 
       {{!-- Tags Start --}}
       {{#with item}}

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

@@ -7,4 +7,8 @@
         <legend>{{localize "DAGGERHEART.GENERAL.description"}}</legend>
         {{formInput systemFields.description value=document.system.description enriched=enrichedDescription toggled=true}}
     </fieldset>
+    
+    {{#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/global/tabs/tab-navigation.hbs

@@ -5,7 +5,7 @@
             <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}}'>
-                        {{localize tab.label}}
+                        <span>{{localize tab.label}}</span>
                     </a>
                 {{/each}}
             </nav>

templates/sheets/items/ancestry/header.hbs

@@ -4,6 +4,7 @@
         <h1 class='item-name'><input type='text' name='name' value='{{source.name}}' /></h1>
         <div class='item-description'>
             <h3>{{localize 'TYPES.Item.ancestry'}}</h3>
+            {{#if (and showAttribution source.system.attributionLabel)}} <div class="attribution-header-label">{{source.system.attributionLabel}}</div>{{/if}}
         </div>
     </div>
 </header>

templates/sheets/items/community/header.hbs

@@ -4,6 +4,7 @@
         <h1 class='item-name'><input type='text' name='name' value='{{source.name}}' /></h1>
         <div class='item-description'>
             <h3>{{localize 'TYPES.Item.community'}}</h3>
+            {{#if (and showAttribution source.system.attributionLabel)}} <div class="attribution-header-label">{{source.system.attributionLabel}}</div>{{/if}}
         </div>
     </div>
 </header>

templates/sheets/items/domainCard/header.hbs

@@ -24,5 +24,6 @@
                 {{source.system.level}}
             </h3>
         </div>
+        {{#if (and showAttribution source.system.attributionLabel)}} <div class="attribution-header-label">{{source.system.attributionLabel}}</div>{{/if}}
     </div>
 </header>

templates/sheets/items/weapon/settings.hbs

@@ -34,6 +34,8 @@
             {{/if}}
             <span>{{localize "DAGGERHEART.GENERAL.type"}}</span>
             {{formInput fields.type value=source.type name="system.attack.damage.parts.0.type" localize=true}}
+            <span>{{localize "DAGGERHEART.CONFIG.DamageType.direct.name"}}</span>
+            {{formInput @root.systemFields.attack.fields.damage.fields.direct value=@root.document.system.attack.damage.direct name="system.attack.damage.direct" localize=true}}
             <input type="hidden" name="system.attack.damage.parts.0.value.multiplier" value="{{source.value.multiplier}}">
         {{/with}}
         {{/with}}