Fix #84

modules/pegasus-actor.js

@@ -7,7 +7,7 @@ const coverBonusTable = { "nocover": 0, "lightcover": 2, "heavycover": 4, "entre
 const statThreatLevel = ["agi", "str", "phy", "com", "def", "per"]
 const __subkey2title = {
   "melee-dmg": "Melee Damage", "melee-atk": "Melee Attack", "ranged-atk": "Ranged Attack",
-  "ranged-dmg": "Ranged Damage", "defence": "Defence", "dmg-res": "Damare Resistance"
+  "ranged-dmg": "Ranged Damage", "defence": "Defence", "dmg-res": "Damage Resistance", "power-dmg": "Power Damage"
 }
 const __statBuild = [
   { modules: ["vehiclehull"], field: "hr", itemfield: "hr" },
@@ -121,6 +121,7 @@ export class PegasusActor extends Actor {
       this.system.encCapacity = this.getEncumbranceCapacity()
       this.buildContainerTree()
       this.updatePPP()
+      this.updateSize()
     }
     if (this.type == 'vehicle') {
       this.computeVehicleStats();
@@ -375,6 +376,18 @@ export class PegasusActor extends Actor {
       this.update({ 'system.ppp.spentPPP': ppp })
     }
   }
+  /* -------------------------------------------- */
+  updateSize() {
+    let sizeBonus = 0
+    for(let effect of this.items) {
+      if (effect.type == "effect" && effect.system.effectlevel > 0 &&  effect.system.affectsize) {
+        sizeBonus += effect.system.effectlevel
+      }
+    }
+    if (sizeBonus != this.system.biodata.sizebonus) {
+      this.update( {'system.biodata.sizebonus': sizeBonus})
+    }
+  }
 
   /* -------------------------------------------- */
   async activatePower(itemId) {
@@ -758,6 +771,9 @@ export class PegasusActor extends Actor {
     if (this.type == 'character') {
       this.rollMR(true, combatId, combatantId)
     }
+    if (this.type == 'vehicle') {
+      this.rollMR(true, combatId, combatantId)
+    }
     console.log("Init required !!!!")
     return -1;
   }
@@ -1330,9 +1346,60 @@ export class PegasusActor extends Actor {
       this.system.combat.hindrancedice = hindrance
       this.getTraumaState()
       this.cleanupPerksIfTrauma()
+      this.parseStatEffects()
+      this.parseStatusEffects()
     }
   }
 
+  /* -------------------------------------------- */
+  parseStatEffects() {
+    let effects = this.items.filter(effect => effect.type == "effect" && effect.system.genre == "positive" && effect.system.statdice )
+    for (let statKey in this.system.statistics) {
+      let stat = duplicate(this.system.statistics[statKey])
+      let bonus = 0
+      for (let effect of effects) {
+        if (effect.system.stataffected == statKey) {
+          bonus += Number(effect.system.effectlevel)
+        }
+      }
+      if ( bonus != stat.bonuseffect) {
+        stat.bonuseffect = bonus
+        this.update( { [`system.statistics.${statKey}`]: stat} )
+      }
+    }
+  }
+
+  /* -------------------------------------------- */
+  parseStatusEffects() {
+    let effects = this.items.filter(effect => effect.type == "effect" && effect.system.affectstatus && (Number(effect.system.effectlevel) > 0) )
+    for (let statusKey in this.system.secondary) {
+      let status = duplicate(this.system.secondary[statusKey])
+      let bonus = 0
+      for (let effect of effects) { 
+        if ( effect.system.affectedstatus && effect.system.affectedstatus == statusKey) {
+          bonus += Number(effect.system.effectlevel)
+        }
+      }
+      if ( bonus != status.bonus) {
+        status.bonus = bonus
+        this.update( { [`system.secondary.${statusKey}`]: status} )
+      }
+    }
+
+    let nrg = duplicate(this.system.nrg)
+    let bonus = 0
+    for (let effect of effects) { 
+      if ( effect.system.affectedstatus && effect.system.affectedstatus == "nrg") {
+        bonus += Number(effect.system.effectlevel)
+      }
+    }
+    if ( bonus != nrg.mod) {
+      nrg.mod = bonus
+      this.update( { [`system.nrg`]: nrg} )
+    }
+
+  }
+
   /* -------------------------------------------- */
   async modStat(key, inc = 1) {
     let stat = duplicate(this.system.statistics[key])
@@ -1568,7 +1635,7 @@ export class PegasusActor extends Actor {
     let effects = this.items.filter(item => item.type == 'effect')
     for (let effect of effects) {
       effect = duplicate(effect)
-      if (!effect.system.hindrance
+      if (!effect.system.hindrance && !effect.system.statdice 
         && (effect.system.stataffected != "notapplicable" || effect.system.specaffected.length > 0)
         && effect.system.stataffected != "special"
         && effect.system.stataffected != "powerroll"
@@ -1652,6 +1719,7 @@ export class PegasusActor extends Actor {
     rollData.diceList = PegasusUtility.getDiceList()
     rollData.noBonusDice = this.checkNoBonusDice()
     rollData.dicePool = []
+    rollData.subKey = subKey
 
     if (subKey == "melee-dmg" || subKey == "ranged-dmg" || subKey == "power-dmg") {
       rollData.isDamage = true
@@ -1660,7 +1728,10 @@ export class PegasusActor extends Actor {
     if (statKey) {
       rollData.statKey = statKey
       rollData.stat = this.getStat(statKey)
-      rollData.statDicesLevel = rollData.stat.value || rollData.stat.level
+      if ( rollData.stat.value != undefined ) {
+        rollData.stat.level = rollData.stat.value // Normalize
+      }
+      rollData.statDicesLevel = rollData.stat.level + rollData.stat.bonuseffect
       rollData.statMod = rollData.stat.mod
       if (vehicle) {
         rollData.vehicle = duplicate(vehicle)
@@ -1708,6 +1779,7 @@ export class PegasusActor extends Actor {
       }
     }
 
+    this.processSizeBonus(rollData)
     this.addEffects(rollData, isInit, isPower, subKey == "power-dmg")
     this.addArmorsShields(rollData, statKey, useShield)
     this.addWeapons(rollData, statKey, useShield)
@@ -1717,6 +1789,34 @@ export class PegasusActor extends Actor {
     return rollData
   }
 
+  /* -------------------------------------------- */
+  processSizeBonus( rollData) { 
+    if ( rollData.defenderTokenId) {
+      let diffSize = rollData.defenderSize - this.system.biodata.sizenum+this.system.biodata.sizebonus
+      //console.log("Diffsize", diffSize)
+      if( rollData.subKey == "melee-atk" || rollData.subKey == "ranged-atk")  {
+        if ( diffSize > 0) {
+          rollData.effectsList.push({ label: "Size Bonus", type: "effect", applied: false, isdynamic: true, value: diffSize })
+        }
+      } 
+      if( rollData.subKey == "dmg-res" )  {
+        if ( diffSize < 0) {
+          rollData.effectsList.push({ label: "Size Bonus", type: "effect", applied: false, isdynamic: true, value: Math.abs(diffSize) })
+        }
+      }
+      if( rollData.subKey == "defence" )  {
+        if ( diffSize > 0) {
+          rollData.effectsList.push({ label: "Size Bonus", type: "effect", applied: false, isdynamic: true, value: Math.abs(diffSize) })
+        }
+      }
+      if( rollData.subKey == "melee-dmg" || rollData.subKey == "ranged-dmg" || rollData.subKey == "power-dmg")  {
+        if ( diffSize < 0) {
+          rollData.effectsList.push({ label: "Size Bonus", type: "effect", applied: false, isdynamic: true, value: Math.abs(diffSize) })
+        }
+      } 
+    }
+  }
+
   /* -------------------------------------------- */
   getLevelRemainingList() {
     let options = []
@@ -1822,7 +1922,8 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   async rollMR(isInit = false, combatId = 0, combatantId = 0) {
-    let mr = duplicate(this.system.mr)
+    
+    let mr = duplicate((this.type =="vehicle") ? this.system.statistics.mr : this.system.mr)
     if (mr) {
       mr.dice = PegasusUtility.getDiceFromLevel(mr.value);
 
@@ -2196,12 +2297,12 @@ export class PegasusActor extends Actor {
     if (actor) {
       let stat = this.getStat("hr")
       let rollData = this.getCommonRollData("hr")
+      rollData.isVehicleStun = true
       rollData.mode = "stat"
-      rollData.title = `Stat ${stat.label}`;
+      rollData.title = `Stat ${stat.label}`
 
       this.addVehicleArmors(rollData)
       this.startRoll(rollData)
-      this.modifyVehicleStun(1)
     }
   }
 

modules/pegasus-roll-dialog.js

@@ -49,7 +49,7 @@ export class PegasusRollDialog extends Dialog {
       effect.applied = toggled
 
       let level, genre, idVal, key
-      if (effect.type == 'effect') {
+      if (effect.type == 'effect' && effect.effect) {
         let effectData = effect.effect
         level = effectData.system.effectlevel
         genre = effectData.system.genre

modules/pegasus-utility.js

@@ -8,9 +8,11 @@ import { PegasusRollDialog } from "./pegasus-roll-dialog.js";
 const __level2Dice = ["d0", "d4", "d6", "d8", "d10", "d12"]
 const __name2DiceValue = { "0": 0, "d0": 0, "d4": 4, "d6": 6, "d8": 8, "d10": 10, "d12": 12 }
 const __dice2Level = { "d0": 0, "d4": 1, "d6": 2, "d8": 3, "d10": 4, "d12": 5 }
-const __rangeKeyToText = { notapplicable: "N/A", touch: "Self Only", touchself: "Touch/Self", tz: "Threat Zone", close: "Close", medium: "Medium", 
+const __rangeKeyToText = {
+  notapplicable: "N/A", touch: "Self Only", touchself: "Touch/Self", tz: "Threat Zone", close: "Close", medium: "Medium",
   long: "Long", extreme: "Extreme", sight: "Lineof Sight", tz_close: "TZ/Close", close_medium: "Close/Medium", medium_long: "Medium/Long",
-    long_extreme: "Long/Extreme"}
+  long_extreme: "Long/Extreme"
+}
 
 /* -------------------------------------------- */
 export class PegasusUtility {
@@ -59,6 +61,16 @@ export class PegasusUtility {
     Handlebars.registerHelper('mul', function (a, b) {
       return parseInt(a) * parseInt(b);
     })
+    Handlebars.registerHelper('add', function (a, b) {
+      return parseInt(a) + parseInt(b);
+    });
+    Handlebars.registerHelper('sub', function (a, b) {
+      return parseInt(a) - parseInt(b);
+    })
+    Handlebars.registerHelper('getDice', function (a) {
+      return PegasusUtility.getDiceFromLevel(a)
+    })
+
   }
 
   /* -------------------------------------------- */
@@ -134,9 +146,12 @@ export class PegasusUtility {
   static updateEffectsBonusDice(rollData) {
     let newDicePool = rollData.dicePool.filter(dice => dice.name != "effect-bonus-dice")
     for (let effect of rollData.effectsList) {
-      if (effect && effect.applied && effect.type == "effect" && effect.effect.system.bonusdice) {
+      if (effect && effect.applied && effect.type == "effect" && effect.effect && effect.effect.system.bonusdice) {
         newDicePool = newDicePool.concat(this.buildDicePool("effect-bonus-dice", effect.effect.system.effectlevel, 0, effect.effect.name))
       }
+      if (effect && effect.applied && effect.type == "effect" && effect.value && effect.isdynamic) {
+        newDicePool = newDicePool.concat(this.buildDicePool("effect-bonus-dice", effect.value, 0, effect.name))
+      }
     }
     rollData.dicePool = newDicePool
   }
@@ -258,6 +273,7 @@ export class PegasusUtility {
 
   /* -------------------------------------------- */
   static async addItemDropToActor(actor, item) {
+    console.log("ITEM DROPPED", actor, item)
     actor.preprocessItem("none", item, false)
     let chatData = {
       user: game.user.id,
@@ -281,11 +297,16 @@ export class PegasusUtility {
     for (let token of tokensList) {
       if (x >= token.x && x <= (token.x + token.width)
         && y >= token.y && y <= (token.y + token.height)) {
-        let item = await this.searchItem(data)
+        const item = fromUuidSync(data.uuid)
+        if (item == undefined) {
+          item = this.actor.items.get(data.uuid)
+        }
+        let itemFull = await PegasusUtility.searchItem(item)
+        //console.log("DROPPED DATA", data.uuid)
         if (game.user.isGM || token.actor.isOwner) {
-          this.addItemDropToActor(token.actor, item)
+          this.addItemDropToActor(token.actor, itemFull)
         } else {
-          game.socket.emit("system.fvtt-pegasus-rpg", { name: "msg_gm_item_drop", data: { actorId: token.actor.id, itemId: item.id, isPack: item.pack } })
+          game.socket.emit("system.fvtt-pegasus-rpg", { name: "msg_gm_item_drop", data: { actorId: token.actor.id, itemId: itemFull.id, isPack: item.pack } })
         }
         return
       }
@@ -554,6 +575,21 @@ export class PegasusUtility {
     return undefined;
   }
 
+  /* -------------------------------------------- */
+  static computeDistance() {
+    let mytarget = game.user.targets.first()
+    console.log("target", mytarget, mytarget)
+    let mytoken = _token
+
+    if (mytarget) {
+      let dist = canvas.grid.measureDistances(
+        [{ ray: new Ray(mytoken.center, mytarget.center) }],
+        { gridSpaces: true });
+      console.log("DIST", dist)
+    } else {
+      console.log("NO TARGET")
+    }
+  }
   /* -------------------------------------------- */
   static getDefenseState(actorId) {
     return this.defenderStore[actorId];
@@ -795,10 +831,13 @@ export class PegasusUtility {
       combat.updateEmbeddedDocuments("Combatant", [{ _id: rollData.combatantId, initiative: rollData.finalScore }])
     }
 
-    // Stun specific -> Suffere a stun level when dmg-res
+    // Stun specific -> Suffer a stun level when dmg-res for character
     if (rollData.subKey && rollData.subKey == "dmg-res") {
       actor.modifyStun(+1)
     }
+    if (rollData.isVehicleStun) {
+      this.modifyVehicleStun(1)
+    }
 
     //this.removeUsedPerkEffects( rollData) // Unused for now
     this.removeOneUseEffects(rollData) // Unused for now
@@ -981,11 +1020,11 @@ export class PegasusUtility {
   static updateWithTarget(rollData) {
     let target = PegasusUtility.getTarget()
     if (target) {
-      console.log("TARGET ", target)
       let defenderActor = target.actor
       rollData.defenderTokenId = target.id
+      rollData.defenderSize = Number(defenderActor.system.biodata.sizenum) + Number(defenderActor.system.biodata.sizebonus)
       //rollData.attackerId = this.id
-      console.log("DEFENDER", defenderActor)
+      console.log("Target/DEFENDER", defenderActor)
       defenderActor.addHindrancesList(rollData.effectsList)
     }
   }

styles/simple.css

@@ -293,6 +293,12 @@ table {border: 1px solid #7a7971;}
   padding: 0 3px;
 }
 
+.long-editor{
+  border: 2;
+  height: 400px;
+  padding: 0 3px;
+}
+
 .medium-editor {
   border: 2;
   height: 240px;
@@ -613,6 +619,9 @@ ul, li {
   flex-grow: 2;
   margin-left: 4px;
 }
+.select-stat {
+  max-width: 5rem;
+}
 .status-header-label {
   margin-left: 2px;
 }

system.json

@@ -253,7 +253,7 @@
   ],
   "title": "Pegasus RPG",
   "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
-  "version": "10.0.21",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.0.21.zip",
+  "version": "10.0.28",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.0.28.zip",
   "background": "systems/fvtt-pegasus-rpg/images/ui/pegasus_welcome_page.webp"
 }

template.json

@@ -11,6 +11,7 @@
           "age": 0,
           "size": "",
           "sizenum": 0,
+          "sizebonus": 0,
           "weight": "",
           "hair": "",
           "sex": "",
@@ -49,6 +50,7 @@
             "abbrev": "AGI",
             "level": 1,
             "value": 1,
+            "bonuseffect": 0,
             "mod": 0,
             "col": 1
           },
@@ -57,6 +59,7 @@
             "abbrev": "MND",
             "level": 1,
             "value": 1,
+            "bonuseffect": 0,
             "col": 1,
             "mod": 0
           },
@@ -65,6 +68,7 @@
             "abbrev": "SOC",
             "level": 1,
             "value": 1,
+            "bonuseffect": 0,
             "col": 1,
             "mod": 0
           },
@@ -73,6 +77,7 @@
             "abbrev": "STR",
             "level": 1,
             "value": 1,
+            "bonuseffect": 0,
             "col": 1,
             "mod": 0
           },
@@ -81,6 +86,7 @@
             "abbrev": "PHY",
             "level": 1,
             "value": 1,
+            "bonuseffect": 0,
             "col": 1,
             "mod": 0
           },
@@ -89,6 +95,7 @@
             "abbrev": "COM",
             "level": 1,
             "value": 1,
+            "bonuseffect": 0,
             "col": 2,
             "mod": 0
           },
@@ -97,6 +104,7 @@
             "abbrev": "DEF",
             "level": 1,
             "value": 1,
+            "bonuseffect": 0,
             "col": 2,
             "mod": 0
           },
@@ -105,6 +113,7 @@
             "abbrev": "STL",
             "level": 1,
             "value": 1,
+            "bonuseffect": 0,
             "col": 2,
             "mod": 0
           },
@@ -113,6 +122,7 @@
             "abbrev": "PER",
             "level": 1,
             "value": 1,
+            "bonuseffect": 0,
             "col": 2,
             "mod": 0
           },
@@ -121,6 +131,7 @@
             "abbrev": "FOC",
             "level": 1,
             "value": 1,
+            "bonuseffect": 0,
             "col": 2,
             "mod": 0
           }
@@ -143,6 +154,7 @@
           "label": "MR (Initiative)",
           "type": "dice",
           "value": 0,
+          "bonuseffect": 0,
           "mod": 0
         },
         "momentum": {
@@ -208,6 +220,7 @@
             "label": "FC",
             "abbrev": "fc",
             "level": 0,
+            "bonuseffect": 0,
             "currentlevel": 0,
             "col": 1
           },
@@ -216,6 +229,7 @@
             "abbrev": "man",
             "dicevalue": "",
             "level": 0,
+            "bonuseffect": 0,
             "currentlevel": 0,
             "turningarc45": 0,
             "col": 1
@@ -224,6 +238,7 @@
             "label": "HR",
             "abbrev": "hr",
             "level": 0,
+            "bonuseffect": 0,
             "currentlevel": 0,
             "size": 0,
             "col": 2
@@ -232,6 +247,7 @@
             "label": "PC",
             "abbrev": "pc",
             "level": 0,
+            "bonuseffect": 0,
             "currentlevel": 0,
             "actnrg": 0,
             "curnrg": 0,
@@ -242,6 +258,7 @@
             "label": "MR",
             "abbrev": "mr",
             "level": 0,
+            "bonuseffect": 0,
             "currentlevel": 0,
             "col": 3
           },
@@ -249,6 +266,7 @@
             "label": "A/D",
             "abbrev": "ad",
             "level": 0,
+            "bonuseffect": 0,
             "currentlevel": 0,
             "accmode": "",
             "currentspeed": "",
@@ -385,6 +403,7 @@
       "recoveryrollspec": [],
       "effectstatlevel": false,
       "effectstat": "",
+      "affectsize": false,
       "oneuse": false,
       "ignorehealthpenalty": false,
       "isthispossible": "",
@@ -394,6 +413,9 @@
       "physicalimmunity": false,
       "nobonusdice": false,
       "noperksallowed": false,
+      "affectstatus": false,
+      "affectedstatus": "",
+      "locked": false,
       "description": ""
     },
     "race": {
@@ -425,7 +447,8 @@
       "specincrease": [],
       "perks": [],
       "perksrole": "",
-      "description": ""
+      "description": "",
+      "rolelevel": 1
     },
     "ability": {
       "affectedstat": "str",
@@ -548,6 +571,8 @@
       "activatedtext": "",
       "deactivatedtext": "",
       "powerlevelcost": "",
+      "powerdamagetype": "",
+      "powerdamagetypelevel": 0,
       "dmgroll": false,
       "dmgstatistic": "",
       "description": ""

templates/actor-sheet.html

@@ -302,18 +302,30 @@
           </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>
+          <li class="item stat flexrow list-item list-item-shadow" data-arme-id="{{effect.id}}" data-item-id="{{effect._id}}">
+            {{#if effect.system.locked}}
+              {{#if @root.isGM}}
+                <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{effect.img}}" /></a>
+              {{else}}
+                <img class="sheet-competence-img" src="{{effect.img}}" />
+              {{/if}}
+            {{else}}
+              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{effect.img}}" /></a>
+            {{/if}}
             <span class="item-name-label-long2">{{effect.name}}</span>
             <span class="item-field-label-short">{{effect.system.effectlevel}}</span>
             <span class="item-field-label-short">{{upperFirst effect.system.type}}</span>
-            <span class="item-field-label-short">{{upperFirst effect.datsystema.genre}}</span>
+            <span class="item-field-label-short">{{upperFirst effect.system.genre}}</span>
             <span class="item-field-label-short">{{upper effect.system.stataffected}}</span>
             <div class="item-filler">&nbsp;</div>
             <div class="item-controls item-controls-fixed">
+              {{#if effect.system.locked}}
+                {{#if  @root.isGM}}
                   <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                {{/if}}
+              {{else}}
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              {{/if}}
             </div>
           </li>
           {{/each}}
@@ -865,6 +877,8 @@
               <label class="generic-label">Size</label>
               <input type="text" class="" name="system.biodata.sizenum" value="{{data.biodata.sizenum}}"
                 data-dtype="Number" />
+              <input type="text" class="" value="{{add data.biodata.sizenum data.biodata.sizebonus}}"
+                data-dtype="Number" disabled />
             </li>
             <li class="flexrow item">
               <label class="generic-label">Origin</label>

templates/chat-generic-result.html

@@ -45,6 +45,10 @@
           {{/if}}
         {{/if}}
 
+        {{#if power}}  
+          <li>Power Damage type : {{power.system.powerdamagetype}} {{power.system.powerdamagetypelevel}}</li>
+        {{/if}}
+
         {{#if isResistance}}
         <li><strong>Defense Result : {{finalScore}}</strong>
         {{else}}

templates/chat-perk-activated.html

@@ -5,8 +5,8 @@
   {{/if}}
   <div>{{name}} has just activated the Perk: {{perk.name}}.</div>
   
-  {{#if (count perk.data.activatedtext)}}
-  <div>{{perk.data.activatedtext}}</div>
+  {{#if (count perk.system.activatedtext)}}
+  <div>{{perk.system.activatedtext}}</div>
   {{/if}}
 
 </div>

templates/chat-perk-ready.html

@@ -5,8 +5,8 @@
   {{/if}}
   <div>{{name}} has just deactivated the Perk: {{perk.name}}, make sure to manually delete all Effects provided by this Perk from Targets.</div>
   
-  {{#if (count perk.data.deactivatedtext)}}
-  <div>{{perk.data.deactivatedtext}}</div>
+  {{#if (count perk.system.deactivatedtext)}}
+  <div>{{perk.system.deactivatedtext}}</div>
   {{/if}}
 
 </div>

templates/item-effect-sheet.html

@@ -61,11 +61,13 @@
             <li class="flexrow"><label class="generic-label">No perks allowed ?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="system.noperksallowed" {{checked data.noperksallowed}}/></label>
             </li>
+            <li class="flexrow"><label class="generic-label">Locked (Only GM can change/edit) ?</label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.locked" {{checked data.locked}}/></label>
+            </li>
 
             <li class="flexrow"><label class="generic-label">Effect Level is a Stat?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="system.effectstatlevel" {{checked data.effectstatlevel}}/></label>
             </li>
-
             {{#if data.effectstatlevel}}
               <li class="flexrow"><label class="generic-label">Stat to use for Effect Level</label>
                 <select class="competence-base flexrow" type="text" name="system.effectstat" value="{{data.effectstat}}" data-dtype="String">
@@ -78,6 +80,26 @@
               <li class="flexrow"><label class="generic-label">Effect Level</label>
                 <input type="text" class="input-numeric-short padd-right" name="system.effectlevel" value="{{data.effectlevel}}" data-dtype="Number"/>
               </li>
+              <li class="flexrow"><label class="generic-label">Affect size ?</label>
+                <label class="attribute-value checkbox"><input type="checkbox" name="system.affectsize" {{checked data.affectsize}}/></label>
+              </li>              
+            {{/if}}
+
+            <li class="flexrow"><label class="generic-label">Affect Status?</label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.affectstatus" {{checked data.affectstatus}}/></label>
+            </li>
+            {{#if data.affectstatus}}
+              <li class="flexrow"><label class="generic-label">Affected status</label>
+                <select class="competence-base flexrow" type="text" name="system.affectedstatus" value="{{data.affectedstatus}}" data-dtype="String">
+                  {{#select data.affectedstatus}}
+                  <option value="health">Health</option>
+                  <option value="delirium">Delirium</option>
+                  <option value="socialhealth">Social Health</option>
+                  <option value="stealthhealth">Stealth Health</option>
+                  <option value="nrg">NRG</option>
+                  {{/select}}
+                </select> 
+              </li>
             {{/if}}
 
             <li class="flexrow"> <label class="generic-label">Affected Specialisations </label></li>

templates/item-power-sheet.html

@@ -13,25 +13,29 @@
 
     <div class="tab description" data-group="primary" data-tab="description">
       <div class="medium-editor item-text-long-line">
-        <label class="generic-label">Description</label>
-        {{editor description target="system.description" button=true owner=owner editable=editable}}
-      </div>
-      <div class="medium-editor item-text-long-line">
-        <label class="generic-label">Available Effects</label>
-        {{editor effects target="system.effects" button=true owner=owner editable=editable}}
-      </div>
-      <div class="medium-editor item-text-long-line">
-        <label class="generic-label">Purchased Effects</label>
+        <label class="generic-label"><strong>Power Ups</strong></label>
           {{editor purchasedeffects target="system.purchasedeffects" button=true owner=owner
           editable=editable}}
       </div>
+      <span><label>&nbsp;</label></span>
+      <hr>
+      <div class="long-editor item-text-long-line">
+        <label class="generic-label"><strong>Description</strong></label>
+        {{editor description target="system.description" button=true owner=owner editable=editable}}
+      </div>
+      <span><label>&nbsp;</label></span>
+      <hr>
+      <div class="medium-editor item-text-long-line">
+        <label class="generic-label"><strong>Available Upgrades</strong></label>
+        {{editor effects target="system.effects" button=true owner=owner editable=editable}}
+      </div>
     </div>
 
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
         <li class="flexrow"><label class="generic-label">Roll Needed ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="system.rollneeded" {{checked
-              data.rollneeded}} /></label>
+          <label class="attribute-value checkbox">
+          <input type="checkbox" name="system.rollneeded" {{checked data.rollneeded}} /></label>
         </li>
         {{#if data.rollneeded}}
         <li class="flexrow"><label class="generic-label">Related Statistic (only if roll is needed)</label>
@@ -112,6 +116,14 @@
               {{/select}}
             </select>
           </li>
+          <li class="flexrow"><label class="generic-label">Damage Type</label>
+            <input type="text" class="padd-right" name="system.powerdamagetype" value="{{data.powerdamagetype}}"
+              data-dtype="String" />
+          </li>        
+          <li class="flexrow"><label class="generic-label">Damage Type Level</label>
+            <input type="text" class="padd-right" name="system.powerdamagetypelevel" value="{{data.powerdamagetypelevel}}"
+              data-dtype="Number" />
+          </li>        
         {{/if}}
 
         <li class="flexrow"><label class="generic-label">When purchased display text</label>

templates/item-role-sheet.html

@@ -16,15 +16,22 @@
 
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
+        <li class="flexrow"><label class="generic-label">Role Level</label>
+          <input type="text" class="input-numeric-short padd-right" name="system.rolelevel" value="{{data.rolelevel}}"
+            data-dtype="Number" />
+        </li>
+
         <li class="flexrow"><label class="generic-label">Stat increase 1</label>
-              <select class="competence-base flexrow" type="text" name="system.statincrease1" value="{{data.statincrease1}}" data-dtype="String">
+          <select class="competence-base flexrow" type="text" name="system.statincrease1" value="{{data.statincrease1}}"
+            data-dtype="String">
             {{#select data.statincrease1}}
             {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=false mr=false}}
             {{/select}}
           </select>
         </li>
         <li class="flexrow"><label class="generic-label">Stat increase 2</label>
-              <select class="competence-base flexrow" type="text" name="system.statincrease2" value="{{data.statincrease2}}" data-dtype="String">
+          <select class="competence-base flexrow" type="text" name="system.statincrease2" value="{{data.statincrease2}}"
+            data-dtype="String">
             {{#select data.statincrease2}}
             {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=false mr=false}}
             {{/select}}
@@ -35,13 +42,16 @@
           <label class="generic-label">Role Ability</label>
         </li>
         <ul class="ul-level1">
-                <li class="flexrow"><div class="drop-specialability"><label>Drop Abilities here !</label></div>
+          <li class="flexrow">
+            <div class="drop-specialability"><label>Drop Abilities here !</label></div>
           </li>
           {{#each data.specialability as |ability idx|}}
           <li class="flexrow">
-                  <label name="system.specialability[{{idx}}].name"><a class="view-subitem" data-type="specialability" data-index="{{idx}}">{{ability.name}}</a></label>
+            <label name="system.specialability[{{idx}}].name"><a class="view-subitem" data-type="specialability"
+                data-index="{{idx}}">{{ability.name}}</a></label>
             <div class="item-controls padd-left">
-                    <a class="item-control delete-subitem padd-left" data-type="specialability" data-index="{{idx}}" title="Delete Ability"><i class="fas fa-trash"></i></a>
+              <a class="item-control delete-subitem padd-left" data-type="specialability" data-index="{{idx}}"
+                title="Delete Ability"><i class="fas fa-trash"></i></a>
             </div>
           </li>
           {{/each}}
@@ -53,14 +63,16 @@
           <li class="flexrow">
             {{#each data.statincreasechoice as |stat idx|}}
             <label name="statchoice{{idx}}">{{stat.name}}</label>
-                <label class="attribute-value checkbox"><input type="checkbox" class="stat-choice-flag" data-stat-idx="{{idx}}" {{checked stat.flag}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" class="stat-choice-flag"
+                data-stat-idx="{{idx}}" {{checked stat.flag}} /></label>
             {{/each}}
           </li>
         </ul>
         </li>
 
         <li class="flexrow"><label class="generic-label">Role category for available perks</label>
-              <select class="competence-base flexrow" type="text" name="system.perksrole" value="{{data.perksrole}}" data-dtype="String">
+          <select class="competence-base flexrow" type="text" name="system.perksrole" value="{{data.perksrole}}"
+            data-dtype="String">
             {{#select data.perksrole}}
             <option value="agitator">Agitator</option>
             <option value="defender">Defender</option>

templates/npc-sheet.html

@@ -47,7 +47,7 @@
                 <li class="item flexrow list-item" data-item-id="{{trait.id}}">
                   <img class="sheet-competence-img" src="{{trait.img}}"/>
                   <span class="competence-label">{{trait.name}}</span>
-                  <span class="competence-label">{{trait.data.data.type}}</span>
+                  <span class="competence-label">{{trait.system.type}}</span>
                   <div class="item-controls">
                     <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                     <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@@ -103,17 +103,17 @@
               <img class="sheet-competence-img" src="{{weapon.img}}"/>
               <span class="stat-label">{{weapon.name}}</span>
               <div class="item-controls">
-                <a class="item-control item-equip" title="Worn">{{#if weapon.data.data.equipped}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                <a class="item-control item-equip" title="Worn">{{#if weapon.system.equipped}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
                 <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
             <li class="item stat flexrow list-item stats-table" data-armure-id="{{weapon.id}}" data-item-id="{{weapon.id}}">
-              {{#each weapon.data.data.weaponstats as |weaponstat statkey|}}
+              {{#each weapon.system.weaponstats as |weaponstat statkey|}}
               <ul>
                 <li class="item stat flexrow list-item" data-item-id="{{weapon.id}}" data-stat-id={{statkey}}><span class="stat-label weapon-label"><a name="{{weapon.name}}">Attack with {{weaponstat.name}}</a></span>
                 </li>
-                <li>{{> "systems/fvtt-fragged-kingdom/templates/weapon-stats-section.html" stats=weaponstat.data.statstotal isfinal=false header=true}}
+                <li>{{> "systems/fvtt-fragged-kingdom/templates/weapon-stats-section.html" stats=weaponstat.system.statstotal isfinal=false header=true}}
                 </li>
               </ul>
               {{/each}}
@@ -151,7 +151,7 @@
               <span class="equipement-label">{{equip.name}}</span>
               <span class="equipement-label">{{equip.type}}</span>
               <div class="item-controls">
-                <a class="item-control item-equip" title="Worn">{{#if equip.data.data.equipped}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                <a class="item-control item-equip" title="Worn">{{#if equip.system.equipped}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
                 <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>

templates/partial-actor-equipment.html

@@ -24,7 +24,7 @@
     {{/if}}
   </span>
   <span class="item-field-label-short">
-    {{#if equip.data.iscontainer}}
+    {{#if equip.system.iscontainer}}
       {{equip.system.contentsEnc}}
     {{else}}
       {{mul equip.system.weight equip.system.quantity}}
@@ -32,7 +32,7 @@
   </span>
   <span class="item-field-label-medium">
     {{#if equip.system.idrDice}}
-    <a class="roll-idr" data-dice-value="{{equip.data.idrDice}}">{{equip.system.idrDice}}</a>
+    <a class="roll-idr" data-dice-value="{{equip.system.idrDice}}">{{equip.system.idrDice}}</a>
     {{else}}
     &nbsp;-&nbsp;
     {{/if}}

templates/partial-actor-stat-block.html

@@ -5,12 +5,15 @@
   <span class="stat-label stat-margin" name="{{key}}">
     <h4 class="stat-text-white stat-margin"><a class="roll-stat stat-margin" data-stat-key="{{key}}">{{stat.abbrev}}</a></h4>
   </span>
-  <select class="status-small-label color-class-common" type="text" name="system.statistics.{{key}}.value" value="{{stat.value}}"
+  <select class="status-small-label color-class-common select-stat" type="text" name="system.statistics.{{key}}.value" value="{{stat.value}}"
     data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
     {{#select stat.value}}
     {{{@root.optionsDiceList}}}
     {{/select}}
   </select>
+  <span class="stat-label stat-margin" name="{{key}}">
+    <h4 class="stat-text-white stat-margin">{{getDice (add stat.value stat.bonuseffect)}}</h4>
+  </span>
   <input type="text" class="input-numeric-short padd-right status-small-label color-class-common" name="system.statistics.{{key}}.mod" value="{{stat.mod}}"
     data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}} />
 </li>

templates/partial-actor-status.html

@@ -18,7 +18,7 @@
         </label>
       </span>
       <input type="text" class="padd-right status-small-label no-grow" name="system.secondary.{{key}}.value" value="{{stat2.value}}" data-dtype="Number"/>
-      <input type="text" class="padd-right status-small-label no-grow" name="system.secondary.{{key}}.bonus" value="{{stat2.bonus}}" data-dtype="Number"/>
+      <input type="text" class="padd-right status-small-label no-grow" name="system.secondary.{{key}}.bonus" value="{{stat2.bonus}}" data-dtype="Number" disabled/>
       <input type="text" class="padd-right status-small-label no-grow" name="system.secondary.{{key}}.max" value="{{stat2.max}}" data-dtype="Number"/>
     </li>
   {{/each}}
@@ -27,7 +27,7 @@
       <label class="status-small-label"><strong>{{data.nrg.label}}</strong></label>               
     </span>
     <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.value" value="{{data.nrg.value}}" data-dtype="Number"/>
-    <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.mod" value="{{data.nrg.mod}}" data-dtype="Number"/>
+    <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.mod" value="{{data.nrg.mod}}" data-dtype="Number" disabled/>
     <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.max" value="{{data.nrg.max}}" data-dtype="Number"/>
     <span class="small-label status-small-label">&nbsp;/ {{data.nrg.absolutemax}}</span>
   </li>

templates/partial-roll-select-effects.html

@@ -17,13 +17,13 @@
       </li>
       {{else}}
         
-        {{#if (eq effect.effect.data.stataffected "powerroll")}}
+        {{#if (eq effect.effect.system.stataffected "powerroll")}}
           <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">{{effect.label}} ({{effect.value}})</label>
         </li>
         {{/if}}
-        {{#if (eq effect.effect.data.stataffected "powerdmgroll")}}
+        {{#if (eq effect.effect.system.stataffected "powerdmgroll")}}
           <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">{{effect.label}} ({{effect.value}})</label>

templates/roll-dialog-generic.html

@@ -119,10 +119,9 @@
           <option value="d4">Slight cover d4</option>
           <option value="d8">Half cover d8</option>
           <option value="d12">Full cover d12</option>
-          <option value="d12">Full cover d12</option>
           <option value="none2">===== Cover Damage Resistance</option>
           <option value="d4">Soft cover d4</option>
-          <option value="d6">Dense cover d16</option>
+          <option value="d6">Dense cover d6</option>
           <option value="d8">Light cover d8</option>
           <option value="d10">Thick cover d10</option>
           <option value="d12">Solid cover d12</option>
@@ -131,7 +130,7 @@
           <option value="d6">Outnumbered 2 Extra Allies d6</option>
           <option value="d8">Outnumbered 3 Extra Allies d8</option>
           <option value="d10">Outnumbered 4 Extra Allies d10</option>
-          <option value="d12">Outnumbered 5 Extra Allies d1<option>
+          <option value="d12">Outnumbered 5 Extra Allies d12<option>
           <option value="none4">===== Called DMG Shot Bonus</option>
           <option value="d12">Eyes/head d12<option>
           <option value="none4">===== Impact DMG Bonus</option>