Various automations fixes

templates/actors/actor-sheet.hbs

@@ -32,7 +32,10 @@
         <ul class="stat-list alternate-list item-list stat-column-size">
           {{#each system.attributes as |attr key|}}
           <li class="item stat flexrow list-item list-item-shadow">
-            <label class="item-field-label-medium">{{attr.label}}</label>
+            <a class="roll-attribute" data-attr-key="{{key}}">
+              <i class="fa-solid fa-dice-d10"></i>
+              <label class="item-field-label-medium">{{attr.label}}</label>
+            </a>
             <input type="text" class="item-field-label-short padd-right" name="system.attributes.{{key}}.value" value="{{attr.value}}" data-dtype="Number"/>
           {{/each}}
           </li>
@@ -99,21 +102,24 @@
           <span class="item-name-label-header-long2">
             <h3><label class="items-title-text">Skills</label></h3>
           </span>
-          <span class="item-field-label-medium">
+          <span class="item-field-label-short">
             <label class="short-label">Base</label>
           </span>
           <span class="item-field-label-long">
             <label class="short-label">Derivated</label>
           </span>
-          <span class="item-field-label-medium">
+          <span class="item-field-label-short">
             <label class="short-label">Bonus</label>
           </span>
           <span class="item-field-label-medium">
             <label class="short-label">Total</label>
           </span>
-          <span class="item-field-label-medium">
+          <span class="item-field-label-short">
             <label class="short-label">Used?</label>
           </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Cumul.</label>
+          </span>
           <span class="item-field-label-medium">
             <label class="short-label">&nbsp;</label>
           </span>
@@ -123,11 +129,47 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{skill.img}}" />
           </a>
           <span class="item-field-label-vlong2"><i class="fa-solid fa-dice-d10"></i><a class="roll-skill">{{skill.name}}</a></span>
-          <span class="item-field-label-medium">{{skill.system.value}}</span>
+          <span class="item-field-label-short">{{skill.system.value}}</span>
           <span class="item-field-label-long">{{skill.derivated.label}} ({{skill.derivated.value}})</span>
-          <span class="item-field-label-medium">{{skill.system.bonus}}</span>
+          <span class="item-field-label-short">{{skill.system.bonus}}</span>
           <span class="item-field-label-medium">{{skill.total}}%</span>
           <label class="attribute-value checkbox"><input type="checkbox" class="skill-used-id"  {{checked skill.system.used}}/></label>
+          <span class="item-field-label-short" data-tooltip="Start a cumulative task"><a class="start-cumulative-task"><i class="fa-solid fa-circle-plus"></i></a></span>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+
+      <ul class="alternate-list item-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header-long2">
+            <h3><label class="items-title-text">Tasks</label></h3>
+          </span>
+          <span class="item-field-label-long">
+            <label class="short-label">Skill</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Nb Rolls</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Total</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">&nbsp;</label>
+          </span>
+        </li>
+        {{#each tasks as |task key|}}
+        <li class="item flexrow list-item list-item-shadow" data-item-id="{{task._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{task.img}}" />
+          </a>
+          <span class="item-field-label-vlong2"><i class="fa-solid fa-dice-d10"></i><a class="roll-skill">{{task.name}}</a></span>
+          <span class="item-field-label-long">{{task.system.skill}}</span>
+          <span class="item-field-label-short">{{task.system.nbrolls}}</span>
+          <span class="item-field-label-short">{{task.system.cumulated}}</span>
+          <div class="item-filler">&nbsp;</div>
+
           <div class="item-controls item-controls-fixed">
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
@@ -270,12 +312,8 @@
               
               {{#if weapon.system.needammo}}
                 <select class="item-field-label-long edit-weapon-ammo" type="text" data-dtype="String">
-                  {{#select system.ammoid}}
                     <option value="">None</option>
-                    {{#each @root.ammos as |ammo index|}}
-                    <option value="{{ammo._id}}">{{ammo.name}}</option>
-                    {{/each}}
-                  {{/select}}
+                  {{selectOptions @root.ammos selected=system.ammoid valueAttr="_id" nameAttr="_id" labelAttr="name"}}
                 </select>
                 {{#if weapon.ammo}}              
                   <span class="item-field-label-medium   margin-left-4"><label>{{weapon.ammo.system.damage}}</label></span>
@@ -440,12 +478,8 @@
 
           {{#if weapon.system.needammo}}
             <select class="item-field-label-vlong edit-weapon-ammo" type="text" data-dtype="String">
-              {{#select system.ammoid}}
-                <option value="">None</option>
-                {{#each @root.ammos as |ammo index|}}
-                <option value="{{ammo._id}}">{{ammo.name}}</option>
-                {{/each}}
-              {{/select}}
+              <option value="">None</option>
+              {{selectOptions @root.ammos selected=system.ammoid valueAttr="_id" nameAttr="_id" labelAttr="name"}}
             </select>
             {{#if weapon.ammo}}              
               <span class="item-field-label-medium"><label>{{weapon.ammo.system.damage}}</label></span>
@@ -712,14 +746,7 @@
             <li class="flexrow item">
               <label class="generic-label">Size</label>
               <select class="competence-base flexrow" type="text" name="system.biodata.size" value="{{data.biodata.size}}" data-dtype="Number">
-                {{#select data.biodata.size}}
-                <option value="1">Tiny</option>
-                <option value="2">Small</option>
-                <option value="3">Medium</option>
-                <option value="4">Large</option>
-                <option value="5">Huge</option>
-                <option value="6">Gargantuan</option>
-                {{/select}}
+                {{selectOptions config.sizeOptions selected=data.biodata.size}}
               </select> 
             </li>
             <li class="flexrow item">

templates/actors/npc-sheet.hbs

@@ -23,14 +23,7 @@
                   <h4 class="ability-text-white ability-margin">Class</h4>
                 </span>
                 <select class="competence-base flexrow" type="text" name="system.biodata.class" value="{{data.biodata.class}}" data-dtype="String">
-                  {{#select data.biodata.class}}
-                  <option value="none">None</option>
-                  <option value="chaplain">Chaplain</option>
-                  <option value="magus">Magus</option>
-                  <option value="martial">Martial</option>
-                  <option value="skalawag">Skalawag</option>
-                  <option value="warden">Warden</option>
-                  {{/select}}
+                  {{selectOptions @root.config.classNPC selected=data.biodata.class }}
                 </select>
               </li>
             
@@ -365,14 +358,7 @@
             <li class="flexrow item">
               <label class="generic-label">Size</label>
               <select class="competence-base flexrow" type="text" name="system.biodata.size" value="{{data.biodata.size}}" data-dtype="Number">
-                {{#select data.biodata.size}}
-                <option value="1">Tiny</option>
-                <option value="2">Small</option>
-                <option value="3">Medium</option>
-                <option value="4">Large</option>
-                <option value="5">Huge</option>
-                <option value="6">Gargantuan</option>
-                {{/select}}
+                {{selectOptions config.sizeOptions selected=data.biodata.size}}
               </select> 
             </li>
             <li class="flexrow item">

templates/apps/roll-dialog-generic.hbs

@@ -7,58 +7,62 @@
   </header>
 
     <div class="flexcol">
-  
+      
+      {{#if attr}}
+        <div class="flexrow">
+          <span class="roll-dialog-label">Attribute : </span>
+          <span class="roll-dialog-label">{{attr.label}} ( {{attr.value}} )</span>
+        </div>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Modifier : </span>
+            <select class="status-small-label color-class-common" type="text" id="attribute-modifier" value="{{attributeModifier}}" data-dtype="String" >
+              {{selectOptions config.attributeModifier selected=attributeModifier valueAttr="value" nameAttr="value" labelAttr="label"}}
+          </select>
+        </div>
+      {{/if}}
+
       {{#if skill}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Skill : </span>
-        <span class="roll-dialog-label">{{skill.name}} ( {{skill.total}}% )</span>
-      </div>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Skill : </span>
+          <span class="roll-dialog-label">{{skill.name}} ( {{skill.total}}% )</span>
+        </div>
+
+        {{#if weapon}}
+        <div class="flexrow">
+          <span class="roll-dialog-label">Weapon : </span>
+          <span class="roll-dialog-label">{{weapon.name}}</span>
+        </div>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Above effective range ({{weapon.system.effectiverange}}, -30%) : </span>
+          <label class="attribute-value checkbox"><input type="checkbox" id="above-effective-range" {{checked isAboveEffectiveRange}}/></label>
+        </div>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Aiming : </span>
+            <select class="status-small-label color-class-common" type="text" id="weapon-aiming" value="{{weaponAiming}}" data-dtype="String" >
+              {{selectOptions config.weaponAiming selected=weaponAiming}}
+          </select>
+        </div>
+        {{else}}
+        <div class="flexrow">
+          <span class="roll-dialog-label">Synergy Bonus : </span>
+            <select class="status-small-label color-class-common" type="text" id="synergy-bonus" value="{{synergyBonus}}" data-dtype="N"umber >
+              {{selectOptions config.synergyBonus selected=synergyBonus}}
+          </select>
+        </div>
+        <div class="flexrow">
+          <span class="roll-dialog-label">Extra time (+30%): </span>
+          <input type="checkbox" id="extra-time" name="extraTime" {{checked extraTime}}/></label>
+        </div>
+        {{/if}}
+
+        <div class="flexrow">
+          <span class="roll-dialog-label">Bonus/Malus : </span>
+          <select class="status-small-label color-class-common" type="text" id="bonusMalus" value="{{bonusMalus}}" data-dtype="Number" >
+            {{selectOptions config.rollModifiers selected=bonusMalus valueAttr="value" nameAttr="value" labelAttr="label"}}
+          </select>
+        </div>
       {{/if}}
 
-      {{#if weapon}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Weapon : </span>
-        <span class="roll-dialog-label">{{weapon.name}}</span>
-      </div>
-      <div class="flexrow">
-        <span class="roll-dialog-label">Above effective range ({{weapon.system.effectiverange}}, -30%) : </span>
-        <label class="attribute-value checkbox"><input type="checkbox" id="above-effective-range" {{checked isAboveEffectiveRange}}/></label>
-      </div>
-      <div class="flexrow">
-        <span class="roll-dialog-label">Aiming : </span>
-          <select class="status-small-label color-class-common" type="text" id="weapon-aiming" value="{{weaponAiming}}" data-dtype="String" >
-          {{#select weaponAiming}}
-          <option value="none">None</option>
-          <option value="arm">Arm (-50)</option>
-          <option value="head">Head (-50)</option>
-          <option value="torso">Torso(-30)</option>
-          <option value="leg">Leg (-30)</option>
-          <option value="hand">Hand/Weapon (-70)</option>
-          {{/select}}
-        </select>
-      </div>
-      {{/if}}
-
-     <div class="flexrow">
-        <span class="roll-dialog-label">Bonus/Malus : </span>
-        <select class="status-small-label color-class-common" type="text" id="bonusMalus" value="{{bonusMalus}}" data-dtype="Number" >
-          {{#select bonusMalus}}
-          <option value="-80">-80%</option>
-          <option value="-70">-70%</option>
-          <option value="-60">-60%</option>
-          <option value="-50">-50%</option>
-          <option value="-40">-40%</option>
-          <option value="-30">-30%</option>
-          <option value="-20">-20%</option>
-          <option value="-10">-10%</option>
-          <option value="0">0%</option>
-          <option value="+10">+10%</option>
-          <option value="+20">+20%</option>
-          <option value="+30">+30%</option>
-          <option value="+40">+40%</option>
-          {{/select}}
-        </select>
-      </div>
   </div>
 
 </form>

templates/chat/chat-attack-defense-result.hbs

@@ -1,75 +0,0 @@
-<div class="chat-message-header">
-  {{#if actorImg}}
-  <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
-  {{/if}}
-  <h4 class=chat-actor-name>{{alias}}</h4>
-</div>
-
-  <hr>
-  
-  {{#if img}}
-  <div >
-    <img class="chat-icon" src="{{img}}" alt="{{name}}" />
-  </div>
-  {{/if}}
-
-  <div class="flexcol">
-    </div>
-
-    <div>
-      <ul>
-        <li><strong>Fight result !</strong></li>
-        {{#if successDetails.fumbleDetails}}
-        <li>Fumble ! :  {{successDetails.fumbleDetails.data.text}} </li>
-        {{/if}}
-
-
-        {{#if armorResult}}
-          <li>Armor initial result : {{armorResult.rawArmor}}</li>
-          {{#each armorResult.messages as |message idx|}}
-            <li>{{message}}</li>
-          {{/each}}
-        {{/if}}
-
-        {{#if successDetails.hack_vs_shields}} 
-        <li>Hack weapon : check shield !</li>
-        {{/if}}
-
-        {{#if successDetails.entangle}} 
-        <li>Entangle weapon : attacker can entangle !</li>
-        {{/if}}
-        
-        {{#if successDetails.knockback}} 
-        <li>Knockback weapon : check knockback !</li>
-        {{/if}}
-        
-        {{#if successDetails.hack_armors}} 
-        <li>Hack weapon : check armor damage !</li>
-        {{/if}}
-
-        {{#if successDetails.penetrating_impale}} 
-        <li>Penetrating weapon : apply the Impale condition !</li>
-        {{/if}}
-
-        {{#if (or successDetails.critical_1 successDetails.critical_2)}} 
-        <li>Critical {{#if successDetails.critical_1}} 1 {{else}} 2 {{/if}} : {{successDetails.criticalText}} </li>
-        {{/if}}
-
-        {{#if successDetails.attackerHPLossValue}}
-        <li>Attacker has lost HP :  {{successDetails.attackerHPLossValue}} HP </li>
-        {{/if}}
-
-        {{#if successDetails.defenderHPLossValue}}
-        <li>Defender has lost HP :  {{successDetails.defenderHPLossValue}} HP </li>
-        {{/if}}
-
-        <li>Success details : {{successDetails.result}} </li>
-
-        <li><strong>Final successes</strong> {{sumSuccess}} </li>
-
-        <!-- <button class="chat-card-button reroll-level-remaining" data-roll-id="{{rollId}}">Reroll</button> -->
-
-      </ul>  
-    </div>
-
-  </div>

templates/chat/chat-attribute-result.hbs

@@ -0,0 +1,30 @@
+<div class="chat-message-header">
+  {{#if actorImg}}
+  <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
+  {{/if}}
+  <h4 class=chat-actor-name>{{alias}}</h4>
+</div>
+
+  <hr>
+  
+  <div class="flexcol">
+    </div>
+
+    <div>
+      <ul>
+        
+        <li>Attribute : {{attr.label}} ({{attr.value}})</li>
+        <li>Modifier : {{attributeModifier}}</li>
+        <li>Target : {{targetNumber}}</li>
+        <li>Result : {{diceResult}}</li>
+
+        {{#if isSuccess}}
+          <li><strong>Success !</strong></li> 
+        {{else}}
+          <li><strong>Failure ...</strong></li> 
+        {{/if}}
+
+      </ul>  
+    </div>
+
+  </div>

templates/chat/chat-generic-result.hbs

@@ -18,7 +18,7 @@
 
     <div>
       <ul>
-
+        
         {{#if skill}}
         <li>Skill : {{skill.name}} ({{skill.total}}%)</li>
         {{/if}}
@@ -30,18 +30,41 @@
         {{/if}}
 
         <li>Bonus/Malus: {{bonusMalus}}% </li>
+        
+        {{#if extraTime}}
+        <li>Extra time: +30%, time x 2</li>
+        {{/if}}
+        
+        {{#if synergyBonus}}
+        <li>Synergy Bonus: +{{synergyBonus}}% </li>
+        {{/if}}
+
         <li>Target Number: {{percentValue}}% </li>
         <li>Result: {{diceResult}} </li>
-        <li>Degrees: {{degrees}} </li>
+        <li class="flexrow gm-actions">
+          <span>Degrees: {{degrees}}</span>
+          <a class="chat-roll-opposed">
+            <span data-tooltip="Opposed" class="roll-opposed-icon fa-stack fa-1x">
+            <i class="fa-thin fa-square fa-stack-1x"></i>
+            <i class="fa-solid fa-arrow-right-arrow-left fa-stack-1x "></i>
+            </span>
+          </a>
+        </li>
         
+        {{#if taskId}}
+        <li>Task : {{taskName}}</li>
+        <li>Nb rolls : {{taskNbrolls}} </li>
+        <li>Cumulated : {{taskCumulated}} </li>
+        {{/if}}
+
         {{#if isCriticalSuccess}}
-        <li><strong>Critical Success !</strong></li> 
+        <li><strong>Special Success !</strong></li> 
         {{else}}
           {{#if isSuccess}}
             <li><strong>Success !</strong></li> 
           {{else}}
             {{#if isCriticalFailure}}
-              <li><strong>Critical Failure !</strong></li> 
+              <li><strong>Mishap !</strong></li> 
               {{else}}
               <li><strong>Failure ...</strong></li> 
             {{/if}}

templates/chat/chat-opposed-fail.hbs

@@ -1,11 +0,0 @@
-<div class="chat-message-header">
-  <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
-  <h4 class=chat-actor-name>{{defenderName}}</h4>
-</div>
-
-  <hr>
-  <div >
-    {{defenderName}} wins the opposition against {{attackerName}} !
-  </div>
-
-  </div>

templates/chat/chat-opposition-result.hbs

@@ -0,0 +1,19 @@
+<div class="chat-message-header">
+
+  <img class="actor-icon" src="{{winner.actorImg}}" alt="{{winner.alias}}" />
+
+  <span data-tooltip="Opposed" class="roll-opposed-icon fa-stack fa-1x">
+    <i class="fa-thin fa-square fa-stack-1x"></i>
+    <i class="fa-solid fa-arrow-right-arrow-left fa-stack-1x "></i>
+  </span>
+
+  <img class="actor-icon" src="{{looser.actorImg}}" alt="{{looser.alias}}" />
+    <label class="chat-actor-name-opposition">{{winner.alias}} vs {{looser.alias}}</label>
+</div>
+
+  <hr>
+  <div >
+    <label class="chat-result-success">{{winner.alias}} ({{winner.skill.name}}, {{winner.diceResult}}) wins opposition against {{looser.alias}} ({{looser.skill.name}},  {{looser.diceResult}})</label>
+  </div>
+
+  

templates/chat/chat-request-defense.hbs

@@ -1,46 +0,0 @@
-<div class="chat-message-header">
-  {{#if actorImg}}
-  <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
-  {{/if}}
-  <h4 class=chat-actor-name>{{alias}}</h4>
-</div>
-
-<hr>
-
-{{#if img}}
-<div>
-  <img class="chat-icon" src="{{img}}" alt="{{name}}" />
-</div>
-{{/if}}
-
-<div class="flexcol">
-</div>
-
-<div>
-  
-  {{#if isRangedAttack}}
-  <div>{{defender.name}} is under Ranged attack. He must roll a Target Roll to defend himself.</div>
-  {{else}}
-  <div>{{defender.name}} is under Melee attack. He must roll a Defense Roll to defend himself.</div>
-  {{/if}}
-
-  <ul>
-    {{#if isRangedAttack}}
-      <li>
-        <button class="chat-card-button roll-defense-ranged" data-roll-id="{{@root.rollId}}">Roll Target !</button>
-      </li>
-    {{else}}
-      <li>
-        {{#each defenderWeapons as |weapon idx|}}
-        <button class="chat-card-button roll-defense-melee" data-defense-weapon-id="{{weapon._id}}"
-          data-roll-id="{{@root.rollId}}">{{weapon.name}}</button>
-        {{/each}}
-      </li>
-    {{/if}}
-    </ul>
-  <!-- <button class="chat-card-button reroll-level-remaining" data-roll-id="{{rollId}}">Reroll</button> -->
-
-  </ul>
-</div>
-
-</div>

templates/items/item-armor-sheet.hbs

@@ -47,11 +47,7 @@
 
             <li class="flexrow"><label class="generic-label">Availability</label>
               <select class="competence-base flexrow" type="text" name="system.availability" value="{{system.availability}}" data-dtype="String">
-                {{#select system.availability}}
-                  {{#each config.availability as |name key|}}
-                  <option value="{{key}}">{{name}}</option>
-                  {{/each}}
-                {{/select}}
+                {{selectOptions config.availability selected=system.availability}}
               </select> 
             </li>
 

templates/items/item-cumulativetask-sheet.hbs

@@ -0,0 +1,33 @@
+<form class="{{cssClass}}" autocomplete="off">
+    <header class="sheet-header">
+        <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+        <div class="header-fields">
+            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
+        </div>
+    </header>
+
+    {{> systems/fvtt-dark-stars/templates/partials/partial-item-nav.hbs}}
+
+    {{!-- Sheet Body --}}
+    <section class="sheet-body">
+
+      {{> systems/fvtt-dark-stars/templates/partials/partial-item-description.hbs}}
+
+      <div class="tab details" data-group="primary" data-tab="details">
+        <ul>
+            <li class="flexrow">
+              <label class="item-field-label-long">Skill</label>
+              <label class="item-field-label-long">{{system.skill}}</label>
+            </li>
+            <li class="flexrow">
+              <label class="item-field-label-long">Cumulated score</label>
+              <label class="item-field-label-long">{{system.cumulated}}</label>
+            </li>
+            <li class="flexrow">
+              <label class="item-field-label-long">Number of rolls</label>
+              <label class="item-field-label-long">{{system.nbrolls}}</label>
+            </li>
+          </ul>
+        </div>
+    </section>
+</form>

templates/items/item-cyber-sheet.hbs

@@ -19,11 +19,7 @@
           <label class="item-field-label-long">Cyber Type</label>
           <select class="item-field-label-vlong" type="text" name="system.cybertype" value="{{system.cybertype}}"
             data-dtype="String">
-            {{#select system.cybertype}}
-            {{#each config.cyberTypes as |type key|}}
-            <option value="{{key}}">{{type}}</option>
-            {{/each}}
-            {{/select}}
+            {{selectOptions config.cyberTypes selected=system.cybertype}}
           </select>
         </li>
         <li class="flexrow"><label class="item-field-label-long">Upgrade</label>

templates/items/item-genetic-sheet.hbs

@@ -19,11 +19,7 @@
           <label class="item-field-label-long">Genetic Type</label>
           <select class="item-field-label-vlong" type="text" name="system.cybertype" value="{{system.cybertype}}"
             data-dtype="String">
-            {{#select system.cybertype}}
-            {{#each config.cyberTypes as |type key|}}
-            <option value="{{key}}">{{type}}</option>
-            {{/each}}
-            {{/select}}
+            {{selectOptions config.cyberTypes selected=system.cybertype}}
           </select>
         </li>
         <li class="flexrow"><label class="item-field-label-long">Upgrade</label>

templates/items/item-job-sheet.hbs

@@ -17,11 +17,7 @@
 
         <li class="flexrow"><label class="item-field-label-long">Perk Type</label>
           <select class="item-field-label-vlong" type="text" name="system.perktype" value="{{system.perktype}}" data-dtype="String">
-            {{#select system.perktype}}
-              {{#each config.perktypes as |type key|}}
-              <option value="{{key}}">{{type}}</option>
-              {{/each}}
-            {{/select}}
+            {{selectOptions config.perktypes selected=system.perktype}}
           </select> 
         </li>
 

templates/items/item-perk-sheet.hbs

@@ -17,11 +17,7 @@
 
         <li class="flexrow"><label class="item-field-label-long">Perk Type</label>
           <select class="item-field-label-vlong" type="text" name="system.perktype" value="{{system.perktype}}" data-dtype="String">
-            {{#select system.perktype}}
-              {{#each config.perktypes as |type key|}}
-              <option value="{{key}}">{{type}}</option>
-              {{/each}}
-            {{/select}}
+            {{selectOptions config.perktypes selected=system.perktype}}
           </select> 
         </li>
 

templates/items/item-skill-sheet.hbs

@@ -17,11 +17,7 @@
         <ul>
             <li class="flexrow"><label class="item-field-label-long">Base</label>
               <select class="item-field-label-long competence-base flexrow" type="text" name="system.base" value="{{system.base}}" data-dtype="String">
-                {{#select system.base}}
-                  {{#each config.basebonus as |name key|}}
-                  <option value="{{key}}">{{name}}</option>
-                  {{/each}}
-                {{/select}}
+                {{selectOptions config.basebonus selected=system.base}}
               </select> 
             </li>
 

templates/items/item-spell-sheet.hbs

@@ -19,11 +19,7 @@
           <label class="item-field-label-long">Magic Type</label>
           <select class="item-field-label-vlong" type="text" name="system.magictype" value="{{system.magictype}}"
             data-dtype="String">
-            {{#select system.magictype}}
-            {{#each config.magicTypes as |type key|}}
-            <option value="{{key}}">{{type}}</option>
-            {{/each}}
-            {{/select}}
+            {{selectOptions config.magicTypes selected=system.magictype}}
           </select>
         </li>
         <li class="flexrow"><label class="item-field-label-long">Experience</label>

templates/items/item-weapon-sheet.hbs

@@ -21,21 +21,13 @@
 
           <li class="flexrow"><label class="item-field-label-long">Weapon Type</label>
             <select class="item-field-label-vlong" type="text" name="system.weapontype" value="{{system.weapontype}}" data-dtype="String">
-              {{#select system.weapontype}}
-                {{#each config.weapontypes as |type key|}}
-                <option value="{{key}}">{{type}}</option>
-                {{/each}}
-              {{/select}}
+              {{selectOptions config.weapontypes selected=system.weapontype}}
             </select> 
           </li>
 
           <li class="flexrow"><label class="item-field-label-long">Associated skill</label>
             <select class="item-field-label-vlong" type="text" name="system.skill" value="{{system.skill}}" data-dtype="String">
-              {{#select system.skill}}
-                {{#each skills as |skill idx|}}
-                <option value="{{skill.name}}">{{skill.name}}</option>
-                {{/each}}
-              {{/select}}
+              {{selectOptions skills selected=system.skill nameAttr="name" valueAttr="name" labelAttr="name"}}
             </select> 
           </li>
 
@@ -91,21 +83,13 @@
 
           <li class="flexrow"><label class="item-field-label-long">Effective Range</label>
             <select class="item-field-label-long" type="text" name="system.effectiverange" value="{{system.effectiverange}}" data-dtype="Number">
-              {{#select system.effectiverange}}
-                {{#each config.range as |type key|}}
-                <option value="{{key}}">{{type}}</option>
-                {{/each}}
-              {{/select}}
+              {{selectOptions config.range selected=system.effectiverange}}
             </select> 
           </li>
 
           <li class="flexrow"><label class="item-field-label-long">Maximum Range</label>
             <select class="item-field-label-long" type="text" name="system.maxrange" value="{{system.maxrange}}" data-dtype="Number">
-              {{#select system.maxrange}}
-                {{#each config.range as |type key|}}
-                <option value="{{key}}">{{type}}</option>
-                {{/each}}
-              {{/select}}
+              {{selectOptions config.range selected=system.maxrange}}
             </select> 
           </li>
 

templates/partials/partial-actor-ability-block.hbs

@@ -4,16 +4,6 @@
   </span>
   <select class="status-small-label color-class-common" type="text" name="system.abilities.{{key}}.value" value="{{ability.value}}"
     data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
-    {{#select ability.value}}
-      <option value="0">0</option>
-      <option value="1">1</option>
-      <option value="2">2</option>
-      <option value="3">3</option>
-      <option value="4">4</option>
-      <option value="5">5</option>
-      <option value="6">6</option>
-      <option value="7">7</option>
-      <option value="8">8</option>
-    {{/select}}
+    {{selectOptions @root.config.abilityValues selected=ability.value}}
   </select>
 </li>

templates/partials/partial-options-abilities.hbs

@@ -1,7 +0,0 @@
-<option value="agi">Agility</option>
-<option value="str">Strength</option>
-<option value="dex">Dexterity</option>
-<option value="con">Constitution</option>
-<option value="int">Intelligence</option>
-<option value="wit">Wits</option>
-<option value="cha">Charisma</option>

templates/partials/partial-options-level.hbs

@@ -1,14 +0,0 @@
-{{#if notapplicable}}
-<option value="notapplicable">Not applicable</option>
-{{/if}}
-<option value="0">0</option>
-<option value="1">d4</option>
-<option value="2">d6</option>
-<option value="3">d8</option>
-<option value="4">d10</option>
-<option value="5">d12</option>
-<option value="6">d12 d4</option>
-<option value="7">d12 d6</option>
-<option value="8">d12 d8</option>
-<option value="9">d12 d10</option>
-<option value="10">d12 d12</option>

templates/partials/partial-options-range.hbs

@@ -1,15 +0,0 @@
-{{#if notapplicable}}
-<option value="notapplicable">Not applicable</option>
-{{/if}}
-<option value="touch">Self Only</option>
-<option value="touchself">Touch/Self</option>
-<option value="tz">Threat Zone</option>
-<option value="close">Close</option>
-<option value="medium">Medium</option>
-<option value="long">Long</option>
-<option value="extreme">Extreme</option>
-<option value="sight">Line of Sight</option>
-<option value="tz_close">TZ/Close</option>
-<option value="close_medium">Close/Medium</option>
-<option value="medium_long">Medium/Long</option>
-<option value="long_extreme">Long/Extreme</option>

templates/partials/partial-roll-select.hbs

@@ -1,4 +0,0 @@
-
-<ul>
-</ul>
-