Merge branch 'main' of https://github.com/Foundryborne/daggerheart into feature/enhance-style-applications

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/dialogs/dice-roll/costSelection.hbs

@@ -18,7 +18,4 @@
             </div>
         </div>
     {{/each}}
-    {{!-- <footer>
-        <button data-action="sendCost"{{#unless canUse}} disabled{{/unless}}>Accept</button>
-    </footer> --}}
 </div>

templates/dialogs/dice-roll/damageSelection.hbs

@@ -4,7 +4,7 @@
     </header>
     {{#each @root.formula}}
         <div class="damage-formula">
-            <span class="damage-resource"><b>Formula:</b> {{roll.formula}}</span>
+            <span class="damage-resource"><b>{{localize "DAGGERHEART.GENERAL.formula"}}:</b> {{roll.formula}}</span>
             <span class="damage-details">
                 {{#with (lookup @root.config.GENERAL.healingTypes applyTo)}}
                     {{localize label}}

templates/dialogs/dice-roll/rollSelection.hbs

@@ -17,14 +17,14 @@
                                 <div class="dice-option">
                                     <img class="dice-icon" src="{{concat 'systems/daggerheart/assets/icons/dice/adv/' @root.roll.d20.denomination '.svg'}}" alt="">
                                     <div class="dice-select">
-                                        <span class="label">Advantage</span>
+                                        <span class="label">{{localize "DAGGERHEART.GENERAL.Advantage.full"}}</span>
                                     </div>
                                 </div>
                             {{else if (eq @root.advantage -1)}}
                                 <div class="dice-option">
                                     <img class="dice-icon" src="{{concat 'systems/daggerheart/assets/icons/dice/disadv/' @root.roll.d20.denomination '.svg'}}" alt="">
                                     <div class="dice-select">
-                                        <span class="label">Disdvantage</span>
+                                        <span class="label">{{localize "DAGGERHEART.GENERAL.Disadvantage.full"}}</span>
                                     </div>
                                 </div>
                             {{/if}}
@@ -34,7 +34,7 @@
                         <div class="dice-option">
                             <img class="dice-icon" src="{{concat 'systems/daggerheart/assets/icons/dice/hope/' @root.roll.dHope.denomination '.svg'}}" alt="">
                             <div class="dice-select">
-                                <span class="label">Hope</span>
+                                <span class="label">{{localize "DAGGERHEART.GENERAL.hope"}}</span>
                                 <select name="roll.dice.dHope">
                                     {{selectOptions diceOptions selected=@root.roll.dHope.denomination}}
                                 </select>
@@ -54,14 +54,14 @@
                                 <div class="dice-option">
                                     <img class="dice-icon" src="{{concat 'systems/daggerheart/assets/icons/dice/adv/' @root.roll.dAdvantage.denomination '.svg'}}" alt="">
                                     <div class="dice-select">
-                                        <span class="label">Advantage</span>
+                                        <span class="label">{{localize "DAGGERHEART.GENERAL.Advantage.full"}}</span>
                                     </div>
                                 </div>
                             {{else if (eq @root.advantage -1)}}
                                 <div class="dice-option">
                                     <img class="dice-icon" src="{{concat 'systems/daggerheart/assets/icons/dice/disadv/' @root.roll.dAdvantage.denomination '.svg'}}" alt="">
                                     <div class="dice-select">
-                                        <span class="label">Disdvantage</span>
+                                        <span class="label">{{localize "DAGGERHEART.GENERAL.Disadvantage.full"}}</span>
                                     </div>
                                 </div>
                             {{/if}}
@@ -70,7 +70,7 @@
                 </div>
 
                 <fieldset class="experience-container">
-                    <legend>Experiences</legend>
+                    <legend>{{localize "DAGGERHEART.GENERAL.experience.plural"}}</legend>
                     {{#each experiences}}
                         {{#if name}}
                             <div class="experience-chip {{#if (includes ../selectedExperiences id)}}selected{{/if}}" data-action="selectExperience" data-key="{{id}}">
@@ -89,7 +89,7 @@
                     {{/each}}
                 </fieldset>
                 <fieldset class="modifier-container {{#if (eq @root.rollType 'DualityRoll')}}two-columns{{else}}one-column{{/if}}">
-                    <legend>Modifiers</legend>
+                    <legend>{{localize "DAGGERHEART.GENERAL.Modifier.plural"}}</legend>
                     <div class="nest-inputs">
                         <button class="advantage-chip flex1 {{#if (eq advantage 1)}}selected{{/if}}" data-action="updateIsAdvantage" data-advantage="1">
                             {{#if (eq advantage 1)}}
@@ -132,7 +132,7 @@
                             {{selectOptions @root.rallyDie blank="" selected=@root.roll._rallyIndex}}
                         </select>
                     {{/if}}
-                    {{#if (eq @root.rollType 'DualityRoll')}}<span class="formula-label">Situational Bonus</span>{{/if}}
+                    {{#if (eq @root.rollType 'DualityRoll')}}<span class="formula-label">{{localize "DAGGERHEART.GENERAL.situationalBonus"}}</span>{{/if}}
                     <input type="text" value="{{extraFormula}}" name="extraFormula" placeholder="{{#if (eq @root.rollType 'DualityRoll')}}Ex: 1d6 + 5{{else}}Situational Bonus{{/if}}">
                 </fieldset>
                 {{#if costs}}
@@ -142,19 +142,19 @@
                     </fieldset>
                 {{/if}}
             {{/unless}}
-            <span class="formula-label"><b>Formula:</b> {{@root.formula}}</span>
+            <span class="formula-label"><b>{{localize "DAGGERHEART.GENERAL.formula"}}:</b> {{@root.formula}}</span>
             <div class="roll-dialog-controls">
                 <select class="roll-mode-select" name="selectedRollMode">
                     {{selectOptions rollModes selected=selectedRollMode valueAttr="action" labelAttr="label" localize=true}}
                 </select>
                 <button class="sunmit-btn" data-action="submitRoll"{{#unless canRoll}} disabled{{/unless}}>
                     <i class="fa-solid fa-dice"></i>
-                    <span class="label">Roll</span>
+                    <span class="label">{{localize "DAGGERHEART.GENERAL.roll"}}</span>
                 </button>
             </div>
     {{else}}
         <button class="sunmit-btn" data-action="submitRoll"{{#unless canRoll}} disabled{{/unless}}>
-            <span class="label">Continue</span>
+            <span class="label">{{localize "DAGGERHEART.GENERAL.continue"}}</span>
         </button>
     {{/if}}
         </div>