[Feature] Beastform Types (#372)

* Temp

* Finished Evolved

* Fixed hybrid

* Changed generalConfig.tiers to be number based

* Weaponhandling while in beastform

* Added unarmed strike in sidebar

* Added DamageEnricher

* Added effect enricher

* Corrected downtime buttons and actions

* Added BeastformTooltip

* Split the BeastformDialog into parts with tabs

* Added temp beastform features

* rollData change

* Improvement

* character.getRollData cleanup

templates/dialogs/beastform/advanced.hbs

@@ -0,0 +1,73 @@
+<div class="advanced-container">
+    {{#if (eq selected.system.beastformType 'evolved')}}
+        <h2>{{localize "DAGGERHEART.ITEMS.Beastform.evolve"}}</h2>
+
+        <div class="form-features">   
+            {{#if selectedBeastformEffect}}
+                <div class="form-feature" data-tooltip="{{concat "#item#" selectedBeastformEffect.uuid}}">
+                    <h4>{{localize "DAGGERHEART.ITEMS.Beastform.evolvedFeatureTitle"}}</h4>
+                    <div>{{{selectedBeastformEffect.description}}}</div>
+                </div>
+            {{/if}}
+        </div>
+
+        <div class="advanced-form-container evolved">
+            {{#if evolved.form}}
+                <div class="beastform-title">{{concat (localize "DAGGERHEART.CONFIG.BeastformType.evolved") " " evolved.form.name}}</div>
+                <img src="{{evolved.form.img}}" />                        
+            {{else}}
+                <div class="empty-form">
+                    <i class="fa-solid fa-plus"></i>
+                    <label>{{localize "DAGGERHEART.ITEMS.Beastform.evolvedDrag"}}</label>
+                </div>
+            {{/if}}
+        </div>
+    {{/if}}
+    {{#if (eq selected.system.beastformType 'hybrid')}}
+        <h2>{{localize "DAGGERHEART.ITEMS.Beastform.hybridize"}}</h2>
+
+        <div class="form-features">   
+            {{#if selectedBeastformEffect}}
+                <div class="form-feature" data-tooltip="{{concat "#item#" selectedBeastformEffect.uuid}}">
+                    <h4>{{localize "DAGGERHEART.ITEMS.Beastform.hybridizeFeatureTitle"}}</h4>
+                    <div>{{{selectedBeastformEffect.description}}}</div>
+                </div>
+            {{/if}}
+        </div>
+
+        <div class="advanced-forms-container">
+            {{#each hybridForms as | form key |}}
+                <div class="advanced-form-container hybridized {{#unless form}}empty{{/unless}}" id="{{key}}">
+                    {{#if form}}
+                        <div class="beastform-title-wrapper">
+                            <div class="beastform-title">{{form.name}}</div>
+                        </div>
+                        <div class="hybrid-data-wrapper">
+                            <div class="hybrid-data-container">
+                                <label>{{localize "DAGGERHEART.GENERAL.features"}}</label>
+                                <div class="hybrid-data-inner-container">
+                                    {{#each form.system.features as | feature |}}
+                                        <a data-action="toggleHybridFeature" id="{{feature.uuid}}" data-form="{{@../key}}"><div class="hybrid-data {{#if feature.selected}}active{{/if}}" data-tooltip="{{concat "#item#" feature.uuid}}">{{feature.name}}</div></a>
+                                    {{/each}}
+                                </div>
+                            </div>    
+                            <div class="hybrid-data-container">
+                                <label>{{localize "DAGGERHEART.GENERAL.Advantage.plural"}}</label>
+                                <div class="hybrid-data-inner-container">
+                                    {{#each form.system.advantageOn as | advantage id |}}
+                                        <a data-action="toggleHybridAdvantage" id="{{id}}" data-form="{{@../key}}"><div class="hybrid-data {{#if advantage.selected}}active{{/if}}">{{advantage.value}}</div></a>
+                                    {{/each}}
+                                </div>
+                            </div>     
+                        </div>               
+                    {{else}}
+                        <div class="empty-form">
+                            <i class="fa-solid fa-plus"></i>
+                            <label>{{localize "DAGGERHEART.ITEMS.Beastform.hybridizeDrag"}}</label>
+                        </div>
+                    {{/if}}
+                </div>
+            {{/each}}
+        </div>
+    {{/if}}
+</div>

templates/dialogs/beastform/beastformTier.hbs

@@ -0,0 +1,8 @@
+<div class="beastforms-tier">
+    {{#each tier.values as |form uuid|}}
+        <div data-action="selectBeastform" data-uuid="{{uuid}}" data-tooltip="{{concat "#item#" uuid}}" class="beastform-container {{#unless form.selected}}inactive{{/unless}} {{#if form.draggable}}draggable{{/if}}">
+            <img src="{{form.value.img}}" />
+            <div class="beastform-title">{{form.value.name}}</div>
+        </div>
+    {{/each}}
+</div>

templates/dialogs/beastform/footer.hbs

@@ -0,0 +1,3 @@
+<footer>
+    <button type="button" data-action="submitBeastform" {{#if (not canSubmit)}}disabled{{/if}}>{{localize "DAGGERHEART.ITEMS.Beastform.transform"}}</button>
+</footer>

templates/dialogs/beastform/tabs.hbs

@@ -0,0 +1,11 @@
+<section class='tab-navigation'>
+    <div class='navigation-container beastform-nav'>
+        <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}}
+                </a>
+            {{/each}}
+        </nav>
+    </div>
+</section>

templates/dialogs/beastformDialog.hbs

@@ -1,18 +0,0 @@
-<div>
-    <div class="beastforms-container">
-        {{#each beastformTiers as |tier tierKey|}}
-            <fieldset class="beastforms-tier">
-                <legend>{{tier.label}}</legend>
-                {{#each tier.values as |form uuid|}}
-                    <div data-action="selectBeastform" data-uuid="{{uuid}}" data-tooltip="{{concat "#item#" uuid}}" class="beastform-container {{#if (and @root.canSubmit (not form.selected))}}inactive{{/if}}">
-                        <img src="{{form.value.img}}" />
-                        <div class="beastform-title">{{form.value.name}}</div>
-                    </div>
-                {{/each}}
-            </fieldset>
-        {{/each}}
-    </div>
-    <footer>
-        <button type="button" data-action="submitBeastform" {{#if (not canSubmit)}}disabled{{/if}}>{{localize "DAGGERHEART.ITEMS.Beastform.transform"}}</button>
-    </footer>
-</div>

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

@@ -19,7 +19,7 @@
 
     <div class="fieldsets-section">
         <fieldset class="flex">
-            <legend>{{localize "DAGGERHEART.GENERAL.hitPoints.plural"}}</legend>
+            <legend>{{localize "DAGGERHEART.GENERAL.HitPoints.plural"}}</legend>
             {{formGroup systemFields.resources.fields.hitPoints.fields.value value=document.system.resources.hitPoints.value label=(localize "DAGGERHEART.ACTORS.Adversary.FIELDS.resources.hitPoints.value.label")}}
             {{formGroup systemFields.resources.fields.hitPoints.fields.max value=document.system.resources.hitPoints.max}}
         </fieldset>

templates/sheets/actors/adversary/header.hbs

@@ -20,7 +20,7 @@
         {{#if (eq source.system.type 'horde')}}
             <div class="tag">
                 <span>{{source.system.hordeHp}}</span>
-                <span>/{{localize "DAGGERHEART.GENERAL.hitPoints.short"}}</span>
+                <span>/{{localize "DAGGERHEART.GENERAL.HitPoints.short"}}</span>
             </div>
         {{/if}}
     </div>

templates/sheets/actors/adversary/sidebar.hbs

@@ -17,7 +17,7 @@
                 <progress class='progress-bar' value='{{source.system.resources.hitPoints.value}}'
                     max='{{source.system.resources.hitPoints.max}}'></progress>
                 <div class="status-label">
-                    <h4>{{localize 'DAGGERHEART.GENERAL.attack.hitPoints.short'}}</h4>
+                    <h4>{{localize 'DAGGERHEART.GENERAL.HitPoints.short'}}</h4>
                 </div>
 
             </div>
@@ -92,7 +92,7 @@
     <div class="experience-section">
         <div class="title">
             <side-line-div class="invert"></side-line-div>
-            <h3>{{localize DAGGERHEART.GENERAL.experience.plural}}</h3>
+            <h3>{{localize "DAGGERHEART.GENERAL.experience.plural"}}</h3>
             <side-line-div></side-line-div>
         </div>
         <div class="experience-list">
@@ -113,6 +113,6 @@
     </div>
     <line-div></line-div>
     <div class="reaction-section">
-        <button data-action="reactionRoll">{{localize DAGGERHEART.GENERAL.Roll.reaction}}</button>
+        <button data-action="reactionRoll">{{localize "DAGGERHEART.GENERAL.Roll.reaction"}}</button>
     </div>
 </aside>

templates/sheets/actors/character/sidebar.hbs

@@ -47,7 +47,7 @@
                     <p>{{document.system.proficiency}}</p>
                 </div>
                 <div class="status-label">
-                    <h4>{{localize "DAGGERHEART.GENERAL.proficienc"}}</h4>
+                    <h4>{{localize "DAGGERHEART.GENERAL.proficiency"}}</h4>
                 </div>
             </div>
 
@@ -95,6 +95,9 @@
             <side-line-div></side-line-div>
         </div>
         <ul class="items-sidebar-list">
+            {{#if document.system.usedUnarmed}}
+                {{> 'daggerheart.inventory-item' item=document.system.usedUnarmed type='attack' isSidebar=true}}
+            {{/if}}
             {{#each document.items as |item|}}
             {{#if item.system.equipped}}
             {{> 'daggerheart.inventory-item'
@@ -132,7 +135,7 @@
     <div class="experience-section">
         <div class="title">
             <side-line-div class="invert"></side-line-div>
-            <h3>{{localize "DAGGERHEART.GENERAL.experience.Single"}}</h3>
+            <h3>{{localize "DAGGERHEART.GENERAL.experience.single"}}</h3>
             <side-line-div></side-line-div>
         </div>
         <div class="experience-list">

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

@@ -15,13 +15,20 @@ Parameters:
 - showActions {boolean} : If true show feature's actions.
 --}}
 
-<li class="inventory-item" {{#if (eq type 'action' )}}data-action-id="{{item.id}}" {{/if}}
+<li class="inventory-item" {{#if (or (eq type 'action' ) (eq type 'attack'))}}data-action-id="{{item.id}}" {{/if}}
   data-item-uuid="{{item.uuid}}" data-type="{{type}}" draggable="true">
   <div class="inventory-item-header" {{#unless noExtensible}}data-action="toggleExtended" {{/unless}}>
     {{!-- Image --}}
     <div class="img-portait"
-      data-action='{{ifThen (hasProperty item "use") "useItem" (ifThen (hasProperty item "toChat") "toChat" "editDoc") }}'
-      {{#unless hideTooltip}}data-tooltip="#item#{{item.uuid}}" {{/unless}}>
+      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}}" />
       <img class="roll-img" src="systems/daggerheart/assets/icons/dice/default/d20.svg" alt="d20">
     </div>
@@ -30,7 +37,20 @@ Parameters:
     <div class="item-label {{#if hideResources}}fullWidth{{/if}}">
 
       {{!-- Item Name --}}
-      <div class="item-name">{{item.name}}</div>
+      <div class="item-name">{{localize item.name}}</div>
+
+      {{!-- Attack Block Start --}}
+      {{#if  (eq type 'attack')}}
+          <div class="item-tags">
+              <div class="tag">
+                  {{localize 'DAGGERHEART.GENERAL.unarmed'}}
+              </div>
+              <div class="tag">
+                  {{localize 'DAGGERHEART.CONFIG.ActionType.action'}}
+              </div>
+          </div>
+      {{/if}}
+      {{!-- Attack Block End --}}
 
       {{!-- Weapon Block Start --}}
       {{#if (eq type 'weapon')}}

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

@@ -0,0 +1,207 @@
+<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-wrapper">
+        <div class="item-label {{#unless (and (not isSidebar) (or (eq item.system.resource.type 'simple') item.system.quantity))}}fullWidth{{/unless}}">
+            {{#if isCompanion}}
+                <a class="item-name" data-action="attackRoll">{{item.name}}</a>
+            {{else}}
+                <div class="item-name">{{localize item.name}}</div>
+            {{/if}}
+            {{#if  (eq type 'weapon')}} 
+                <div class="item-tags">
+                    {{#if isSidebar}}
+                        <div class="item-labels">
+                            <div class="label">
+                                {{localize (concat 'DAGGERHEART.CONFIG.Traits.' item.system.attack.roll.trait '.short')}}
+                                {{localize (concat 'DAGGERHEART.CONFIG.Range.' item.system.attack.range '.short')}}
+                                <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}}
+                                {{#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}}
+                        <div class="tag">
+                            {{localize (concat 'DAGGERHEART.CONFIG.Traits.' item.system.attack.roll.trait '.name')}}
+                        </div>
+                        <div class="tag">
+                            {{localize (concat 'DAGGERHEART.CONFIG.Range.' item.system.attack.range '.name')}}
+                        </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}}
+                            (
+                                {{#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)}}
+                        </div>
+                    {{/if}}
+                </div>
+            {{/if}}
+            {{#if  (eq type 'armor')}}
+                {{#if isSidebar}}
+                    <div class="item-labels">
+                        <div class="label">
+                            {{localize "DAGGERHEART.ITEMS.Armor.baseScore"}}:
+                            {{item.system.baseScore}}
+                        </div>
+                    </div>
+                {{else}}
+                    <div class="item-tags">
+                        <div class="tag">
+                            {{localize "DAGGERHEART.ITEMS.Armor.baseScore"}}:
+                            {{item.system.baseScore}}
+                        </div>
+                        <div class="tag">
+                            {{localize "DAGGERHEART.ITEMS.Armor.baseThresholds.base"}}:
+                            {{item.system.baseThresholds.major}}
+                            <span>/</span>
+                            {{item.system.baseThresholds.severe}}
+                        </div>
+                    </div>
+                {{/if}}
+            {{/if}}
+            {{#if  (eq type 'domainCard')}}
+                {{#if isSidebar}}
+                    <div class="item-labels">
+                        <div class="label">
+                            {{localize (concat 'DAGGERHEART.CONFIG.DomainCardTypes.' item.system.type)}}
+                            <span> - </span>
+                            {{localize (concat 'DAGGERHEART.GENERAL.Domain.' item.system.domain '.label')}}
+                            <span> - </span>
+                            <span class="recall-value">{{item.system.recallCost}}</span>
+                            <i class="fa-solid fa-bolt"></i>
+                        </div>
+                    </div>
+                {{else}}
+                    <div class="item-tags">
+                        <div class="tag">
+                            {{localize (concat 'DAGGERHEART.CONFIG.DomainCardTypes.' item.system.type)}}
+                        </div>
+                        <div class="tag">
+                            {{localize (concat 'DAGGERHEART.GENERAL.Domain.' item.system.domain '.label')}}
+                        </div>
+                        <div class="tag">
+                            <span class="recall-label">{{localize "DAGGERHEART.ITEMS.DomainCard.recallCost"}}: </span>
+                            <span class="recall-value">{{item.system.recallCost}}</span>
+                        </div>
+                    </div>
+                {{/if}}
+            {{/if}}
+            {{#if  (eq type 'effect')}}
+                <div class="item-tags">
+                    <div class="tag">
+                        {{localize (concat 'TYPES.Item.' item.parent.type)}}
+                        <span>: </span>
+                        {{item.parent.name}}
+                    </div>
+                    <div class="tag">
+                        {{#if item.duration.duration}}
+                            {{localize 'DAGGERHEART.EFFECTS.Duration.temporary'}}
+                        {{else}}
+                            {{localize 'DAGGERHEART.EFFECTS.Duration.passive'}}
+                        {{/if}}
+                    </div>
+                    {{#each item.statuses as |status|}}
+                        <div class="tag">
+                            {{localize (concat 'DAGGERHEART.CONFIG.Condition.' status '.name')}}
+                        </div>
+                    {{/each}}
+                </div>
+            {{/if}}
+            {{#if  (eq type 'action')}}
+                <div class="item-tags">
+                    <div class="tag">
+                        {{localize (concat 'DAGGERHEART.ACTIONS.TYPES.' item.type '.name')}}
+                    </div>
+                    <div class="tag">
+                        {{localize (concat 'DAGGERHEART.CONFIG.ActionType.' item.actionType)}}
+                    </div>
+                </div>
+            {{/if}}
+            {{#if  (eq type 'attack')}}
+                <div class="item-tags">
+                    <div class="tag">
+                        {{localize 'DAGGERHEART.GENERAL.unarmed'}}
+                    </div>
+                    <div class="tag">
+                        {{localize 'DAGGERHEART.CONFIG.ActionType.action'}}
+                    </div>
+                </div>
+            {{/if}}
+        </div>
+        {{#if (and (not isSidebar) (eq item.system.resource.type 'simple'))}}
+            {{> "systems/daggerheart/templates/sheets/global/partials/item-resource.hbs"}}
+        {{/if}}
+        {{#if (and (not isSidebar) item.system.quantity)}}
+            <div class="item-resource">
+                <input type="number" class="inventory-item-quantity" value="{{item.system.quantity}}" step="1" />
+            </div>
+        {{/if}}
+    </div>
+    {{#unless hideControls}}
+        {{#if isActor}}
+            <div class="controls">
+                {{#if (eq type 'actor')}}
+                    <a data-action="viewActor" data-potential-adversary="{{categoryAdversary}}" data-adversary="{{item.uuid}}" data-tooltip='{{localize "DAGGERHEART.UI.Tooltip.openActorWorld"}}'>
+                        <i class="fa-solid fa-globe"></i>
+                    </a>
+                {{/if}}
+                {{#if (eq type 'adversary')}}
+                    <a data-action="viewAdversary" data-potential-adversary="{{categoryAdversary}}" data-adversary="{{item.uuid}}" data-tooltip='{{localize "DAGGERHEART.UI.Tooltip.openActorWorld"}}'>
+                        <i class="fa-solid fa-globe"></i>
+                    </a>
+                    <a data-action='deleteAdversary' data-potential-adversary="{{categoryAdversary}}" data-adversary="{{item.uuid}}" data-tooltip='{{localize "CONTROLS.CommonDelete"}}'>
+                        <i class='fas fa-trash'></i>
+                    </a>
+                {{/if}}
+            </div>
+        {{else}}
+            <div class="controls">
+                {{#if (eq type 'weapon')}}
+                    <a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem" data-tooltip="{{#unless item.system.equipped}}{{localize 'DAGGERHEART.UI.Tooltip.equip'}}{{else}}{{localize 'DAGGERHEART.UI.Tooltip.unequip'}}{{/unless}}">
+                        <i class="fa-solid fa-hands"></i>
+                    </a>
+                {{/if}}
+                {{#if (eq type 'armor')}}
+                    <a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem" data-tooltip="{{#unless item.system.equipped}}{{localize 'DAGGERHEART.UI.Tooltip.equip'}}{{else}}{{localize 'DAGGERHEART.UI.Tooltip.unequip'}}{{/unless}}">
+                    <i class="fa-solid fa-shield"></i>
+                    </a>
+                {{/if}}
+                {{#if (eq type 'domainCard')}}
+                    {{#unless item.system.inVault}}
+                        <a data-action="toggleVault" data-tooltip="{{localize 'DAGGERHEART.UI.Tooltip.sendToVault'}}">
+                            <i class="fa-solid fa-arrow-down"></i>
+                        </a>
+                    {{else}}
+                        <a data-action="toggleVault" data-tooltip="{{localize 'DAGGERHEART.UI.Tooltip.sendToLoadout'}}">
+                            <i class="fa-solid fa-arrow-up"></i>
+                        </a>
+                    {{/unless}}
+                    
+                {{/if}}
+                <a data-action="toChat" data-tooltip="{{localize 'DAGGERHEART.UI.Tooltip.sendToChat'}}"><i class="fa-regular fa-message"></i></a>
+                <a data-action="triggerContextMenu" data-tooltip="{{localize 'DAGGERHEART.UI.Tooltip.moreOptions'}}"><i class="fa-solid fa-ellipsis-vertical"></i></a>
+            </div>
+        {{/if}}
+    {{else}}
+        <span></span>
+    {{/unless}}
+    <div class="item-description">{{#unless isSidebar}}{{{item.system.description}}}{{/unless}}</div>
+    {{#if (and (not isSidebar) (eq item.system.resource.type 'diceValue'))}}
+        {{> "systems/daggerheart/templates/sheets/global/partials/item-resource.hbs"}}
+    {{/if}}
+    {{#if featureType}}
+        <div class="item-buttons">
+            {{#each item.system.actions as | action |}}
+                <button type="button" data-action="useAction" data-action-id="{{action.id}}">{{action.name}}</button>
+            {{/each}}
+        </div>
+    {{/if}}
+</li>

templates/sheets/items/beastform/advanced.hbs

@@ -0,0 +1,29 @@
+<section
+    class='tab {{tabs.advanced.cssClass}} {{tabs.advanced.id}}'
+    data-tab='{{tabs.advanced.id}}'
+    data-group='{{tabs.advanced.group}}'
+>
+    {{formGroup systemFields.beastformType value=source.system.beastformType localize=true blank=false}}
+
+    {{#if (eq source.system.beastformType 'evolved')}}
+        <fieldset class="two-columns even">
+            <legend>{{localize "DAGGERHEART.CONFIG.BeastformType.evolved"}}</legend>
+
+            {{formGroup systemFields.evolved.fields.maximumTier value=source.system.evolved.maximumTier localize=true blank=false}}
+            {{formGroup systemFields.evolved.fields.mainTraitBonus value=source.system.evolved.mainTraitBonus localize=true}}
+        </fieldset>
+    {{/if}}
+
+    {{#if (eq source.system.beastformType 'hybrid')}}
+        <fieldset class="one-column">
+            <legend>{{localize "DAGGERHEART.CONFIG.BeastformType.hybrid"}}</legend>
+
+            {{formGroup systemFields.hybrid.fields.maximumTier value=source.system.hybrid.maximumTier localize=true blank=false}}
+            <div class="nest-inputs">
+                {{formGroup systemFields.hybrid.fields.beastformOptions value=source.system.hybrid.beastformOptions localize=true}}
+                {{formGroup systemFields.hybrid.fields.advantages value=source.system.hybrid.advantages localize=true}}
+                {{formGroup systemFields.hybrid.fields.features value=source.system.hybrid.features localize=true}}
+            </div>
+        </fieldset>
+    {{/if}}
+</section>

templates/sheets/items/beastform/settings.hbs

@@ -3,12 +3,22 @@
     data-tab='{{tabs.settings.id}}'
     data-group='{{tabs.settings.group}}'
 >
-    <div class="two-columns">
+    {{#if (eq source.system.beastformType 'evolved')}}
         {{formGroup systemFields.tier value=source.system.tier localize=true}}
-        {{formGroup systemFields.examples value=source.system.examples localize=true}}
-    </div>
+    {{else}}
+        <div class="two-columns even">
+            {{formGroup systemFields.tier value=source.system.tier localize=true}}
+            {{formGroup systemFields.mainTrait value=source.system.mainTrait blank=false localize=true}}
+        </div>
 
-    {{formGroup systemFields.advantageOn value=source.system.advantageOn localize=true}}
+        {{#unless (eq source.system.beastformType 'hybrid')}}
+            {{formGroup systemFields.examples value=source.system.examples localize=true}}
+            <div class="advantage-on-section">
+                <label>{{localize "DAGGERHEART.ITEMS.Beastform.FIELDS.advantageOn.label"}}</label>
+                <input class="advantageon-input" value="{{advantageOn}}" />
+            </div>
+        {{/unless}}
+    {{/if}}
 
     <fieldset class="two-columns even">
         <legend>{{localize "DAGGERHEART.ITEMS.Beastform.tokenTitle"}}</legend>

templates/ui/chat/downtime.hbs

@@ -2,10 +2,12 @@
     <h2 class="downtime-title-container">
         <div>{{title}}</div>
     </h2>
-    {{#each moves}}
-        <strong>{{this.name}}</strong>
-        <img class="downtime-image" src="{{this.img}}" />
-        <div>{{{this.description}}}</div>
-        {{#if (gt this.actions.length 0)}}<button class="action-use-button">{{localize "Action"}}</button>{{/if}}
+    {{#each moves as | move index |}}
+        <strong>{{move.name}}</strong>
+        <img class="downtime-image" src="{{move.img}}" />
+        <div>{{{move.description}}}</div>
+        {{#each move.actions as | action index |}}
+            <button class="action-use-button" data-move-index="{{@../key}}" data-action-index="{{index}}">{{localize action.name}}</button>
+        {{/each}}
     {{/each}}
 </div>

templates/ui/tooltip/action.hbs

@@ -1,7 +1,7 @@
 <div class="daggerheart dh-style tooltip">
     <h2 class="tooltip-title">{{item.name}}</h2>
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{item.description}}}</div>
+    <div class="tooltip-description">{{{description}}}</div>
 
     {{#if item.uses.max}}
         <h4 class="tooltip-sub-title">{{localize "DAGGERHEART.GENERAL.uses"}}</h4>

templates/ui/tooltip/adversary.hbs

@@ -1,7 +1,7 @@
 <div class="daggerheart dh-style tooltip">
     <h2 class="tooltip-title">{{item.name}}</h2>
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{item.system.description}}}</div>
+    <div class="tooltip-description">{{{description}}}</div>
 
     <div class="tooltip-information-section triple spaced">
         <div class="tooltip-information">
@@ -23,7 +23,7 @@
     </div>
     <div class="tooltip-information-section spaced">
         <div class="tooltip-information">
-            <label>{{localize "DAGGERHEART.GENERAL.hitPoints.plural"}}</label>
+            <label>{{localize "DAGGERHEART.GENERAL.HitPoints.plural"}}</label>
             <div>{{item.system.resources.hitPoints.max}}</div>
         </div>
         <div class="tooltip-information">

templates/ui/tooltip/armor.hbs

@@ -1,7 +1,7 @@
 <div class="daggerheart dh-style tooltip">
     <h2 class="tooltip-title">{{item.name}}</h2>
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{item.system.description}}}</div>
+    <div class="tooltip-description">{{{description}}}</div>
 
     <div class="tooltip-information-section">
         <div class="tooltip-information full-width">

templates/ui/tooltip/attack.hbs

@@ -0,0 +1,29 @@
+<div class="daggerheart dh-style tooltip">
+    <h2 class="tooltip-title">{{attack.name}}</h2>
+    <img class="tooltip-image" src="{{attack.img}}" />
+    <div class="tooltip-description">{{{description}}}</div>
+
+    <div class="tooltip-information-section spaced">
+        <div class="tooltip-information">
+            <label>{{localize "DAGGERHEART.GENERAL.Trait.single"}}</label>
+            {{#with (lookup config.ACTOR.abilities attack.roll.trait) as | trait |}}
+                <div>{{localize trait.label}}</div>
+            {{/with}}
+        </div>
+        <div class="tooltip-information">
+            <label>{{localize "DAGGERHEART.GENERAL.range"}}</label>
+            {{#with (lookup config.GENERAL.range attack.range) as | range |}}
+                <div>{{localize range.label}}</div>
+            {{/with}}
+        </div>
+
+        <div class="tooltip-information">
+            <label>{{localize "DAGGERHEART.GENERAL.damage"}}</label>
+            <div>{{{damageFormula attack parent}}}</div>
+        </div>
+        <div class="tooltip-information">
+            <label>{{localize "DAGGERHEART.GENERAL.damageType"}}</label>
+            <div>{{{damageSymbols attack.damage.parts}}}</div>
+        </div>
+    </div>
+</div>

templates/ui/tooltip/beastform.hbs

@@ -0,0 +1,8 @@
+<div class="daggerheart dh-style tooltip">
+    <h2 class="tooltip-title">{{item.name}}</h2>
+    <img class="tooltip-image" src="{{item.img}}" />
+    <div class="tooltip-description">{{{description}}}</div>
+
+    {{> "systems/daggerheart/templates/ui/tooltip/parts/tooltipChips.hbs" chips=item.system.advantageOn label=(localize "DAGGERHEART.ITEMS.Beastform.FIELDS.advantageOn.label")}}
+    {{> "systems/daggerheart/templates/ui/tooltip/parts/tooltipTags.hbs" features=item.system.features label=(localize "DAGGERHEART.GENERAL.features")}}
+</div>

templates/ui/tooltip/consumable.hbs

@@ -1,7 +1,7 @@
 <div class="daggerheart dh-style tooltip">
     <h2 class="tooltip-title">{{item.name}}</h2>
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{item.system.description}}}</div>
+    <div class="tooltip-description">{{{description}}}</div>
 
     <div class="tooltip-information-section">
         <div class="tooltip-information full-width">

templates/ui/tooltip/domainCard.hbs

@@ -1,7 +1,7 @@
 <div class="daggerheart dh-style tooltip">
     <h2 class="tooltip-title">{{item.name}}</h2>
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{item.system.description}}}</div>
+    <div class="tooltip-description">{{{description}}}</div>
 
     <div class="tooltip-information-section">
         <div class="tooltip-information">

templates/ui/tooltip/feature.hbs

@@ -1,7 +1,7 @@
 <div class="daggerheart dh-style tooltip">
     <h2 class="tooltip-title">{{item.name}}</h2>
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{item.system.description}}}</div>
+    <div class="tooltip-description">{{{description}}}</div>
 
     {{> "systems/daggerheart/templates/ui/tooltip/parts/tooltipTags.hbs" features=item.system.actions label=(localize "DAGGERHEART.GENERAL.Action.plural") }}
     {{> "systems/daggerheart/templates/ui/tooltip/parts/tooltipTags.hbs" features=item.effects label=(localize "DAGGERHEART.GENERAL.Effect.plural") }}

templates/ui/tooltip/miscellaneous.hbs

@@ -1,7 +1,7 @@
 <div class="daggerheart dh-style tooltip">
     <h2 class="tooltip-title">{{item.name}}</h2>
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{item.system.description}}}</div>
+    <div class="tooltip-description">{{{description}}}</div>
 
     {{> "systems/daggerheart/templates/ui/tooltip/parts/tooltipTags.hbs" features=item.system.actions label=(localize "DAGGERHEART.GENERAL.Action.plural") }}
 </div>

templates/ui/tooltip/parts/tooltipChips.hbs

@@ -0,0 +1,6 @@
+<h4 class="tooltip-sub-title">{{localize label}}</h4>
+<div class="tooltip-chips">
+    {{#each chips as | chip |}}
+        <div class="tooltip-chip">{{ifThen chip.value chip.value chip}}</div>
+    {{/each}}
+</div>

templates/ui/tooltip/parts/tooltipTags.hbs

@@ -6,7 +6,7 @@
                     <div class="tooltip-tag-label">{{localize feature.name}}</div>
                     {{#if feature.img}}<img class="tooltip-tag-image" src="{{feature.img}}" />{{/if}}
                 </div>
-            <div class="tooltip-tag-description">{{{localize (ifThen feature.description feature.description feature.system.description)}}}</div>
+            <div class="tooltip-tag-description">{{{localize (ifThen feature.description feature.description (ifThen feature.system.enrichedDescription feature.system.enrichedDescription feature.system.description))}}}</div>
         </div>
     {{/each}}
 </div>

templates/ui/tooltip/weapon.hbs

@@ -1,7 +1,7 @@
 <div class="daggerheart dh-style tooltip">
     <h2 class="tooltip-title">{{item.name}}</h2>
     <img class="tooltip-image" src="{{item.img}}" />
-    <div class="tooltip-description">{{{item.system.description}}}</div>
+    <div class="tooltip-description">{{{description}}}</div>
 
     <div class="tooltip-information-section">
         <div class="tooltip-information">