Modify Skills again

templates/chat-generic-result.html

@@ -28,12 +28,26 @@
           {{/if}}
         </li>
         {{/if}}
-        {{#if (eq advantage "advantage")}}
-        <li>Advantage !</li>
+
+        {{#if (eq advantage "advantage1")}}
+        <li>1 Advantage Die !</li>
         {{/if}}
-        {{#if (eq advantage "disadvantage")}}
-        <li>Disdvantage !</li>
+        {{#if (eq advantage "advantage2")}}
+        <li>2 Advantage Dice !</li>
         {{/if}}
+        {{#if (eq advantage "disadvantage1")}}
+        <li>1 Disadvantage Die !</li>
+        {{/if}}
+        {{#if (eq advantage "disadvantage2")}}
+        <li>2 Disadvantage Dice !</li>
+        {{/if}}
+        {{#if (eq rollAdvantage "roll-advantage")}}
+        <li>Roll with Advantage !</li>
+        {{/if}}
+        {{#if (eq rollAdvantage "roll-disadvantage")}}
+        <li>Roll with Disadvantage !</li>
+        {{/if}}
+
         {{#if (ne featDieName "none")}}
         <li>Feature Die :  d10 ({{featDieName}})</li>
         {{/if}}

templates/item-skill-sheet.html

@@ -31,6 +31,15 @@
               <label class="attribute-value checkbox"><input type="checkbox" name="data.isproficient" {{checked data.isproficient}}/></label>
             </li>
 
+            <li class="flexrow"><label class="generic-label">Skill Type</label>
+              <select class="competence-base flexrow" type="text" name="data.skilltype" value="{{data.skilltype}}" data-dtype="string">
+                {{#select data.skilltype}}
+                <option value="simple">Simple</option>
+                <option value="complex">Complex</option>
+                {{/select}}
+              </select> 
+            </li>
+
             <li class="flexrow"><label class="generic-label">Skill Dice</label>
               <select class="competence-base flexrow" type="text" name="data.level" value="{{data.level}}" data-dtype="Number">
                 {{#select data.level}}
@@ -50,6 +59,10 @@
             <li class="flexrow"><label class="generic-label">Is Innate ?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="data.isinnate" {{checked data.isinnate}}/></label>
             </li>
+            
+            <li class="flexrow"><label class="generic-label">Is Lore ?</label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="data.islore" {{checked data.islore}}/></label>
+            </li>
 
             <li class="flexrow"><label class="generic-label">Is Weapon Skill ?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="data.isweaponskill" {{checked data.isweaponskill}}/></label>

templates/partial-roll-select.html

@@ -1,24 +1,4 @@
 
 <ul>
-  <li class="flex-group-left">
-    <label class="ability-value checkbox">
-      <input type="checkbox" id="none-clicked" class="none-clicked" {{#if (eq advantage "none")}} checked {{/if}} /></label>
-      <label class="generic-label">None</label>
-  </li>
-  <li class="flex-group-left">
-      <label class="ability-value checkbox">
-        <input type="checkbox" id="advantage-clicked" class="advantage-clicked" {{#if (eq advantage "advantage")}} checked {{/if}} /></label>
-        <label class="generic-label">Advantage ?</label>
-    </li>
-    <li class="flex-group-left">
-      <label class="ability-value checkbox">
-        <input type="checkbox" id="disadvantage-clicked" class="disadvantage-clicked" {{#if (eq advantage "disadvantage")}} checked {{/if}} /></label>
-        <label class="generic-label">Disadvantage ?</label>
-    </li>
-    <li class="flex-group-left">
-      <label class="ability-value checkbox">
-        <input type="checkbox" id="roll-with-advantage-clicked" class="roll-with-advantage-clicked" {{#if rollAdvantage}} checked {{/if}} /></label>
-        <label class="generic-label">Roll With Advantage ?</label>
-    </li>
 </ul>
 

templates/roll-dialog-generic.html

@@ -6,8 +6,6 @@
     <h1 class="dialog-roll-title roll-dialog-header">{{title}}</h1>
   </header>
 
-  <div class="grid grid-2col">
-
     <div class="flexcol">
 
       <div class="flexrow">
@@ -18,10 +16,34 @@
       {{#if skill}}
       <div class="flexrow">
         <span class="roll-dialog-label">Skill : </span>
-        <span class="roll-dialog-label">{{skill.name}} - {{skill.data.value}}d8</span>
+        <span class="roll-dialog-label">{{skill.name}} - {{skill.data.level}}d8</span>
       </div>
       {{/if}}
 
+      <div class="flexrow">
+        <span class="roll-dialog-label">Advantage/Disadvantage : </span>
+        <select class="status-small-label color-class-common" type="text" id="advantage" value="{{advantage}}" data-dtype="String" >
+          {{#select advantage}}
+          <option value="none">None</option>
+          <option value="advantage1">1 Advantage</option>
+          <option value="advantage2">2 Advantages</option>
+          <option value="disadvantage1">1 Disadvantage</option>
+          <option value="disadvantage2">2 Disadvantages</option>
+          {{/select}}
+        </select>
+      </div>
+
+      <div class="flexrow">
+        <span class="roll-dialog-label">Roll with Advantage/Disadvantage : </span>
+        <select class="status-small-label color-class-common" type="text" id="rollAdvantage" value="{{rollAdvantage}}" data-dtype="String" >
+          {{#select rollAdvantage}}
+          <option value="none">None</option>
+          <option value="roll-advantage">Roll with Advantage</option>
+          <option value="roll-disadvantage">Roll with Disadvantage</option>
+          {{/select}}
+        </select>
+      </div>
+
       <div class="flexrow">
         <span class="roll-dialog-label">Feature Die : </span>
         <select class="status-small-label color-class-common" type="text" id="featDieName" value="{{featDieName}}" data-dtype="String" >
@@ -46,12 +68,6 @@
         </select>
       </div>
 
-    </div>
-
-    <div>
-      {{> systems/fvtt-crucible-rpg/templates/partial-roll-select.html}}
-    </div>
-
   </div>
 
 </form>