Feature/233 234 235 (#246)

* #233 #234 #235 + Fixes

* Fix reaction roll

templates/chat/adversary-roll.hbs

@@ -6,7 +6,7 @@
             <div class="wrapper">
                 <section class="tooltip-part">
                     <div class="dice">
-                        {{#each roll.dice}}
+                        {{#each roll.dice as | dice index |}}
                             <header class="part-header flexrow">
                                 <span class="part-formula">{{formula}}</span>
                                 <span class="part-total">{{total}}</span>
@@ -17,9 +17,11 @@
                                         <li class="roll die {{../dice}}{{#if discarded}} discarded{{/if}} min">{{result}}</li>
                                     {{/each}}
                                 </ol>
+                                {{#if (eq index 0)}}
                                 <div class="attack-roll-advantage-container">
                                     {{#if (eq ../roll.advantage.type 1)}}{{localize "DAGGERHEART.General.Advantage.Full"}}{{/if}}{{#if (eq ../roll.advantage.type -1)}}{{localize "DAGGERHEART.General.Disadvantage.Full"}}{{/if}}
                                 </div>
+                                {{/if}}
                             </div>
                         {{/each}}
                     </div>

templates/chat/duality-roll.hbs

@@ -82,6 +82,30 @@
                             </div>  
                         </div>
                     {{/if}}
+                    {{#each roll.extra as | extra | }}
+                        <div class="dice">
+                            <header class="part-header flexrow">
+                                <span class="part-formula">
+                                    <span>1{{extra.dice}}</span>
+                                </span>
+                                <span class="part-total">{{extra.value}}</span>
+                            </header>
+                            <div class="flexrow">
+                                <ol class="dice-rolls">
+                                    <li class="roll die {{extra.dice}}">
+                                        <div class="dice-container">
+                                            <div class="dice-inner-container">
+                                                <div class="dice-wrapper">
+                                                    <img class="dice" src="../icons/svg/{{extra.dice}}-grey.svg"/>
+                                                </div>
+                                                <div class="dice-value">{{extra.value}}</div>
+                                            </div>
+                                        </div>
+                                    </li>
+                                </ol>
+                            </div>  
+                        </div>
+                    {{/each}}
                     {{#if roll.modifierTotal}}<div class="duality-modifier">{{#if (gt roll.modifierTotal 0)}}+{{/if}}{{roll.modifierTotal}}</div>{{/if}}
                 </section>
             </div>

templates/sheets/applications/adversary-settings/attack.hbs

@@ -1,22 +1,22 @@
 <section
-    class='tab {{tabs.attack.cssClass}} {{tabs.attack.id}}'
-    data-tab='{{tabs.attack.id}}'
-    data-group='{{tabs.attack.group}}'
+    class="tab {{tabs.attack.cssClass}} {{tabs.attack.id}}"
+    data-tab="{{tabs.attack.id}}"
+    data-group="{{tabs.attack.group}}"
 >
     <fieldset class="one-column">
-        <legend>{{localize 'DAGGERHEART.General.basics'}}</legend>
-        {{formGroup systemFields.attack.fields.img value=document.img label="Image Path" name="system.attack.img"}}
+        <legend>{{localize "DAGGERHEART.General.basics"}}</legend>
+        {{formGroup systemFields.attack.fields.img value=document.system.attack.img label="Image Path" name="system.attack.img"}}
         {{formGroup systemFields.attack.fields.name value=document.system.attack.name label="Attack Name" name="system.attack.name"}}
     </fieldset>
     <fieldset class="flex">
         <legend>{{localize "DAGGERHEART.Sheets.Adversary.Attack"}}</legend>
             {{formField systemFields.attack.fields.roll.fields.bonus value=document.system.attack.roll.bonus label="Attack Bonus" name="system.attack.roll.bonus"}}
-            {{formField systemFields.attack.fields.range value=document.system.attack.range label="Range" name=(concat path "range") localize=true}}
+            {{formField systemFields.attack.fields.range value=document.system.attack.range label="Range" name="system.attack.range" localize=true}}
             {{#if systemFields.attack.fields.target.fields}}
-                {{#if (and document.system.target.type (not (eq document.system.target.type 'self')))}}
-                    {{ formField systemFields.attack.fields.target.fields.amount value=document.system.target.amount label="Amount" name=(concat path "target.amount") }}
+                {{ formField systemFields.attack.fields.target.fields.type value=document.system.attack.target.type label="Target" name="system.attack.target.type" localize=true }}
+                {{#if (and document.system.attack.target.type (not (eq document.system.attack.target.type 'self')))}}
+                    {{ formField systemFields.attack.fields.target.fields.amount value=document.system.attack.target.amount label="Amount" name="system.attack.target.amount" }}
                 {{/if}}
-                {{ formField systemFields.attack.fields.target.fields.type value=document.system.target.type label="Target" name=(concat path "target.type") localize=true }}
             {{/if}}
     </fieldset>
     {{> 'systems/daggerheart/templates/views/actionTypes/damage.hbs' fields=systemFields.attack.fields.damage.fields.parts.element.fields source=document.system.attack.damage path="system.attack."}}

templates/views/action.hbs

@@ -33,10 +33,8 @@
             </fieldset>
         </div>
         <div class="tab {{this.tabs.config.cssClass}}" data-group="primary" data-tab="config">
-            {{#unless isNPC}}
             {{> 'systems/daggerheart/templates/views/actionTypes/uses.hbs' fields=fields.uses.fields source=source.uses}}
             {{> 'systems/daggerheart/templates/views/actionTypes/cost.hbs' fields=fields.cost.element.fields source=source.cost}}
-            {{/unless}}
             {{#if fields.target}}{{> 'systems/daggerheart/templates/views/actionTypes/range-target.hbs' fields=(object range=fields.range target=fields.target.fields) source=(object target=source.target range=source.range)}}{{/if}}
         </div>
         <div class="tab {{this.tabs.effect.cssClass}}" data-group="primary" data-tab="effect">

templates/views/actionTypes/damage.hbs

@@ -1,61 +1,57 @@
 
-<fieldset class="action-category">
-    <legend class="action-category-label" data-action="toggleSection" data-section="effects">
-        <div>Damage</div>
-    </legend>
-    <div class="action-category-data open">
-        {{#unless @root.isNPC}}
-            <div class="fas fa-plus icon-button" data-action="addDamage"></div>
-            {{#if @root.hasBaseDamage}}
-                <div>
-                    {{formField @root.fields.damage.fields.includeBase value=@root.source.damage.includeBase label="Include Item Damage" name="damage.includeBase" }}
-                </div>
-            {{/if}}
-        {{/unless}}
-        {{#each source.parts as |dmg index|}}
-            {{#if @root.isNPC}}
-                {{formField ../fields.value.fields.custom.fields.enabled value=dmg.value.custom.enabled name=(concat ../path "damage.parts." index ".value.custom.enabled")}}
-                <input type="hidden" name="{{../path}}damage.parts.{{index}}.value.multiplier" value="{{dmg.value.multiplier}}">
-                {{#if dmg.value.custom.enabled}}
-                    {{formField ../fields.value.fields.custom.fields.formula value=dmg.value.custom.formula name=(concat ../path "damage.parts." index ".value.custom.formula") localize=true}}
-                {{else}}
-                    <div class="multi-display">
-                        {{formField ../fields.value.fields.flatMultiplier value=dmg.value.flatMultiplier name=(concat ../path "damage.parts." index ".value.flatMultiplier") label="Multiplier" }}
-                        {{formField ../fields.value.fields.dice value=dmg.value.dice name=(concat ../path "damage.parts." index ".value.dice")}}
-                        {{formField ../fields.value.fields.bonus value=dmg.value.bonus name=(concat ../path "damage.parts." index ".value.bonus") localize=true}}
-                    </div>
-                {{/if}}
-                {{formField ../fields.type value=dmg.type name=(concat ../path "damage.parts." index ".type") localize=true}}
+<fieldset class="flex wrap">
+    <legend>Damage</legend>
+    {{#unless (eq path 'system.attack.')}}
+    <div class="fas fa-plus icon-button" data-action="addDamage"></div>
+    {{/unless}}
+    {{#unless @root.isNPC}}
+        {{#if @root.hasBaseDamage}}
+            <div>
+                {{formField @root.fields.damage.fields.includeBase value=@root.source.damage.includeBase label="Include Item Damage" name="damage.includeBase" }}
+            </div>
+        {{/if}}
+    {{/unless}}
+    {{#each source.parts as |dmg index|}}
+        {{#if @root.isNPC}}
+            {{formField ../fields.value.fields.custom.fields.enabled value=dmg.value.custom.enabled name=(concat ../path "damage.parts." index ".value.custom.enabled") classes="checkbox"}}
+            <input type="hidden" name="{{../path}}damage.parts.{{index}}.value.multiplier" value="{{dmg.value.multiplier}}">
+            {{#if dmg.value.custom.enabled}}
+                {{formField ../fields.value.fields.custom.fields.formula value=dmg.value.custom.formula name=(concat ../path "damage.parts." index ".value.custom.formula") localize=true}}
             {{else}}
-                {{#with (@root.getRealIndex index) as | realIndex |}}
-                    <fieldset{{#if dmg.base}} disabled{{/if}}>
-                        {{#if (and (not @root.isNPC) @root.hasRoll (not dmg.base))}}
-                            {{formField ../../fields.resultBased value=dmg.resultBased name=(concat "damage.parts." realIndex ".resultBased") localize=true}}
-                        {{/if}}
-                        {{#if (and (not @root.isNPC) @root.hasRoll (not dmg.base) dmg.resultBased)}}
-                            <fieldset>
-                                <legend>
-                                    <div>With Hope</div>
-                                </legend>
-                                {{> formula fields=../../fields.value.fields type=../../fields.type dmg=dmg source=dmg.value target="value" realIndex=realIndex}}
-                            </fieldset>
-                            <fieldset>
-                                <legend>
-                                    <div>With Fear</div>
-                                </legend>
-                                {{> formula fields=../../fields.valueAlt.fields type=../../fields.type dmg=dmg source=dmg.valueAlt target="valueAlt" realIndex=realIndex}}
-                            </fieldset>
-                        {{else}}
-                            {{> formula fields=../../fields.value.fields type=../fields.type dmg=dmg source=dmg.value target="value" realIndex=realIndex}}
-                        {{/if}}
-                        {{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}}">
-                        {{#unless dmg.base}}<div class="fas fa-trash" data-action="removeDamage" data-index="{{realIndex}}"></div>{{/unless}}
-                    </fieldset>
-                {{/with}}
+                {{formField ../fields.value.fields.flatMultiplier value=dmg.value.flatMultiplier name=(concat ../path "damage.parts." index ".value.flatMultiplier") label="Multiplier" classes="inline-child" }}
+                {{formField ../fields.value.fields.dice value=dmg.value.dice name=(concat ../path "damage.parts." index ".value.dice") classes="inline-child"}}
+                {{formField ../fields.value.fields.bonus value=dmg.value.bonus name=(concat ../path "damage.parts." index ".value.bonus") localize=true classes="inline-child"}}
             {{/if}}
-        {{/each}}
-    </div>
+            {{formField ../fields.type value=dmg.type name=(concat ../path "damage.parts." index ".type") localize=true}}
+        {{else}}
+            {{#with (@root.getRealIndex index) as | realIndex |}}
+                <fieldset{{#if dmg.base}} disabled{{/if}}>
+                    {{#if (and (not @root.isNPC) @root.hasRoll (not dmg.base))}}
+                        {{formField ../../fields.resultBased value=dmg.resultBased name=(concat "damage.parts." realIndex ".resultBased") localize=true}}
+                    {{/if}}
+                    {{#if (and (not @root.isNPC) @root.hasRoll (not dmg.base) dmg.resultBased)}}
+                        <fieldset>
+                            <legend>
+                                <div>With Hope</div>
+                            </legend>
+                            {{> formula fields=../../fields.value.fields type=../../fields.type dmg=dmg source=dmg.value target="value" realIndex=realIndex}}
+                        </fieldset>
+                        <fieldset>
+                            <legend>
+                                <div>With Fear</div>
+                            </legend>
+                            {{> formula fields=../../fields.valueAlt.fields type=../../fields.type dmg=dmg source=dmg.valueAlt target="valueAlt" realIndex=realIndex}}
+                        </fieldset>
+                    {{else}}
+                        {{> formula fields=../../fields.value.fields type=../fields.type dmg=dmg source=dmg.value target="value" realIndex=realIndex}}
+                    {{/if}}
+                    {{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}}">
+                    {{#unless dmg.base}}<div class="fas fa-trash" data-action="removeDamage" data-index="{{realIndex}}"></div>{{/unless}}
+                </fieldset>
+            {{/with}}
+        {{/if}}
+    {{/each}}
 </fieldset>
 
 {{#*inline "formula"}}

templates/views/actionTypes/roll.hbs

@@ -24,5 +24,8 @@
                 </div>
             {{/if}}
         {{/if}}
+        {{#unless (eq source.type "diceSet")}}
+            {{formField fields.advState label= "Advantage State" name="roll.advState" value=source.advState localize=true}}
+        {{/unless}}
     </div>
 </fieldset>

templates/views/damageSelection.hbs

@@ -2,7 +2,11 @@
     <div class="form-group">
         <label><strong>{{title}}</strong></label>
         <div class="form-fields">
-            <input type="text" value="{{formula}}" disabled />
+            {{!-- <input type="text" value="{{formula}}" disabled /> --}}
+            <div>{{@root.formula}}</div>
+        </div>
+        <div>
+            <input type="text" value="{{extraFormula}}" name="extraFormula" placeholder="Situational Bonus">
         </div>
     </div>
     {{!-- {{#each bonusDamage as |damage index|}}

templates/views/rollSelection.hbs

@@ -2,25 +2,58 @@
     {{#if @root.hasRoll}}
     <div class="roll-dialog-container">
         <div class="flexcol">
-            {{#unless @root.isLite}}
-            <div class="roll-dialog-experience-container">
-                {{#each experiences}}
-                    {{#if name}}
-                        <div class="roll-dialog-chip {{#if (includes ../selectedExperiences id)}}selected{{/if}}" data-action="selectExperience" data-key="{{id}}">
-                            <span>{{name}}</span>
-                            <span>+{{value}}</span>
-                        </div>
-                    {{/if}}
-                {{/each}}
-            </div>
-            <div class="flexrow">
-                <button class="disadvantage flex1 {{#if (eq advantage 1)}}selected{{/if}}" data-action="updateIsAdvantage" data-advantage="1">{{localize "DAGGERHEART.General.Advantage.Full"}}</button>
-                <button class="disadvantage flex1 {{#if (eq advantage -1)}}selected{{/if}}" data-action="updateIsAdvantage" data-advantage="-1">{{localize "DAGGERHEART.General.Disadvantage.Full"}}</button>
-            </div>
-            {{/unless}}
             <div>
-                <input type="text" value="{{@root.formula}}" disabled>
+                {{!-- <input type="text" value="{{@root.formula}}" disabled> --}}
+                <div>{{@root.formula}}</div>
             </div>
+            {{#unless @root.isLite}}
+                <div class="roll-dialog-experience-container">
+                    {{#each experiences}}
+                        {{#if name}}
+                            <div class="roll-dialog-chip {{#if (includes ../selectedExperiences id)}}selected{{/if}}" data-action="selectExperience" data-key="{{id}}">
+                                <span>{{name}}</span>
+                                <span>+{{value}}</span>
+                            </div>
+                        {{/if}}
+                    {{/each}}
+                </div>
+                <div class="flexrow">
+                    <button class="disadvantage flex1 {{#if (eq advantage 1)}}selected{{/if}}" data-action="updateIsAdvantage" data-advantage="1">{{localize "DAGGERHEART.General.Advantage.Full"}}</button>
+                    <button class="disadvantage flex1 {{#if (eq advantage -1)}}selected{{/if}}" data-action="updateIsAdvantage" data-advantage="-1">{{localize "DAGGERHEART.General.Disadvantage.Full"}}</button>
+                </div>
+                {{#if (eq @root.rollType 'D20Roll')}}
+                    <div class="flexrow">
+                        <select name="roll.dice.d20">
+                            {{selectOptions diceOptions selected=@root.roll.d20.denomination}}
+                        </select>
+                    </div>
+                {{/if}}
+                {{#if (eq @root.rollType 'DualityRoll')}}
+                    <div class="flexrow">
+                        <div>Hope Dice</div>
+                        <select name="roll.dice.dHope">
+                            {{selectOptions diceOptions selected=@root.roll.dHope.denomination}}
+                        </select>
+                    </div>
+                    <div class="flexrow">
+                        <div>Fear Dice</div>
+                        <select name="roll.dice.dFear">
+                            {{selectOptions diceOptions selected=@root.roll.dFear.denomination}}
+                        </select>
+                    </div>
+                    {{#if roll.advantage}}
+                    <div class="flexrow">
+                        <div>Adv/Disadv Dice</div>
+                        <select name="roll.dice.advantageFaces">
+                            {{selectOptions diceOptions selected=@root.roll.dAdvantage.denomination}}
+                        </select>
+                    </div>
+                    {{/if}}
+                {{/if}}
+                <div>
+                    <input type="text" value="{{extraFormula}}" name="extraFormula" placeholder="Situational Bonus">
+                </div>
+            {{/unless}}
             {{!-- {{#if (not isNpc)}} --}}
                 {{!-- <div class="form-group">
                     <label>Hope</label>