Actor sheet v1

templates/actors/actor-sheet.hbs

@@ -3,77 +3,10 @@
   {{!-- Sheet Header --}}
   <header class="sheet-header">
     <div class="header-fields">
-      <h1 class="charname margin-right"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
       <div class="flexrow">
         <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
         <div class="flexcol">
-
-          <div class="flexrow">
-            <div class="ability-item">
-              <ul>
-                {{#each data.abilities as |ability key|}}
-                {{#if (eq ability.col 1)}}
-                {{> systems/fvtt-crucible-rpg/templates/partial-actor-ability-block.html ability=ability key=key}}
-                {{/if}}
-                {{/each}}
-              </ul>
-
-              <li class="item flexrow list-item" data-attr-key="class">
-                <span class="ability-label " name="class">
-                  <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="chaplain">Chaplain</option>
-                  <option value="magus">Magus</option>
-                  <option value="martial">Martial</option>
-                  <option value="skalawag">Skalawag</option>
-                  <option value="warden">Warden</option>
-                  {{/select}}
-                </select>
-              </li>
-            
-            </div>
-
-            <div class="ability-item">
-              <ul>
-                {{#each data.abilities as |ability key|}}
-                {{#if (eq ability.col 2)}}
-                {{> systems/fvtt-crucible-rpg/templates/partial-actor-ability-block.html ability=ability key=key}}
-                {{/if}}
-                {{/each}}
-
-                {{#if equippedArmor}}
-                <li class="item flexrow list-item" data-attr-key="class">
-                  <img class="sheet-competence-img" src="{{equippedArmor.img}}" />
-                  <span class="ability-label " name="class">
-                    <h4 class="ability-text-white ability-margin"><a class="roll-armor-die ability-margin">{{equippedArmor.name}}</a></h4>
-                  </span>
-                </li>
-                {{/if}}
-                {{#if equippedShield}}
-                <li class="item flexrow list-item" data-attr-key="class">              
-                  <img class="sheet-competence-img" src="{{equippedShield.img}}" />
-                  <span class="ability-label " name="equippedShield">
-                    <h4 class="ability-text-white ability-margin"><a class="roll-shield-die ability-margin">{{equippedShield.name}}</a></h4>
-                  </span>
-                </li>
-                {{/if}}
-                <li class="item flexrow list-item" data-attr-key="class">              
-                  <img class="sheet-competence-img" src="systems/fvtt-crucible-rpg/images/icons/feats/Marksman (Ballistic).webp" />
-                  <span class="ability-label " name="rollTarget">
-                    <h4 class="ability-text-white ability-margin"><a class="roll-target-die ability-margin">Target Roll</a></h4>
-                  </span>
-                </li>
-
-              </ul>
-            </div>
-
-            <div class="ability-item status-block">
-              {{> systems/fvtt-crucible-rpg/templates/partial-actor-status.html}}
-            </div>
-
-          </div>
+          <h1 class="charname margin-right"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
         </div>
       </div>
     </div>
@@ -81,9 +14,9 @@
 
   {{!-- Sheet Tab Navigation --}}
   <nav class="sheet-tabs tabs" data-group="primary">
+    <a class="item" data-tab="main">Main</a>
     <a class="item" data-tab="skills">Skills</a>
     <a class="item" data-tab="combat">Combat</a>
-    <a class="item" data-tab="lore">Lore</a>
     <a class="item" data-tab="equipment">Equipment</a>
     <a class="item" data-tab="biodata">Biography</a>
   </nav>
@@ -91,39 +24,84 @@
   {{!-- Sheet Body --}}
   <section class="sheet-body">
 
+    {{!-- Skills Tab --}}
+    <div class="tab main" data-group="primary" data-tab="main">
+
+      <div class="flexrow">
+        <ul class="stat-list alternate-list item-list">
+          {{#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>
+            <input type="text" class="item-field-label-short padd-right" name="system.attributes.{{key}}.value" value="{{attr.value}}" data-dtype="Number"/>
+          {{/each}}
+          </li>
+        </ul>
+
+        <ul class="stat-list alternate-list item-list">
+          {{#each system.derivated as |deriv key|}}
+          <li class="item stat flexrow list-item list-item-shadow">
+            <label class="item-field-label-medium">{{deriv.label}}</label>
+            <label class="item-field-label-short">{{deriv.value}}</label>
+            <input type="text" class="item-field-label-short padd-right" name="system.derivated.{{key}}.bonus" value="{{deriv.bonus}}" data-dtype="Number"/>
+          {{/each}}
+          </li>
+        </ul>
+
+        <ul class="stat-list alternate-list item-list">
+          {{#each system.secondary as |second key|}}
+          <li class="item stat flexrow list-item list-item-shadow">
+            <label class="item-field-label-medium">{{second.label}}</label>
+            <input type="text" class="item-field-label-short padd-right" name="system.secondary.{{key}}.value" value="{{second.value}}" data-dtype="Number"/>
+            {{#if second.maxeditable}}
+              <label class="item-field-label-short">&nbsp;/&nbsp;</label>
+              <input type="text" class="item-field-label-short padd-right" name="system.secondary.{{key}}.max" value="{{second.max}}" data-dtype="Number"/>
+            {{else}}
+              <label class="item-field-label-short">&nbsp;/&nbsp;{{second.max}}</label>
+            {{/if}}
+            <input type="text" class="item-field-label-short padd-right" name="system.secondary.{{key}}.bonus" value="{{second.bonus}}" data-dtype="Number"/>
+          {{/each}}
+          </li>
+        </ul>
+
+      </div>
+    </div>
+    
     {{!-- Skills Tab --}}
     <div class="tab skills" data-group="primary" data-tab="skills">
 
-      <ul class="stat-list alternate-list item-list">
+      <ul class="alternate-list item-list">
         <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
+          <span class="item-name-label-header-long2">
             <h3><label class="items-title-text">Skills</label></h3>
           </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Ability</label>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Dice</label>
-          </span>
           <span class="item-field-label-long">
-            <label class="short-label">Background</label>
+            <label class="short-label">Derivated</label>
+          </span>
+          <span class="item-field-label-medium">
+            <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">
+            <label class="short-label">&nbsp;</label>
           </span>
         </li>
         {{#each skills as |skill key|}}
-        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{skill._id}}">
-          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{skill.img}}" /></a>
-          <span class="item-name-label"><a class="roll-skill">{{skill.name}}</a></span>
-          <span class="item-field-label-short">{{upper skill.system.ability}}</span>
-          <span class="item-field-label-short">{{skill.system.skilldice}}</span>
-          <span class="item-field-label-long">&nbsp;-&nbsp;</span>
-          <div class="item-filler">&nbsp;</div>
+        <li class="item flexrow list-item list-item-shadow" data-item-id="{{skill._id}}">
+          <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"><a class="roll-skill">{{skill.name}}</a></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-medium">{{skill.total}}</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>
+
     </div>
 
     {{!-- Combat Tab --}}

templates/apps/roll-dialog-generic.hbs

@@ -8,68 +8,6 @@
 
     <div class="flexcol">
       
-      {{#if sizeDice}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Size basic dices : </span>
-        <span class="roll-dialog-label">{{sizeDice.nb}}{{sizeDice.dice}}</span>
-      </div>
-
-      <div class="flexrow">
-        <span class="roll-dialog-label">Distance bonus dice(s) : </span>
-        <select class="status-small-label color-class-common" type="text" id="distanceBonusDice" value="{{distanceBonusDice}}" data-dtype="String" >
-          {{#select distanceBonusDice}}
-          <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>
-          {{/select}}
-        </select>
-      </div>
-      {{/if}}
-
-      {{#if hasCover}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Cover : </span>
-        <select class="status-small-label color-class-common" type="text" id="hasCover" value="{{hasCover}}" data-dtype="String" >
-          {{#select hasCover}}
-          <option value="none">None</option>
-          <option value="cover50">Cover at 50% (+1 dice)</option>
-          {{/select}}
-        </select>
-      </div>
-      {{/if}}
-
-      {{#if situational}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Situational : </span>
-        <select class="status-small-label color-class-common" type="text" id="situational" value="{{situational}}" data-dtype="String" >
-          {{#select situational}}
-          <option value="none">None</option>
-          <option value="dodge">Dodge (+1 dice)</option>
-          <option value="prone">Prone (+1 dice)</option>
-          <option value="moving">Moving (+1 dice)</option>
-          <option value="Engaged">Engaged (+1 dice)</option>
-          {{/select}}
-        </select>
-      </div>
-      {{/if}}
-
-
-      {{#if save}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">{{save.label}} : </span>
-        <span class="roll-dialog-label">{{save.value}}d6</span>
-      </div>
-      {{/if}}
-
-      {{#if ability}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Ability : </span>
-        <span class="roll-dialog-label">{{ability.value}}d6</span>
-      </div>
-      {{/if}}
-
       {{#if weapon}}
       <div class="flexrow">
         <span class="roll-dialog-label">Weapon : </span>
@@ -77,91 +15,29 @@
       </div>
       {{/if}}
 
-      {{#if shield}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Use shield ? : </span>
-        <span class="roll-dialog-label"><input type="checkbox" id="useshield" name="useshield" {{checked useshield}}/></span>
-      </div>
-      <div class="flexrow">
-        <span class="roll-dialog-label">{{shield.name}} : </span>
-        <span class="roll-dialog-label">{{shield.data.shielddie}}</span>
-      </div>
-      {{/if}}
-
       {{#if skill}}
       <div class="flexrow">
         <span class="roll-dialog-label">Skill : </span>
-        <span class="roll-dialog-label">{{skill.name}} - {{skill.data.skilldice}}</span>
-      </div>
-      <div class="flexrow">
-        <span class="roll-dialog-label">Feature die or SL+2? : </span>
-        <span class="roll-dialog-label">{{#if skill.data.isfeatdie}} Yes {{else}} No {{/if}}</span>
+        <span class="roll-dialog-label">{{skill.name}} ( {{skill.total}}% )</span>
       </div>
       {{/if}}
 
-      {{#if noAdvantage}} 
-        <div>
-          <span class="roll-dialog-label">No advantage due to condition : {{noAdvantage.name}}</span>
-        </div>
-      {{else}}
-        <div class="flexrow">
-          <span class="roll-dialog-label">Advantage : </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>
-            {{/select}}
-          </select>
-        </div>
-      {{/if}}
-      
-      <div class="flexrow">
-        <span class="roll-dialog-label">Disadvantage : </span>
-        <select class="status-small-label color-class-common" type="text" id="disadvantage" value="{{disadvantage}}" data-dtype="String" >
-          {{#select disadvantage}}
-          <option value="none">None</option>
-          <option value="disadvantage1">1 Disadvantage</option>
-          <option value="disadvantage2">2 Disadvantages</option>
+     <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="-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 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>
-
-      {{#if forceAdvantage}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">1 Advantage from condition : {{forceAdvantage.name}} 
-          {{#if advantageFromTarget}} (Provided by targetted actor) {{/if}}
-        </span>
-      </div>
-      {{/if}}
-      {{#if forceDisadvantage}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">1 Disadvantage from condition : {{forceDisadvantage.name}} </span>
-      </div>
-      {{/if}}
-      {{#if forceRollAdvantage}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Roll Advantage from condition : {{forceRollAdvantage.name}} </span>
-      </div>
-      {{/if}}
-      {{#if forceRollDisadvantage}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Roll Disadvantage from condition : {{forceRollDisadvantage.name}} </span>
-      </div>
-      {{/if}}
-
-
   </div>
 
 </form>

templates/chat/chat-generic-result.hbs

@@ -18,129 +18,22 @@
 
     <div>
       <ul>
-        {{#if (eq rollOrder 1)}}
-        <li><strong>Roll with {{rollType}} - Roll 1</strong></li>
-        {{/if}}
-        {{#if (eq rollOrder 2)}}
-        <li><strong>Roll with {{rollType}} - Roll 2</strong></li>
-        {{/if}}
-        {{#if (eq rollOrder 3)}}
-        <li><strong>Roll with {{rollType}} - Final result !</strong></li>
-        {{/if}}
-
-        {{#if save}}  
-        <li>Save : {{save.label}} - {{save.value}}d6 
-          ({{#each roll.terms.0.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
-        {{/if}}
-
-        {{#if sizeDice}}
-        <li>Size/Range/Cover/Situational dices 
-          ({{#each roll.terms.0.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
-        {{/if}}
-
-        {{#if ability}}  
-        <li>Ability : {{ability.label}} - {{ability.value}}d6 
-          ({{#each roll.terms.0.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
-        {{/if}}
 
         {{#if skill}}
-        <li>Skill : {{skill.name}} - {{skill.data.skilldice}} 
-          {{#if featSL}}
-           - with Feat SL +{{featSL}}
-          {{/if}}
-          &nbsp;({{#each roll.terms.2.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
+        <li>Skill : {{skill.name}} ({{skill.total}}%) 
         </li>
         {{/if}}
-
-        {{#if noAdvantage}} 
-          <li>No advantage due to condition : {{noAdvantage.name}}</li>
+        <li>Bonus/Malus: {{bonusMalus}}%
+        </li>
+        <li> Result: {{diceResult}} 
+        </li>
+        
+        {{#if isSuccess}}
+        <li><strong>Success !</strong></li> 
         {{else}}
-          {{#if (or (eq advantage "advantage1") forceAdvantage)}}
-          <li>1 Advantage Die !
-            &nbsp;({{#each roll.terms.8.results as |die idx|}}
-            {{die.result}}&nbsp;
-            {{/each}})
-          </li>
-          {{/if}}
-          {{#if (eq advantage "advantage2") }}
-          <li>2 Advantage Dice !
-            &nbsp;({{#each roll.terms.8.results as |die idx|}}
-            {{die.result}}&nbsp;
-            {{/each}})
-          </li>
-          {{/if}}
+        <li><strong>Failure ...</strong></li> 
         {{/if}}
-
-        {{#if (or (eq disadvantage "disadvantage1") forceDisadvantage)}}
-        <li>1 Disadvantage Die !
-          &nbsp;({{#each roll.terms.10.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
-        {{/if}}
-        {{#if (eq disadvantage "disadvantage2")}}
-        <li>2 Disadvantage Dice !
-          &nbsp;({{#each roll.terms.10.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </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 skillArmorPenalty}}
-        <li>Armor Penalty : {{skillArmorPenalty}} Disadvantage Dice 
-          &nbsp;({{#each roll.terms.12.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
-        {{/if}}
-
-        {{#if hasBonusDice}}
-        <li>Skill bonus dice : {{hasBonusDice}} 
-          &nbsp;({{#each roll.terms.6.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
-        {{/if}}
-        
-        {{#if complexSkillDisadvantage}}
-        <li>Roll with Disadvantage because of Complex Skill at SL 0 !</li>
-        {{/if}}
-        
-        {{#if hasFeatDie}}
-        <li>Feat Die :  d10 
-          &nbsp;({{#each roll.terms.4.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
-        {{/if}}
-        
-        {{#if useshield}}  
-        <li>Shield : {{shield.name}} - {{shield.data.shielddie}} 
-          ({{#each roll.terms.14.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
-        {{/if}}
-
-        <li><strong>Number of successes</strong> {{nbSuccess}} </li>
-
+      
         <!-- <button class="chat-card-button reroll-level-remaining" data-roll-id="{{rollId}}">Reroll</button> -->
 
       </ul>