Data model change

modules/crucible-actor-sheet.js

@@ -16,7 +16,7 @@ export class CrucibleActorSheet extends ActorSheet {
       template: "systems/fvtt-crucible-rpg/templates/actor-sheet.html",
       width: 960,
       height: 720,
-      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "combat" }],
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "skills" }],
       dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
       editScore: true
     });
@@ -213,28 +213,14 @@ export class CrucibleActorSheet extends ActorSheet {
       this.actor.rollPool( 'phy', false, "dmg-res");
     });
             
-    html.find('.roll-stat').click((event) => {
+    html.find('.roll-ability').click((event) => {
-      const statId = $(event.currentTarget).data("stat-key");
+      const abilityKey = $(event.currentTarget).data("ability-key");
-      this.actor.rollStat(statId);
+      this.actor.rollAbility(abilityKey);
     });
-    html.find('.roll-mr').click((event) => {
+    html.find('.roll-skill').click((event) => {
-      this.actor.rollMR();
-    });
-    html.find('.roll-idr').click((event) => {
-      const diceValue = $(event.currentTarget).data("dice-value")
-      const li = $(event.currentTarget).parents(".item")
-      this.rollIDR( li.data("item-id"), diceValue)
-    })    
-    
-    html.find('.roll-spec').click((event) => {
       const li = $(event.currentTarget).parents(".item");
-      const specId = li.data("item-id");
+      const skillId = li.data("item-id")
-      this.actor.rollSpec(specId);
+      this.actor.rollSkill(skillId)
-    });
-    html.find('.power-roll').click((event) => {
-      const li = $(event.currentTarget).parents(".item");
-      const powerId = li.data("item-id");
-      this.actor.rollPower(powerId);
     });
     html.find('.weapon-roll').click((event) => {
       const li = $(event.currentTarget).parents(".item");

modules/crucible-actor.js

@@ -361,19 +361,17 @@ export class CrucibleActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  getCommonRollData(abKey = undefined) {
+  getCommonRollData(abilityKey = undefined) {
     let rollData = CrucibleUtility.getBasicRollData()
     rollData.alias = this.name
     rollData.actorImg = this.img
     rollData.actorId = this.id
     rollData.img = this.img
 
-    if (abilKey) {
+    if (abilityKey) {
-      rollData.getRelevantSkill(abKey)
+      rollData.ability = this.getAbility(abilityKey)
-      rollData.ability = this.getAbility(abKey)
+      //rollData.skillList = this.getRelevantSkill(abilityKey)
-      rollData.skillList = this.getRelevantSkill(abKey)
+      rollData.selectedKill = undefined
-      rollData.selectedKill = "0"
-      rollData.img = `systems/fvtt-crucible-rpg/images/icons/${rollData.ability.abbrev}.webp`
     }
 
     console.log("ROLLDATA", rollData)
@@ -381,6 +379,25 @@ export class CrucibleActor extends Actor {
     return rollData
   }
 
+  /* -------------------------------------------- */
+  rollAbility(abilityKey) {
+    let rollData = this.getCommonRollData(abilityKey)
+    rollData.mode = "ability"
+    CrucibleUtility.rollCrucible(rollData)
+  }
+
+  /* -------------------------------------------- */
+  rollSkill(skillId) {
+    let skill = this.data.items.get(skillId)
+    if (skill) {
+      skill = duplicate(skill)
+      let abilityKey = skill.data.ability
+      let rollData = this.getCommonRollData(abilityKey)
+      rollData.mode = "skill"
+      rollData.skill = skill
+      CrucibleUtility.rollCrucible(rollData)
+    }
+  }
 
   /* -------------------------------------------- */
   async startRoll(rollData) {

modules/crucible-utility.js

@@ -262,50 +262,24 @@ export class CrucibleUtility {
 
     let actor = game.actors.get(rollData.actorId)
 
-    let diceFormulaTab = []
+    let diceFormula = String(rollData.ability.value) + "d6cs>=5"
-    for (let dice of rollData.dicePool) {
+    if (rollData.skill) {
-      let level = dice.level
+      diceFormula += "+" + String(rollData.skill.data.level) + "d8cs>=5"
-      if (dice.name == "stat") {
-        level += rollData.statLevelBonus
-      }
-      diceFormulaTab.push(this.getFoundryDiceFromLevel(level))
     }
-    let diceFormula = '{' + diceFormulaTab.join(', ') + '}kh + ' + (rollData.stat?.mod || 0)
 
     // Performs roll
     let myRoll = rollData.roll
-    if (!myRoll || rollData.rerollHero || rollData.rerollMomentum) { // New rolls only of no rerolls
+    if (!myRoll) { // New rolls only of no rerolls
       myRoll = new Roll(diceFormula).roll({ async: false })
       await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
       rollData.roll = myRoll
     }
-    // Final score and keep data
+    rollData.nbSuccess = myRoll.total
-    rollData.finalScore = myRoll.total
-
-    if (rollData.damages) {
-      let dmgFormula = this.getFoundryDiceFromLevel(rollData.damages.value)
-      let dmgRoll = new Roll(dmgFormula).roll({ async: false })
-      await this.showDiceSoNice(dmgRoll, game.settings.get("core", "rollMode"))
-      rollData.dmgResult = dmgRoll.total
-    }
 
     this.createChatWithRollMode(rollData.alias, {
       content: await renderTemplate(`systems/fvtt-crucible-rpg/templates/chat-generic-result.html`, rollData)
-    });
+    })
-
+    console.log("Rolldata result", rollData)
-    // Init stuf
-    if (rollData.isInit) {
-      let combat = game.combats.get(rollData.combatId)
-      combat.updateEmbeddedDocuments("Combatant", [{ _id: rollData.combatantId, initiative: rollData.finalScore }])
-    }
-
-    // Stun specific -> Suffere a stun level when dmg-res
-    if (rollData.subKey && rollData.subKey == "dmg-res") {
-      actor.modifyStun(+1)
-    }
-
-    //this.removeUsedPerkEffects( rollData) // Unused for now
-    this.removeOneUseEffects(rollData) // Unused for now
 
     // And save the roll
     this.saveRollData(rollData)

styles/simple.css

@@ -605,7 +605,7 @@ ul, li {
 .devotion-label,
 .sort-label,
 .technique-label,
-.stat-label,
+.ability-label,
 .arme-label,
 .armure-label,
 .equipement-label,
@@ -720,7 +720,7 @@ ul, li {
   flex-shrink: 1;
   flex-grow: 0;
 }
-.npc-stat-label {
+.npc-ability-label {
   flex-grow: 2;
 }
 
@@ -739,7 +739,7 @@ ul, li {
   margin-left: 0.25rem;
 }
 
-.stats-table {
+.abilities-table {
   align-content: flex-start;
 }
 
@@ -926,7 +926,7 @@ ul, li {
   height: 64px;
 }
 
-.stat-icon {
+.ability-icon {
   border: 0;
   padding: 2px 2px 2px 2px;
   max-width:32px;
@@ -934,7 +934,7 @@ ul, li {
   width: auto;
   height: auto;
 }
-.small-stat-icon {
+.small-ability-icon {
   border: 0;
   padding: 2px 2px 2px 2px;
   max-width:16px;
@@ -1348,15 +1348,15 @@ Focus FOC: #ff0084
   max-width: 128px;
   justify-content: flex-start;
 }
-.stat-item {
+.ability-item {
   flex-grow: 1;  
   justify-content: flex-start;
   margin: 2px;
 }
-.stat-block {
+.ability-block {
   min-width: 160px;
 }
-.stat-margin {
+.ability-margin {
   margin-left: 4px;
   margin-top: 5px;  
 }
@@ -1364,14 +1364,11 @@ Focus FOC: #ff0084
   margin-left: 4px;
   margin-top: 3px;  
 }
-.stat-text-white {
+.item-ability-roll {
-  color: white;
-}
-.item-stat-roll {
   max-height: 42px;
   min-height: 36px;
 }
-.item-stat-roll select, .item-stat-roll input {
+.item-ability-roll select, .item-ability-roll input {
   margin-top: 4px;
   margin-right: 2px;
 }

templates/actor-sheet.html

@@ -9,7 +9,7 @@
         <div class="flexcol">
 
           <div class="flexrow">
-            <div class="stat-item">
+            <div class="ability-item">
               <ul>
                 {{#each data.abilities as |ability key|}}
                 {{#if (eq ability.col 1)}}
@@ -19,7 +19,7 @@
               </ul>
             </div>
 
-            <div class="stat-item">
+            <div class="ability-item">
               <ul>
                 {{#each data.abilities as |ability key|}}
                 {{#if (eq ability.col 2)}}
@@ -29,7 +29,7 @@
               </ul>
             </div>
 
-            <div class="stat-item status-block">
+            <div class="ability-item status-block">
               {{> systems/fvtt-crucible-rpg/templates/partial-actor-status.html}}
             </div>
 
@@ -52,7 +52,7 @@
   <section class="sheet-body">
 
     {{!-- Skills Tab --}}
-    <div class="tab items" data-group="primary" data-tab="skills">
+    <div class="tab skills" data-group="primary" data-tab="skills">
 
       <ul class="stat-list alternate-list">
         <li class="item flexrow list-item items-title-bg">
@@ -73,9 +73,9 @@
         <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-spec">{{skill.name}}</a></span>
+          <span class="item-name-label"><a class="roll-skill">{{skill.name}}</a></span>
           <span class="item-field-label-short">{{upper skill.data.ability}}</span>
-          <span class="item-field-label-short">{{skill.data.dice}}</span>
+          <span class="item-field-label-short">{{skill.data.level}}d8</span>
           <span class="item-field-label-long">&nbsp;-&nbsp;</span>
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
@@ -87,90 +87,9 @@
     </div>
 
     {{!-- Combat Tab --}}
-    <div class="tab fight" data-group="primary" data-tab="combat">
+    <div class="tab combat" data-group="primary" data-tab="combat">
       <div class="flexcol">
 
-        <div class="flexrow">
-          
-          <div class="stat-item">
-            <ul class="stat-list alternate-list">
-              <li class="item flexrow list-item color-class-melee"><a class="combat-button attack-melee flexrow">
-                  <span class="combat-icon flexrow">
-                    <img class="combat-icon" src="systems/fvtt-pegasus-rpg/images/icons/COM.webp">
-                  </span>
-                  <span class="generic-label combat-margin stat-text-white">Melee Attack</span>
-                </a>
-              </li>
-              <li class="item flexrow list-item color-class-meleedmg"><a class="combat-button damage-melee flexrow">
-                  <span class="combat-icon flexrow">
-                    <img class="combat-icon" src="systems/fvtt-pegasus-rpg/images/icons/STR.webp">
-                  </span>
-                  <span class="generic-label combat-margin stat-text-white">Melee/Thrown Damage</span>
-                </a>
-              </li>
-            </ul>
-          </div>
-
-          <div class="stat-item">
-            <ul class="stat-list alternate-list">
-              <li class="item flexrow list-item color-class-ranged"><a class="combat-button attack-ranged flexrow">
-                  <span class="combat-icon flexrow">
-                    <img class="combat-icon" src="systems/fvtt-pegasus-rpg/images/icons/PER.webp">
-                  </span>
-                  <span class="generic-label combat-margin stat-text-white">Ranged Attack</span>
-                </a>
-              </li>
-              <li class="item flexrow list-item color-class-range"><a class="combat-button damage-ranged flexrow">
-                  <span class="combat-icon flexrow">
-                    <img class="combat-icon" src="systems/fvtt-pegasus-rpg/images/icons/AGI.webp">
-                  </span>
-                  <span class="generic-label combat-margin stat-text-white">Ranged Damage</span>
-                </a>
-              </li>
-            </ul>
-          </div>
-
-          <div class="stat-item">
-            <ul class="stat-list alternate-list">
-              <li class="item flexrow list-item color-class-defence"><a class="combat-button defense-roll flexrow">
-                  <span class="combat-icon flexrow">
-                    <img class="combat-icon" src="systems/fvtt-pegasus-rpg/images/icons/DEF.webp">
-                  </span>
-                  <span class="generic-label combat-margin stat-text-white">Defence</span>
-                </a>
-              </li>
-              <li class="item flexrow list-item color-class-dmgres"><a class="combat-button damage-resistance flexrow">
-                  <span class="combat-icon flexrow">
-                    <img class="combat-icon" src="systems/fvtt-pegasus-rpg/images/icons/PHY.webp">
-                  </span>
-                  <span class="generic-label combat-margin stat-text-white">Damage Resistance</span>
-                </a>
-              </li>
-            </ul>
-          </div>
-
-
-          <div class="stat-item">
-            <span class="flexrow">
-              <h3>Stun</h3>
-              <span class="status-small-label no-grow">
-                <a class="stun-plus plus-minus-button">+</a>
-                <a class="stun-minus plus-minus-button">&nbsp;-</a>
-              </span>        
-            </span>
-            <ul class="stat-list alternate-list">
-              <li class="item stat flexrow list-item">
-                <span class="generic-label small-label">Current</span>
-                <input type="text" class="" name="data.combat.stunlevel" value="{{data.combat.stunlevel}}"
-                  data-dtype="Number" />
-                <span class="generic-label small-label">Threshold</span>
-                <input type="text" class="" name="data.combat.stunthreshold" value="{{data.combat.stunthreshold}}"
-                  data-dtype="Number" />
-              </li>
-            </ul>
-          </div>
-        </div>
-
         <div>
           <ul class="stat-list alternate-list">
             <li class="item flexrow list-item items-title-bg">
@@ -282,93 +201,24 @@
         </div>
 
         <ul class="stat-list alternate-list">
-          <li class="item flexrow list-item items-title-bg">
-            <span class="item-name-label-header-long2">
-              <h3><label class="items-title-text">Effects</label></h3>
-            </span>
-            <span class="item-field-label-short">
-              <label class="short-label">Level</label>
-            </span>
-            <span class="item-field-label-short">
-              <label class="short-label">Type</label>
-            </span>
-            <span class="item-field-label-short">
-              <label class="short-label">P/N</label>
-            </span>
-            <span class="item-field-label-long">
-              <label class="short-label">Stat</label>
-            </span>
-          </li>
-
-          {{#each effects as |effect key|}}
-          <li class="item stat flexrow list-item list-item-shadow" data-arme-id="{{effect.id}}"
-            data-item-id="{{effect._id}}">
-            <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-                src="{{effect.img}}" /></a>
-            <span class="item-name-label-long2">{{effect.name}}</span>
-            <span class="item-field-label-short">{{effect.data.effectlevel}}</span>
-            <span class="item-field-label-short">{{upperFirst effect.data.type}}</span>
-            <span class="item-field-label-short">{{upperFirst effect.data.genre}}</span>
-            <span class="item-field-label-short">{{upper effect.data.stataffected}}</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>
-          </li>
-          {{/each}}
         </ul>
+
       </div>
     </div>
 
 
-    {{!-- Powers Tab --}}
+    {{!-- Lore Tab --}}
-    <div class="tab fight" data-group="primary" data-tab="lore">
+    <div class="tab lore" data-group="primary" data-tab="lore">
 
       <div class="flexcol">
 
-        <ul>
-          <li class="item flexrow list-item" data-key="nrg">
-            <span class="stat-label flexrow" name="nrg">
-              <h4>{{data.nrg.label}}</h4>
-            </span>
-            <span class="small-label padd-right packed-left">Activated</span><input type="text"
-              class="padd-right update-field" data-field-name="data.nrg.activated" value="{{data.nrg.activated}}"
-              data-dtype="Number" />
-            <span class="small-label padd-right packed-left">&nbsp;Current</span><input type="text"
-              class="padd-right update-field" data-field-name="data.nrg.value" value="{{data.nrg.value}}"
-              data-dtype="Number" />
-            <span class="small-label padd-right packed-left">&nbsp;Mod</span><input type="text"
-              class="padd-right update-field" data-field-name="data.nrg.mod" value="{{data.nrg.mod}}"
-              data-dtype="Number" />
-            <span class="small-label padd-right packed-left">&nbsp;Max</span><input type="text"
-              class="padd-right update-field" data-field-name="data.nrg.max" value="{{data.nrg.max}}"
-              data-dtype="Number" />
-            <span class="small-label padd-right packed-left"> / {{data.nrg.absolutemax}}</span>
-          </li>
-        </ul>
-
         <ul class="stat-list alternate-list">
           <li class="item flexrow list-item items-title-bg">
             <span class="item-name-label-header">
-              <h3><label class="items-title-text">Powers</label></h3>
+              <h3><label class="items-title-text">Lore</label></h3>
             </span>
             <span class="item-field-label-medium">
-              <label class="short-label">Type</label>
+              <label class="short-label">Lore</label>
-            </span>
-            <span class="item-field-label-short">
-              <label class="short-label">Status</label>
-            </span>
-            <span class="item-field-label-medium">
-              <label class="short-label">Action</label>
-            </span>
-            <span class="item-field-label-medium">
-              <label class="short-label">DMG Roll</label>
-            </span>
-            <span class="item-field-label-medium">
-              <label class="short-label">NRG Cost</label>
-            </span>
-            <span class="item-field-label-medium">
-              <label class="short-label">NRG Spent</label>
             </span>
           </li>
 
@@ -383,78 +233,10 @@
               {{power.name}}
               {{/if}}
             </span>
-            <span class="item-field-label-medium">{{upperFirst power.data.type}}</span>
+            <span class="item-field-label-medium">{{upperFirst power.data.lore}}</span>
-
-            <span class="item-field-label-short"><label class="short-label">
-                {{#if power.data.activated}}
-                Activated
-                {{else}}
-                &nbsp;-&nbsp;
-                {{/if}}
-              </label>
-            </span>
-
-            <span class="item-field-label-medium">{{upperFirst power.data.action}}</span>
-
-            <span class="item-field-label-medium"><a class="power-dmg-roll">
-                {{#if power.data.dmgroll}}
-                {{upper power.data.dmgstatistic}}
-                {{else}}
-                &nbsp;-&nbsp;
-                {{/if}}
-              </a></span>
-
-            <span class="item-field-label-medium">{{power.data.cost}}</span>
-            <span class="item-field-label-medium">
-              <input type="text" class="padd-right input-numeric-short power-cost-spent"
-                value="{{power.data.costspent}}" data-dtype="Number" />
-            </span>
-
-            <div class="item-filler">&nbsp;</div>
-            <div class="item-controls item-controls-fixed">
-              <a class="item-control power-activate" title="Activated">{{#if power.data.activated}}<i
-                  class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-            </div>
           </li>
           {{/each}}
-        </ul>
 
-        <ul class="stat-list alternate-list">
-          <li class="item flexrow list-item items-title-bg">
-            <span class="item-name-label-header">
-              <h3><label class="items-title-text">Abilities</label></h3>
-            </span>
-            <span class="item-field-label-long">
-              <label class="short-label">Stat</label>
-            </span>
-            <span class="item-field-label-medium">
-              <label class="short-label">Stat Modifier</label>
-            </span>
-            <span class="item-field-label-medium">
-              <label class="short-label">Affected status</label>
-            </span>
-            <span class="item-field-label-medium">
-              <label class="short-label">Status Modifier</label>
-            </span>
-          </li>
-          {{#each abilities as |ability key|}}
-          <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{ability._id}}">
-            <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-                src="{{ability.img}}" /></a>
-            <span class="item-name-label">{{ability.name}}</span>
-
-            <span class="item-field-label-long">{{upper ability.data.affectedstat}}</span>
-            <span class="item-field-label-medium">{{ability.data.statmodifier}}</span>
-            <span class="item-field-label-medium">{{upperFirst ability.data.statusaffected}}</span>
-            <span class="item-field-label-medium">{{ability.data.statusmodifier}}</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>
-          </li>
-          {{/each}}
         </ul>
 
       </div>
@@ -467,7 +249,6 @@
         <h3>Encumbrance</h3>
         <span class="small-label">Current : {{encCurrent}}</span>
         <span class="small-label">Capacity : {{encCapacity}}</span>
-        <span class="small-label">Hindrance : {{encHindrance}}</span>
       </div>
 
       <ul class="item-list alternate-list">
@@ -530,27 +311,6 @@
           <span class="item-field-label-short">
             <label class="short-label">Damage</label>
           </span>
-          <span class="item-field-label-short">
-            <label class="short-label">DMG</label>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">DMGT</label>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">DMGTLVL</label>
-          </span>
-          <span class="item-field-label-long">
-            <label class="short-label">Ammo</label>
-          </span>
-          <span class="item-field-label-medium">
-            <label class="short-label">Act/Deact</label>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Weight</label>
-          </span>
-          <span class="item-field-label-medium">
-            <label class="short-label">IDR</label>
-          </span>
           <div class="item-controls item-controls-fixed">
             <a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a>
           </div>
@@ -560,41 +320,8 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{weapon.img}}" /></a>
           <span class="item-name-label">{{weapon.name}}</span>
-          <span class="item-field-label-short"><label>{{upper weapon.data.statistic}}</label></span>
+          <span class="item-field-label-short"><label>{{upper weapon.data.ability}}</label></span>
-          <span class="item-field-label-short"><label>{{upper weapon.data.damagestatistic}}</label></span>
+          <span class="item-field-label-short"><label>{{upper weapon.data.damage}}</label></span>
-          <span class="item-field-label-short"><label>{{weapon.data.damageDice}}</label></span>
-          <span class="item-field-label-short"><label>{{weapon.data.damagetype}}</label></span>
-          <span class="item-field-label-short"><label>{{weapon.data.damagetypelevel}}</label></span>
-
-          {{#if (gt weapon.data.ammomax 0)}}
-          <span class="item-field-label-long"><label>{{weapon.data.ammocurrent}}/{{weapon.data.ammomax}}
-              (<a class="ammo-minus plus-minus-button"> -</a>/<a class="ammo-plus plus-minus-button">+</a>)
-            </label></span>
-          {{else}}
-          <span class="item-field-label-long"><label>-</label>
-          </span>
-          {{/if}}
-
-          <span class="item-field-label-medium">
-            {{#if (count weapon.data.effects)}}
-            {{#if weapon.data.activated}}
-            <a class="equip-deactivate">Deactivate</a>
-            {{else}}
-            <a class="equip-activate">Activate</a>
-            {{/if}}
-            {{else}}
-            &nbsp;-&nbsp;
-            {{/if}}
-          </span>
-          <span class="item-field-label-short"><label>{{weapon.data.weight}}</label></span>
-
-          <span class="item-field-label-medium">
-            {{#if weapon.data.idrDice}}
-            <a class="roll-idr" data-dice-value="{{weapon.data.idrDice}}">{{weapon.data.idrDice}}</a>
-            {{else}}
-            &nbsp;-&nbsp;
-            {{/if}}
-          </span>
 
           <div class="item-controls item-controls-fixed">
             <a class="item-control item-equip" title="Worn">{{#if weapon.data.equipped}}<i
@@ -611,22 +338,10 @@
             <h3><label class="items-title-text">Armors</label></h3>
           </span>
           <span class="item-field-label-short">
-            <label class="short-label">Stat</label>
+            <label class="short-label">Type</label>
           </span>
           <span class="item-field-label-short">
-            <label class="short-label">DMG RES</label>
+            <label class="short-label">Absorption</label>
-          </span>
-          <span class="item-field-label-medium">
-            <label class="short-label">Loc</label>
-          </span>
-          <span class="item-field-label-medium">
-            <label class="short-label">Act/Deact</label>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Weight</label>
-          </span>
-          <span class="item-field-label-medium">
-            <label class="short-label">IDR</label>
           </span>
 
           <div class="item-filler">&nbsp;</div>
@@ -639,30 +354,8 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{armor.img}}" /></a>
           <span class="item-name-label">{{armor.name}}</span>
-          <span class="item-field-label-short">{{upper armor.data.statistic}}</span>
+          <span class="item-field-label-short">{{upper armor.data.armortype}}</span>
-          <span class="item-field-label-short">{{armor.data.resistanceDice}}</span>
+          <span class="item-field-label-short">{{armor.data.absorprionroll}}</span>
-          <span class="item-field-label-medium">{{armor.data.locationprotected}}</span>
-
-          <span class="item-field-label-medium">
-            {{#if (count armor.data.effects)}}
-            {{#if armor.data.activated}}
-            <a class="equip-deactivate">Deactivate</a>
-            {{else}}
-            <a class="equip-activate">Activate</a>
-            {{/if}}
-            {{else}}
-            &nbsp;-&nbsp;
-            {{/if}}
-          </span>
-
-          <span class="item-field-label-short">{{armor.data.weight}}</span>
-          <span class="item-field-label-medium">
-            {{#if armor.data.idrDice}}
-            <a class="roll-idr" data-dice-value="{{armor.data.idrDice}}">{{armor.data.idrDice}}</a>
-            {{else}}
-            &nbsp;-&nbsp;
-            {{/if}}
-          </span>
 
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
@@ -682,15 +375,6 @@
           <span class="item-field-label-short">
             <label class="short-label">Dice</label>
           </span>
-          <span class="item-field-label-medium">
-            <label class="short-label">Act/Deact</label>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Weight</label>
-          </span>
-          <span class="item-field-label-medium">
-            <label class="short-label">IDR</label>
-          </span>
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control item-add" data-type="shield" title="Create Item"><i class="fas fa-plus"></i></a>
@@ -703,26 +387,6 @@
           <span class="item-name-label">{{shield.name}}</span>
           <span class="item-field-label-short">{{shield.data.levelDice}}</span>
 
-          <span class="item-field-label-medium">
-            {{#if (count shield.data.effects)}}
-            {{#if shield.data.activated}}
-            <a class="equip-deactivate">Deactivate</a>
-            {{else}}
-            <a class="equip-activate">Activate</a>
-            {{/if}}
-            {{else}}
-            &nbsp;-&nbsp;
-            {{/if}}
-          </span>
-
-          <span class="item-field-label-short">{{shield.data.weight}}</span>
-          <span class="item-field-label-medium">
-            {{#if shield.data.idrDice}}
-            <a class="roll-idr" data-dice-value="{{shield.data.idrDice}}">{{shield.data.idrDice}}</a>
-            {{else}}
-            &nbsp;-&nbsp;
-            {{/if}}
-          </span>
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control item-equip" title="Worn">{{#if shield.data.equipped}}<i
@@ -741,15 +405,6 @@
           <span class="item-field-label-long">
             <label class="short-label">Quantity</label>
           </span>
-          <span class="item-field-label-medium">
-            <label class="short-label">Act/Deact</label>
-          </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Weight</label>
-          </span>
-          <span class="item-field-label-medium">
-            <label class="short-label">IDR</label>
-          </span>
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control item-add" data-type="equipment" title="Create Item"><i class="fas fa-plus"></i></a>

templates/chat-generic-result.html

@@ -18,37 +18,15 @@
 
     <div>
       <ul>
-        {{#if power}}  
+        {{#if ability}}  
-        <li>Power : {{power.name}}</li>
+        <li>Ability : {{ability.label}} - {{ability.value}}d6</li>
         {{/if}}
-        {{#if isDamage}}
+        {{#if skill}}
-        <li>Weapon Damage Dice : {{weaponDamageDice}}</li>
+        <li>Skill : {{skill.name}} - {{skill.data.level}}d8</li>
-        {{/if}}
-        {{#if isResistance}}
-        <li>Armor Resistance  Dice : {{armor.data.resistanceDice}}</li>
-        {{/if}}
-        {{#if stat}}  
-        <li>Statistic : {{stat.label}}</li>
-        {{/if}}
-        {{#if spec}}  
-        <li>Specialisation : {{spec.name}}</li>
         {{/if}}
+        <li><strong>Number of successes</strong> {{nbSuccess}} </li>
 
-        {{#if weaponName}}  
+        <!-- <button class="chat-card-button reroll-level-remaining" data-roll-id="{{rollId}}">Reroll</button> -->
-        <li>Weapon : {{weaponName}}</li>
-        {{/if}}
-
-        {{#if isResistance}}
-        <li><strong>Defense Result : {{finalScore}}</strong>
-        {{else}}
-          {{#if isDamage}}
-          <li><strong>Damages : {{finalScore}}</strong>
-          {{else}}
-          <li><strong>Final Result : {{finalScore}}</strong>
-          {{/if}}
-        {{/if}}
-        
-        <button class="chat-card-button reroll-level-remaining" data-roll-id="{{rollId}}">Reroll</button>
 
       </ul>  
     </div>

templates/partial-actor-status.html

@@ -1,71 +1,4 @@
 <ul class="status-block">
-  <li class="item flexrow">
-    <span class="stat-label status-small-label status-col-name"><label class="status-small-label"><strong>Status</strong></label></span>
-    <span class="status-header-label status-small-label no-grow"><label class="status-small-label">Cur</label></span>
-    <span class="status-header-label status-small-label no-grow"><label class="status-small-label">Mod</label></span>
-    <span class="status-header-label status-small-label no-grow"><label class="status-small-label">Max</label></span>
-  </li>
-  {{#each data.secondary as |stat2 key|}}
-    <li class="item flexrow " data-attr-key="{{key}}">
-      <span class="stat-label flexrow status-col-name" name="{{key}}">
-        <label class="status-small-label"><strong>{{stat2.label}}</strong><br>
-          {{#if (eq key "health")}}
-          (KOV -{{stat2.max}})
-          {{/if}}
-          {{#if (eq key "delirium")}}
-          (MV -{{stat2.max}})
-          {{/if}}
-        </label>
-      </span>
-      <input type="text" class="padd-right status-small-label no-grow" name="data.secondary.{{key}}.value" value="{{stat2.value}}" data-dtype="Number"/>
-      <input type="text" class="padd-right status-small-label no-grow" name="data.secondary.{{key}}.bonus" value="{{stat2.bonus}}" data-dtype="Number"/>
-      <input type="text" class="padd-right status-small-label no-grow" name="data.secondary.{{key}}.max" value="{{stat2.max}}" data-dtype="Number"/>
-    </li>
-  {{/each}}
-  <li class="item flexrow " data-key="nrg">
-    <span class="stat-label flexrow status-col-name" name="nrg">
-      <label class="status-small-label"><strong>{{data.nrg.label}}</strong></label>               
-    </span>
-    <input type="text" class="padd-right status-small-label no-grow" name="data.nrg.value" value="{{data.nrg.value}}" data-dtype="Number"/>
-    <input type="text" class="padd-right status-small-label no-grow" name="data.nrg.mod" value="{{data.nrg.mod}}" data-dtype="Number"/>
-    <input type="text" class="padd-right status-small-label no-grow" name="data.nrg.max" value="{{data.nrg.max}}" data-dtype="Number"/>
-    <span class="small-label status-small-label">&nbsp;/ {{data.nrg.absolutemax}}</span>
-  </li>
-  <li class="item flexrow " data-key="nrg">
-    <span class="stat-label flexrow status-col-name" name="activated-nrg">
-      <label class="status-small-label"><strong>Activated NRG</strong><br>
-    </span>
-    <span class="stat-label flexrow status-col-name" name="activated-nrg">
-      <input type="text" class="padd-right status-small-label no-grow" name="data.nrg.activated" value="{{data.nrg.activated}}" data-dtype="Number"/>
-    </span>
-    <!--<span class="stat-label flexrow status-col-name" name="momentum">
-      <label class="status-small-label flexrow"><strong>
-        <a class="stat-icon lock-unlock-sheet">{{#if editScore}}Lock{{else}}Unlock{{/if}}</a>
-      </strong></label>-->
-    </span>
-  </li>
-  <li class="item flexrow " data-key="momentum">
-    <span class="stat-label flexrow status-col-name" name="momentum">
-      <label class="status-small-label"><strong>Momentum</strong></label>               
-    </span>
-    <input type="text" class="padd-right status-small-label no-grow" name="data.momentum.value" value="{{data.momentum.value}}" data-dtype="Number"/>
-    <span class="padd-right status-small-label no-grow">
-      <a class="momentum-plus plus-minus-button">+</a>
-      <a class="momentum-minus plus-minus-button">&nbsp;-</a>
-    </span>
-    <input type="text" class="padd-right status-small-label no-grow" name="data.momentum.max" value="{{data.momentum.max}}" data-dtype="Number"/>
-    <span class="small-label status-small-label">&nbsp;</span>
-  </li>
-  <!--<li class="item flexrow list-item" data-key="lock-unlock">
-    <span class="stat-label flexrow status-col-name" name="momentum">
-      <a class="stat-icon lock-unlock-sheet"><img class="small-button-container" 
-      src="systems/fvtt-pegasus-rpg/images/icons/{{#if editStatSkill}}unlocked.svg{{else}}locked.svg{{/if}}" alt="lock/unlock"
-      ></a>
-    </span>-->
-  </li>
 
 </ul>
 
-<!--    <span class="small-label padd-right packed-left">Act</span>
-      <input type="text" class="padd-right" name="data.nrg.activated" value="{{data.nrg.activated}}" data-dtype="Number"/>
--->