Feature/112 items use action datamodel (#194)

* Fix action for items

* Cost & Range #1

* remove log

* actions

* Split methods

* Roll classes

* Begin damage

* g

* Actions

* before main merge

* Fix d20RollDialog costs check

* Fix submit on close

* Add uses in action dialog

* Adversary Attack

* 166 - Damage Reduction (#180)

* Temp

* Fixed Stress Reductions

* Changed from index based to object

* Fixed stress resources management for DamageReduction

* Fix Adversary attack multiplier

* Auto add Attack action to newly created weapon

* Few fixes

* 164 - Add Hope/Fear formula

* 163 - Actor Sub Datas (#182)

* Added rules/bonuses for all classes and subclasses

* More

* Add Save

* Fix delete action button

---------

Co-authored-by: WBHarry <williambjrklund@gmail.com>
Co-authored-by: WBHarry <89362246+WBHarry@users.noreply.github.com>

templates/views/actionTypes/cost.hbs

@@ -7,7 +7,7 @@
         {{#each source as |cost index|}}
             <fieldset>
                 <div class="multi-display">
-                    {{formField ../fields.type label="Resource" value=cost.type name=(concat "cost." index ".type") localize=true}}
+                    {{formField ../fields.type choices=(@root.disableOption index ../fields.type.choices ../source) label="Resource" value=cost.type name=(concat "cost." index ".type") localize=true}}
                     {{formField ../fields.value label="Value" value=cost.value name=(concat "cost." index ".value")}}
                 </div>
                 <div class="multi-display">

templates/views/actionTypes/damage.hbs

@@ -4,33 +4,72 @@
         <div>Damage</div>
     </legend>
     <div class="action-category-data open">
-        <div class="fas fa-plus icon-button" data-action="addDamage"></div>
-        {{#if @root.hasBaseDamage}}
-            <div>
-                {{!-- <input type="checkbox" data-action="addBaseDamage"{{#if @root.hasBaseDamage}} checked{{/if}}> --}}
-                {{formField @root.fields.damage.fields.includeBase value=@root.source.damage.includeBase label="Include Item Damage" name="damage.includeBase" }}
-            </div>
-        {{/if}}
+        {{#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|}}
-            {{#with (@root.getRealIndex index) as | realIndex |}}
-            <fieldset{{#if dmg.base}} disabled{{/if}}>
-                {{#unless dmg.base}}
-                    {{formField ../../fields.custom.fields.enabled value=dmg.custom.enabled name=(concat "damage.parts." realIndex ".custom.enabled")}}
-                {{/unless}}
-                {{#if dmg.custom.enabled}}
-                    {{formField ../../fields.custom.fields.formula value=dmg.custom.formula name=(concat "damage.parts." realIndex ".custom.formula") localize=true}}
+            {{#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.multiplier value=dmg.multiplier name=(concat "damage.parts." realIndex ".multiplier") localize=true}}
-                        {{formField ../../fields.dice value=dmg.dice name=(concat "damage.parts." realIndex ".dice")}}
-                        {{formField ../../fields.bonus value=dmg.bonus name=(concat "damage.parts." realIndex ".bonus") localize=true}}
+                        {{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 "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.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}}
     </div>
-</fieldset>
+</fieldset>
+
+{{#*inline "formula"}}
+        {{#unless dmg.base}}
+            {{formField fields.custom.fields.enabled value=source.custom.enabled name=(concat "damage.parts." realIndex "." target ".custom.enabled")}}
+        {{/unless}}
+        {{#if source.custom.enabled}}
+            {{formField fields.custom.fields.formula value=source.custom.formula name=(concat "damage.parts." realIndex "." target ".custom.formula") localize=true}}
+        {{else}}
+            <div class="multi-display">
+                {{formField fields.multiplier value=source.multiplier name=(concat "damage.parts." realIndex "." target ".multiplier") localize=true}}
+                {{#if (eq source.multiplier 'flat')}}{{formField fields.flatMultiplier value=source.flatMultiplier name=(concat "damage.parts." realIndex ".flatMultiplier") }}{{/if}}
+                {{formField fields.dice value=source.dice name=(concat "damage.parts." realIndex "." target ".dice")}}
+                {{formField fields.bonus value=source.bonus name=(concat "damage.parts." realIndex "." target ".bonus") localize=true}}
+            </div>
+        {{/if}}
+{{/inline}}

templates/views/actionTypes/effect.hbs

@@ -4,15 +4,31 @@
     </legend>
     <div class="action-category-data open" data-key="effects">
         <div class="fas fa-plus icon-button" data-action="addEffect"></div>
-        {{#each @root.effects as | effect index | }}
+        {{!-- {{#each @root.effects as | effect index | }}
             <fieldset>
-                {{!-- <div class="multi-display"> --}}
+                <div class="multi-display">
                     <div class="form-group">
                         <img src="{{img}}">
                         <label data-action="editEffect">{{name}}</label>
                         <div class="fas fa-trash" data-action="removeEffect" data-index="{{index}}"></div>
                     </div>
-                {{!-- </div> --}}
+                    {{formfield }}
+                </div>
+            </fieldset>
+        {{/each}} --}}
+        {{#each source as | effect index |}}
+            <fieldset data-effect-id="{{effect._id}}">
+                <div class="multi-display">
+                    {{#with (@root.getEffectDetails effect._id) as | details |}}
+                        <div class="form-group" data-action="editEffect">
+                            <img src="{{img}}">
+                            <label>{{name}}</label>
+                            <div class="fas fa-trash" data-action="removeEffect" data-index="{{index}}"></div>
+                        </div>
+                    {{/with}}
+                    <input type="hidden" name="effects.{{index}}._id" value="{{effect._id}}">
+                    {{formField ../fields.onSave value=effect.onSave name=(concat "effects." index ".onSave")}}
+                </div>
             </fieldset>
         {{/each}}
     </div>

templates/views/actionTypes/healing.hbs

@@ -6,16 +6,38 @@
     <div class="action-category-data open">
         <fieldset>
             {{formField fields.type value=source.type name="healing.type" localize=true}}
-            <div class="multi-display">
-                {{formField fields.value.fields.custom.fields.enabled value=source.value.custom.enabled name="healing.value.custom.enabled"}}
-                {{#if source.value.custom.enabled}}
-                    {{formField fields.value.fields.custom.fields.formula value=source.value.custom.formula name="healing.value.custom.formula" localize=true}}
-                {{else}}
-                    {{formField fields.value.fields.multiplier value=source.value.multiplier name="healing.value.multiplier" localize=true}}
-                    {{formField fields.value.fields.dice value=source.value.dice name="healing.value.dice"}}
-                    {{formField fields.value.fields.bonus value=source.value.bonus name="healing.value.bonus" localize=true}}
-                {{/if}}
-            </div>
+            {{#if (and (not @root.isNPC) @root.hasRoll)}}
+                {{formField fields.resultBased value=source.resultBased name="healing.resultBased" localize=true}}
+            {{/if}}
+            {{#if (and (not @root.isNPC) @root.hasRoll source.resultBased)}}
+                <fieldset>
+                    <legend>
+                        <div>With Hope</div>
+                    </legend>
+                    {{> formula fields=fields.value.fields source=source.value target="value"}}
+                </fieldset>
+                <fieldset>
+                    <legend>
+                        <div>With Fear</div>
+                    </legend>
+                    {{> formula fields=fields.valueAlt.fields source=source.valueAlt target="valueAlt"}}
+                </fieldset>
+            {{else}}
+                {{> formula fields=fields.value.fields source=source.value target="value"}}
+            {{/if}}
         </fieldset>
     </div>
-</fieldset>
+</fieldset>
+
+{{#*inline "formula"}}
+    <div class="multi-display">
+        {{formField fields.custom.fields.enabled value=source.custom.enabled name=(concat "healing." target ".custom.enabled")}}
+        {{#if source.custom.enabled}}
+            {{formField fields.custom.fields.formula value=source.custom.formula name=(concat "healing." target ".custom.formula") localize=true}}
+        {{else}}
+            {{formField fields.multiplier value=source.multiplier name=(concat "healing." target ".multiplier") localize=true}}
+            {{formField fields.dice value=source.dice name=(concat "healing." target ".dice")}}
+            {{formField fields.bonus value=source.bonus name=(concat "healing." target ".bonus") localize=true}}
+        {{/if}}
+    </div>
+{{/inline}}

templates/views/actionTypes/range-target.hbs

@@ -3,11 +3,16 @@
         <div>Range{{#if fields.target}} & Target{{/if}}</div>
     </legend>
     <div class="action-category-data open">
-        {{formField fields.range value=source.range label="Range" name="range" localize=true}}
+        {{formField fields.range value=source.range label="Range" name=(concat path "range") localize=true}}
     </div>
     {{#if fields.target}}
     <div class="action-category-data open">
-        {{formField fields.target.type value=source.target.type label="Target" name="target.type" localize=true}}
+        <div class="multi-display">
+            {{#if (and source.target.type (not (eq source.target.type 'self')))}}
+                {{ formField fields.target.amount value=source.target.amount label="Amount" name=(concat path "target.amount") }}
+            {{/if}}
+            {{ formField fields.target.type value=source.target.type label="Target" name=(concat path "target.type") localize=true }}
+        </div>
     </div>
     {{/if}}
 </fieldset>

templates/views/actionTypes/roll.hbs

@@ -3,8 +3,12 @@
         <div>Roll</div>
     </legend>
     <div class="action-category-data open">
-        {{formField fields.type label="Type" name="roll.type" value=source.type localize=true}}
-        {{formField fields.trait label="Trait" name="roll.trait" value=source.trait localize=true}}
-        {{formField fields.difficulty label="Difficulty" name="roll.difficulty" value=source.difficulty}}
+        {{#if @root.isNPC}}
+            {{formField fields.bonus label="Bonus" name="roll.bonus" value=source.bonus}}
+        {{else}}
+            {{formField fields.type label="Type" name="roll.type" value=source.type localize=true}}
+            {{formField fields.trait label="Trait" name="roll.trait" value=source.trait localize=true disabled=(not source.type)}}
+            {{formField fields.difficulty label="Difficulty" name="roll.difficulty" value=source.difficulty disabled=(not source.type)}}
+        {{/if}}
     </div>
 </fieldset>

templates/views/actionTypes/save.hbs

@@ -0,0 +1,10 @@
+<fieldset class="action-category">
+    <legend class="action-category-label" data-action="toggleSection" data-section="roll">
+        <div>Save</div>
+    </legend>
+    <div class="action-category-data open">
+        {{formField fields.trait label="Trait" name="save.trait" value=source.trait localize=true}}
+        {{formField fields.difficulty label="Difficulty" name="save.difficulty" value=source.difficulty disabled=(not source.trait)}}
+        {{formField fields.damageMod label="Damage on Save" name="save.damageMod" value=source.damageMod localize=true disabled=(not source.trait)}}
+    </div>
+</fieldset>