Sync effetcts + initiative

templates/partial-roll-common-dices.html

@@ -1,40 +0,0 @@
-{{#if specList}}
-<div class="flexrow">
-  <span class="roll-dialog-label" >Specialisation : </span>        
-  <select class="competence-base" id="specList" type="text" name="selectedSpec" value="{{selectedSpec}}" data-dtype="String">
-    {{#select selectedSpecIndex}}
-    <option value="0">None</option>
-      {{#each specList as |spec idx|}}
-        <option value="{{spec._id}}">{{spec.name}}</option>
-      {{/each}}
-    {{/select}}
-  </select> 
-</div>
-{{/if}}
-
-<div class="flexrow">
-  <span class="roll-dialog-label" >Bonus Dice : </span>      
-  <select class="roll-dialog-label" id="bonusDicesLevel" type="text" name="bonusDicesLevel" value="{{bonusDicesLevel}}" data-dtype="Number">
-    {{#select bonusDicesLevel}}
-    {{{optionsDiceList}}}
-    {{/select}}
-  </select> 
-</div>
-
-<div class="flexrow">
-  <span class="roll-dialog-label" >Target Hindrance Dice :</span>
-    <select class="roll-dialog-label" id="hindranceDicesLevel" type="text" name="hindranceDicesLevel" value="{{hindranceDicesLevel}}" data-dtype="Number">
-      {{#select hindranceDicesLevel}}
-      {{{optionsDiceList}}}
-      {{/select}}
-    </select> 
-</div>
-
-<div class="flexrow">
-  <span class="roll-dialog-label" >Other Dice :</span>
-    <select class="roll-dialog-label" id="otherDicesLevel" type="text" name="otherDicesLevel" value="{{otherDicesLevel}}" data-dtype="Number">
-      {{#select otherDicesLevel}}
-      {{{optionsDiceList}}}
-      {{/select}}
-    </select> 
-</div>

templates/partial-roll-select-effects.html

@@ -0,0 +1,41 @@
+<ul>
+  {{#each effectsList as |effect idx|}}
+    
+  {{#if (eq @root.statKey effect.effect.data.stataffected)}}
+    <li class="flex-group-left">
+      <label class="attribute-value checkbox"><input type="checkbox" class="effect-clicked" id="effect-{{idx}}" data-effect-idx="{{idx}}" {{checked effect.applied}}/></label>
+      {{#if effect.effect}}
+      <label class="generic-label">{{effect.label}} ({{upperFirst effect.effect.data.type}}, {{upperFirst effect.effect.data.genre}}, {{effect.value}})</label>
+      {{else}}
+      <label class="generic-label">{{effect.label}} ({{effect.value}})</label>
+      {{/if}}
+    </li>
+    {{/if}}
+  
+    {{#if effect.effect.data.hindrance}}
+    <li class="flex-group-left">
+      <label class="attribute-value checkbox"><input type="checkbox" class="effect-clicked" id="effect-{{idx}}" data-effect-idx="{{idx}}" {{checked effect.applied}}/></label>
+      <label class="generic-label">Target Hindrance : {{effect.label}} ({{upperFirst effect.effect.data.type}}, {{upperFirst effect.effect.data.genre}}, {{effect.value}})</label>
+    </li>
+    {{/if}}
+
+    {{#if (eq type "hindrance")}}
+    <li class="flex-group-left">
+      <label class="attribute-value checkbox"><input type="checkbox" class="effect-clicked" id="effect-{{idx}}" data-effect-idx="{{idx}}" {{checked effect.applied}}/></label>
+      <label class="generic-label">Target Hindrance : {{effect.label}} ({{effect.value}})</label>
+    </li>
+    {{/if}}
+
+    {{/each}}
+</ul>
+
+<ul>
+
+  {{#each armorsList as |armor idx|}}
+  <li class="flex-group-left">
+    <label class="attribute-value checkbox"><input type="checkbox" class="armor-clicked" id="armor-{{idx}}" data-armor-idx="{{idx}}" {{checked armor.applied}}/></label>
+    <label class="generic-label padd-right">{{armor.label}} ({{armor.value}})</label>
+  </li>
+  {{/each}}
+
+</ul>

templates/roll-dialog-generic.html

@@ -6,28 +6,82 @@
     <h1 class="dialog-roll-title roll-dialog-header">{{title}}</h1>  
   </header>
 
-  <div class="floxrow">
+  <div class="grid grid-2col">
 
-    <div class="flexrow">
-      <span class="roll-dialog-label" >Stat Dice : </span>      
-      <select class="competence-base" id="statDicesLevel" type="text" name="statDicesLevel" value="{{statDicesLevel}}" data-dtype="Number">
-        {{#select statDicesLevel}}
-        {{{optionsDiceList}}}
-        {{/select}}
-      </select> 
+    <div class="flexcol">
+
+      <div class="flexrow">
+        <span class="roll-dialog-label" >Stat Dice : </span>      
+        <select class="roll-dialog-label" id="statDicesLevel" type="text" name="statDicesLevel" value="{{statDicesLevel}}" data-dtype="Number"
+        {{#if statKey}}disabled{{/if}}>
+          {{#select statDicesLevel}}
+          {{{optionsDiceList}}}
+          {{/select}}
+        </select> 
+        <span class="small-label">&nbsp;+&nbsp;{{statMod}}</span>
+      </div>
+      
+      {{#if specList}}
+      <div class="flexrow">
+        <span class="roll-dialog-label" >Specialisation : </span>        
+        <select class="competence-base" id="specList" type="text" name="selectedSpec" value="{{selectedSpec}}" data-dtype="String">
+          {{#select selectedSpecIndex}}
+          <option value="0">None</option>
+            {{#each specList as |spec idx|}}
+              <option value="{{spec._id}}">{{spec.name}}</option>
+            {{/each}}
+          {{/select}}
+        </select> 
+        <span class="small-label">&nbsp;</span>
+      </div>
+      {{/if}}
+      <div class="flexrow">
+        <span class="roll-dialog-label" >Spec Dice : </span>      
+        <select class="roll-dialog-label" id="specDicesLevel" type="text" name="specDicesLevel" value="{{specDicesLevel}}" data-dtype="Number"
+          {{#if specList}}disabled{{/if}}>
+          {{#select specDicesLevel}}
+          {{{optionsDiceList}}}
+          {{/select}}
+        </select> 
+        <span class="small-label">&nbsp;</span>
+      </div>
+      
+      <div class="flexrow">
+        <span class="roll-dialog-label" >Bonus Dice : </span>      
+        <select class="roll-dialog-label" id="bonusDicesLevel" type="text" name="bonusDicesLevel" value="{{bonusDicesLevel}}" data-dtype="Number">
+          {{#select bonusDicesLevel}}
+          {{{optionsDiceList}}}
+          {{/select}}
+        </select> 
+        <span class="small-label">&nbsp;</span>
+      </div>
+      
+      <div class="flexrow">
+        <span class="roll-dialog-label" >Hindrance Dice :</span>
+          <select class="roll-dialog-label" id="hindranceDicesLevel" type="text" name="hindranceDicesLevel" value="{{hindranceDicesLevel}}" data-dtype="Number">
+            {{#select hindranceDicesLevel}}
+            {{{optionsDiceList}}}
+            {{/select}}
+          </select> 
+          <span class="small-label">&nbsp;</span>
+        </div>
+      
+      <div class="flexrow">
+        <span class="roll-dialog-label" >Other Dice :</span>
+          <select class="roll-dialog-label" id="otherDicesLevel" type="text" name="otherDicesLevel" value="{{otherDicesLevel}}" data-dtype="Number">
+            {{#select otherDicesLevel}}
+            {{{optionsDiceList}}}
+            {{/select}}
+          </select> 
+          <span class="small-label">&nbsp;</span>
+        </div>
+      
     </div>
 
-    <div class="flexrow">
-      <span class="roll-dialog-label" >Spec Dice : </span>      
-      <select class="competence-base" id="specDicesLevel" type="text" name="specDicesLevel" value="{{specDicesLevel}}" data-dtype="Number">
-        {{#select specDicesLevel}}
-        {{{optionsDiceList}}}
-        {{/select}}
-      </select> 
+    <div>
+      {{> systems/fvtt-pegasus-rpg/templates/partial-roll-select-effects.html}}
     </div>
 
-    {{> systems/fvtt-pegasus-rpg/templates/partial-roll-common-dices.html}}
-
   </div>
   
 </form>

templates/roll-dialog-spec.html

@@ -4,17 +4,26 @@
     <h1 class="dialog-roll-title roll-dialog-header">{{title}}</h1>  
   </header>
 
-  <div class="floxrow">
-    
-    <div class="flexrow">
-      <span class="roll-dialog-label" >{{stat.label}} : {{stat.dice}} (+{{stat.mod}})</span>      
-    </div>
-    <div class="flexrow">
-      <span class="roll-dialog-label" >{{spec.name}} : {{spec.data.dice}}</span>      
-    </div>
+  <div class="grid grid-2col">
 
-    {{> systems/fvtt-pegasus-rpg/templates/partial-roll-common-dices.html}}
+    <div class="floxrow">
+      
+      <div class="flexrow">
+        <span class="roll-dialog-label" >{{stat.label}} : <span id="stat-dice">{{stat.dice}}</span> (+{{stat.mod}})</span>      
+      </div>
+
+      <div class="flexrow">
+        <span class="roll-dialog-label" >{{spec.name}} : {{spec.data.dice}}</span>      
+      </div>
+
+      {{> systems/fvtt-pegasus-rpg/templates/partial-roll-common-dices.html}}
+
+    </div>
+    
+    <div>
+      {{> systems/fvtt-pegasus-rpg/templates/partial-roll-select-effects.html}}
+    </div>
 
   </div>
-  
+
 </form>

templates/roll-dialog-stat.html

@@ -1,17 +1,24 @@
 <form class="skill-roll-dialog">
   <header class="roll-dialog-header">
     <img class="actor-icon" src="{{img}}" data-edit="img" title="{{name}}" />
-    <h1 class="dialog-roll-title roll-dialog-header">{{title}}</h1>  
+    <h1 class="dialog-roll-title roll-dialog-header">{{title}}</h1>
   </header>
 
-  <div class="floxrow">
-    
-    <div class="flexrow">
-      <span class="roll-dialog-label" >{{stat.label}} : {{stat.dice}} (+{{stat.mod}})</span>      
+  <div class="grid grid-2col">
+
+    <div class="floxrow">
+
+      <div class="flexrow">
+        <span class="roll-dialog-label">{{stat.label}} : <span id="stat-dice">{{stat.dice}}</span> (+{{stat.mod}})</span>
+      </div>
+
+      {{> systems/fvtt-pegasus-rpg/templates/partial-roll-common-dices.html}}
+
     </div>
 
-    {{> systems/fvtt-pegasus-rpg/templates/partial-roll-common-dices.html}}
-
+    <div>
+      {{> systems/fvtt-pegasus-rpg/templates/partial-roll-select-effects.html}}
+    </div>
   </div>
-  
-</form>
+
+</form>

templates/roll-dialog-weapon.html

@@ -1,17 +1,25 @@
 <form class="skill-roll-dialog">
   <header class="roll-dialog-header">
     <img class="actor-icon" src="{{img}}" data-edit="img" title="{{name}}" />
-    <h1 class="dialog-roll-title roll-dialog-header">{{title}}</h1>  
+    <h1 class="dialog-roll-title roll-dialog-header">{{title}}</h1>
   </header>
 
-  <div class="floxrow">
-    
-    <div class="flexrow">
-      <span class="roll-dialog-label" >{{stat.label}} : {{stat.dice}} (+{{stat.mod}})</span>      
+  <div class="grid grid-2col">
+
+    <div class="floxrow">
+
+      <div class="flexrow">
+        <span class="roll-dialog-label">{{stat.label}} : <span id="stat-dice">{{stat.dice}}</span> (+{{stat.mod}})</span>
+      </div>
+
+      {{> systems/fvtt-pegasus-rpg/templates/partial-roll-common-dices.html}}
+
+    </div>
+    <div>
+      {{> systems/fvtt-pegasus-rpg/templates/partial-roll-select-effects.html}}
     </div>
 
-    {{> systems/fvtt-pegasus-rpg/templates/partial-roll-common-dices.html}}
-
   </div>
-  
-</form>
+
+
+</form>