Fix stun hindrances

.gitignore

@@ -0,0 +1,14 @@
+.vscode/settings.json
+.idea
+.history
+todo.md
+/.vscode
+/ignored/
+/node_modules/
+/jsconfig.json
+/package.json
+/package-lock.json
+/packs/*/
+/packs/*/CURRENT
+/packs/*/LOG
+/packs/*/LOCK

lang/en.json

@@ -1,25 +1,33 @@
 {
-  "ITEM": {
-    "TypeRace": "Race",
-    "TypeRole": "Role",
-    "TypeAbility": "Ability",
-    "TypeSpecialisation": "Specialisation",
-    "TypePerk": "Perk",
-    "TypePower": "Power",
-    "TypeArmor": "Armor",
-    "TypeShield": "Shield",
-    "TypeEquipment": "Equipment",
-    "TypeWeapon": "Weapon",
-    "TypeEffect": "Effect",
-    "TypeMoney": "Money",
-    "TypeVirtue": "Virtue",
-    "TypeVice": "Vice",
-    "TypeVehiclehull": "Vehicule Hull",
-    "TypePowercoremodule": "Power Core Module",
-    "TypeMobilitymodule": "Mobility Module",
-    "TypeCombatmodule": "Combat Module",
-    "TypeVehiclemodule": "Vehicle Module",
-    "TypeVehicleweaponmodule" : "Vehicle Weapon Module",
-    "TypePropulsionmodule": "Propulsion module"
+  "TYPES": {
+    "Actor": {
+      "character": "Character",
+      "npc": "NPC",
+      "vehicle": "Vehicle"
+    },
+    "Item": {
+      "race": "Race",
+      "role": "Role",
+      "ability": "Ability",
+      "specialisation": "Specialisation",
+      "perk": "Perk",
+      "power": "Power",
+      "armor": "Armor",
+      "shield": "Shield",
+      "equipment": "Equipment",
+      "weapon": "Weapon",
+      "effect": "Effect",
+      "money": "Money",
+      "virtue": "Virtue",
+      "vice": "Vice",
+      "vehiclehull": "Vehicule Hull",
+      "powercoremodule": "Power Core Module",
+      "mobilitymodule": "Mobility Module",
+      "combatmodule": "Combat Module",
+      "vehiclemodule": "Vehicle Module",
+      "vehicleweaponmodule" : "Vehicle Weapon Module",
+      "propulsionmodule": "Propulsion module"
+  
+    }
   }
 }

modules/pegasus-actor-sheet.js

@@ -38,9 +38,9 @@ export class PegasusActorSheet extends ActorSheet {
       cssClass: this.isEditable ? "editable" : "locked",
       data: actorData.system,
       traumaState: this.actor.getTraumaState(),
-      effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
       limited: this.object.limited,
       specs: this.actor.getSpecs( ),
+      config: game.system.pegasus.config,
       optionsDiceList: PegasusUtility.getOptionsDiceList(),
       optionsLevel: PegasusUtility.getOptionsLevel(),
       weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ),
@@ -53,7 +53,7 @@ export class PegasusActorSheet extends ActorSheet {
       powers: duplicate(this.actor.getPowers()),
       subActors: duplicate(this.actor.getSubActors()),
       race: duplicate(this.actor.getRace()),
-      role: duplicate(this.actor.getRole()),
+      role: this.actor.getRole(),
       effects: duplicate(this.actor.getEffects()),
       moneys: duplicate(this.actor.getMoneys()),
       virtues: duplicate(this.actor.getVirtues()),
@@ -62,6 +62,8 @@ export class PegasusActorSheet extends ActorSheet {
       levelRemainingList: this.actor.getLevelRemainingList(),
       maxLevelRemainingList: this.actor.getMaxLevelRemainingList(),
       disabledBonus: (this.actor.system.biodata.noautobonus) ? "" : "disabled",
+      mt: this.actor.getMT(),
+      kbv: this.actor.getKBV(),
       containersTree: this.actor.containersTree,
       encCurrent: this.actor.encCurrent,
       encHindrance: this.actor.encHindrance,
@@ -352,13 +354,13 @@ export class PegasusActorSheet extends ActorSheet {
   
   /* -------------------------------------------- */
   /** @override */
-  setPosition(options = {}) {
+  /*setPosition(options = {}) {
     const position = super.setPosition(options);
     const sheetBody = this.element.find(".sheet-body");
     const bodyHeight = position.height - 192;
     sheetBody.css("height", bodyHeight);
     return position;
-  }
+  }*/
 
   /* -------------------------------------------- */
   async _onDropItem(event, dragData) {

modules/pegasus-actor.js

@@ -92,9 +92,7 @@ export class PegasusActor extends Actor {
       return actor;
     }
 
-    if (data.type == 'character') {
-    }
-    if (data.type == 'npc') {
+    if (data.type == 'character' || this.type == 'npc') {
     }
 
 
@@ -112,11 +110,19 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   prepareDerivedData() {
+
+    if (this.system.secondary.stealthhealth) {
+      this.update({ "system.secondary": { "-=stealthhealth": null } })
+    }
+    if (this.system.secondary.socialhealth) {
+      this.update({ "system.secondary": { "-=socialhealth": null } })
+    }
+
     if (!this.traumaState) {
       this.traumaState = "none"
     }
 
-    if (this.type == 'character') {
+    if (this.type == 'character' || this.type == 'npc') {
       this.computeNRGHealth();
       this.system.encCapacity = this.getEncumbranceCapacity()
       this.buildContainerTree()
@@ -134,7 +140,43 @@ export class PegasusActor extends Actor {
 
     super._preUpdate(changed, options, user);
   }
+  /* -------------------------------------------- */
+  getMT() {
+    let modifier = 0
+    for (let effect of this.items) {
+      if (effect.type == "effect" && effect.system.affectstatus && effect.system.affectedstatus == "mt") {
+        if (effect.system.genre == "positive") {
+          modifier += effect.system.effectlevel
+        }
+        if (effect.system.genre == "negative") {
+          modifier -= effect.system.effectlevel
+        }
+      }
+      if (effect.type == "ability" && effect.system.statusaffected && effect.system.statusaffected == "mt") {
+        modifier += effect.system.statusmodifier
+      }
+    }
+    return PegasusUtility.getDiceValue(this.system.statistics.mnd.value) + this.system.statistics.mnd.mod + PegasusUtility.getDiceValue(this.system.statistics.mnd.bonuseffect) + modifier
+  }
 
+  /* -------------------------------------------- */
+  getKBV() {
+    let modifier = 0
+    for (let effect of this.items) {
+      if (effect.type == "effect" && effect.system.affectstatus && effect.system.affectedstatus == "kbv") {
+        if (effect.system.genre == "positive") {
+          modifier += effect.system.effectlevel
+        }
+        if (effect.system.genre == "negative") {
+          modifier -= effect.system.effectlevel
+        }
+      }
+      if (effect.type == "ability" && effect.system.statusaffected && effect.system.statusaffected == "kbv") {
+        modifier += effect.system.statusmodifier
+      }
+    }
+    return this.system.statistics.phy.value + this.system.statistics.phy.mod + this.system.statistics.phy.bonuseffect + modifier
+  }
   /* -------------------------------------------- */
   getEncumbranceCapacity() {
     return this.system.statistics.str.value * 25
@@ -239,14 +281,14 @@ export class PegasusActor extends Actor {
     return race[0] ?? [];
   }
   getRole() {
-    let role = this.items.filter(item => item.type == 'role')
-    return role[0] ?? [];
+    let role = this.items.find(item => item.type == 'role')
+    return role;
   }
   /* -------------------------------------------- */
   getRoleLevel() {
     let role = this.items.find(item => item.type == 'role')
     if (role) {
-      console.log("Role", role)
+      //console.log("Role", role)
       return role.system.rolelevel
     }
     return 0
@@ -280,6 +322,26 @@ export class PegasusActor extends Actor {
       ChatMessage.create({ content: `Tactician Bonus Dice has been removed to ${this.name}`, whisper: ChatMessage.getWhisperRecipients('GM') })
     }
   }
+  /* -------------------------------------------- */
+  getStatus(statusKey) {
+    if (statusKey == "nrg") {
+      return duplicate(this.system.nrg)
+    }
+    return duplicate(this.system.secondary[statusKey])
+  }
+
+  /* -------------------------------------------- */
+  async addStatusBonus(statusKey, value) {
+    let status = this.getStatus(statusKey)
+    let effect = duplicate(__bonusEffect)
+    effect.name = `${status.label} Creation Bonus`
+    effect.system.affectstatus = true
+    effect.system.affectedstatus = statusKey
+    effect.system.effectlevel = value
+    effect.system.bonusdice = false
+    effect.system.locked = true
+    await this.createEmbeddedDocuments('Item', [effect])
+  }
 
   /* -------------------------------------------- */
   isEnhancer() {
@@ -425,7 +487,7 @@ export class PegasusActor extends Actor {
   async activatePerk(perkId) {
     let item = this.items.find(item => item.id == perkId);
     if (item && item.system) {
-      let update = { _id: item.id, "data.active": !item.system.active };
+      let update = { _id: item.id, "system.active": !item.system.active };
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
   }
@@ -433,7 +495,7 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   async activateViceOrVirtue(itemId) {
     let item = this.items.find(item => item.id == itemId)
-    if (item && item.system) {
+    if (item?.system) {
       let nrg = duplicate(this.system.nrg)
       if (!item.system.activated) { // Current value
 
@@ -456,10 +518,40 @@ export class PegasusActor extends Actor {
           await this.deleteEmbeddedDocuments('Item', toRem)
         }
       }
-      let update = { _id: item.id, "data.activated": !item.system.activated }
+      let update = { _id: item.id, "system.activated": !item.system.activated }
       await this.updateEmbeddedDocuments('Item', [update]) // Updates one EmbeddedEntity
     }
   }
+  /* -------------------------------------------- */
+  setHandInformation(info) {
+    this.update({ 'system.biodata.preferredhand': info })
+  }
+
+  /* -------------------------------------------- */
+  increaseRoleAbility() {
+    let role = this.getRole()
+    let level = role.system.rolelevel + 1
+    this.updateEmbeddedDocuments('Item', [{ _id: role.id, 'system.rolelevel': level }])
+  }
+
+  /* -------------------------------------------- */
+  setBonusInformation(info) {
+    this.update({ 'system.biodata.bonusselection': info })
+  }
+  /* -------------------------------------------- */
+  addCDP(value) {
+    let cdp = this.system.biodata.cdp
+    cdp += value
+    this.update({ 'system.biodata.cdp': cdp })
+  }
+
+  /* -------------------------------------------- */
+  addPPP(value) {
+    let ppp = duplicate(this.system.ppp)
+    console.log("PPP", ppp)
+    ppp.availablePPP += Number(value)
+    this.update({ 'system.ppp': ppp })
+  }
 
   /* -------------------------------------------- */
   updatePPP() {
@@ -489,7 +581,7 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   async activatePower(itemId) {
     let item = this.items.find(item => item.id == itemId)
-    if (item && item.system) {
+    if (item?.system) {
 
       let nrg = duplicate(this.system.nrg)
       if (!item.system.activated) { // Current value
@@ -532,7 +624,7 @@ export class PegasusActor extends Actor {
           ChatMessage.create({ content: `Power ${item.name} deactivated : ${item.system.deactivatedtext}` })
         }
       }
-      let update = { _id: item.id, "data.activated": !item.system.activated }
+      let update = { _id: item.id, "system.activated": !item.system.activated }
       await this.updateEmbeddedDocuments('Item', [update]) // Updates one EmbeddedEntity
     }
   }
@@ -541,7 +633,7 @@ export class PegasusActor extends Actor {
   async equipItem(itemId) {
     let item = this.items.find(item => item.id == itemId);
     if (item && item.system) {
-      let update = { _id: item.id, "data.equipped": !item.system.equipped };
+      let update = { _id: item.id, "system.equipped": !item.system.equipped };
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
   }
@@ -582,7 +674,7 @@ export class PegasusActor extends Actor {
     for (let spec of specThreat) {
       tl += PegasusUtility.getDiceValue(spec.system.level)
     }
-    tl += this.system.nrg.absolutemax + this.system.secondary.health.max + this.system.secondary.delirium.max
+    tl += this.system.nrg.absolutemax /* NO MORE USED + this.system.secondary.health.max + this.system.secondary.delirium.max*/
     tl += this.getPerks().length * 5
 
     let weapons = this.getWeapons()
@@ -672,15 +764,30 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   modifyStun(incDec) {
-    let combat = duplicate(this.system.combat)
+    if (incDec < 0 && (this.system.secondary.confidence.status == "anxious" || this.system.secondary.confidence.status == "lostface")) {
+      ui.notifications.warn("Unable to recover STUN because of Confidence status : " + this.system.secondary.confidence.status)
+      return
+    }
+    let myself = this
+    let combat = duplicate(myself.system.combat)
     combat.stunlevel += incDec
+    let daze = this.effects.find(e => e.label == "Daze")
+
+    if (daze && combat.stunlevel == 0) {
+      this.deleteEmbeddedDocuments("ActiveEffect", [daze.id])
+    }
     if (combat.stunlevel >= 0) {
-      this.update({ 'system.combat': combat })
+      myself.update({ 'system.combat': combat })
       let chatData = {
         user: game.user.id,
         rollMode: game.settings.get("core", "rollMode"),
         whisper: [game.user.id].concat(ChatMessage.getWhisperRecipients('GM'))
       }
+      if (!daze) {
+        this.createEmbeddedDocuments("ActiveEffect", [
+          { label: 'Daze', icon: 'icons/svg/daze.svg', flags: { core: { statusId: 'daze' } } }
+        ])
+      }
       if (incDec > 0) {
         chatData.content = `<div>${this.name} suffered a Stun level.</div`
       } else {
@@ -694,15 +801,21 @@ export class PegasusActor extends Actor {
     if (stunAbove > 0) {
       ChatMessage.create({ content: `${this.name} Stun threshold has been exceeded.` })
     }
+    /* NO MORE AUTOMATION HERE
     if (incDec > 0 && stunAbove > 0) {
-      let delirium = duplicate(this.system.secondary.delirium)
+      let delirium = duplicate(myself.system.secondary.delirium)
       delirium.value -= incDec
-      this.update({ 'system.secondary.delirium': delirium })
-    }
+      myself.update({ 'system.secondary.delirium': delirium })
+    }*/
   }
 
   /* -------------------------------------------- */
   modifyMomentum(incDec) {
+    if (this.system.combat.stunlevel > 0) {
+      ui.notifications.warn("Unable to gain/use Momentum while stunned")
+      return
+    }
+
     let momentum = duplicate(this.system.momentum)
     momentum.value += incDec
     this.update({ 'system.momentum': momentum })
@@ -824,11 +937,11 @@ export class PegasusActor extends Actor {
       }
     }
 
-    if (item.type == 'race') {
+    if (item.type == "race") {
       this.applyRace(item)
-    } else if (item.type == 'role') {
+    } else if (item.type == "role") {
       this.applyRole(item)
-    } else if (item.type == 'ability') {
+    } else if (item.type == "ability") {
       this.applyAbility(item, [], true)
       if (!onDrop) {
         await this.createEmbeddedDocuments('Item', [item])
@@ -863,13 +976,13 @@ export class PegasusActor extends Actor {
   async equipGear(equipmentId) {
     let item = this.items.find(item => item.id == equipmentId);
     if (item && item.system) {
-      let update = { _id: item.id, "data.equipped": !item.system.equipped };
+      let update = { _id: item.id, "system.equipped": !item.system.equipped };
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
   }
   /* -------------------------------------------- */
   getInitiativeScore(combatId, combatantId) {
-    if (this.type == 'character') {
+    if (this.type == 'character' || this.type == 'npc') {
       this.rollMR(true, combatId, combatantId)
     }
     if (this.type == 'vehicle') {
@@ -920,7 +1033,7 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   getStat(statKey) {
     let stat
-    if (this.type == "character" && statKey == 'mr') {
+    if ((this.type == "character" || this.type == 'npc') && statKey == 'mr') {
       stat = duplicate(this.system.mr)
     } else {
       stat = duplicate(this.system.statistics[statKey])
@@ -1058,7 +1171,7 @@ export class PegasusActor extends Actor {
   async updatePerkUsed(itemId, index, checked) {
     let item = this.items.get(itemId)
     if (item && index) {
-      let key = "data.used" + index
+      let key = "system.used" + index
       await this.updateEmbeddedDocuments('Item', [{ _id: itemId, [`${key}`]: checked }])
       item = this.items.get(itemId) // Refresh
       if (item.system.nbuse == "next1action" && item.system.used1) {
@@ -1097,7 +1210,7 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   incDecNRG(value) {
-    if (this.type == "character") {
+    if (this.type == "character" || this.type == 'npc') {
       let nrg = duplicate(this.system.nrg)
       nrg.value += value
       if (nrg.value >= 0 && nrg.value <= nrg.max) {
@@ -1150,24 +1263,6 @@ export class PegasusActor extends Actor {
           nrg.max += item.system.features.nrgcost.value
           await this.update({ 'system.nrg': nrg })
         }
-        if (item.system.features.bonushealth.flag) {
-          let health = duplicate(this.system.secondary.health)
-          health.value -= Number(item.system.features.bonushealth.value) || 0
-          health.max -= Number(item.system.features.bonushealth.value) || 0
-          await this.update({ 'system.secondary.health': health })
-        }
-        if (item.system.features.bonusdelirium.flag) {
-          let delirium = duplicate(this.system.secondary.delirium)
-          delirium.value -= Number(item.system.features.bonusdelirium.value) || 0
-          delirium.max -= Number(item.system.features.bonusdelirium.value) || 0
-          await this.update({ 'system.secondary.delirium': delirium })
-        }
-        if (item.system.features.bonusnrg.flag) {
-          let nrg = duplicate(this.system.nrg)
-          nrg.value -= Number(item.system.features.bonusnrg.value) || 0
-          nrg.max -= Number(item.system.features.bonusnrg.value) || 0
-          await this.update({ 'system.nrg': nrg })
-        }
         this.disableWeaverPerk(item)
         PegasusUtility.createChatWithRollMode(item.name, {
           content: await renderTemplate(`systems/fvtt-pegasus-rpg/templates/chat-perk-ready.html`, { name: this.name, perk: duplicate(item) })
@@ -1200,6 +1295,7 @@ export class PegasusActor extends Actor {
             ui.notifications.warn("Not enough NRG to activate the Perk " + item.name)
           }
         }
+        /* NO MORE USED
         if (item.system.features.bonushealth.flag) {
           let health = duplicate(this.system.secondary.health)
           health.value += Number(item.system.features.bonushealth.value) || 0
@@ -1211,7 +1307,7 @@ export class PegasusActor extends Actor {
           delirium.value += Number(item.system.features.bonusdelirium.value) || 0
           delirium.max += Number(item.system.features.bonusdelirium.value) || 0
           await this.update({ 'system.secondary.delirium': delirium })
-        }
+        }*/
         if (item.system.features.bonusnrg.flag) {
           let nrg = duplicate(this.system.nrg)
           nrg.value += Number(item.system.features.bonusnrg.value) || 0
@@ -1231,7 +1327,8 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   async deleteAllItemsByType(itemType) {
-    let items = this.items.filter(item => item.type == itemType);
+    let items = this.items.filter(item => item.type == itemType).map(item => item.id)
+    console.log("Dele....", items)
     await this.deleteEmbeddedDocuments('Item', items);
   }
 
@@ -1246,17 +1343,14 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   getTraumaState() {
     this.traumaState = "none"
-    if (this.type == "character") {
-      let negDelirium = -Math.floor((this.system.secondary.delirium.max + 1) / 2)
-      if (this.type == "character") {
-        if (this.system.secondary.delirium.value <= 0 && this.system.secondary.delirium.value >= negDelirium) {
+    if (this.type == "character" || this.type == 'npc') {
+      if (this.system.secondary.delirium.status == "trauma") {
         this.traumaState = "trauma"
       }
-        if (this.system.secondary.delirium.value < negDelirium) {
+      if (this.system.secondary.delirium.status == "severetrauma" || this.system.secondary.delirium.status == "defeated") {
         this.traumaState = "severetrauma"
       }
     }
-    }
     return this.traumaState
   }
 
@@ -1351,35 +1445,6 @@ export class PegasusActor extends Actor {
 
     if (this.isOwner || game.user.isGM) {
       let updates = {}
-      let phyDiceValue = PegasusUtility.getDiceValue(this.system.statistics.phy.value) + this.system.secondary.health.bonus + this.system.statistics.phy.mod + PegasusUtility.getDiceValue(this.system.statistics.phy.bonuseffect);
-      if (phyDiceValue != this.system.secondary.health.max) {
-        updates['system.secondary.health.max'] = phyDiceValue
-      }
-      if (this.computeValue) {
-        updates['system.secondary.health.value'] = phyDiceValue
-      }
-      let mndDiceValue = PegasusUtility.getDiceValue(this.system.statistics.mnd.value) + this.system.secondary.delirium.bonus + this.system.statistics.mnd.mod + PegasusUtility.getDiceValue(this.system.statistics.mnd.bonuseffect);
-      if (mndDiceValue != this.system.secondary.delirium.max) {
-        updates['system.secondary.delirium.max'] = mndDiceValue
-      }
-      if (this.computeValue) {
-        updates['system.secondary.delirium.value'] = mndDiceValue
-      }
-      let stlDiceValue = PegasusUtility.getDiceValue(this.system.statistics.stl.value) + this.system.secondary.stealthhealth.bonus + this.system.statistics.stl.mod + PegasusUtility.getDiceValue(this.system.statistics.stl.bonuseffect);
-      if (stlDiceValue != this.system.secondary.stealthhealth.max) {
-        updates['system.secondary.stealthhealth.max'] = stlDiceValue
-      }
-      if (this.computeValue) {
-        updates['system.secondary.stealthhealth.value'] = stlDiceValue
-      }
-
-      let socDiceValue = PegasusUtility.getDiceValue(this.system.statistics.soc.value) + this.system.secondary.socialhealth.bonus + this.system.statistics.soc.mod + PegasusUtility.getDiceValue(this.system.statistics.soc.bonuseffect);
-      if (socDiceValue != this.system.secondary.socialhealth.max) {
-        updates['system.secondary.socialhealth.max'] = socDiceValue
-      }
-      if (this.computeValue) {
-        updates['system.secondary.socialhealth.value'] = socDiceValue
-      }
 
       let nrgValue = PegasusUtility.getDiceValue(this.system.statistics.foc.value) + this.system.nrg.mod + this.system.statistics.foc.mod + PegasusUtility.getDiceValue(this.system.statistics.foc.bonuseffect)
       if (nrgValue != this.system.nrg.absolutemax) {
@@ -1402,7 +1467,7 @@ export class PegasusActor extends Actor {
         updates['system.momentum.max'] = momentum
       }
 
-      let mrLevel = (this.system.statistics.agi.value + this.system.statistics.str.value) - this.system.statistics.phy.value
+      let mrLevel = (this.system.statistics.agi.value + this.system.statistics.agi.mod + this.system.statistics.str.value + this.system.statistics.str.mod) - (this.system.statistics.phy.value + this.system.statistics.phy.mod)
       mrLevel = (mrLevel < 1) ? 1 : mrLevel;
       if (mrLevel != this.system.mr.value) {
         updates['system.mr.value'] = mrLevel
@@ -1413,9 +1478,9 @@ export class PegasusActor extends Actor {
         updates['system.biodata.moralitythreshold'] = moralitythreshold
       }
       if (!this.isToken) {
-        if (this.warnMorality != this.system.biodata.morality && this.system.biodata.morality < 0) {
-          console.log("CHAR", this)
+        if (this.warnMorality != this.system.biodata.morality && this.system.biodata.morality <= 0) {
           ChatMessage.create({ content: "WARNING: Your character is dangerously close to becoming corrupted and defeated. Start on a path of redemption!" })
+          ChatMessage.create({ content: "This character can no longer spend CDP until their Morality has reached 1 or higher" })
         }
         if (this.warnMorality != this.system.biodata.morality) {
           this.warnMorality = this.system.biodata.morality
@@ -1423,11 +1488,11 @@ export class PegasusActor extends Actor {
       }
 
       let race = this.getRace()
-      if (race && race.name && (race.name != this.system.biodata.racename)) {
+      if (race?.name && (race.name != this.system.biodata.racename)) {
         updates['system.biodata.racename'] = race.name
       }
       let role = this.getRole()
-      if (role && role.name && (role.name != this.system.biodata.rolename)) {
+      if (role?.name && (role.name != this.system.biodata.rolename)) {
         updates['system.biodata.rolename'] = role.name
       }
       if (Object.entries(updates).length > 0) {
@@ -1435,27 +1500,138 @@ export class PegasusActor extends Actor {
       }
       this.computeThreatLevel()
     }
-
     if (this.isOwner || game.user.isGM) {
       // Update current hindrance level
-      let hindrance = this.system.combat.hindrancedice
+      let hindrance = 0; //this.system.combat.hindrancedice
       if (!this.checkIgnoreHealth()) {
-        if (this.system.secondary.health.value < 0) {
-          if (this.system.secondary.health.value < -Math.floor((this.system.secondary.health.max + 1) / 2)) { // Severe wounded
-            hindrance += 3
-          } else {
+        if (this.system.secondary.health.status == "wounded") {
           hindrance += 1
         }
+        if (this.system.secondary.health.status == "severlywounded" || this.system.secondary.health.status == "defeated") {
+          hindrance += 3
+        }
+        /* Manage confidence */
+        if (this.system.secondary.confidence.status == "shaken" || this.system.secondary.confidence.status == "anxious" ||
+          this.system.secondary.confidence.status == "lostface") {
+          if (!this.items.find(it => it.name.toLowerCase() == "fear" && it.type == "effect")) {
+            let effect = await PegasusUtility.getEffectFromCompendium("Fear")
+            this.createEmbeddedDocuments('Item', [effect])
+          }
+        } else { // Remove fear if healed
+          let fear = this.items.find(it => it.name.toLowerCase() == "fear" && it.type == "effect")
+          if (fear) {
+            this.deleteEmbeddedDocuments('Item', [fear.id])
+          }
+        }
+        /* Manage flag state for status */
+        this.defeatedDisplayed = this.defeatedDisplayed && this.system.secondary.health.status != "defeated"
+        this.deliriumDisplayed = this.deliriumDisplayed && this.system.secondary.delirium.status != "defeated"
+        this.concealmentDisplayed = this.concealmentDisplayed && this.system.secondary.concealment.status != "defeated"
+        this.confidenceDisplayed = this.confidenceDisplayed && this.system.secondary.confidence.status != "defeated"
+        /* Then display relevant messages */
+        if (!this.defeatedDisplayed && this.system.secondary.health.status == "defeated") {
+          ChatMessage.create({ content: `DEFEATED : ${this.name} must make a Death Save!` })
+          this.defeatedDisplayed = true
+        }
+        if (!this.deliriumDisplayed && this.system.secondary.delirium.status == "defeated") {
+          ChatMessage.create({ content: `DEFEATED : ${this.name} must make a Madness Check!` })
+          this.deliriumDisplayed = true
+        }
+        if (!this.concealmentDisplayed && this.system.secondary.concealment.status == "located") {
+          ChatMessage.create({ content: `${this.name} has been discovered! You can not longer hide and either must fight/surrender or make a run for it` })
+          this.concealmentDisplayed = true
+        }
+        if (!this.confidenceDisplayed && this.system.secondary.confidence.status == "lostface") {
+          ChatMessage.create({ content: `${this.name} have Lost Face! You can not longer make any Social Rolls, all social rolls against your character is considered an automatic success until healed!` })
+          this.confidenceDisplayed = true
         }
       }
       this.system.combat.hindrancedice = hindrance
       this.getTraumaState()
       this.cleanupPerksIfTrauma()
       this.parseStatEffects()
-      this.parseStatusEffects()
+      this.parseDamageValues()
+      await this.parseStatusEffects()
     }
   }
 
+  /* -------------------------------------------- */
+  getArmorResistanceBonus() {
+    let bonus = 0
+    for (let a of armors) {
+      bonus += Number(a.system.resistance)
+    }
+    return bonus
+  }
+  /* -------------------------------------------- */
+  parseDamageValues() {
+    if (this.system.biodata.noautobonus) { // If we are in "no-bonus mode
+      return
+    }
+    let updates = []
+    let role = this.getRole() // Get the role for optionnal bonuses
+    let roleBonus = 0
+
+    /* Get MDL bonus */
+    let meleeBonus = 0
+    let effects = this.items.filter(effect => effect.type == "effect" && effect.system.affectstatus && effect.system.affectstatus == "mdl" && (Number(effect.system.effectlevel) > 0))
+    for (let e of effects) {
+      meleeBonus += Number(e.system.effectlevel)
+    }
+    this.baseMDL = this.system.biodata.sizenum + this.system.biodata.sizebonus + this.system.statistics.str.value +
+      this.system.statistics.str.mod + this.system.statistics.str.bonuseffect + meleeBonus
+    let weaponsMelee = this.items.filter(it => it.type == "weapon" && it.system.damagestatistic.toLowerCase() == "str")
+    for (let w of weaponsMelee) {
+      let damage = this.baseMDL + Number(w.system.damage)
+      if (damage != w.system.mdl) {
+        updates.push({ _id: w.id, "system.mdl": damage })
+      }
+    }
+
+    let rangedBonus = 0
+    effects = this.items.filter(effect => effect.type == "effect" && effect.system.affectstatus && effect.system.affectstatus == "rdl" && (Number(effect.system.effectlevel) > 0))
+    for (let e of effects) {
+      rangedBonus += Number(e.system.effectlevel)
+    }
+    if (role?.name?.toLowerCase() == "ranged") { // Add ranged bonus to ADRL
+      roleBonus = this.getRoleLevel()
+    }
+    this.baseRDL = roleBonus + rangedBonus
+    let weaponsRanged = this.items.filter(it => it.type == "weapon" && it.system.damagestatistic.toLowerCase() == "pre")
+    for (let w of weaponsRanged) {
+      let damage = this.baseRDL + Number(w.system.damage)
+      if (damage != w.system.rdl) {
+        updates.push({ _id: w.id, "system.rdl": damage })
+      }
+    }
+
+    let armorBonus = 0
+    effects = this.items.filter(effect => effect.type == "effect" && effect.system.affectstatus && effect.system.affectstatus == " adrl" && (Number(effect.system.effectlevel) > 0))
+    for (let e of effects) {
+      armorBonus += Number(e.system.effectlevel)
+    }
+    roleBonus = 0
+    if (role?.name?.toLowerCase() == "defender") { // Add defender bonus to ADRL
+      roleBonus = this.getRoleLevel()
+    }
+    this.baseADRL = roleBonus + armorBonus + this.system.statistics.phy.value + this.system.statistics.phy.mod +
+      this.system.statistics.phy.bonuseffect + this.system.biodata.sizenum + this.system.biodata.sizebonus
+    let armors = this.items.filter(it => it.type == "armor")
+    for (let a of armors) {
+      let adrl = this.baseADRL + a.system.resistance
+      if (adrl != a.system.adrl) {
+        updates.push({ _id: a.id, "system.adrl": adrl })
+      }
+    }
+
+    if (updates.length > 0) {
+      this.updateEmbeddedDocuments('Item', updates)
+    }
+  }
+  /* -------------------------------------------- */
+  getBaseADRL() {
+
+  }
   /* -------------------------------------------- */
   parseStatEffects() {
     if (this.system.biodata.noautobonus) { // If we are in "no-bonus mode
@@ -1488,11 +1664,13 @@ export class PegasusActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  parseStatusEffects() {
+  async parseStatusEffects() {
     if (this.system.biodata.noautobonus) { // If we are in "no-bonus mode
       return
     }
     let effects = this.items.filter(effect => effect.type == "effect" && effect.system.affectstatus && (Number(effect.system.effectlevel) > 0))
+    let abilities = this.items.filter(ability => ability.type == "ability" && ability.system.statusaffected != "notapplicable")
+
     for (let statusKey in this.system.secondary) {
       let status = duplicate(this.system.secondary[statusKey])
       let bonus = 0
@@ -1501,9 +1679,14 @@ export class PegasusActor extends Actor {
           bonus += Number(effect.system.effectlevel)
         }
       }
+      for (let ability of abilities) {
+        if (ability.system.statusaffected && ability.system.statusaffected == statusKey) {
+          bonus += Number(effect.system.statusmodifier)
+        }
+      }
       if (bonus != status.bonus) {
         status.bonus = bonus
-        this.update({ [`system.secondary.${statusKey}`]: status })
+        await this.update({ [`system.secondary.${statusKey}`]: status })
       }
     }
 
@@ -1514,18 +1697,22 @@ export class PegasusActor extends Actor {
         bonus += Number(effect.system.effectlevel)
       }
     }
+    for (let ability of abilities) {
+      if (ability.system.statusaffected && ability.system.statusaffected == "nrg") {
+        bonus += Number(ability.system.statusmodifier)
+      }
+    }
     if (bonus != nrg.mod) {
       nrg.mod = bonus
-      this.update({ [`system.nrg`]: nrg })
+      await this.update({ [`system.nrg`]: nrg })
     }
-
   }
 
   /* -------------------------------------------- */
   async modStat(key, inc = 1) {
     let stat = duplicate(this.system.statistics[key])
     stat.mod += parseInt(inc)
-    await this.update({ [`data.statistics.${key}`]: stat })
+    await this.update({ [`system.statistics.${key}`]: stat })
   }
 
   /* -------------------------------------------- */
@@ -1533,7 +1720,20 @@ export class PegasusActor extends Actor {
     key = key.toLowerCase()
     let stat = duplicate(this.system.statistics[key])
     stat.value += parseInt(inc)
-    await this.update({ [`data.statistics.${key}`]: stat })
+    await this.update({ [`system.statistics.${key}`]: stat })
+  }
+
+  /* -------------------------------------------- */
+  async modStatus(key, inc = 1) {
+    if (key == "nrg") {
+      let nrg = duplicate(this.system.nrg)
+      nrg.mod += parseInt(inc)
+      await this.update({ [`system.nrg`]: nrg })
+    } else {
+      let status = duplicate(this.system.secondary[key])
+      status.bonus += parseInt(inc)
+      await this.update({ [`system.secondary.${key}`]: status })
+    }
   }
 
   /* -------------------------------------------- */
@@ -1543,13 +1743,27 @@ export class PegasusActor extends Actor {
     if (specExist) {
       specExist = duplicate(specExist)
       specExist.system.level += inc;
-      let update = { _id: specExist._id, "data.level": specExist.system.level };
+      let update = { _id: specExist._id, "system.level": specExist.system.level };
       await this.updateEmbeddedDocuments('Item', [update]);
     } else {
-      spec.system.level += inc;
+      spec.system.level = inc;
       await this.createEmbeddedDocuments('Item', [spec]);
     }
   }
+  /* -------------------------------------------- */
+  async addIncPerk(perk, inc = 1) {
+    console.log("Using perk : ", perk, inc)
+    let perkExist = this.items.find(item => item.type == 'perk' && item.name.toLowerCase() == perk.name.toLowerCase())
+    if (perkExist) {
+      perkExist = duplicate(perkExist)
+      perkExist.system.level += inc;
+      let update = { _id: perkExist._id, "system.level": perkExist.system.level };
+      await this.updateEmbeddedDocuments('Item', [update]);
+    } else {
+      perk.system.level = inc;
+      await this.createEmbeddedDocuments('Item', [perk]);
+    }
+  }
 
   /* -------------------------------------------- */
   async incDecQuantity(objetId, incDec = 0) {
@@ -1557,7 +1771,7 @@ export class PegasusActor extends Actor {
     if (objetQ) {
       let newQ = objetQ.system.quantity + incDec
       if (newQ >= 0) {
-        const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.quantity': newQ }]) // pdates one EmbeddedEntity
+        await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.quantity': newQ }]) // pdates one EmbeddedEntity
       }
     }
   }
@@ -1567,19 +1781,28 @@ export class PegasusActor extends Actor {
     if (objetQ) {
       let newQ = objetQ.system.ammocurrent + incDec;
       if (newQ >= 0 && newQ <= objetQ.system.ammomax) {
-        const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.ammocurrent': newQ }]); // pdates one EmbeddedEntity
+        await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.ammocurrent': newQ }]); // pdates one EmbeddedEntity
       }
     }
   }
 
   /* -------------------------------------------- */
-  async applyAbility(ability, updates = [], directUpdate = false) {
+  async applyAbility(ability, updates = {}, directUpdate = false) {
     // manage stat bonus
+    if (!ability.system) {
+      ability.system = ability.data
+    }
     if (ability.system.affectedstat != "notapplicable") {
+      if (ability.system.affectedstat == "mr") {
+        let stat = duplicate(this.system.mr)
+        stat.mod += Number(ability.system.statmodifier)
+        updates[`system.mr`] = stat
+      } else {
         let stat = duplicate(this.system.statistics[ability.system.affectedstat])
         stat.mod += Number(ability.system.statmodifier)
         updates[`system.statistics.${ability.system.affectedstat}`] = stat
       }
+    }
     // manage status bonus
     if (ability.system.statusaffected != "notapplicable") {
       if (ability.system.statusaffected == 'nrg') {
@@ -1587,6 +1810,7 @@ export class PegasusActor extends Actor {
         nrg.mod += Number(ability.system.statusmodifier)
         updates[`system.nrg`] = nrg
       }
+      /* NO MORE USED
       if (ability.system.statusaffected == 'health') {
         let health = duplicate(this.system.secondary.health)
         health.bonus += Number(ability.system.statusmodifier)
@@ -1597,6 +1821,16 @@ export class PegasusActor extends Actor {
         delirium.bonus += Number(ability.system.statusmodifier)
         updates[`system.secondary.delirium`] = delirium
       }
+      if (ability.system.statusaffected == 'socialhealth') {
+        let socialhealth = duplicate(this.system.secondary.socialhealth)
+        socialhealth.bonus += Number(ability.system.statusmodifier)
+        updates[`system.secondary.socialhealth`] = delirium
+      }
+      if (ability.system.statusaffected == 'stealthhealth') {
+        let stealthhealth = duplicate(this.system.secondary.stealthhealth)
+        stealthhealth.bonus += Number(ability.system.statusmodifier)
+        updates[`system.secondary.stealthhealth`] = delirium
+      }*/
     }
     if (directUpdate) {
       await this.update(updates)
@@ -1639,11 +1873,11 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   async applyRace(race) {
     let updates = { 'system.biodata.racename': race.name }
+    updates['system.biodata.sizenum'] = race.system.size
     let newItems = []
-    await this.deleteAllItemsByType('race')
-    newItems.push(race);
+    await this.deleteAllItemsByType("race")
+    newItems.push(race)
 
-    console.log("DROPPED RACE", race)
     for (let ability of race.system.abilities) {
       if (!ability.system) ability.system = ability.data
       newItems.push(ability)
@@ -1666,7 +1900,7 @@ export class PegasusActor extends Actor {
   getIncreaseStatValue(updates, statKey) {
     let stat = duplicate(this.system.statistics[statKey])
     stat.value += 1;
-    updates[`data.statistics.${statKey}`] = stat
+    updates[`system.statistics.${statKey}`] = stat
   }
 
   /* -------------------------------------------- */
@@ -1690,11 +1924,63 @@ export class PegasusActor extends Actor {
     await this.createEmbeddedDocuments('Item', newItems)
 
   }
+  /* -------------------------------------------- */
+  checkEFfectsHindranceDeletion(statKey) {
+    let toRem = []
+    let effects = this.items.filter(effect => effect.type == 'effect' && effect.system.oneuse &&
+      effect.system.hindrance && (effect.system.stataffected == statKey || effect.system.stataffected == "all"))
+    for (let effect of effects) {
+      toRem.push(effect.id)
+    }
+    if (toRem.length > 0) {
+      this.deleteEmbeddedDocuments('Item', toRem)
+    }
+  }
 
+  /* -------------------------------------------- */
+  computeCurrentHindrances(statKey) {
+    let hindrancesDices = 0
+    if (this.type == "character" || this.type == 'npc') {
+
+      hindrancesDices += this.system.combat.hindrancedice
+      let overCapacity = Math.floor(this.encCurrent / this.getEncumbranceCapacity())
+      if (overCapacity > 0) {
+        hindrancesDices += overCapacity
+      }
+      let effects = this.items.filter(effect => effect.type == 'effect' && effect.system.hindrance && (effect.system.stataffected == statKey || effect.system.stataffected == "all"))
+      for (let effect of effects) {
+        hindrancesDices += effect.system.effectlevel
+      }
+      if (statKey.toLowerCase() == "stl" && this.system.secondary.concealment.status == "exposed") {
+        hindrancesDices += 1
+      }
+      if (statKey.toLowerCase() == "stl" && (this.system.secondary.concealment.status == "detected" || this.system.secondary.concealment.status == "located")) {
+        hindrancesDices += 3
+      }
+    }
+    if (this.type == "vehicle") {
+      if (this.isVehicleCrawling()) {
+        hindrancesDices += 3
+      }
+      if (this.isVehicleSlow()) {
+        hindrancesDices += 1
+      }
+      if (this.isVehicleAverage()) {
+        hindrancesDices += 1
+      }
+      if (this.isVehicleFast()) {
+        hindrancesDices += 3
+      }
+      if (this.isVehicleExFast()) {
+        hindrancesDices += 5
+      }
+    }
+    return hindrancesDices
+  }
 
   /* -------------------------------------------- */
   addHindrancesList(effectsList) {
-    if (this.type == "character") {
+    if (this.type == "character" || this.type == 'npc') {
       if (this.system.combat.stunlevel > 0) {
         effectsList.push({ label: "Stun Hindrance", type: "hindrance", foreign: true, actorId: this.id, applied: false, value: 2 })
       }
@@ -1705,9 +1991,9 @@ export class PegasusActor extends Actor {
       if (overCapacity > 0) {
         effectsList.push({ label: "Encumbrance Hindrance", type: "hindrance", foreign: true, actorId: this.id, applied: false, value: overCapacity })
       }
-      if (this.system.biodata.morality <= 0) {
+      /* Remove as per ticket #159if (this.system.biodata.morality <= 0) {
         effectsList.push({ label: "Morality Hindrance", type: "hindrance", foreign: true, actorId: this.id, applied: false, value: 3 })
-      }
+      }*/
       let effects = this.items.filter(item => item.type == 'effect')
       for (let effect of effects) {
         effect = duplicate(effect)
@@ -1742,12 +2028,8 @@ export class PegasusActor extends Actor {
   /* ROLL SECTION
   /* -------------------------------------------- */
   pushEffect(rollData, effect) {
-    if (this.getTraumaState() == "none" && !this.checkNoBonusDice()) {
+    if ((this.getTraumaState() == "none" && !this.checkNoBonusDice()) || !effect.system.bonusdice) {
       rollData.effectsList.push({ label: effect.name, type: "effect", applied: false, effect: effect, value: effect.system.effectlevel })
-    } else {
-      if (!effect.system.bonusdice) { // Do not push bonus dice effect when TraumaState is activated
-        rollData.effectsList.push({ label: effect.name, type: "effect", applied: false, effect: effect, value: effect.system.effectlevel })
-      }
     }
   }
 
@@ -1772,7 +2054,23 @@ export class PegasusActor extends Actor {
       if (isPowerDmg && effect.system.stataffected == "powerdmgroll") {
         this.pushEffect(rollData, effect)
       }
+    }
+  }
 
+  /* -------------------------------------------- */
+  addRoleBonus(rollData, statKey, subKey) {
+    let role = this.getRole()
+    if (role && role.name.toLowerCase() == "ranged" && subKey == "ranged-dmg") {
+      rollData.effectsList.push({ label: "Ranged Role Bonus", type: "effect", applied: true, isdynamic: true, value: this.getRoleLevel() })
+      rollData.dicePool = rollData.dicePool.concat(PegasusUtility.buildDicePool("effect-bonus-dice", this.getRoleLevel(), 0, "Ranged Role Bonus"))
+    }
+    if (role && role.name.toLowerCase() == "defender" && (subKey == "defence" || subKey == "dmg-res")) {
+      rollData.effectsList.push({ label: "Defender Role Bonus", type: "effect", applied: true, isdynamic: true, value: this.getRoleLevel() })
+      rollData.dicePool = rollData.dicePool.concat(PegasusUtility.buildDicePool("effect-bonus-dice", this.getRoleLevel(), 0, "Defender Role Bonus"))
+    }
+    if (role && role.name.toLowerCase() == "scrapper" && statKey == "com") {
+      rollData.effectsList.push({ label: "Scrapper Role Bonus", type: "effect", applied: true, isdynamic: true, value: this.getRoleLevel() })
+      rollData.dicePool = rollData.dicePool.concat(PegasusUtility.buildDicePool("effect-bonus-dice", this.getRoleLevel(), 0, "Scrapper Role Bonus"))
     }
   }
 
@@ -1781,7 +2079,7 @@ export class PegasusActor extends Actor {
     if (statKey == 'phy' && subKey == "dmg-res") {
       let armors = this.getArmors()
       for (let armor of armors) {
-        rollData.armorsList.push({ label: `Armor ${armor.name}`, type: "armor", applied: false, value: armor.system.resistance })
+        rollData.armorsList.push({ label: `Armor ${armor.name}`, type: "armor", applied: false, value: armor.system.resistance, adrl: armor.system.adrl })
       }
     }
     if (useShield) {
@@ -1859,7 +2157,9 @@ export class PegasusActor extends Actor {
     let rollData = PegasusUtility.getBasicRollData(isInit)
     rollData.alias = this.name
     rollData.actorImg = this.img
-    rollData.actorId = this.id
+    rollData.actorType = this.type
+    rollData.tokenId = this.token?.id
+    rollData.actorId = (this.token) ? this.token.actor.id : this.id
     rollData.img = this.img
     rollData.traumaState = this.getTraumaState()
     rollData.levelRemaining = this.getLevelRemaining()
@@ -1868,6 +2168,8 @@ export class PegasusActor extends Actor {
     rollData.noBonusDice = this.checkNoBonusDice()
     rollData.dicePool = []
     rollData.subKey = subKey
+    rollData.MDL = this.baseMDL
+    rollData.ADRL = this.baseADRL
 
     if (subKey == "melee-dmg" || subKey == "ranged-dmg" || subKey == "power-dmg") {
       rollData.isDamage = true
@@ -1930,7 +2232,7 @@ export class PegasusActor extends Actor {
     }
 
     if (statKey == "mr") {
-      if (this.type == "character") {
+      if (this.type == "character" || this.type == 'npc') {
         rollData.mrVehicle = PegasusUtility.checkIsVehicleCrew(this.id)
         if (rollData.mrVehicle) {
           rollData.effectsList.push({
@@ -1951,11 +2253,15 @@ export class PegasusActor extends Actor {
       }
     }
 
+    rollData.hindranceDices = this.computeCurrentHindrances(statKey)
+    rollData.minHindranceDices = rollData.hindranceDices
+
     this.processSizeBonus(rollData)
     this.addEffects(rollData, isInit, isPower, subKey == "power-dmg")
     this.addArmorsShields(rollData, statKey, useShield, subKey)
     this.addWeapons(rollData, statKey, useShield)
     this.addEquipments(rollData, statKey)
+    this.addRoleBonus(rollData, statKey, subKey)
     this.processVehicleTargetMessage(rollData)
 
     console.log("ROLLDATA", rollData)
@@ -1967,7 +2273,7 @@ export class PegasusActor extends Actor {
   processSizeBonus(rollData) {
     if (rollData.defenderTokenId) {
       let diffSize = 0
-      if (this.type == "character") {
+      if (this.type == "character" || this.type == 'npc') {
         this.system.biodata.sizenum = this.system.biodata?.sizenum ?? 0
         this.system.biodata.sizebonus = this.system.biodata?.sizebonus ?? 0
         diffSize = rollData.defenderSize - this.system.biodata.sizenum + this.system.biodata.sizebonus
@@ -1997,6 +2303,15 @@ export class PegasusActor extends Actor {
       }
     }
   }
+  /* -------------------------------------------- */
+  getExtraTICsFromEffect() {
+    let effects = this.items.filter(it => it.type == "effect" && Number(it.system.extratics) > 0)
+    let nbTics = 0
+    for (let e of effects) {
+      nbTics += Number(e.system.extratics)
+    }
+    return nbTics
+  }
 
   /* -------------------------------------------- */
   getLevelRemainingList() {
@@ -2117,6 +2432,11 @@ export class PegasusActor extends Actor {
       console.log("MR ROLL", rollData)
       if (isInit) {
         rollData.title = "MR / Initiative"
+        rollData.nbTIC = ((this.type == "character") ? 2 : 1) + this.getExtraTICsFromEffect()
+        rollData.TICs = []
+        for (let i = 0; i < rollData.nbTIC; i++) {
+          rollData.TICs.push({ text: "NONE", revealed: false, displayed: false })
+        }
       }
       this.startRoll(rollData);
     } else {

modules/pegasus-combat.js

@@ -1,5 +1,56 @@
 import { PegasusUtility } from "./pegasus-utility.js";
 
+/* -------------------------------------------- */
+export class PegasusCombatTracker extends CombatTracker {
+
+  /* -------------------------------------------- */
+  static get defaultOptions() {
+    let path = "systems/fvtt-pegasus-rpg/templates/pegasus-combat-tracker.html";
+    return foundry.utils.mergeObject(super.defaultOptions, {
+      template: path,
+    });
+  }
+
+  /* -------------------------------------------- */
+  async getData() {
+    let combatData = await super.getData()
+    for (let t of combatData.turns) {
+      let c = game.combat.combatants.get(t.id)
+      t.displayTIC = (c.actor.isOwner && c.actor.hasPlayerOwner && !game.user.isGM) || (c.actor.type == "npc" && !c.actor.hasPlayerOwner && game.user.isGM) 
+      let TICs = c.getFlag("world", "TICs")
+      if (TICs) {
+        t.TICs = TICs
+      } else {
+        t.TICs = []
+      }
+    }
+    //console.log("CBT", combatData)
+    return combatData
+  }
+
+  /* -------------------------------------------- */
+  activateListeners(html) {
+    super.activateListeners(html)
+
+    html.find('.combat-tracker-tic').click(ev => {
+      let ticNum = $(ev.currentTarget).data("tic-num")
+      let combatantId = $(ev.currentTarget).data("combatant-id")
+      game.combat.revealTIC(ticNum, combatantId)
+    })
+
+    html.find('.reset-npc-initiative').click(ev => {
+      game.combat.resetNPCInitiative()
+    })
+    html.find('.select-combat-actor').click(ev => {
+      let combatantId = $(ev.currentTarget).data("combatant-id")
+      game.combat.selectActor(combatantId)
+    })
+
+
+  }
+
+}
+
 /* -------------------------------------------- */
 export class PegasusCombat extends Combat {
 
@@ -16,6 +67,134 @@ export class PegasusCombat extends Combat {
     return this;
   }
 
+  /* -------------------------------------------- */
+  async resetNPCInitiative() {
+    for (let c of this.combatants) {
+      if (c.actor && c.actor.type == "npc") {
+        await this.updateEmbeddedDocuments("Combatant", [{ _id: c.id, initiative: -1 }]);
+      }
+    }
+  }
+
+  /* -------------------------------------------- */
+  isCharacter(combatantId) {
+    const combatant = game.combat.combatants.get(combatantId)
+    if (combatant) {
+      return combatant.actor.type == "character"
+    }
+    return false
+  }
+
+  /* -------------------------------------------- */
+  selectActor(combatantId) {
+    const combatant = game.combat.combatants.get(combatantId)
+    if (combatant) {
+      let TICs = combatant.getFlag("world", "TICs") || []
+      let allRevealed = true
+      for(let tic of TICs) {
+        if (!tic.revealed ) {
+          allRevealed = false
+        }
+      }
+      let msg = `<div>${combatant.actor.name} has been nominated to act, ${combatant.actor.name} choose which TIC you wish to activate!</div`
+      if ( allRevealed) {
+        msg = `<div>${combatant.actor.name} has used all its TIC's please choose a different character.</div`
+      }
+      let chatData = {
+        user: game.user.id,
+        alias: combatant.actor.name,
+        rollMode: game.settings.get("core", "rollMode"),
+        content: msg
+        }
+      ChatMessage.create(chatData);
+    }
+  }
+
+  /* -------------------------------------------- */
+  async setTic(combatantId, rollData) {
+    if (!combatantId) {
+      return
+    }
+    const combatant = game.combat.combatants.get(combatantId)
+    if (combatant) {
+      await combatant.setFlag("world", "TICs", rollData.TICs)
+    }
+  }
+
+  /* -------------------------------------------- */
+  async revealTIC(num, combatantId) {
+    console.log('revealTIC', num, combatantId)
+    if (num == undefined || combatantId == undefined) {
+      return
+    }
+    const combatant = game.combat.combatants.get(combatantId)
+    if (combatant) {
+      console.log('revealTIC', num, combatantId, combatant)
+      let ticData = combatant.getFlag("world", "TICs")
+      if (ticData) {
+        console.log('revealTIC', num, combatantId, ticData)
+        num = Number(num)
+        if ( ticData[num].revealed && ticData[num].displayed ) {
+          let chatData = {
+            user: game.user.id,
+            alias: combatant.actor.name,
+            rollMode: game.settings.get("core", "rollMode"),
+            whisper: [game.user.id].concat(ChatMessage.getWhisperRecipients('GM')),
+            content: `<div>${combatant.actor.name} : This Action has already been performed please choose a different TIC</div`
+          };
+          ChatMessage.create(chatData);
+          return
+        }
+        ticData[num].revealed = true
+        ticData[num].displayed = true
+        combatant.setFlag("world", "TICs", ticData).then(() => {
+          let chatData = {
+            user: game.user.id,
+            alias: combatant.actor.name,
+            rollMode: game.settings.get("core", "rollMode"),
+            content: `<div>${combatant.actor.name} is performing ${ticData[num].text}</div`
+          };
+          ChatMessage.create(chatData);
+          // Manage if all TIC has been ACTED
+          let allRevealed = true
+          for (let c of this.combatants) {
+            let TICs = c.getFlag("world", "TICs")
+            if (TICs) {
+              for (let t of TICs) {
+                if (!t.revealed) {
+                  allRevealed = false
+                }
+              }
+            }
+          }
+          // If all TIC has been ACTED, display a message
+          if (allRevealed) {
+            let chatData = {
+              user: game.user.id,
+              rollMode: game.settings.get("core", "rollMode"),
+              content: `<div>All Characters have acted, All Characters who do not have Stun gain 1 Momentum!</div`
+            }
+            ChatMessage.create(chatData);
+          }
+        })
+      }
+    }
+  }
+
+  /* -------------------------------------------- */
+  nextRound() {
+    for (let c of this.combatants) {
+      let TICs = duplicate(c.getFlag("world", "TICs"))
+      for (let t of TICs) {
+        t.displayed = false
+        t.revealed = false
+        t.text = ""
+      }
+      c.setFlag("world", "TICs", TICs)
+    }
+    super.nextRound()
+  }
+
   /* -------------------------------------------- */
   _onUpdate(changed, options, userId) {
   }

modules/pegasus-config.js

@@ -0,0 +1,37 @@
+export const PEGASUS_CONFIG = {
+  healthStatus: {
+    healthy: { key: "healthy", name: 'Healthy', hindrance: 0 },
+    injured: { key: "injured",name: 'Injured',hindrance: 0 },
+    wounded: { key: "wounded",name: 'Wounded',hindrance: 1, rolls: 'ALL' },
+    severlywounded: { key: "severlywounded",name: 'Severly Wounded',hindrance: 3, rolls: 'ALL' },
+    defeated: { key: "defeated",name:'Defeated',hindrance: 3, defeated: true}
+  },
+  deliriumStatus: {
+    stable: { key:'stable', name: 'Stable', hindrance: 0 },
+    unstable: { key:'unstable',name: 'Unstable', hindrance: 0 },
+    trauma: { key:'trauma',name: 'Trauma', hindrance: 0, nobonusdice: true },
+    severetrauma: { key:'severetrauma',name: 'Severe Trauma', hindrance: 0, nobonusdice: true, noperks: true },
+    defeated: { key:'defeated',name:'Defeated',hindrance: 0, defeated: true}
+  },
+  concealmentStatus: {
+    hidden: { key:'hidden',name: 'Hidden', hindrance: 0 },
+    covered: { key:'covered',name: 'Covered', hindrance: 0 },
+    exposed: { key:'exposed',name: 'Exposed', hindrance: 1, rolls: 'STL' },
+    detected: { key:'detected',name: 'Detected', hindrance: 3, rolls: 'STL'},
+    located: { key:'located',name: 'Located', hindrance: 0 }
+  },
+  confidenceStatus: {
+    confident: { key:'confident',name: 'Confident', hindrance: 0 },
+    uncertain: { key:'uncertain',name: 'Uncertain', hindrance: 0 },
+    shaken: { key:'shaken',name: 'Shaken', hindrance: 0, hasfear: true },
+    anxious: { key:'anxious',name: 'Anxious', hindrance: 0, nostunrecover: true },
+    lostface: { key:'lostface',name: 'Lost Face', hindrance: 0 }
+  },
+  extraTIC: {
+    "0": {key: "0", name: "None", value: 0},
+    "1": {key: "1", name: "+1 TIC", value: 1},
+    "2": {key: "2", name: "+2 TIC", value: 2},
+    "3": {key: "3", name: "+3 TIC", value: 3},
+    "4": {key: "4", name: "+4 TIC", value: 4},
+  }
+}

modules/pegasus-create-char.js

@@ -23,6 +23,10 @@ export class PegasusActorCreate {
     this.perks = perksPack.map(i => i.toObject())
     const specPack = await PegasusUtility.loadCompendium("fvtt-pegasus-rpg.specialisations")
     this.specs = specPack.map(i => i.toObject())
+    const virtuePack = await PegasusUtility.loadCompendium("fvtt-pegasus-rpg.virtues")
+    this.virtues = virtuePack.map(i => i.toObject())
+    const vicePack = await PegasusUtility.loadCompendium("fvtt-pegasus-rpg.vices")
+    this.vices = vicePack.map(i => i.toObject())
 
     this.showRaces()
   }
@@ -64,14 +68,14 @@ export class PegasusActorCreate {
   }
 
   /* -------------------------------------------- */
-  processChatEvent( event ) {
+  async processChatEvent(event) {
     const step = $(event.currentTarget).data("step-name");
     const itemId = $(event.currentTarget).data("item-id");
 
     if (step == "select-race") {
       let race = this.races.find(item => item._id == itemId);
       this.currentRace = race;
-      this.actor.applyRace( race);
+      await this.actor.applyRace(race);
       PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget));
       if (race.system.nboptionnal > 0 && race.system.optionnalabilities.length > 0) {
         this.manageOptionnalAbilities(race);
@@ -88,9 +92,11 @@ export class PegasusActorCreate {
 
     if (step == 'select-race-optionnal') {
       let ability = this.raceOptionnalAbilities.optionnalabilities.find(item => item._id == itemId);
-      let update = []
-      this.actor.applyAbility( ability, update );
+      let update = {}
+      await this.actor.applyAbility(ability, update);
+      if (!jQuery.isEmptyObject(update)) {
         this.actor.update(update)
+      }
       this.actor.createEmbeddedDocuments('Item', [ability]);
       PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget));
       this.raceOptionnalAbilities.optionnalabilities = this.raceOptionnalAbilities.optionnalabilities.filter(item => item._id != itemId);
@@ -100,7 +106,7 @@ export class PegasusActorCreate {
 
     if (step == 'select-race-stats') {
       let statKey = $(event.currentTarget).data("stat-key");
-      this.actor.modStat( statKey, 1);
+      await this.actor.modStat(statKey, 1);
       this.raceSelectableStats.stats[statKey].used = true;
       this.raceSelectableStats.numberstats -= 1;
       PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget));
@@ -110,7 +116,7 @@ export class PegasusActorCreate {
     if (step == 'select-race-perks') {
       PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget));
       let perk = this.racePerks.find(item => item._id == itemId);
-      this.actor.createEmbeddedDocuments( 'Item', [perk]);
+      await this.actor.createEmbeddedDocuments('Item', [perk]);
       this.racePerks = this.racePerks.filter(item => item._id != itemId);
       this.nbRacePerks -= 1;
       if (this.nbRacePerks == 0 || this.racePerks.length == 0) {
@@ -123,7 +129,7 @@ export class PegasusActorCreate {
     if (step == 'select-role') {
       let role = this.roles.find(item => item._id == itemId);
       PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget));
-      this.actor.applyRole( role );
+      await this.actor.applyRole(role);
       this.currentRole = role;
       this.nbRoleStat = 2;
       this.roleStats = duplicate(role.system.statincreasechoice)
@@ -133,7 +139,7 @@ export class PegasusActorCreate {
     if (step == 'select-role-start-spec') {
       PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget));
       let spec = this.roleSpecStart.find(item => item._id == itemId);
-      this.actor.addIncSpec(spec, 1);
+      await this.actor.addIncSpec(spec, 1);
       this.nbRoleSpecStart--;
       this.roleSpecStart = this.roleSpecStart.filter(item => item._id != itemId);//Remove selected spec
       if (this.nbRoleSpecStart == 0) {
@@ -146,7 +152,7 @@ export class PegasusActorCreate {
     if (step == 'select-role-stat') {
       PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget));
       let statKey = $(event.currentTarget).data("stat-key");
-      this.actor.valueStat( statKey, 1);
+      await this.actor.valueStat(statKey, 1);
 
       for (let stat of this.roleStats) {
         if (stat.name.toLowerCase() == statKey.toLowerCase()) {
@@ -168,15 +174,15 @@ export class PegasusActorCreate {
       PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget));
       let spec = this.roleSpec.find(item => item._id == itemId);
       if (this.nbDT2 > 0) {
-        this.actor.addIncSpec(spec, 2)
+        await this.actor.addIncSpec(spec, 2)
         this.nbDT2--;
       } else {
-        this.actor.addIncSpec(spec, 1)
+        await this.actor.addIncSpec(spec, 1)
         this.nbDT1--;
       }
       this.roleSpec = this.roleSpec.filter(item => item._id != itemId);//Remove selected spec
       if (this.nbDT1 == 0 || this.roleSpec.length == 0) {
-        this.rolePerks =  this.getPerksFromRole( this.currentRole ) // duplicate(this.currentRole.data.perks)
+        this.rolePerks = this.getPerksFromRole(this.currentRole) 
         this.nbPerks = 2;
         this.showRolePerks()
       } else {
@@ -187,15 +193,198 @@ export class PegasusActorCreate {
     if (step == 'select-role-perk') {
       PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget));
       let perk = this.rolePerks.find(item => item._id == itemId);
-      this.actor.addItemWithoutDuplicate(perk)
+      await this.actor.addIncPerk(perk, 1)
+      let excludedPerks = this.actor.items.filter(it => it.type == "perk" && !it.system.upgradable)
+      this.rolePerks = []
+      for (let perk of this.rolePerks) {
+        if (!excludedPerks.find(it => it.name == perk.name)) {
+          this.rolePerks.push(perk)
+        }
+      }
+      this.rolePerks.sort(function compare(a, b) { if (a.name < b.name) { return -1 } else { return 1 } })
       this.nbPerks--;
-      this.rolePerks = this.rolePerks.filter( item => item._id != itemId);//Remove selected perk
       if (this.nbPerks == 0 || this.rolePerks.length == 0) {
-        this.showCharacterEnd()
+        this.nbGlobalSpec = 5
+        if (this.forceVirtue) {
+          this.showVirtue()
+        } else {
+          this.showGlobalSpec()
+        }
       } else {
         this.showRolePerks()
       }
     }
+
+    if (step == 'select-global-spec') {
+      PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget));
+      let spec = this.specs.find(item => item._id == itemId);
+      await this.actor.addIncSpec(spec, 1)
+      this.nbGlobalSpec--;
+      if (this.nbGlobalSpec == 0) {
+        this.nbGlobalStat = 5
+        if (this.forceVirtue) {
+          this.showVirtue()
+        } else {
+          this.showGlobalStat()
+        }
+      } else {
+        this.showGlobalSpec()
+      }
+    }
+
+    if (step == 'select-global-stat') {
+      PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget))
+      let statKey = $(event.currentTarget).data("stat-key")
+      await this.actor.valueStat(statKey, 1)
+      this.nbGlobalStat--
+      if (this.nbGlobalStat == 0) {
+        this.nbGlobalPerk = 1
+        if (this.forceVirtue) {
+          this.showVirtue()
+        } else {
+          this.showGlobalPerk()
+        }
+      } else {
+        this.showGlobalStat()
+      }
+    }
+
+    if (step == 'select-global-perk') {
+      PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget))
+      let perk = this.perks.find(item => item._id == itemId);
+      await this.actor.addIncPerk(perk, 1)
+      this.nbGlobalPerk--;
+      if (this.nbGlobalPerk == 0) {
+        this.nbGlobalStatus = 1
+        if (this.forceVirtue) {
+          this.showVirtue()
+        } else {
+          this.statusCount = {}
+          this.showGlobalStatus()
+        }
+      } else {
+        this.showGlobalPerk()
+      }
+    }
+
+    if (step == 'select-global-status') {
+      PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget))
+      let statusKey = $(event.currentTarget).data("status-key")
+      await this.actor.addStatusBonus(statusKey, 1)
+      this.statusCount[statusKey] = (this.statusCount[statusKey]) ? this.statusCount[statusKey]+1 : 1; 
+      this.nbGlobalStatus--;
+      if (this.nbGlobalStatus == 0) {
+        this.nbBonusSelection = 1
+        if (this.forceVirtue) {
+          this.showVirtue()
+        } else {
+          this.showBonusSelection()
+        }
+      } else {
+        this.showGlobalStatus()
+      }
+    }
+
+    if (step == 'select-bonus-selection') {
+      PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget))
+      let nextStep = $(event.currentTarget).data("bonus-key")
+      this.forceVirtue = true
+      if (nextStep == "bonus-statistic") {
+        this.actor.setBonusInformation("Stats Increased")
+        this.nbGlobalStat = 2
+        this.showGlobalStat()
+      }
+      if (nextStep == "bonus-specialisation") {
+        this.actor.setBonusInformation("Specialisations Increased")
+        this.nbGlobalSpec = 4
+        this.showGlobalSpec()
+      }
+      if (nextStep == "bonus-perk") {
+        this.actor.setBonusInformation("Perks - Check Effects & Perk Details.")
+        this.nbGlobalPerk = 2
+        this.showGlobalPerk()
+      }
+      if (nextStep == "bonus-status") {
+        this.actor.setBonusInformation("Status Modifiers")        
+        this.nbGlobalStatus = 5
+        this.statusCount = {}
+        this.showGlobalStatus()
+      }
+      if (nextStep == "bonus-roleability") {
+        this.actor.setBonusInformation("Role Ability Level Increased")        
+        this.actor.increaseRoleAbility()
+        this.showVirtue()
+      }
+      if (nextStep == "bonus-ppp5") {
+        this.actor.setBonusInformation("Power Purchase Points")        
+        this.actor.addPPP(5)
+        this.showVirtue()
+      }
+      if (nextStep == "bonus-wealthy") {
+        this.actor.setBonusInformation("x2 Starting Funds")        
+        ChatMessage.create({ content: "NOT AUTOMATED! Your character starts with x2 Starting Funds" })
+        this.showVirtue()
+      }
+      if (nextStep == "bonus-heirloom") {
+        this.actor.setBonusInformation("Family Heirloom (Level 1 Bonus Dice Item)")        
+        ChatMessage.create({ content: "NOT AUTOMATED! Your character starts with an item of choice (GM Must approve). This item provides a Level 1 Bonus Dice to a Stat of choice" })
+        this.showVirtue()
+      }
+      if (nextStep == "bonus-vehicle") {
+        this.actor.setBonusInformation("Vehicle")        
+        ChatMessage.create({ content: "NOT AUTOMATED! Your character starts with a Vehicle of Choice (GM Must approve)." })
+        this.showVirtue()
+      }
+      if (nextStep == "bonus-mount") {
+        this.actor.setBonusInformation("Mount")        
+        ChatMessage.create({ content: "NOT AUTOMATED! Your character starts with a Mount of Choice (GM Must approve)." })
+        this.showVirtue()
+      }
+      if (nextStep == "bonus-sidekick") {
+        this.actor.setBonusInformation("Sidekick")        
+        ChatMessage.create({ content: "NOT AUTOMATED! Your character starts with a Sidekick of Choice (GM Must approve)." })
+        this.showVirtue()
+      }
+      if (nextStep == "bonus-ambidextrious") {
+        this.actor.setBonusInformation("Ambidextrious")        
+        this.actor.setHandInformation("Ambidextrious")
+        this.showVirtue()
+      }
+    }
+
+    if (step == 'select-global-virtue') {
+      PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget));
+      let virtue = this.virtues.find(item => item._id == itemId);
+      await this.actor.createEmbeddedDocuments('Item', [virtue])
+      this.showVice()
+    }
+
+    if (step == 'select-global-vice') {
+      PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget));
+      let vice = this.vices.find(item => item._id == itemId);
+      await this.actor.createEmbeddedDocuments('Item', [vice]);
+      if(this.forceEnd) {
+        this.showCharacterEnd()
+      } else {
+        this.showViceQuestion()
+      }
+    }
+
+    if (step == "select-vice-question") {
+      PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget))
+      let nextStep = $(event.currentTarget).data("question-key")
+      this.forceEnd = true
+      if (nextStep == "vice-next-step") {
+        this.showCharacterEnd()
+      }
+      if (nextStep == "vice-5-cdp") {
+        this.actor.addCDP(5)
+        this.showVice()
+      }
+      if (nextStep == "vice-vertue") {
+        this.showVirtue()
+      }
+    }
   }
 
   /* -------------------------------------------- */
@@ -228,6 +417,9 @@ export class PegasusActorCreate {
     if (step == 'select-role-perk') {
       itemData = this.rolePerks.find(item => item._id == itemId);
     }
+    if (step == 'select-global-spec') {
+      itemData = this.specs.find(item => item._id == itemId);
+    }
     if (itemData) {
       let item = await Item.create(itemData, { temporary: true });
       new PegasusItemSheet(item).render(true);
@@ -238,9 +430,9 @@ export class PegasusActorCreate {
   manageSelectableStats(race) {
     this.raceSelectableStats = {
       "race": race,
-      "statsonlyonce": race.data.statsonlyonce, 
-      "numberstats": race.data.numberstats,
-      "stats": duplicate(this.actor.data.data.statistics)
+      "statsonlyonce": race.system.statsonlyonce,
+      "numberstats": race.system.numberstats,
+      "stats": duplicate(this.actor.system.statistics)
     }
     this.processSelectableStats()
   }
@@ -260,20 +452,21 @@ export class PegasusActorCreate {
 
   /* ---------------  --------------------  --------- */
   manageRacePerks(race) {
-    if ( !this.currentRace.data.perksgained ) {
+    if (!this.currentRace.system.perksgained) {
       this.showRoles()
       return;
     }
     if (!this.racePerks) { // First init
-      if ( this.currentRace.data.perksall) {
+      if (this.currentRace.system.perksall) {
         this.racePerks = duplicate(this.perks)
       } else {
-        this.racePerks = duplicate(this.currentRace.data.perks)
+        this.racePerks = duplicate(this.currentRace.system.perks)
       }
-      this.nbRacePerks = this.currentRace.data.perksnumber;      
+      this.nbRacePerks = this.currentRace.system.perksnumber;
     }
     let formData = this.createFormData("select-race-perks")
     formData.raceperks = this.racePerks;
+    formData.raceperks.sort( function compare(a, b) { if (a.name<b.name){ return -1}else{return 1}} )
     formData.nbraceperks = this.nbRacePerks;
     this.renderChatMessage(formData)
   }
@@ -300,8 +493,8 @@ export class PegasusActorCreate {
   /* ---------------  ----------------------------- */
   manageOptionnalAbilities(race) {
     this.raceOptionnalAbilities = {
-      "nboptionnal": race.data.nboptionnal, 
-      "optionnalabilities": duplicate(race.data.optionnalabilities),
+      "nboptionnal": race.system.nboptionnal,
+      "optionnalabilities": duplicate(race.system.optionnalabilities),
     }
     this.processOptionnalAbilitiesStep()
   }
@@ -339,12 +532,11 @@ export class PegasusActorCreate {
   async showRoleStartSpec() {
     if (!this.roleSpecStart) {
       this.roleSpecStart = this.specs.filter(spec => spec.system.statistic.toUpperCase() == this.currentRole.system.statincrease1.toUpperCase() || spec.system.statistic.toUpperCase() == this.currentRole.system.statincrease2.toUpperCase())
-      console.log("SPEC FOUND", this.roleSpecStart)
-      //this.roleSpecStart = duplicate(this.currentRole.data.specialisationsplus1)
       this.nbRoleSpecStart = 2;
     }
     let formData = this.createFormData("select-role-start-spec")
     formData.rolestartspec = this.roleSpecStart
+    formData.rolestartspec.sort(function compare(a, b) { if (a.name < b.name) { return -1 } else { return 1 } })
     formData.nbrolespecstart = this.nbRoleSpecStart;
     this.renderChatMessage(formData)
   }
@@ -355,7 +547,10 @@ export class PegasusActorCreate {
     formData.rolestats = []
     for (let stat of this.roleStats) {
       if (stat.flag) {
-        formData.rolestats.push( duplicate(this.actor.system.statistics[stat.name.toLowerCase()]) )
+        let actorStat = this.actor.system.statistics[stat.name.toLowerCase()]
+        if ( actorStat.value < 5) { // Only below D12
+          formData.rolestats.push(duplicate(actorStat))
+        }
       }
     }
     //console.log("STAT", this.roleStats, formData)
@@ -366,6 +561,7 @@ export class PegasusActorCreate {
   async showRoleSpecialisations() {
     let formData = this.createFormData("select-role-spec")
     formData.rolespec = duplicate(this.roleSpec)
+    formData.rolespec.sort(function compare(a, b) { if (a.name < b.name) { return -1 } else { return 1 } })
     formData.dt = 1
     if (this.nbDT2 > 0) {
       formData.dt = 2
@@ -373,14 +569,169 @@ export class PegasusActorCreate {
     this.renderChatMessage(formData)
   }
 
+
   /* -------------------------------------------- */
   async showRolePerks() {
     let formData = this.createFormData("select-role-perk")
     formData.roleperks = duplicate(this.rolePerks)
+    formData.roleperks.sort(function compare(a, b) { if (a.name < b.name) { return -1 } else { return 1 } })
     formData.nbperks = this.nbPerks
     this.renderChatMessage(formData)
   }
 
+  /* -------------------------------------------- */
+  async showGlobalSpec() {
+    let formData = this.createFormData("select-global-spec")
+    let excludedSpecs = this.actor.items.filter(it => it.type == "specialisation" && it.system.level >= 5)
+    formData.specs = []
+    for (let spec of this.specs) {
+      let isOK = true
+      for (let excluded of excludedSpecs) {
+        if (excluded.name == spec.name) {
+          isOK = false
+          break
+        }
+      }
+      if (isOK) {
+        formData.specs.push(spec)
+      }
+    }
+    formData.specs.sort(function compare(a, b) { if (a.name < b.name) { return -1 } else { return 1 } })
+    this.renderChatMessage(formData)
+  }
+
+  /* -------------------------------------------- */
+  async showGlobalStat() {
+    let formData = this.createFormData("select-global-stat")
+    formData.stats = {}
+    for (let key in this.actor.system.statistics) {
+      let stat = this.actor.system.statistics[key]
+      if (stat.value < 5) {
+        formData.stats[key] = duplicate(stat)
+      }
+    }
+    this.renderChatMessage(formData)
+  }
+
+  /* -------------------------------------------- */
+  async showGlobalPerk() {
+    let formData = this.createFormData("select-global-perk")
+    let excludedPerks = this.actor.items.filter(it => it.type == "perk" && !it.system.upgradable)
+    formData.perks = []
+    for (let perk of this.perks) {
+      let isOK = true
+      for (let excluded of excludedPerks) {
+        if (excluded.name == perk.name) {
+          isOK = false
+          break
+        }
+      }
+      if (isOK) {
+        formData.perks.push(perk)
+      }
+    }
+    formData.perks.sort(function compare(a, b) { if (a.name < b.name) { return -1 } else { return 1 } })
+    this.renderChatMessage(formData)
+  }
+
+  /* -------------------------------------------- */
+  async showGlobalStatus() {
+    let formData = this.createFormData("select-global-status")
+    formData.status = {}
+    for(let statusKey in this.actor.system.secondary) {
+      if ( this.statusCount[statusKey] == undefined) {
+        this.statusCount[statusKey] = 0
+      }
+      if ( this.statusCount[statusKey] < 3) {
+        formData.status[statusKey] = duplicate(this.actor.system.secondary[statusKey])
+      }
+    }
+    if ( this.statusCount["nrg"] < 3) {
+      formData.status["nrg"] = duplicate(this.actor.system.nrg)    
+    }
+    this.renderChatMessage(formData)
+  }
+
+  /* -------------------------------------------- */
+  async showBonusSelection() {
+    let formData = this.createFormData("select-bonus-selection")
+    formData.bonuses = {
+      "bonus-statistic": { name: "Increase 2 Stats" },
+      "bonus-specialisation": { name: "Increase 4 Specialisations" },
+      "bonus-perk": { name: "Choose/Upgrade 2 Perks" },
+      "bonus-status": { name: "Upgrade 5 status" },
+      "bonus-roleability": { name: "Role Ability +1" },
+      "bonus-ppp5": { name: "Gain +5 PPP" },
+      "bonus-wealthy": { name: "Wealthy (money x 2)" },
+      "bonus-heirloom": { name: "Family Heirloom (Special Item)" },
+      "bonus-vehicle": { name: "Starting Vehicle" },
+      "bonus-sidekick": { name: "Starting Sidekick" },
+      "bonus-ambidextrious": { name: "Ambidextrious" }
+    }
+    this.renderChatMessage(formData)
+  }
+
+  /* -------------------------------------------- */
+  async showVirtue() {
+    let formData = this.createFormData("select-global-virtue")
+    let virtues = this.actor.items.filter(it => it.type == "virtue")
+    formData.virtues = []
+    for ( let virtue1 of this.virtues) { // Filter existing virtues
+      let isOK = true
+      for(let virtue2 of virtues) {
+        if (virtue1.name == virtue2.name) {
+          isOK = false
+          break
+        }
+      }
+      if (isOK) {
+        formData.virtues.push(virtue1)
+      }
+    }
+    formData.virtues.sort(function compare(a, b) { if (a.name < b.name) { return -1 } else { return 1 } })
+    this.renderChatMessage(formData)
+  }
+  /* -------------------------------------------- */
+  async showVice() {
+    let formData = this.createFormData("select-global-vice")
+    let virtues = this.actor.items.filter(it => it.type == "virtue")
+    let vices = this.actor.items.filter(it => it.type == "vice")
+    formData.vices = []
+    for (let vice of this.vices) {
+      let isOK = true
+      for ( let virtue of virtues) {
+        for (let nonVice of virtue.system.unavailablevice) {
+          if(nonVice.name == vice.name) {
+            isOK = false
+            break
+          }
+        }  
+      }
+      for ( let vice2 of vices) {
+        if(vice2.name == vice.name) {
+          isOK = false
+          break
+        }  
+      }
+      if (isOK) {
+        formData.vices.push( vice)
+      }
+    }
+    formData.vices.sort(function compare(a, b) { if (a.name < b.name) { return -1 } else { return 1 } })
+    this.renderChatMessage(formData)
+  }
+  
+  /* -------------------------------------------- */
+  showViceQuestion() {
+    let formData = this.createFormData("select-vice-question")
+    formData.questions = {
+      "vice-next-step": { name: "Go to next step" },
+      "vice-5-cdp": { name: "Gain +5 CDP and choose a Vice" },
+      "vice-vertue": { name: "Choose a Virtue and a Vice" }
+    }
+    this.renderChatMessage(formData)
+  }
+
   /* -------------------------------------------- */
   async showCharacterEnd() {
     await this.actor.computeNRGHealth()

modules/pegasus-hindrance-die.js

@@ -0,0 +1,25 @@
+export class PegasusHindranceDie extends Die {
+  constructor(termData ) {
+      termData.faces=6;
+      super(termData);
+  }
+
+  /* -------------------------------------------- */
+
+  /** @override */
+  static DENOMINATION = "h";
+
+  /* -------------------------------------------- */
+
+  /** @override */
+  getResultLabel(result) {
+      return {
+          "1": '<img src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png" />',
+          "2": '<img src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png" />',
+          "3": '<img src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png" />',
+          "4": '<img src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png" />',
+          "5": '<img src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png" />',
+          "6": '<img src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png" />'
+      }[result.result];
+  }
+}

modules/pegasus-item-sheet.js

@@ -57,10 +57,10 @@ export class PegasusItemSheet extends ItemSheet {
       type: objectData.type,
       img: objectData.img,
       name: objectData.name,
+      config: game.system.pegasus.config,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
       optionsDiceList: PegasusUtility.getOptionsDiceList(),
-      optionsStatusList: PegasusUtility.getOptionsStatusList(),
       data: itemData.system,
       description: await TextEditor.enrichHTML(this.object.system.description, {async: true}),
       limited: this.object.limited,
@@ -424,7 +424,6 @@ export class PegasusItemSheet extends ItemSheet {
     }
   }
 
-  
   /* -------------------------------------------- */
   async _onDrop(event) {
 

modules/pegasus-main.js

@@ -12,11 +12,11 @@ import { PegasusActor } from "./pegasus-actor.js";
 import { PegasusItemSheet } from "./pegasus-item-sheet.js";
 import { PegasusActorSheet } from "./pegasus-actor-sheet.js";
 import { PegasusVehicleSheet } from "./pegasus-vehicle-sheet.js";
-import { PegasusNPCSheet } from "./pegasus-npc-sheet.js";
 import { PegasusUtility } from "./pegasus-utility.js";
-import { PegasusCombat } from "./pegasus-combat.js";
+import { PegasusCombatTracker,PegasusCombat } from "./pegasus-combat.js";
 import { PegasusItem } from "./pegasus-item.js";
-import { PegasusToken } from "./pegasus-token.js";
+import { PegasusHindranceDie } from "./pegasus-hindrance-die.js";
+import { PEGASUS_CONFIG } from "./pegasus-config.js"
 
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
@@ -57,14 +57,18 @@ Hooks.once("init", async function () {
   CONFIG.Combat.documentClass = PegasusCombat
   CONFIG.Actor.documentClass = PegasusActor
   CONFIG.Item.documentClass = PegasusItem
+  CONFIG.ui.combat = PegasusCombatTracker
+  CONFIG.Dice.terms["h"] = PegasusHindranceDie
   game.system.pegasus = { 
-    utility: PegasusUtility
+    utility: PegasusUtility,
+    config: PEGASUS_CONFIG
   }
 
   /* -------------------------------------------- */
   // Register sheet application classes
   Actors.unregisterSheet("core", ActorSheet);
   Actors.registerSheet("fvtt-pegasus", PegasusActorSheet, { types: ["character"], makeDefault: true })
+  Actors.registerSheet("fvtt-pegasus", PegasusActorSheet, { types: ["npc"], makeDefault: true })
   Actors.registerSheet("fvtt-pegasus", PegasusVehicleSheet, { types: ["vehicle"], makeDefault: false })
 
   Items.unregisterSheet("core", ItemSheet);
@@ -72,7 +76,6 @@ Hooks.once("init", async function () {
 
   PegasusUtility.init()
 
-
 });
 
 /* -------------------------------------------- */

modules/pegasus-roll-dialog.js

@@ -39,6 +39,9 @@ export class PegasusRollDialog extends Dialog {
 
   /* -------------------------------------------- */
   roll() {
+    for(let i=0; i<this.rollData.nbTIC; i++) {
+      this.rollData.TICs[i].text = $('#roll-input-tic'+i).val()   
+    }
     PegasusUtility.rollPegasus(this.rollData)
   }
 
@@ -101,6 +104,12 @@ export class PegasusRollDialog extends Dialog {
     if (armor) {
       armor.applied = toggled
     }
+    this.rollData.armorUsed = false
+    for(let a of this.rollData.armorsList) {
+      if (a.applied) {
+        this.rollData.armorUsed = true
+      }
+    }
     console.log("Armor", armorIdx, toggled)
     PegasusUtility.updateArmorDicePool(this.rollData)
   }
@@ -117,6 +126,12 @@ export class PegasusRollDialog extends Dialog {
       }
       weapon.applied = toggled
     }
+    this.rollData.weaponUsed = false
+    for(let a of this.rollData.weaponsList) {
+      if (a.applied) {
+        this.rollData.weaponUsed = true
+      }
+    }
     console.log("Weapon", weaponIdx, toggled, weapon)
     PegasusUtility.updateDamageDicePool(this.rollData)
   }
@@ -281,6 +296,13 @@ export class PegasusRollDialog extends Dialog {
       PegasusUtility.removeFromDicePool(this.rollData, idx)
       this.refreshDialog()
     })
+    html.find('.pool-remove-hindrance-dice').click(async (event) => {
+      if (this.rollData.hindranceDices > this.rollData.minHindranceDices) { 
+        this.rollData.hindranceDices--;
+      }
+      this.refreshDialog()
+    })
+    
 
 
   }

modules/pegasus-utility.js

@@ -23,9 +23,32 @@ export class PegasusUtility {
     Hooks.on('renderChatLog', (log, html, data) => PegasusUtility.chatListeners(html))
     Hooks.on('targetToken', (user, token, flag) => PegasusUtility.targetToken(user, token, flag))
     Hooks.on('renderSidebarTab', (app, html, data) => PegasusUtility.addDiceRollButton(app, html, data))
-    Hooks.on("getCombatTrackerEntryContext", (html, options) => {
+    /* Deprecated, no more used in rules Hooks.on("getCombatTrackerEntryContext", (html, options) => {
       PegasusUtility.pushInitiativeOptions(html, options);
-    });
+    });*/
+    Hooks.once('diceSoNiceReady', (dice3d) => {
+      dice3d.addSystem({ id: "pegasus-hindrance", name: "Hindrance Die" }, "preferred");
+      dice3d.addDicePreset({
+        type: "dh",
+        labels: [
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png'
+        ],
+        bumpMaps: [
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice-empty.png',
+          'systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png'
+        ],
+        system: "pegasus-hindrance"
+      }, "d6")
+    })
     Hooks.on("dropCanvasData", (canvas, data) => {
       PegasusUtility.dropItemOnToken(canvas, data)
     });
@@ -70,6 +93,26 @@ export class PegasusUtility {
     Handlebars.registerHelper('getDice', function (a) {
       return PegasusUtility.getDiceFromLevel(a)
     })
+    Handlebars.registerHelper('getStatusConfig', function (a) {
+      let key = a + "Status"
+      //console.log("TABE", key, game.system.pegasus.config[key] )
+      return game.system.pegasus.config[key]
+    })
+    Handlebars.registerHelper('valueAtIndex', function (arr, idx) {
+      return arr[idx];
+    })
+    Handlebars.registerHelper('for', function (from, to, incr, block) {
+      let accum = '';
+      for (let i = from; i <= to; i += incr)
+        accum += block.fn(i);
+      return accum;
+    })
+    Handlebars.registerHelper('isGM', function () {
+      return game.user.isGM
+    })
+    Handlebars.registerHelper('isCharacter', function (id) {
+      return game.combat.isCharacter(id)
+    })
 
   }
 
@@ -122,7 +165,8 @@ export class PegasusUtility {
   static getDiceList() {
     return [{ key: "d4", level: 1, img: "systems/fvtt-pegasus-rpg/images/dice/d4.webp" }, { key: "d6", level: 2, img: "systems/fvtt-pegasus-rpg/images/dice/d6.webp" },
     { key: "d8", level: 3, img: "systems/fvtt-pegasus-rpg/images/dice/d8.webp" }, { key: "d10", level: 4, img: "systems/fvtt-pegasus-rpg/images/dice/d10.webp" },
-    { key: "d12", level: 5, img: "systems/fvtt-pegasus-rpg/images/dice/d12.webp" }]
+    { key: "d12", level: 5, img: "systems/fvtt-pegasus-rpg/images/dice/d12.webp" }, 
+    { key: "hindrance", level: 0, img: "systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png"}]
   }
 
   /* -------------------------------------------- */
@@ -131,10 +175,10 @@ export class PegasusUtility {
     let diceKey = PegasusUtility.getDiceFromLevel(level)
     let diceList = diceKey.split(" ")
     for (let myDice of diceList) {
-      myDice = myDice.trim()
+      let myDiceTrim = myDice.trim()
       let newDice = {
-        name: name, key: myDice, level: PegasusUtility.getLevelFromDice(myDice), mod: mod, effect: effectName,
-        img: `systems/fvtt-pegasus-rpg/images/dice/${myDice}.webp`
+        name: name, key: myDiceTrim, level: PegasusUtility.getLevelFromDice(myDiceTrim), mod: mod, effect: effectName,
+        img: `systems/fvtt-pegasus-rpg/images/dice/${myDiceTrim}.webp`
       }
       dicePool.push(newDice)
       mod = 0 // Only first dice has modifier
@@ -146,10 +190,10 @@ 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?.hindrance && effect.effect && effect.effect.system.bonusdice) {
+      if (effect?.applied && effect.type == "effect" && !effect.effect?.system?.hindrance && 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 && !effect.effect?.system?.hindrance) {
+      if (effect?.applied && effect.type == "effect" && effect.value && effect.isdynamic && !effect.effect?.system?.hindrance) {
         newDicePool = newDicePool.concat(this.buildDicePool("effect-bonus-dice", effect.value, 0, effect.name))
       }
     }
@@ -160,7 +204,7 @@ export class PegasusUtility {
   static updateHindranceBonusDice(rollData) {
     let newDicePool = rollData.dicePool.filter(dice => dice.name != "effect-hindrance")
     for (let hindrance of rollData.effectsList) {
-      if (hindrance && hindrance.applied && (hindrance.type == "hindrance" || (hindrance.type == "effect" && hindrance.effect?.system?.hindrance))) {
+      if (hindrance?.applied && (hindrance.type == "hindrance" || (hindrance.type == "effect" && hindrance.effect?.system?.hindrance))) {
         console.log("Adding Hindrance 1", hindrance, newDicePool)
         newDicePool = newDicePool.concat(this.buildDicePool("effect-hindrance", (hindrance.value) ? hindrance.value : hindrance.effect.system.effectlevel, 0, hindrance.name))
         console.log("Adding Hindrance 2", newDicePool)
@@ -240,12 +284,16 @@ export class PegasusUtility {
 
   /* -------------------------------------------- */
   static addDicePool(rollData, diceKey, level) {
+    if (diceKey == "hindrance") {
+      rollData.hindranceDices +=1  
+    } else {
       let newDice = {
         name: "dice-click", key: diceKey, level: level,
         img: `systems/fvtt-pegasus-rpg/images/dice/${diceKey}.webp`
       }
       rollData.dicePool.push(newDice)
     }
+  }
 
   /*-------------------------------------------- */
   static removeFromDicePool(rollData, diceIdx) {
@@ -369,14 +417,9 @@ export class PegasusUtility {
     this.optionsDiceList = optionsDiceList;
     this.optionsLevel = optionsLevel;
 
-    this.optionsStatusList = '<option value="notapplicable">Not applicable</option><option value="health">Health</option><option value="nrg">NRG</option><option value="delirium">Delirium</option>';
 
   }
 
-  /* -------------------------------------------- */
-  static getOptionsStatusList() {
-    return this.optionsStatusList;
-  }
   /* -------------------------------------------- */
   static getOptionsDiceList() {
     return this.optionsDiceList;
@@ -749,7 +792,7 @@ export class PegasusUtility {
     // De-actived used effects from perks
     let toRem = []
     for (let effect of rollData.effectsList) {
-      if (effect.effect && effect.effect.system.isUsed && effect.effect.system.oneuse) {
+      if (effect?.effect?.system.isUsed && effect.effect.system.oneuse) {
         effect.defenderTokenId = rollData.defenderTokenId
         if (effect.foreign) {
           if (game.user.isGM) {
@@ -763,11 +806,11 @@ export class PegasusUtility {
         }
       }
     }
-    if (toRem.length > 0) {
-      //console.log("Going to remove one use effects", toRem)
     let actor = game.actors.get(rollData.actorId)
+    if (toRem.length > 0) {
       actor.deleteEmbeddedDocuments('Item', toRem)
     }
+    actor.checkEFfectsHindranceDeletion(rollData.statKey)
   }
 
   /* -------------------------------------------- */
@@ -808,6 +851,12 @@ export class PegasusUtility {
   /* -------------------------------------------- */
   static async rollPegasus(rollData) {
     let actor = game.actors.get(rollData.actorId)
+    if (rollData.tokenId) {
+      let token = canvas.tokens.placeables.find(t => t.id == rollData.tokenId)
+      if (token) {
+        actor = token.actor
+      }
+    }
 
     let diceFormulaTab = []
     for (let dice of rollData.dicePool) {
@@ -820,11 +869,22 @@ export class PegasusUtility {
     let myRoll = rollData.roll
     if (!myRoll || rollData.rerollHero || rollData.rerollMomentum) { // 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
     }
+    if (rollData.hindranceDices > 0) {
+      rollData.hindranceRoll = new Roll(rollData.hindranceDices + "dh").roll({ async: false })
+      this.showDiceSoNice(rollData.hindranceRoll, game.settings.get("core", "rollMode"))
+      for (let res of rollData.hindranceRoll.terms[0].results) {
+        if (res.result == 6) {
+          rollData.hindranceFailure = true
+          rollData.img = `systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png`
+        }
+      }
+    }
+    await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
+
     // Final score and keep data
-    rollData.finalScore = myRoll.total
+    rollData.finalScore = (rollData.hindranceFailure) ? 0 : myRoll.total
 
     if (rollData.damages) {
       let dmgFormula = this.getFoundryDiceFromLevel(rollData.damages.value)
@@ -840,6 +900,7 @@ export class PegasusUtility {
     // Init stuf
     if (rollData.isInit) {
       let combat = game.combats.get(rollData.combatId)
+      await combat.setTic(rollData.combatantId, rollData)
       combat.updateEmbeddedDocuments("Combatant", [{ _id: rollData.combatantId, initiative: rollData.finalScore }])
     }
 
@@ -1042,7 +1103,7 @@ export class PegasusUtility {
       }
       //rollData.attackerId = this.id
       console.log("Target/DEFENDER", defenderActor)
-      defenderActor.addHindrancesList(rollData.effectsList)
+      //defenderActor.addHindrancesList(rollData.effectsList) /* No more used */
     }
   }
 
@@ -1120,7 +1181,7 @@ export class PegasusUtility {
       let friends = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && newToken.document.disposition == token.document.disposition)
       for (let friend of friends) {
         if (friend.actor.id != token.actor.id) {
-          let existing = toApply[friend.actor.id] || { actor: friend.actor, add: false, level: 0, names: [] }
+          let existing = toApply[friend.id] || { token: friend, add: false, level: 0, names: [] }
           let visible = canvas.effects.visibility.testVisibility(friend.center, { object: token })
           console.log("parse visible TACTICIAN : ", visible, token.name, friend.name)
           if (visible) {
@@ -1128,22 +1189,22 @@ export class PegasusUtility {
             existing.level += token.actor.getRoleLevel()
             existing.names.push(token.actor.name)
           }
-          toApply[friend.actor.id] = existing
+          toApply[friend.id] = existing
         }
       }
     }
     for (let id in toApply) {
       let applyDef = toApply[id]
-      let hasBonus = applyDef.actor.hasTacticianBonus()
+      let hasBonus = applyDef.token.actor.hasTacticianBonus()
       if (applyDef.add) {
         if (!hasBonus) {
-          applyDef.actor.addTacticianEffect(applyDef.names.toString(), applyDef.level)
+          await applyDef.token.actor.addTacticianEffect(applyDef.names.toString(), applyDef.level)
         } else if (applyDef.level != hasBonus.system.effectlevel) {
-          await applyDef.actor.removeTacticianEffect()
-          applyDef.actor.addTacticianEffect(applyDef.names.toString(), applyDef.level)
+          await applyDef.token.actor.removeTacticianEffect()
+          await applyDef.token.actor.addTacticianEffect(applyDef.names.toString(), applyDef.level)
         }
       } else if (hasBonus) {
-        applyDef.actor.removeTacticianEffect()
+        await applyDef.token.actor.removeTacticianEffect()
       }
     }
     //Delete all effects if no more tacticians (ie deleted case)
@@ -1151,7 +1212,7 @@ export class PegasusUtility {
       let allTokens = canvas.tokens.placeables.filter(token => token.actor.type == "character")
       for (let token of allTokens) {
         if (token.actor.hasTacticianBonus()) {
-          token.actor.removeTacticianEffect()
+          await token.actor.removeTacticianEffect()
         }
       }
     }
@@ -1168,7 +1229,7 @@ export class PegasusUtility {
       let friends = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && newToken.document.disposition == token.document.disposition)
       for (let friend of friends) {
         if (friend.actor.id != token.actor.id) {
-          let existing = toApply[friend.actor.id] || { actor: friend.actor, add: false, level: 0, names: [] }
+          let existing = toApply[friend.id] || { token: friend, add: false, level: 0, names: [] }
           let visible = canvas.effects.visibility.testVisibility(friend.center, { object: token })
           console.log("parse visible ENHANCER: ", visible, token.name, friend.name)
           if (visible) {
@@ -1179,22 +1240,22 @@ export class PegasusUtility {
               existing.names.push(token.actor.name)
             }
           }
-          toApply[friend.actor.id] = existing
+          toApply[friend.id] = existing
         }
       }
     }
     for (let id in toApply) {
       let applyDef = toApply[id]
-      let hasBonus = applyDef.actor.hasEnhancerBonus()
+      let hasBonus = applyDef.token.actor.hasEnhancerBonus()
       if (applyDef.add) {
         if (!hasBonus) {
-          applyDef.actor.addEnhancerEffect(applyDef.names.toString(), applyDef.level)
+          await applyDef.token.actor.addEnhancerEffect(applyDef.names.toString(), applyDef.level)
         } else if (applyDef.level != hasBonus.system.effectlevel) {
-          await applyDef.actor.removeEnhancerEffect()
-          applyDef.actor.addEnhancerEffect(applyDef.names.toString(), applyDef.level)
+          await applyDef.token.actor.removeEnhancerEffect()
+          await applyDef.token.actor.addEnhancerEffect(applyDef.names.toString(), applyDef.level)
         }
       } else if (hasBonus) {
-        applyDef.actor.removeEnhancerEffect()
+        await applyDef.token.actor.removeEnhancerEffect()
       }
     }
     // Delete all effects if no more tacticians (ie deleted case)
@@ -1202,7 +1263,7 @@ export class PegasusUtility {
       let allTokens = canvas.tokens.placeables.filter(token => token.actor.type == "character")
       for (let token of allTokens) {
         if (token.actor.hasEnhancerBonus()) {
-          token.actor.removeEnhancerEffect()
+          await token.actor.removeEnhancerEffect()
         }
       }
     }
@@ -1225,9 +1286,11 @@ export class PegasusUtility {
       if (token.document.disposition == 0) {
         ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == -1 || newToken.document.disposition == 1))
       }
+      console.log("Ennemies for token", token.actor.name, ennemies)
       for (let ennemy of ennemies) {
         if (ennemy.actor.id != token.actor.id) {
-          let existing = toApply[ennemy.actor.id] || { actor: ennemy.actor, add: false, level: 0, names: [] }
+          //console.log("Adding ennemy", ennemy.id)
+          let existing = toApply[ennemy.id] || { token: ennemy, add: false, level: 0, names: [] }
           let visible = canvas.effects.visibility.testVisibility(ennemy.center, { object: token })
           if (visible) {
             let dist = canvas.grid.measureDistances([{ ray: new Ray(token.center, ennemy.center) }], { gridSpaces: false })
@@ -1237,30 +1300,31 @@ export class PegasusUtility {
               existing.names.push(token.actor.name)
             }
           }
-          toApply[ennemy.actor.id] = existing
+          toApply[ennemy.id] = existing
         }
       }
     }
+    //console.log("To apply stuff : ", toApply)
     for (let id in toApply) {
       let applyDef = toApply[id]
-      let hasHindrance = applyDef.actor.hasAgitatorHindrance()
+      let hasHindrance = applyDef.token.actor.hasAgitatorHindrance()
       if (applyDef.add) {
         if (!hasHindrance) {
-          applyDef.actor.addAgitatorHindrance(applyDef.names.toString(), applyDef.level)
+          await applyDef.token.actor.addAgitatorHindrance(applyDef.names.toString(), applyDef.level)
         } else if (applyDef.level != hasHindrance.system.effectlevel) {
-          await applyDef.actor.removeAgitatorHindrance()
-          applyDef.actor.addAgitatorHindrance(applyDef.names.toString(), applyDef.level)
+          await applyDef.token.actor.removeAgitatorHindrance()
+          await applyDef.token.actor.addAgitatorHindrance(applyDef.names.toString(), applyDef.level)
         }
       } else if (hasHindrance) {
-        applyDef.actor.removeAgitatorHindrance()
+        await applyDef.token.actor.removeAgitatorHindrance()
       }
     }
-    // Delete all effects if no more agtators (ie deleted case)
+    // Delete all effects if no more agitators (ie deleted case)
     if (agitatorTokens.length == 0) {
       let allTokens = canvas.tokens.placeables.filter(token => token.actor.type == "character")
       for (let token of allTokens) {
         if (token.actor.hasAgitatorHindrance()) {
-          token.actor.removeAgitatorHindrance()
+          await token.actor.removeAgitatorHindrance()
         }
       }
     }
@@ -1278,9 +1342,9 @@ export class PegasusUtility {
     this.lastRoleEffectProcess = now
     console.log("=========================+> Searching/Processing roles effects")
 
-    await this.processTactician()
+    /*NO MORE USED : await this.processTactician()*/
     await this.processEnhancer()
-    await this.processAgitator()
+    /*NO MORE USED : await this.processAgitator()*/
 
   }
 

packs/equipment.db

@@ -31,7 +31,7 @@
 {"_id":"L8raESAWGjkdXuPx","name":"Spy Gear","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"spy","cost":200,"weight":0,"idr":"2","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}}}
 {"_id":"LRnQpW6rgkU5NczM","name":"Iron Spike","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"camping","cost":1,"weight":0.5,"idr":"3","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"NEArhgMy0Ej4vkdE","name":"Horseshoes","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"equestrian","cost":50,"weight":4,"idr":"4","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}}}
-{"_id":"NIINjy3fVooviDjq","name":"Backpack, Framed","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"camping","cost":100,"weight":2,"idr":"2","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"NIINjy3fVooviDjq","name":"Backpack, Framed","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"type":"camping","cost":100,"weight":2,"idr":"2","quantity":0,"equipped":false,"stataffected":"notapplicable","level":0,"statdice":false,"bonusdice":false,"otherdice":false,"effects":[],"activated":false,"iscontainer":true,"containercapacity":100,"containerid":"","threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.4","coreVersion":"10.290","createdTime":null,"modifiedTime":1669711117227,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"NJfceDGC0l6TAeO2","name":"Night Vision Goggles","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"spy","cost":600,"weight":2,"idr":"3","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}}}
 {"_id":"Nv0T2i5VMoz6UjLy","name":"Rations","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"camping","cost":2,"weight":0.5,"idr":"1","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"NwW28ql42bRN8JPB","name":"Torch","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"camping","cost":3,"weight":1,"idr":"1","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
@@ -50,17 +50,17 @@
 {"_id":"VsfCjMAN0WDMBBGe","name":"Wand","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"wizard","cost":500,"weight":0.5,"idr":"1","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}}}
 {"_id":"WD3ly2AuBb093Aum","name":"Computer, Laptop","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"communication","cost":1500,"weight":3,"idr":"1","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"XWx2NMmoEYpPc4uA","name":"Cigarette Lighter","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"camping","cost":10,"weight":0,"idr":"1","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"XnHmM4nG7Zkfb4ns","name":"Saddlebags","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"equestrian","cost":100,"weight":3,"idr":"3","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}}}
+{"_id":"XnHmM4nG7Zkfb4ns","name":"Saddlebags","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}},"system":{"type":"equestrian","cost":100,"weight":3,"idr":"3","quantity":0,"equipped":false,"stataffected":"notapplicable","level":0,"statdice":false,"bonusdice":false,"otherdice":false,"effects":[],"activated":false,"iscontainer":true,"containercapacity":40,"containerid":"","threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.4","coreVersion":"10.290","createdTime":null,"modifiedTime":1669711313199,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"YTck6el8D5R8lCmS","name":"Sleeping Bag","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"camping","cost":25,"weight":7,"idr":"2","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"Yg44Yrrx5m3ynWUC","name":"Oil Per Litre","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"camping","cost":1.5,"weight":6,"idr":"2","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"ZZmHZ8GoBilRmyf2","name":"First Aid Kit","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"medical","cost":10,"weight":2,"idr":"3","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}}}
 {"_id":"b387C0DT1IxZREZQ","name":"Power Stone","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"wizard","cost":200,"weight":0.5,"idr":"1","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}}}
 {"_id":"bmE85A0bRsN71WVQ","name":"Super Spandex","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"clothing","cost":200,"weight":0.5,"idr":"5","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}}}
 {"_id":"bq7SRgHwCTAp7VOH","name":"Crowbar","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"tools","cost":20,"weight":3,"idr":"3","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}}}
-{"_id":"cPl15ZpD25yVRiNg","name":"Quiver","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"weaponaccess","cost":15,"weight":1,"idr":"3","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}}}
+{"_id":"cPl15ZpD25yVRiNg","name":"Quiver","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}},"system":{"type":"weaponaccess","cost":15,"weight":1,"idr":"3","quantity":0,"equipped":false,"stataffected":"notapplicable","level":0,"statdice":false,"bonusdice":false,"otherdice":false,"effects":[],"activated":false,"iscontainer":true,"containercapacity":3,"containerid":"","threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.4","coreVersion":"10.290","createdTime":null,"modifiedTime":1669711290440,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"cS5p399AibT1mzFG","name":"Scope","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"weaponaccess","cost":150,"weight":1.5,"idr":"1","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}}}
-{"_id":"ck7luPSPkzbpoilV","name":"Suitcase Hard","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"camping","cost":250,"weight":8,"idr":"2","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"coJ9sWJfo7H0mOg2","name":"Pouch","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"camping","cost":10,"weight":0,"idr":"2","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"ck7luPSPkzbpoilV","name":"Suitcase Hard","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"type":"camping","cost":250,"weight":8,"idr":"2","quantity":0,"equipped":false,"stataffected":"notapplicable","level":0,"statdice":false,"bonusdice":false,"otherdice":false,"effects":[],"activated":false,"iscontainer":true,"containercapacity":100,"containerid":"","threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.4","coreVersion":"10.290","createdTime":null,"modifiedTime":1669711332714,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
+{"_id":"coJ9sWJfo7H0mOg2","name":"Pouch","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"type":"camping","cost":10,"weight":0,"idr":"2","quantity":0,"equipped":false,"stataffected":"notapplicable","level":0,"statdice":false,"bonusdice":false,"otherdice":false,"effects":[],"activated":false,"iscontainer":true,"containercapacity":3,"containerid":"","threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.4","coreVersion":"10.290","createdTime":null,"modifiedTime":1669711216310,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"dysEIsp0AyqGIMwm","name":"Wristwatch","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"camping","cost":100,"weight":0,"idr":"1","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"e0eZDgbBDkcF9a7y","name":"Bullet (50)","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"ammo","cost":15,"weight":2,"idr":"3","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}}}
 {"_id":"evd4BdgmKwuH42zc","name":"Thermos Bottle","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"camping","cost":10,"weight":2,"idr":"3","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
@@ -93,5 +93,5 @@
 {"_id":"vSY6F61C3ET9YLBA","name":"Lanyard","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"weaponaccess","cost":1,"weight":0,"idr":"1","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}}}
 {"_id":"vqF8yH9f4rkoneZn","name":"Arrows AP (20)","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"ammo","cost":60,"weight":1,"idr":"1","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}}}
 {"_id":"w3c6slyBnRVJyRDz","name":"Climbing Gear","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"camping","cost":50,"weight":4,"idr":"3","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"xRXKblx7D5pU9HE4","name":"Backpack, Small","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"camping","cost":100,"weight":10,"idr":"2","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"xRXKblx7D5pU9HE4","name":"Backpack, Small","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"type":"camping","cost":100,"weight":10,"idr":"2","quantity":0,"equipped":false,"stataffected":"notapplicable","level":0,"statdice":false,"bonusdice":false,"otherdice":false,"effects":[],"activated":false,"iscontainer":true,"containercapacity":40,"containerid":"","threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.4","coreVersion":"10.290","createdTime":null,"modifiedTime":1669711128488,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"xaHOAdlKJdym7xvz","name":"Handcuffs","type":"equipment","img":"systems/fvtt-pegasus-rpg/images/icons/icon_equipment.webp","data":{"type":"spy","cost":40,"weight":0.5,"idr":"4","equipped":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.Qf2QKCFHoTjCIFax"}}}

packs/racial-abilities.db

@@ -1,65 +1,66 @@
-{"_id":"0DEuUiseNrqMtkpH","name":"Cybernetic Senses","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"per","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":1,"opponenthindrance":0,"attackgained":[],"armorgained":[],"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"0bW374Onk2LEUKNO","name":"Metal Body","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":2,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":0,"opponenthindrance":0,"attackgained":[],"armorgained":[{"_id":"y3aravy7qqveefeg","name":"Metal Body","type":"armor","img":"systems/fvtt-pegasus-rpg/images/icons/icon_armour.webp","data":{"statistic":"phy","resistance":2,"weight":0,"cost":0,"idr":"0","equipped":false,"locationprotected":"All","description":""},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.nEu11KzIsSfxzGia"}}}],"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"0DEuUiseNrqMtkpH","name":"Cybernetic Senses","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"per","statmodifier":1,"statlevelincrease":0,"statusaffected":"nrg","statusmodifier":-1,"powersgained":[],"specialisations":[],"effectsgained":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":1,"opponenthindrance":0,"attackgained":[],"armorgained":[],"threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":null,"modifiedTime":1669633760146,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
+{"_id":"0bW374Onk2LEUKNO","name":"Metal Body","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"effectsgained":[{"name":"Metal Body BD to DMG RES","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","system":{"type":"physical","genre":"positive","effectlevel":2,"reducedicevalue":false,"stataffected":"dmg-res","specaffected":[],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":false,"effectstat":"","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"","otherdice":false},"effects":[],"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3},"flags":{},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669634637300,"modifiedTime":1669636250438,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"MAV6JVzveHd4kVgF"}],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":0,"opponenthindrance":0,"attackgained":[],"armorgained":[{"_id":"y3aravy7qqveefeg","name":"Metal Body","type":"armor","img":"systems/fvtt-pegasus-rpg/images/icons/icon_armour.webp","data":{"statistic":"phy","resistance":2,"weight":0,"cost":0,"idr":"0","equipped":false,"locationprotected":"All","description":""},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.nEu11KzIsSfxzGia"}}}],"threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","bonusdice":0,"otherdice":2},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":null,"modifiedTime":1669636256107,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"1y6qo5dvemTXe6JF","name":"Perception [PER] +2 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"per","statmodifier":2,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"2XbpJr3oIIdXBQDX","name":"Red Eyes","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"3cq8bAvKZVewpPi0","name":"Strength [STR] +3 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"str","statmodifier":3,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"5KpsiDpZU9iIhoJn","name":"Combat [COM] +2 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"com","statmodifier":2,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"6e8TE1ofdYi6O9R1","name":"Agility [AGI] +2 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"agi","statmodifier":2,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"9pAPPSEEQTaKGIGn","name":"Bite & Tail Combo","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"9pAPPSEEQTaKGIGn","name":"Bite & Tail Combo","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"effectsgained":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":0,"opponenthindrance":0,"attackgained":[{"name":"Bite & Tail Unarmed Combo Attack","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","system":{"statistic":"com","damagestatistic":"str","damage":"1","canbethrown":false,"cost":0,"weight":0,"idr":"0","range":"notapplicable","maxrange":"","ao":"","enhanced":false,"enhancedstat":"","enhancedlevel":0,"damagetype":"crushing","itemsize":"0","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":true,"effects":[],"activated":false,"description":"","aoe":"none"},"effects":[],"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3},"flags":{},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669634991241,"modifiedTime":1669635046683,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"7X9j03q5GuJqaDp3"}],"armorgained":[],"threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":null,"modifiedTime":1669635135766,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"CCQqre28bBEcxbvT","name":"Artificial","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"soc","statmodifier":-2,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>See Pegasus Engine CORE RPG</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.racial-abilities.HJoEmBzCz8vJhMnO"}}}
-{"_id":"Eme4Yf7vZjRBiXsK","name":"Tough Skin","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"IM1vzlBizepTjvYS","name":"Tail","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":0,"opponenthindrance":0,"attackgained":[],"armorgained":[],"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"Eme4Yf7vZjRBiXsK","name":"Tough Skin","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"effectsgained":[{"name":"Tough Skin BD to DMG RES","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","system":{"type":"physical","genre":"positive","effectlevel":1,"reducedicevalue":false,"stataffected":"dmg-res","specaffected":[],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":false,"effectstat":"","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"","otherdice":false},"effects":[],"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3},"flags":{},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669634637300,"modifiedTime":1669634924209,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"bqDQL3kj8JacXgJd"}],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":0,"opponenthindrance":0,"attackgained":[],"armorgained":[],"threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":null,"modifiedTime":1669634940848,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
+{"_id":"IM1vzlBizepTjvYS","name":"Tail","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"effectsgained":[{"name":"Tail BD Acrobatics & Wrestling","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","system":{"type":"physical","genre":"positive","effectlevel":1,"reducedicevalue":false,"stataffected":"all","specaffected":[{"_id":"rYMd2YhMiOdF6iBN","name":"Acrobatics [AGI]","type":"specialisation","img":"systems/fvtt-pegasus-rpg/images/icons/icon_spec.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.specialisations.LLspP53ld6TYG0xH"}},"system":{"statistic":"agi","level":0,"ispowergroup":false,"powersource":"","powersactivated":false,"powers":[],"isthreatlevel":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.1.11","coreVersion":"10.290","createdTime":null,"modifiedTime":1669459157318,"lastModifiedBy":"26RudOd8Ui76NJhI"}},{"_id":"ljivlwQDTlXuykWj","name":"Wrestling [COM]","type":"specialisation","img":"systems/fvtt-pegasus-rpg/images/icons/icon_spec.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.specialisations.P1DutOMWh7ANYH5t"}},"system":{"statistic":"com","level":0,"ispowergroup":false,"powersource":"","powersactivated":false,"powers":[],"isthreatlevel":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.1.11","coreVersion":"10.290","createdTime":null,"modifiedTime":1669458808071,"lastModifiedBy":"26RudOd8Ui76NJhI"}}],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":false,"effectstat":"","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"","otherdice":false},"effects":[],"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3},"flags":{"core":{"sourceId":"Item.zEZRm1JLclv7HRNR"}},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669634637300,"modifiedTime":1669636064204,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"lruYLZNbvXSZl2Ve"}],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":0,"opponenthindrance":0,"attackgained":[],"armorgained":[],"threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>\n<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">Drag onto Target: @UUID[Compendium.fvtt-pegasus-rpg.effects.ZEyan7n07ewf42i9]{Hindrance Dice ALL}</span></p>","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":null,"modifiedTime":1669636116605,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"ITQR244uUDd0oYSu","name":"Social [SOC] -1 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"soc","statmodifier":-1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"KOuUDW0BXlVaHo4W","name":"Night Vision","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"L0jGHI3Yx8Gp00G8","name":"Horns or Spikes","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"LxSNaTYCxAmqYrUh","name":"Cybernetic Legs","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"mr","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":1,"opponenthindrance":0,"attackgained":[],"armorgained":[],"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"L0jGHI3Yx8Gp00G8","name":"Horns or Spikes","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"effectsgained":[{"name":"Horns or Spikes BD UNARMED DMG Only","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","system":{"type":"physical","genre":"positive","effectlevel":1,"reducedicevalue":false,"stataffected":"melee-dmg","specaffected":[],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":false,"effectstat":"","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"","otherdice":false},"effects":[],"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3},"flags":{},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669634637300,"modifiedTime":1669635855846,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"kDHpoobActQnHXIW"},{"name":"Horns or Spikes BD to DMG RES","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","system":{"type":"physical","genre":"positive","effectlevel":1,"reducedicevalue":false,"stataffected":"dmg-res","specaffected":[],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":false,"effectstat":"","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"","otherdice":false},"effects":[],"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3},"flags":{},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669634637300,"modifiedTime":1669635887037,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"tlhl7tPfKXEQhg03"}],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":0,"opponenthindrance":0,"attackgained":[],"armorgained":[],"threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":null,"modifiedTime":1669635915917,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
+{"_id":"LxSNaTYCxAmqYrUh","name":"Cybernetic Legs","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"mr","statmodifier":1,"statlevelincrease":0,"statusaffected":"nrg","statusmodifier":-1,"powersgained":[],"specialisations":[],"effectsgained":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":1,"opponenthindrance":0,"attackgained":[],"armorgained":[],"threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.4","coreVersion":"10.290","createdTime":null,"modifiedTime":1669711615277,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"M7bQBret2fhsndTy","name":"Mind [MND] +3 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"mnd","statmodifier":3,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"MkzLF58m1BK245XX","name":"Defence [DEF] +3 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"def","statmodifier":3,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"Nb6QQVzrIBNB1hS8","name":"Focus [FOC] +1 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"foc","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"O0ygTfkjdjWylVnx","name":"Agility [AGI] +1 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"agi","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"PE4SHrg7x0vKnR7y","name":"Strength [STR] +2 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"str","statmodifier":2,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"Pn3KDs17brH2JLun","name":"Metal Carapace","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":3,"opponenthindrance":0,"attackgained":[],"armorgained":[],"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"Pn3KDs17brH2JLun","name":"Metal Carapace","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"statusaffected":"nrg","statusmodifier":-1,"powersgained":[],"specialisations":[],"effectsgained":[{"name":"Metal Carapace FX: BD to DMG RES","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","system":{"type":"physical","genre":"positive","effectlevel":3,"reducedicevalue":false,"stataffected":"dmg-res","specaffected":[],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":false,"effectstat":"","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"","otherdice":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669633926007,"modifiedTime":1669633946640,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"VEStJ9gJ79E6Abae","folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3}}],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":3,"opponenthindrance":0,"attackgained":[],"armorgained":[],"threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":null,"modifiedTime":1669633978751,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"SxnZHJddjsPfVa7c","name":"Dark Vision","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Item.vZlHA2YhsYm1tPTB"}}}
 {"_id":"TYhCzvymJ3W1B0FC","name":"Wings","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"TYkM7q3FtJbDRvlg","name":"Combat [COM] +1 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"com","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"name":"Small","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3,"hmgQYmqJMH3vUOoa":3},"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.racial-abilities.yahCc1WvFBPZ30QL"}},"_id":"UzUDFwHehTGAMws5"}
 {"_id":"V9VZTm0jztOQxZS1","name":"Social [SOC] +3 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"soc","statmodifier":3,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"X66FYt2SVavGHcUP","name":"Dexterity Gyro","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"agi","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":1,"opponenthindrance":0,"attackgained":[],"armorgained":[],"description":""},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"X66FYt2SVavGHcUP","name":"Dexterity Gyro","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"agi","statmodifier":1,"statlevelincrease":0,"statusaffected":"nrg","statusmodifier":-1,"powersgained":[],"specialisations":[],"effectsgained":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":1,"opponenthindrance":0,"attackgained":[],"armorgained":[],"threatlevel":0,"description":"","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":null,"modifiedTime":1669634075961,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"X85EYqbOGOyOyk4a","name":"Perception [PER] +1 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"per","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"XMXv4DoIJ4EeUEQJ","name":"Stealth [STL] +1 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"stl","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"aTXjv00HKrZ0kOz9","name":"Extra Arms","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"name":"Concealment","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3,"hmgQYmqJMH3vUOoa":3},"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.racial-abilities.k07z4J0VzWJVyW5E"}},"_id":"aUbYKh7giBxXOWrZ"}
-{"_id":"agIfRmAFZeZgnqQ8","name":"Flight","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"agIfRmAFZeZgnqQ8","name":"Flight","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[{"name":"Flight [AGI]","type":"specialisation","img":"systems/fvtt-pegasus-rpg/images/icons/icon_spec.webp","system":{"statistic":"agi","level":1,"ispowergroup":false,"powersource":"","powersactivated":false,"powers":[],"isthreatlevel":false,"description":""},"effects":[],"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3},"flags":{},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669636421359,"modifiedTime":1669636436906,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"FMBH4qGYq2MZw5iK"}],"effectsgained":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":0,"opponenthindrance":0,"attackgained":[],"armorgained":[],"threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":null,"modifiedTime":1669636458055,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"auvwjtiN9r9jlS43","name":"Defence [DEF] +1 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"def","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"bwHIv94lHISxxU5B","name":"Social [SOC] +2 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"soc","statmodifier":2,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"cp6l865666pWJZ1Q","name":"Perception [PER] +3 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"per","statmodifier":3,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"dMtozTo29eCZSLvN","name":"Physique [PHY] +3 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"phy","statmodifier":3,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"dieKfSLXvGjBz8Qk","name":"Radioactive Spit","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"dieKfSLXvGjBz8Qk","name":"Radioactive Spit","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"effectsgained":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":0,"opponenthindrance":0,"attackgained":[{"name":"Radioactive Spit","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","system":{"statistic":"agi","damagestatistic":"special","damage":"0","canbethrown":false,"cost":0,"weight":0,"idr":"0","range":"close","maxrange":"","ao":"","enhanced":false,"enhancedstat":"agi","enhancedlevel":0,"damagetype":"none","itemsize":"0","damagetypelevel":0,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":true,"effects":[],"activated":false,"description":"<p>NRG Cost: 3</p>\n<p>Drag onto Target:</p>\n<p>@UUID[Compendium.fvtt-pegasus-rpg.effects.RzH5QvSanCmD8zT8]{Burning}</p>\n<p>@UUID[Compendium.fvtt-pegasus-rpg.effects.yrJYjyHColPtif8t]{Poisoned}</p>","aoe":"none"},"effects":[],"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3},"flags":{},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669634991241,"modifiedTime":1669635757772,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"m08tBEJTsDeqO3qm"}],"armorgained":[],"threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":null,"modifiedTime":1669635771237,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"e4U1spBkNg6bHxMy","name":"Master","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"eMsrvbhEqLyWo4l5","name":"Focus [FOC] +3 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"foc","statmodifier":3,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"f90XWV1Jt1Kx0ELd","name":"Reduced Move","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"fDuToFiiLNr5CLMf","name":"Mind [MND] +2 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"mnd","statmodifier":2,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"fffy2tzOU9B0eB56","name":"Strength [STR] +1 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"str","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"gKvTfvDjrJs8UOx7","name":"Bite","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"gKvTfvDjrJs8UOx7","name":"Bite","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"effectsgained":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":0,"opponenthindrance":0,"attackgained":[{"name":"Bite","type":"weapon","img":"systems/fvtt-pegasus-rpg/images/icons/icon_meleeweapon.webp","system":{"statistic":"com","damagestatistic":"str","damage":"1","canbethrown":false,"cost":0,"weight":0,"idr":"0","range":"notapplicable","maxrange":"","ao":"","enhanced":false,"enhancedstat":"","enhancedlevel":0,"damagetype":"piercing","itemsize":"0","damagetypelevel":1,"vehicledamagetype":"none","vehicledamagetypelevel":0,"ammocurrent":0,"ammomax":0,"equipped":true,"effects":[],"activated":false,"description":"","aoe":"none"},"effects":[],"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3},"flags":{},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669634991241,"modifiedTime":1669636656758,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"T858DYefLozowtVL"}],"armorgained":[],"threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":null,"modifiedTime":1669636684795,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"h5zbFgislyu171s4","name":"Focus [FOC] +2 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"foc","statmodifier":2,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"hprgdfSobvzQhWp9","name":"Cybernetic Arm","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"str","statmodifier":2,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":2,"opponenthindrance":0,"attackgained":[],"armorgained":[],"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"hprgdfSobvzQhWp9","name":"Cybernetic Arm","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"str","statmodifier":2,"statlevelincrease":0,"statusaffected":"nrg","statusmodifier":-2,"powersgained":[],"specialisations":[],"effectsgained":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":2,"opponenthindrance":0,"attackgained":[],"armorgained":[],"threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":null,"modifiedTime":1669634003460,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"hvhH88QJsfwEOWky","name":"Does Not Breathe","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"i8Se94jUfLCgbyYN","name":"Move Rate (Initiative) [MR] +1 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"mr","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.racial-abilities.xfW887EGz940gkqm"}}}
 {"_id":"lMYftTO5BNDnsvFN","name":"Physique [PHY] +2 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"phy","statmodifier":2,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"nMRz1YLmjFed97rA","name":"Brain CPU","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"mnd","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":1,"opponenthindrance":0,"attackgained":[],"armorgained":[],"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"nMRz1YLmjFed97rA","name":"Brain CPU","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"mnd","statmodifier":1,"statlevelincrease":0,"statusaffected":"nrg","statusmodifier":-1,"powersgained":[],"specialisations":[],"effectsgained":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":1,"opponenthindrance":0,"attackgained":[],"armorgained":[],"threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":null,"modifiedTime":1669633366502,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"nVLbaMi41ArLbp3k","name":"Agility [AGI] +3 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"agi","statmodifier":3,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"neoDM1fyRWDFkS30","name":"Social [SOC] +1 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"soc","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"oES8AIR6MKXPRCR7","name":"Mechanical","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"pNDVA9jsSI3wdVHj","name":"Physique [PHY] +1 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"phy","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"name":"Razor Claws","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","system":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"effectsgained":[{"name":"Razor Claws BD DMG","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","system":{"type":"physical","genre":"positive","effectlevel":2,"reducedicevalue":false,"stataffected":"melee-dmg","specaffected":[],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":false,"effectstat":"","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"","otherdice":false},"effects":[],"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3},"flags":{},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669634637300,"modifiedTime":1669635540469,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"oo5VqTdav2PeR9gl"},{"name":"Razor Claws BD Climbing","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","system":{"type":"physical","genre":"positive","effectlevel":2,"reducedicevalue":false,"stataffected":"str","specaffected":[{"_id":"miGaQlAZU1gkdUTO","name":"Climb [STR]","type":"specialisation","img":"systems/fvtt-pegasus-rpg/images/icons/icon_spec.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.specialisations.u5Ur1zi75TK2zgxA"}},"system":{"statistic":"str","level":0,"ispowergroup":false,"powersource":"","powersactivated":false,"powers":[],"isthreatlevel":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.1.11","coreVersion":"10.290","createdTime":null,"modifiedTime":1669459111297,"lastModifiedBy":"26RudOd8Ui76NJhI"}}],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":false,"effectstat":"","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"","otherdice":false},"effects":[],"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3},"flags":{"core":{"sourceId":"Item.zEZRm1JLclv7HRNR"}},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669634637300,"modifiedTime":1669635545305,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"OwRSIYZ62yPMx3nC"}],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":0,"opponenthindrance":0,"attackgained":[],"armorgained":[],"threatlevel":0,"description":"<p>See Pegasus Engine CORE RPG</p>"},"effects":[],"flags":{"core":{"sourceId":"Item.pXeoM6KkdYYui7x6"}},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669635458741,"modifiedTime":1669635566753,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"pXeoM6KkdYYui7x6","folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3}}
 {"_id":"qLHrMCnPyi7KLz6q","name":"Social [SOC] -2 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"soc","statmodifier":-2,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"qs7k8YK9XcmpKDUK","name":"Reactive Nerve Wiring","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"mr","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":1,"opponenthindrance":0,"attackgained":[],"armorgained":[],"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"qs7k8YK9XcmpKDUK","name":"Reactive Nerve Wiring","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"mr","statmodifier":1,"statlevelincrease":0,"statusaffected":"nrg","statusmodifier":-1,"powersgained":[],"specialisations":[],"effectsgained":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":1,"opponenthindrance":0,"attackgained":[],"armorgained":[],"threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.4","coreVersion":"10.290","createdTime":null,"modifiedTime":1669711557204,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"rOMhQYdYLH4I2ga8","name":"Combat [COM] +3 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"com","statmodifier":3,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"rQsToDamxy670mmN","name":"Thermal Ocular Enhancer","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":1,"opponenthindrance":0,"attackgained":[],"armorgained":[],"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"rQsToDamxy670mmN","name":"Thermal Ocular Enhancer","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"statusaffected":"nrg","statusmodifier":-1,"powersgained":[],"specialisations":[],"effectsgained":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":1,"opponenthindrance":0,"attackgained":[],"armorgained":[],"threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":null,"modifiedTime":1669633847812,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"sOkzSAGdJTGjpWtd","name":"Fearsome Howl/Growl","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[{"_id":"wqzbo05wuiqmb1dc","name":"Intimidate [PHY]","type":"specialisation","img":"systems/fvtt-pegasus-rpg/images/icons/icon_spec.webp","data":{"statistic":"phy","level":1,"ispowergroup":false,"powersource":"","powers":[],"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":0,"opponenthindrance":0,"attackgained":[],"armorgained":[],"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"t80esMj8pfXDPZAt","name":"Claws","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":0,"opponenthindrance":0,"attackgained":[],"armorgained":[],"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"t80esMj8pfXDPZAt","name":"Claws","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"effectsgained":[{"name":"Claws BD DMG","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","system":{"type":"physical","genre":"positive","effectlevel":1,"reducedicevalue":false,"stataffected":"melee-dmg","specaffected":[],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":false,"effectstat":"","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"","otherdice":false},"effects":[],"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3},"flags":{},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669634637300,"modifiedTime":1669634654437,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"gGReC7s0em3iTQ0H"},{"name":"Claws BD Climbing","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","system":{"type":"physical","genre":"positive","effectlevel":1,"reducedicevalue":false,"stataffected":"str","specaffected":[{"_id":"miGaQlAZU1gkdUTO","name":"Climb [STR]","type":"specialisation","img":"systems/fvtt-pegasus-rpg/images/icons/icon_spec.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.specialisations.u5Ur1zi75TK2zgxA"}},"system":{"statistic":"str","level":0,"ispowergroup":false,"powersource":"","powersactivated":false,"powers":[],"isthreatlevel":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.1.11","coreVersion":"10.290","createdTime":null,"modifiedTime":1669459111297,"lastModifiedBy":"26RudOd8Ui76NJhI"}}],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":false,"effectstat":"","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"","otherdice":false},"effects":[],"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3},"flags":{"core":{"sourceId":"Item.zEZRm1JLclv7HRNR"}},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669634637300,"modifiedTime":1669634708687,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"3asR9ntKRy8nJZls"}],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":0,"opponenthindrance":0,"attackgained":[],"armorgained":[],"threatlevel":4,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":null,"modifiedTime":1669634757370,"lastModifiedBy":"26RudOd8Ui76NJhI"}}
 {"_id":"uX9B2hwNrFoBbSGJ","name":"Cybernetic Eye","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"per","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":1,"opponenthindrance":0,"attackgained":[],"armorgained":[],"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"wEBaInNs74V7nab7","name":"Mind [MND] +1 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"mnd","statmodifier":1,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"wsKUMcPNKNfRSYXI","name":"Defence [DEF] +2 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"def","statmodifier":2,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"ycMW7FZelfHvCquA","name":"Stealth [STL] +2 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"stl","statmodifier":2,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
 {"_id":"yhi3UPzYd0OZcCkD","name":"Stealth [STL] +3 Modifier","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"stl","statmodifier":3,"statlevelincrease":0,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p>Change the Stat Modifier to reflect the Statistic Modifier (+/- 1 etc).</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
-{"_id":"yjB1JKOKHK4uEnfZ","name":"Skin of Scales","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","data":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":2,"bonusdice":0,"otherdice":0,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"aoe":"","description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{}}
+{"_id":"yjB1JKOKHK4uEnfZ","name":"Skin of Scales","type":"ability","img":"systems/fvtt-pegasus-rpg/images/icons/icon_raceability.webp","effects":[],"folder":null,"sort":0,"flags":{},"system":{"affectedstat":"notapplicable","statmodifier":0,"statlevelincrease":2,"statusaffected":"notapplicable","statusmodifier":0,"powersgained":[],"specialisations":[],"effectsgained":[{"name":"Skin of Scales BD to DMG RES","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","system":{"type":"physical","genre":"positive","effectlevel":2,"reducedicevalue":false,"stataffected":"dmg-res","specaffected":[],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":false,"effectstat":"","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"","otherdice":false},"effects":[],"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3},"flags":{},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669634637300,"modifiedTime":1669635297093,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"m5PRPVSAkMHQjPoh"}],"aoe":"","affectedcircumstances":"","affectedspecialisations":"","nrgcost":0,"opponenthindrance":0,"attackgained":[],"armorgained":[],"threatlevel":0,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>","bonusdice":0,"otherdice":0},"ownership":{"default":0,"iNL4aGohJ8v6YrUk":3},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":null,"modifiedTime":1669635319964,"lastModifiedBy":"26RudOd8Ui76NJhI"}}

packs/zz-adminfx-zz.db

@@ -69,6 +69,7 @@
 {"_id":"dSJ6W2MmA06wb9cD","name":"Take the Pain","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","effects":[],"flags":{},"system":{"type":"physical","genre":"positive","effectlevel":1,"reducedicevalue":false,"stataffected":"dmg-res","specaffected":[],"statdice":true,"bonusdice":false,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":false,"effectstat":"","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"","otherdice":false},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.1.10","coreVersion":"10.288","createdTime":1667916817027,"modifiedTime":1667916817027,"lastModifiedBy":"26RudOd8Ui76NJhI"},"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3}}
 {"_id":"dgEE4p1JH95EXUz5","name":"Martial Artist - BD to UNARMED DMG ONLY","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","effects":[],"flags":{},"system":{"type":"physical","genre":"positive","effectlevel":0,"reducedicevalue":false,"stataffected":"melee-dmg","specaffected":[],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":true,"effectstat":"com","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"","otherdice":false},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.1.10","coreVersion":"10.288","createdTime":1667916817025,"modifiedTime":1668013554225,"lastModifiedBy":"26RudOd8Ui76NJhI"},"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3}}
 {"name":"TELESCOPIC VISION BD","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","system":{"type":"physical","genre":"positive","effectlevel":0,"reducedicevalue":false,"stataffected":"per","specaffected":[{"name":"Spot [PER]","img":"systems/fvtt-pegasus-rpg/images/icons/icon_spec.webp","type":"specialisation","sort":0,"_id":"fBVYpz2SGNW9EFd0","pack":"fvtt-pegasus-rpg.specialisations"}],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":true,"effectstat":"per","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"","otherdice":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.1.10","coreVersion":"10.288","createdTime":1662376253594,"modifiedTime":1667906596738,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"efuTqKqCnZRn6egq","folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3}}
+{"name":"Metal Carapace FX: BD to DMG RES","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","system":{"type":"physical","genre":"positive","effectlevel":3,"reducedicevalue":false,"stataffected":"dmg-res","specaffected":[],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":false,"effectstat":"","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"","otherdice":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.2.3","coreVersion":"10.290","createdTime":1669633926007,"modifiedTime":1669633946640,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"fppVLRrcPB1sxLf0","folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3}}
 {"_id":"g6mczxPyAY2ODuXN","name":"Rapid Strike BD to atk","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","effects":[],"flags":{},"system":{"type":"physical","genre":"positive","effectlevel":0,"reducedicevalue":false,"stataffected":"melee-atk","specaffected":[],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":true,"effectstat":"com","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"","otherdice":false},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.1.10","coreVersion":"10.288","createdTime":1667916817026,"modifiedTime":1667916817026,"lastModifiedBy":"26RudOd8Ui76NJhI"},"folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3}}
 {"name":"Speed BD to DEF","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","system":{"type":"physical","genre":"positive","effectlevel":2,"reducedicevalue":false,"stataffected":"mr","specaffected":[],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":false,"effectstat":"","affectsize":false,"oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"affectstatus":false,"affectedstatus":"","locked":false,"droptext":"","description":"<p>Increase Level according to Speed Bonus dependant on Power Level.&nbsp;</p>\n<p>See Pegasus Engine CORE RPG</p>","otherdice":false},"effects":[],"flags":{},"_stats":{"systemId":"fvtt-pegasus-rpg","systemVersion":"10.1.10","coreVersion":"10.288","createdTime":1669389785320,"modifiedTime":1669389890530,"lastModifiedBy":"26RudOd8Ui76NJhI"},"_id":"h63QwVsBrrrtjsRx","folder":null,"sort":0,"ownership":{"default":0,"26RudOd8Ui76NJhI":3}}
 {"_id":"hSlKYB5B36LPCzcz","name":"Firing Solution","type":"effect","img":"systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp","data":{"type":"physical","genre":"positive","effectlevel":1,"reducedicevalue":false,"stataffected":"ranged-atk","specaffected":[{"_id":"Zv5xnsRqv02CgrTC","name":"Gunnery [AGI]","type":"specialisation","img":"systems/fvtt-pegasus-rpg/images/icons/icon_spec.webp","data":{"statistic":"agi","level":1,"ispowergroup":false,"powersource":"","powersactivated":false,"powers":[],"isthreatlevel":false,"description":"<p><span style=\"color: #191813; font-size: 12.8px; letter-spacing: 1px; text-align: justify;\">See Pegasus Engine CORE RPG</span></p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"iNL4aGohJ8v6YrUk":3},"flags":{"core":{"sourceId":"Compendium.fvtt-pegasus-rpg.specialisations.P1DutOMWh7ANYH5t"}}}],"statdice":false,"bonusdice":true,"weapondamage":false,"hindrance":false,"resistedby":"notapplicable","recoveryroll":false,"recoveryrollstat":"","recoveryrollspec":[],"effectstatlevel":false,"effectstat":"","oneuse":false,"ignorehealthpenalty":false,"isthispossible":"","mentaldisruption":false,"physicaldisruption":false,"mentalimmunity":false,"physicalimmunity":false,"nobonusdice":false,"noperksallowed":false,"description":"<p>See Vehicle &amp; Mounts Guide</p>","otherdice":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"26RudOd8Ui76NJhI":3},"flags":{}}

styles/simple.css

@@ -1142,7 +1142,6 @@ ul, li {
   position: relative;
   margin:4px;
 }
-
 .chat-card-button {
   box-shadow: inset 0px 1px 0px 0px #a6827e;
   background: linear-gradient(to bottom, #21374afc 5%, #152833ab 100%);
@@ -1352,6 +1351,26 @@ Focus FOC: #ff0084
   max-height: 26px;
   margin-top: 4px;
 }
+.combat-tracker-tic-section {
+  max-width: 5rem;
+  min-width: 5rem;
+  align-content: center;
+}
+.combat-tracker-tic {
+  text-align: center;
+  background: linear-gradient(to bottom, #21374afc 5%, #152833ab 100%);
+  border-radius: 3px;
+  border: 2px ridge #846109;
+  color: #ffffff;
+  font-size: 0.8rem;
+  margin:2px;
+}
+.combat-tracker-tic-button {
+  max-height: 1.8rem;
+  margin-bottom: 4px;
+  background: linear-gradient(to bottom, #21374afc 5%, #152833ab 100%);
+  border-radius: 3px;
+}
 .no-grow {
   flex-grow: 1;
   max-width: 32px;
@@ -1518,3 +1537,12 @@ Focus FOC: #ff0084
   max-height: 48px;
   flex-grow: 0;
 }
+.dice-pool-image-add {
+  border: 0;
+  margin-left: 4px;
+  min-width: 32px;
+  min-height: 32px;
+  max-width: 32px;
+  max-height: 32px;
+  flex-grow: 0;
+}

system.json

@@ -23,8 +23,7 @@
   "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/raw/branch/master/system.json",
   "compatibility": {
     "minimum": "10",
-    "verified": "10",
-    "maximum": "10"
+    "verified": "11"
   },
   "id": "fvtt-pegasus-rpg",
   "packs": [
@@ -245,15 +244,15 @@
       "flags": {}
     }
   ],
-  "primaryTokenAttribute": "secondary.health",
-  "secondaryTokenAttribute": "secondary.delirium",
+  "primaryTokenAttribute": "",
+  "secondaryTokenAttribute": "",
   "socket": true,
   "styles": [
     "styles/simple.css"
   ],
   "title": "Pegasus RPG",
   "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
-  "version": "10.1.11",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.1.11.zip",
+  "version": "11.0.23",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v11.0.23.zip",
   "background": "systems/fvtt-pegasus-rpg/images/ui/pegasus_welcome_page.webp"
 }

template.json

@@ -2,6 +2,7 @@
   "Actor": {
     "types": [
       "character",
+      "npc",
       "vehicle"
     ],
     "templates": {
@@ -171,6 +172,7 @@
             "type": "value",
             "ismax": true,
             "iscombat": true,
+            "status": "healthy",            
             "bonus": 0,
             "max": 0
           },
@@ -180,22 +182,25 @@
             "type": "value",
             "ismax": true,
             "iscombat": true,
+            "status": "stable",
             "bonus": 0,
             "max": 0
           },
-          "stealthhealth": {
-            "label": "STL Health",
+          "concealment": {
+            "label": "Concealment",
             "type": "value",
             "value": 0,
             "ismax": true,
+            "status": "hidden",
             "bonus": 0,
             "max": 0
           },
-          "socialhealth": {
-            "label": "SOC Health",
+          "confidence": {
+            "label": "Confidence",
             "type": "value",
             "value": 0,
             "ismax": true,
+            "status": "confident",
             "bonus": 0,
             "max": 0
           }
@@ -368,6 +373,12 @@
         "core"
       ]
     },
+    "npc": {
+      "templates": [
+        "biodata",
+        "core"
+      ]
+    },
     "vehicle": {
       "templates": [
         "vehicle"
@@ -428,6 +439,7 @@
       "noperksallowed": false,
       "affectstatus": false,
       "affectedstatus": "",
+      "extratics": "none",
       "locked": false,
       "droptext": "",
       "description": ""
@@ -446,6 +458,7 @@
       "perksgained": false,
       "perksall": false,
       "perksnumber": 0,
+      "size": 0,
       "perks": [],
       "perksrole": "",
       "statistics": ""
@@ -594,6 +607,7 @@
     "armor": {
       "statistic": "",
       "resistance": "",
+      "adrl": 0,
       "weight": 0,
       "cost": 0,
       "idr": "",
@@ -644,6 +658,8 @@
     "weapon": {
       "statistic": "",
       "damagestatistic": "",
+      "mdl": 0,
+      "rdl": 0,
       "damage": "",
       "canbethrown": false,
       "cost": 0,

templates/actor-sheet.html

@@ -59,12 +59,6 @@
             <div class="stat-item status-block">
               {{> systems/fvtt-pegasus-rpg/templates/partial-actor-status.html}}
             </div>
-
-            <!--
-                            <label class="status-small-label">Active NRG</label> 
-                          <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.activated" value="{{data.nrg.activated}}" data-dtype="Number"/>
-                          -->
-
           </div>
         </div>
       </div>
@@ -168,6 +162,22 @@
           </div>
         </div>
 
+        <div>
+          <ul class="stat-list alternate-list">
+            <li class="item flexrow list-item items-title-bg">
+              <span class="item-name-label-header-long">
+                <h3><label class="items-title-text">Status Thresholds</label></h3>
+              </span>
+              <span class="item-name-label-header-long">
+                <label class="items-title-text">Madness Threshold (MT): {{mt}}</label>
+              </span>
+              <span class="item-name-label-header-long">
+                <label class="items-title-text">Knock Back Value (KBV): {{kbv}}</label>
+              </span>
+            </li>
+          </ul>
+        </div>
+        
         <div>
           <ul class="stat-list alternate-list">
             <li class="item flexrow list-item items-title-bg">
@@ -410,7 +420,7 @@
               <h4>Power Purchase Points (PPP)</h4>
             </span>
             <span class="small-label padd-right packed-left">Available PPP</span><input type="text"
-              class="padd-right input-numeric-short" name="system.ppp.available" value="{{data.ppp.available}}"
+              class="padd-right input-numeric-short" name="system.ppp.availablePPP" value="{{data.ppp.availablePPP}}"
               data-dtype="Number" />            
             &nbsp;&nbsp;
             <span class="small-label padd-right packed-left">Spent PPP</span><input type="text"

templates/chat-create-actor.html

@@ -134,8 +134,114 @@
   </table>  
   {{/if}}
 
+  {{#if (eq step "select-global-spec")}}
+  <div>Now select a Specialisation at +1DT.
+  </div>
+  <table class="table-create-actor">
+    {{#each specs as |spec index|}}
+    <tr>
+      <td><a class="view-item-from-chat" data-step="{{@root.step}}" data-item-id="{{spec._id}}">{{spec.name}}</a></td>
+      <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-item-id="{{spec._id}}" >Select it !</a></td>
+    </tr>
+    {{/each}}
+  </table>  
+  {{/if}}
+
+  {{#if (eq step "select-global-stat")}}
+  <div>Now select a Statistic at +1DT.
+  </div>
+  <table class="table-create-actor">
+    {{#each stats as |stat key|}}
+    <tr>
+      <td><a class="view-item-from-chat" data-step="{{@root.step}}" data-stat-key="{{key}}">{{stat.label}}</a></td>
+      <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-stat-key="{{key}}" >Select it !</a></td>
+    </tr>
+    {{/each}}
+  </table>  
+  {{/if}}
+
+  {{#if (eq step "select-global-perk")}}
+  <div>Choose a new perk or add +1DT for en existing one.
+  </div>
+  <table class="table-create-actor">
+    {{#each perks as |perk index|}}
+    <tr>
+      <td><a class="view-item-from-chat" data-step="{{@root.step}}" data-item-id="{{perk._id}}">{{perk.name}}</a></td>
+      <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-item-id="{{perk._id}}" >Select it !</a></td>
+    </tr>
+    {{/each}}
+  </table>  
+  {{/if}}
+
+  {{#if (eq step "select-global-status")}}
+  <div>Now add a +1 bonus to a status
+  </div>
+  <table class="table-create-actor">
+    {{#each status as |stat key|}}
+    <tr>
+      <td><a class="view-item-from-chat" data-step="{{@root.step}}" data-status-key="{{key}}">{{stat.label}}</a></td>
+      <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-status-key="{{key}}" >Select it !</a></td>
+    </tr>
+    {{/each}}
+  </table>  
+  {{/if}}
+
+  {{#if (eq step "select-bonus-selection")}}
+  <div>Select a bonus
+  </div>
+  <table class="table-create-actor">
+    {{#each bonuses as |bonus key|}}
+    <tr>
+      <td><a class="view-item-from-chat" data-step="{{@root.step}}" data-bonus-key="{{key}}">{{bonus.name}}</a></td>
+      <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-bonus-key="{{key}}" >Select it !</a></td>
+    </tr>
+    {{/each}}
+  </table>  
+  {{/if}}
+  
+  {{#if (eq step "select-global-virtue")}}
+  <div>Choose a Virtue.
+  </div>
+  <table class="table-create-actor">
+    {{#each virtues as |virtue index|}}
+    <tr>
+      <td><a class="view-item-from-chat" data-step="{{@root.step}}" data-item-id="{{virtue._id}}">{{virtue.name}}</a></td>
+      <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-item-id="{{virtue._id}}" >Select it !</a></td>
+    </tr>
+    {{/each}}
+  </table>  
+  {{/if}}
+
+  {{#if (eq step "select-global-vice")}}
+  <div>Choose an available Vice.
+  </div>
+  <table class="table-create-actor">
+    {{#each vices as |vice index|}}
+    <tr>
+      <td><a class="view-item-from-chat" data-step="{{@root.step}}" data-item-id="{{vice._id}}">{{vice.name}}</a></td>
+      <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-item-id="{{vice._id}}" >Select it !</a></td>
+    </tr>
+    {{/each}}
+  </table>  
+  {{/if}}
+
+  {{#if (eq step "select-vice-question")}}
+  <div>Would you like to skip, to choose a second Vice for 5 CDP or to choose 1 Virtue and 1 Vice?
+  </div>
+  <table class="table-create-actor">
+    {{#each questions as |question key|}}
+    <tr>
+      <td><a class="view-item-from-chat" data-step="{{@root.step}}" data-question-key="{{key}}">{{question.name}}</a></td>
+      <td><a class="chat-card-button chat-create-actor" data-step-name="{{@root.step}}" data-question-key="{{key}}" >Select it !</a></td>
+    </tr>
+    {{/each}}
+  </table>
+  {{/if}}
+
   {{#if (eq step "character-end")}}
-  <div>Follow the next steps from the rulebook page 50 !. You can now spend 150 CDPs to customise your character.
+  <div>
+    Choose Starting Gear, Worst Fear, Desires, Catchphrase & Catchphrase Trigger and fill in the empty fields in the Bio Tab. Lastly, make sure any UPGRADED (Level 2+) Perks and Perk Effects have been updated according to the rules. <br>
+    Games Masters May have to create new Effects and attach to the Perk Items in some cases.
     </div>
   {{/if}}
   

templates/chat-generic-result.html

@@ -24,8 +24,14 @@
         {{#if isDamage}}
         <li>Weapon Damage Dice : {{weaponDamageDice}}</li>
         {{/if}}
+
+        {{#if (eq subKey "dmg-res")}}
+        <li>Damage Resistance</li>
+        {{/if}}
+
         {{#if isResistance}}
         <li>Armor Resistance  Dice : {{armor.system.resistanceDice}}</li>
+        <li>ADRL : {{armor.system.adrl}}</li>
         {{/if}}
         {{#if stat}}  
         <li>Statistic : {{stat.label}}</li>
@@ -38,6 +44,12 @@
         <li>Weapon : {{weaponName}}</li>
         {{/if}}
         {{#if weapon}}  
+          {{#if (eq weapon.weapon.system.damagestatistic "str")}}
+          <li>MDL : {{weapon.weapon.system.mdl}}</li>
+          {{/if}}
+          {{#if (eq weapon.weapon.system.statistic "agi")}}
+          <li>RDL : {{weapon.weapon.system.rdl}}</li>
+          {{/if}}
           {{#if vehicle}}
           <li>Damage type : {{weapon.weapon.system.damagetype}}</li>
           {{else}}
@@ -45,15 +57,32 @@
           {{/if}}
         {{/if}}
         
+        {{#if (eq subKey "melee-dmg")}}
+          {{#if (not weaponUsed)}}
+          <li>MDL : {{MDL}}</li>
+          {{/if}}
+        {{/if}}
+
+        {{#if (eq subKey "dmg-res")}}
+          {{#if (not armorUsed)}}
+          <li>ADRL : {{ADRL}}</li>
+          {{/if}}
+          {{#each armorsList as |armor idx|}}
+            {{#if armor.applied}}
+              <li>ADRL: {{armor.adrl}}</li>
+            {{/if}}
+          {{/each}}
+        {{/if}}
+
         {{#if power}}  
           <li>Power Damage type : {{power.system.powerdamagetype}} {{power.system.powerdamagetypelevel}}</li>
         {{/if}}
 
+        {{#if hindranceFailure}}
+        <li><strong>Failed due to Hindrance Dice !!</strong>
+        {{else}}
           {{#if isResistance}}
           <li><strong>Defense Result : {{finalScore}}</strong>
-        {{else}}
-          {{#if isDamage}}
-          <li><strong>Damages : {{finalScore}}</strong>
           {{else}}
             <li><strong>Final Result : {{finalScore}}</strong>
           {{/if}}

templates/deleted.html

@@ -1,24 +0,0 @@
-{{#if (eq traumaState "none")}}
-<div class="flexrow">
-  <span class="roll-dialog-label" >Bonus Dice : </span>      
-  <select class="roll-dialog-label" id="bonusDicesLevel" type="text" name="bonusDicesLevel" value="{{bonusDicesLevel}}" data-dtype="Number">
-    {{#select bonusDicesLevel}}
-    {{{optionsDiceList}}}
-    {{/select}}
-  </select> 
-  <span class="small-label">&nbsp;</span>
-</div>
-{{/if}}
-
-{{#if isInit}}
-{{else}}
-<div class="flexrow">
-  <span class="roll-dialog-label" >Hindrance Dice :</span>
-    <select class="roll-dialog-label" id="hindranceDicesLevel" type="text" name="hindranceDicesLevel" value="{{hindranceDicesLevel}}" data-dtype="Number">
-      {{#select hindranceDicesLevel}}
-      {{{optionsDiceList}}}
-      {{/select}}
-    </select> 
-    <span class="small-label">&nbsp;</span>
-</div>
-{{/if}}

templates/item-ability-sheet.html

@@ -16,25 +16,32 @@
       <div class="tab details" data-group="primary" data-tab="details">
         <ul>
         <li class="flexrow"><label class="generic-label">Affected stat</label>
-          <select class="competence-base flexrow" type="text" name="data.affectedstat" value="{{data.affectedstat}}" data-dtype="String">
+          <select class="competence-base flexrow" type="text" name="system.affectedstat" value="{{data.affectedstat}}" data-dtype="String">
             {{#select data.affectedstat}}
-            {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=true mr=false}}
+            {{> systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html notapplicable=true mr=true}}
             {{/select}}
           </select> 
         </li>
         <li class="flexrow"><label class="generic-label">Stat modifier</label>
-          <input type="text" class="padd-right" name="data.statmodifier" value="{{data.statmodifier}}" data-dtype="Number"/>
+          <input type="text" class="padd-right" name="system.statmodifier" value="{{data.statmodifier}}" data-dtype="Number"/>
         </li>
 
         <li class="flexrow"><label class="generic-label">Affected status</label>
-          <select class="competence-base flexrow" type="text" name="data.statusaffected" value="{{data.statusaffected}}" data-dtype="String">
+          <select class="competence-base flexrow" type="text" name="system.statusaffected" value="{{data.statusaffected}}" data-dtype="String">
             {{#select data.statusaffected}}
-            {{{optionsStatusList}}}
+            <option value="notapplicable">Not Applicable</option>
+            <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>
+            <option value="mt">MT</option>
+            <option value="kbv">KBV</option>
             {{/select}}
           </select> 
         </li>
         <li class="flexrow"><label class="generic-label">Status modifier</label>
-          <input type="text" class="padd-right" name="data.statusmodifier" value="{{data.statusmodifier}}" data-dtype="Number"/>
+          <input type="text" class="padd-right" name="system.statusmodifier" value="{{data.statusmodifier}}" data-dtype="Number"/>
         </li>
 
         <li class="flexrow"><label class="generic-label">Effects Gained</label>
@@ -45,7 +52,7 @@
             </li>
             {{#each data.effectsgained as |effect idx|}}
             <li class="flexrow">
-              <label name="data.effectsgained[{{idx}}].name"><a class="view-subitem" data-type="effectsgained" data-index="{{idx}}">{{effect.name}}</a></label>
+              <label name="system.effectsgained[{{idx}}].name"><a class="view-subitem" data-type="effectsgained" data-index="{{idx}}">{{effect.name}}</a></label>
               <div class="item-controls padd-left">
                 <a class="item-control delete-subitem padd-left" data-type="effectsgained" data-index="{{idx}}" title="Delete Effect"><i class="fas fa-trash"></i></a>
               </div>   
@@ -62,7 +69,7 @@
             </li>
             {{#each data.powersgained as |power idx|}}
             <li class="flexrow">
-              <label name="data.powersgained[{{idx}}].name"><a class="view-subitem" data-type="powersgained" data-index="{{idx}}">{{power.name}}</a></label>
+              <label name="system.powersgained[{{idx}}].name"><a class="view-subitem" data-type="powersgained" data-index="{{idx}}">{{power.name}}</a></label>
               <div class="item-controls padd-left">
                 <a class="item-control delete-subitem padd-left" data-type="powersgained" data-index="{{idx}}" title="Delete Power"><i class="fas fa-trash"></i></a>
               </div>   
@@ -78,7 +85,7 @@
               </li>
               {{#each data.specialisations as |spec idx|}}
               <li class="flexrow">
-                <label name="data.specialisations[{{idx}}].name"><a class="view-subitem" data-type="specialisations" data-index="{{idx}}">{{spec.name}}</a></label>
+                <label name="system.specialisations[{{idx}}].name"><a class="view-subitem" data-type="specialisations" data-index="{{idx}}">{{spec.name}}</a></label>
                 <div class="item-controls padd-left">
                   <a class="item-control delete-subitem padd-left" data-type="specialisations" data-index="{{idx}}" title="Delete Specialisation"><i class="fas fa-trash"></i></a>
                 </div>   
@@ -89,7 +96,7 @@
         </li>
 
         <li class="flexrow"><label class="generic-label">Threat Level Value</label>
-          <input type="text" class="input-numeric-short padd-right" name="data.threatlevel" value="{{data.threatlevel}}" data-dtype="Number"/>
+          <input type="text" class="input-numeric-short padd-right" name="system.threatlevel" value="{{data.threatlevel}}" data-dtype="Number"/>
         </li>
 
         <li class="flexrow"><label class="generic-label">Attacks Gained</label>
@@ -99,7 +106,7 @@
             </li>
             {{#each data.attackgained as |weapon idx|}}              
               <li class="flexrow">
-                <label name="data.specialisations[{{idx}}].name"><a class="view-subitem" data-type="attackgained" data-index="{{idx}}">{{weapon.name}}</a></label>
+                <label name="system.specialisations[{{idx}}].name"><a class="view-subitem" data-type="attackgained" data-index="{{idx}}">{{weapon.name}}</a></label>
                 <div class="item-controls padd-left">
                   <a class="item-control delete-subitem padd-left" data-type="attackgained" data-index="{{idx}}" title="Delete Weapon"><i class="fas fa-trash"></i></a>
                 </div>   
@@ -116,7 +123,7 @@
               </li>
               {{#each data.armorgained as |armor idx|}}              
                 <li class="flexrow">
-                  <label name="data.specialisations[{{idx}}].name"><a class="view-subitem" data-type="armorgained" data-index="{{idx}}">{{armor.name}}</a></label>
+                  <label name="dasystema.specialisations[{{idx}}].name"><a class="view-subitem" data-type="armorgained" data-index="{{idx}}">{{armor.name}}</a></label>
                   <div class="item-controls padd-left">
                     <a class="item-control delete-subitem padd-left" data-type="armorgained" data-index="{{idx}}" title="Delete Armor"><i class="fas fa-trash"></i></a>
                   </div>   

templates/item-armor-sheet.html

@@ -26,13 +26,21 @@
               </select> 
             </li>
 
-            <li class="flexrow"><label class="generic-label">DMG RES Dice</label>
+            <li class="flexrow"><label class="generic-label">Damage Resistance</label>
               <select class="competence-base flexrow" type="text" name="system.resistance" value="{{data.resistance}}" data-dtype="Number">
                 {{#select data.resistance}}
                 {{{optionsDiceList}}}
                 {{/select}}
               </select> 
             </li>
+
+            {{#if owner}}
+            <li class="flexrow">
+              <label class="generic-label">ADRL</label>
+              <label class="generic-label">{{data.adrl}}</label>
+            </li>
+            {{/if}}
+  
             <li class="flexrow"><label class="generic-label">Location Protected</label>
               <input type="text" class="" name="system.locationprotected" value="{{data.locationprotected}}" data-dtype="String"/>
             </li>

templates/item-effect-sheet.html

@@ -82,25 +82,32 @@
             <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>
+            <li class="flexrow"><label class="generic-label">Permanent/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">Display Text when added to Actor</label>
               <input type="text" class="input-numeric-short padd-right" name="system.droptext" value="{{data.droptext}}" data-dtype="String"/>
             </li>
 
+            <li class="flexrow"><label class="generic-label">Provide extra TICs ?</label>
+              <select class="competence-base flexrow" type="text" name="system.extratics" value="{{data.extratics}}" data-dtype="String">
+                {{selectOptions config.extraTIC selected=data.extratics nameAttr="key" labelAttr="name" }}
+              </select> 
+          </li>
+
             <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>
+              <li class="flexrow"><label class="generic-label">Affected status/Auto damage</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="mdl">MDL</option>
+                  <option value="rdl">RDL</option>
+                  <option value="adrl">ADRL</option>
                   <option value="nrg">NRG</option>
+                  <option value="mt">MT</option>
+                  <option value="kbv">KBV</option>
                   {{/select}}
                 </select> 
               </li>

templates/item-race-sheet.html

@@ -14,19 +14,19 @@
 
       <label class="generic-label">Description</label>
       <div class="medium-editor item-text-long-line">
-        {{editor data.description target="data.description" button=true owner=owner editable=editable}}
+        {{editor description target="system.description" button=true owner=owner editable=editable}}
       </div>
       <label class="generic-label">Environment</label>
       <div class="medium-editor item-text-long-line">
-        {{editor data.environment target="data.environment" button=true owner=owner editable=editable}}
+        {{editor data.environment target="system.environment" button=true owner=owner editable=editable}}
       </div>
       <label class="generic-label">Society/Culture</label>
       <div class="medium-editor item-text-long-line">
-        {{editor data.society_culture target="data.society_culture" button=true owner=owner editable=editable}}
+        {{editor data.society_culture target="system.society_culture" button=true owner=owner editable=editable}}
       </div>
       <label class="generic-label">Outlook</label>
       <div class="medium-editor item-text-long-line">
-        {{editor data.outlook target="data.outlook" button=true owner=owner editable=editable}}
+        {{editor data.outlook target="system.outlook" button=true owner=owner editable=editable}}
       </div>
     </div>
 
@@ -52,6 +52,10 @@
       </ul>
 
       <ul>
+        <li class="flexrow">
+          <label class="generic-label">Size</label>          
+          <input type="text" class="input-numeric-short padd-right" name="system.size" value="{{data.size}}" data-dtype="Number"/>
+        </li>
         <li class="flexrow"><label class="generic-label">Selectable Stats ?</label>
           <label class="attribute-value checkbox"><input type="checkbox" name="system.selectablestats" {{checked
             system.selectablestats}} /></label>

templates/item-weapon-sheet.html

@@ -38,6 +38,19 @@
             </select> 
           </li>
 
+          {{#if (and owner (eq data.damagestatistic "str"))}}
+          <li class="flexrow">
+            <label class="generic-label">MDL</label>
+            <label class="competence-base">{{data.mdl}}</label>
+          </li>
+          {{/if}}
+          {{#if (and owner (eq data.damagestatistic "pre"))}}
+          <li class="flexrow">
+            <label class="generic-label">RDL</label>
+            <label class="competence-base">{{data.rdl}}</label>
+          </li>
+          {{/if}}
+
           <li class="flexrow"><label class="generic-label">Item size</label>
             <input type="text" class="" name="system.itemsize" value="{{data.itemsize}}" data-dtype="String"/>
           </li>

templates/partial-actor-status.html

@@ -1,25 +1,17 @@
 <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>
+    <span class="status-header-label status-small-label no-grow"><label class="status-medium-label">State</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="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" {{@root.disabledBonus}}/>
-      <input type="text" class="padd-right status-small-label no-grow" name="system.secondary.{{key}}.max" value="{{stat2.max}}" data-dtype="Number"/>
+      <select class="padd-right status-small-label" type="text" name="system.secondary.{{key}}.status" value="{{stat2.status}}" data-dtype="String">
+        {{selectOptions (getStatusConfig key) selected=stat2.status nameAttr="key" labelAttr="name" }}
+      </select>
     </li>
   {{/each}}
   <li class="item flexrow " data-key="nrg">

templates/pegasus-combat-tracker.html

@@ -0,0 +1,144 @@
+<section class="{{cssClass}} directory flexcol" id="{{cssId}}" data-tab="{{tabName}}">
+  <header class="combat-tracker-header">
+      {{#if user.isGM}}
+      <nav class="encounters flexrow" aria-label="{{localize 'COMBAT.NavLabel'}}">
+          <a class="combat-button combat-create" aria-label="{{localize 'COMBAT.Create'}}" role="button" data-tooltip="COMBAT.Create">
+              <i class="fas fa-plus"></i>
+          </a>
+          {{#if combatCount}}
+          <a class="combat-button combat-cycle" aria-label="{{localize 'COMBAT.EncounterPrevious'}}" role="button" data-tooltip="COMBAT.EncounterPrevious"
+             {{#if previousId}}data-document-id="{{previousId}}"{{else}}disabled{{/if}}>
+              <i class="fas fa-caret-left"></i>
+          </a>
+          <h4 class="encounter">{{localize "COMBAT.Encounter"}} {{currentIndex}} / {{combatCount}}</h4>
+          <a class="combat-button combat-cycle" aria-label="{{localize 'COMBAT.EncounterNext'}}" role="button" data-tooltip="COMBAT.EncounterNext"
+             {{#if nextId}}data-document-id="{{nextId}}"{{else}}disabled{{/if}}>
+              <i class="fas fa-caret-right"></i>
+          </a>
+          {{/if}}
+          <a class="combat-button combat-control" aria-label="{{localize 'COMBAT.Delete'}}" role="button" data-tooltip="COMBAT.Delete" data-control="endCombat" {{#unless combatCount}}disabled{{/unless}}>
+              <i class="fas fa-trash"></i>
+          </a>
+      </nav>
+      {{/if}}
+
+      <div class="encounter-controls flexrow {{#if hasCombat}}combat{{/if}}">
+          {{#if user.isGM}}
+          <a class="combat-button combat-control" aria-label="{{localize 'COMBAT.RollAll'}}" role="button" data-tooltip="COMBAT.RollAll" data-control="rollAll" {{#unless turns}}disabled{{/unless}}>
+              <i class="fas fa-users"></i>
+          </a>
+          <a class="combat-button combat-control" aria-label="{{localize 'COMBAT.RollNPC'}}" role="button" data-tooltip="COMBAT.RollNPC" data-control="rollNPC" {{#unless turns}}disabled{{/unless}}>
+              <i class="fas fa-users-cog"></i>
+          </a>
+          <a class="combat-button reset-npc-initiative" aria-label="Reset NPC" role="button" data-tooltip="Reset NPC Initiative" data-control="resetNPC" {{#unless turns}}disabled{{/unless}}>
+            <i class="fas fa-pickaxe"></i>
+        </a>
+        {{/if}}
+
+          {{#if combatCount}}
+          {{#if combat.round}}
+          <h3 class="encounter-title noborder">{{localize 'COMBAT.Round'}} {{combat.round}}</h3>
+          {{else}}
+          <h3 class="encounter-title noborder">{{localize 'COMBAT.NotStarted'}}</h3>
+          {{/if}}
+          {{else}}
+          <h3 class="encounter-title noborder">{{localize "COMBAT.None"}}</h3>
+          {{/if}}
+
+          {{#if user.isGM}}
+          <a class="combat-button combat-control" aria-label="{{localize 'COMBAT.InitiativeReset'}}" role="button" data-tooltip="COMBAT.InitiativeReset" data-control="resetAll"
+              {{#unless hasCombat}}disabled{{/unless}}>
+              <i class="fas fa-undo"></i>
+          </a>
+          <a class="combat-button combat-control" aria-label="{{localize 'labels.scope'}}" role="button" data-tooltip="{{labels.scope}}"
+              data-control="toggleSceneLink" {{#unless hasCombat}}disabled{{/unless}}>
+              <i class="fas fa-{{#unless linked}}un{{/unless}}link"></i>
+          </a>
+          {{/if}}
+          <a class="combat-button combat-settings" aria-label="{{localize 'COMBAT.Settings'}}" role="button" data-tooltip="COMBAT.Settings" data-control="trackerSettings">
+              <i class="fas fa-cog"></i>
+          </a>
+      </div>
+  </header>
+
+  <ol id="combat-tracker" class="directory-list">
+      {{#each turns}}
+      <li class="combatant actor directory-item flexrow {{this.css}}" data-combatant-id="{{this.id}}">
+          <img class="token-image" data-src="{{this.img}}" alt="{{this.name}}"/>
+          <div class="token-name flexcol">
+              <h4>{{this.name}}</h4><a class="select-combat-actor" data-combatant-id="{{this.id}}"><i class="fas fa-hand-pointer"></i></a>
+              <div class="combatant-controls flexrow">
+                  {{#if ../user.isGM}}
+                  <a class="combatant-control {{#if this.hidden}}active{{/if}}" aria-label="{{localize 'COMBAT.ToggleVis'}}" role="button" data-tooltip="COMBAT.ToggleVis" data-control="toggleHidden">
+                      <i class="fas fa-eye-slash"></i>
+                  </a>
+                  <a class="combatant-control {{#if this.defeated}}active{{/if}}" aria-label="{{localize 'COMBAT.ToggleDead'}}" role="button" data-tooltip="COMBAT.ToggleDead" data-control="toggleDefeated">
+                      <i class="fas fa-skull"></i>
+                  </a>
+                  {{/if}}
+                  {{#if this.canPing}}
+                  <a class="combatant-control" aria-label="{{localize 'COMBAT.PingCombatant'}}" role="button" data-tooltip="COMBAT.PingCombatant" data-control="pingCombatant">
+                      <i class="fa-solid fa-bullseye-arrow"></i>
+                  </a>
+                  {{/if}}
+                  <div class="token-effects">
+                      {{#each this.effects}}
+                      <img class="token-effect" src="{{this}}"/>
+                      {{/each}}
+                  </div>
+              </div>
+          </div>
+
+          {{#if this.hasResource}}
+          <div class="token-resource">
+              <span class="resource">{{this.resource}}</span>
+          </div>
+          {{/if}}
+          
+          <div class="combat-tracker-tic-section flexcol" id="{{this.id}}">
+            {{#each this.TICs as | tic index|}}
+              <button class="combat-tracker-tic-button"><a class="combat-tracker-tic" data-tic-num="{{index}}" data-combatant-id="{{../id}}">
+                {{#if tic.revealed}}
+                  ACTED
+                {{else}}
+                  {{#if ../displayTIC}}
+                    {{tic.text}}
+                  {{else}}
+                    TIC: {{add index 1}}
+                  {{/if}}
+                {{/if}}
+              </a></button>
+            {{/each}}
+          </div>
+
+          <div class="token-initiative">              
+              {{#if this.hasRolled}}
+              <span class="initiative">{{this.initiative}}</span>
+              {{else if this.owner}}
+              <a class="combatant-control roll" aria-label="{{localize 'COMBAT.InitiativeRoll'}}" role="button" data-tooltip="COMBAT.InitiativeRoll" data-control="rollInitiative"></a>
+              {{/if}}
+          </div>
+      </li>
+      {{/each}}
+  </ol>
+
+  <nav id="combat-controls" class="directory-footer flexrow" data-tooltip-direction="UP">
+  {{#if hasCombat}}
+      {{#if user.isGM}}
+          {{#if round}}
+          <a class="combat-control" aria-label="{{localize 'COMBAT.RoundPrev'}}" role="button" data-tooltip="COMBAT.RoundPrev" data-control="previousRound"><i class="fas fa-step-backward"></i></a>
+          <a class="combat-control" aria-label="{{localize 'COMBAT.TurnPrev'}}" role="button" data-tooltip="COMBAT.TurnPrev" data-control="previousTurn"><i class="fas fa-arrow-left"></i></a>
+          <a class="combat-control center" aria-label="{{localize 'COMBAT.End'}}" role="button" data-control="endCombat">{{localize 'COMBAT.End'}}</a>
+          <a class="combat-control" aria-label="{{localize 'COMBAT.TurnNext'}}" role="button" data-tooltip="COMBAT.TurnNext" data-control="nextTurn"><i class="fas fa-arrow-right"></i></a>
+          <a class="combat-control" aria-label="{{localize 'COMBAT.RoundNext'}}" role="button" data-tooltip="COMBAT.RoundNext" data-control="nextRound"><i class="fas fa-step-forward"></i></a>
+          {{else}}
+          <a class="combat-control center" aria-label="{{localize 'COMBAT.Begin'}}" role="button"  data-control="startCombat">{{localize 'COMBAT.Begin'}}</a>
+          {{/if}}
+      {{else if control}}
+      <a class="combat-control" aria-label="{{localize 'COMBAT.TurnPrev'}}" role="button"  data-tooltip="COMBAT.TurnPrev" data-control="previousTurn"><i class="fas fa-arrow-left"></i></a>
+      <a class="combat-control center" aria-label="{{localize 'COMBAT.TurnEnd'}}" role="button"  data-control="nextTurn">{{localize 'COMBAT.TurnEnd'}}</a>
+      <a class="combat-control" aria-label="{{localize 'COMBAT.TurnNext'}}" role="button"  data-tooltip="COMBAT.TurnNext" data-control="nextTurn"><i class="fas fa-arrow-right"></i></a>
+      {{/if}}
+  {{/if}}
+  </nav>
+</section>

templates/roll-dialog-generic.html

@@ -65,33 +65,30 @@
 
       {{/if}}
 
-      <!--
-      {{#if isDamage}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Weapon Damage :</span>
-        <select class="roll-dialog-label" id="damageDiceLevel" type="text" name="damageDiceLevel"
-          value="{{damageDiceLevel}}" data-dtype="Number">
-          {{#select damageDiceLevel}}
-          {{{optionsDiceList}}}
-          {{/select}}
-        </select>
-        <span class="small-label">&nbsp;</span>
-      </div>
-      {{/if}}
-      -->
-      
       <div class="dice-pool-div">
         <span>
           <h3 class="dice-pool-label">Current pool</h3>
         </span>
         <div class="flexrow dice-pool-stack">
           {{#each dicePool as |dice idx|}}
-          <span><a class="pool-remove-dice" data-dice-idx="{{idx}}" data-dice-level="{{dice.level}}" data-dice-key="{{dice.key}}"><img class="dice-pool-image"
-                src="{{dice.img}}"></a></span>
+          <span><a class="pool-remove-dice" data-dice-idx="{{idx}}" data-dice-level="{{dice.level}}"
+              data-dice-key="{{dice.key}}"><img class="dice-pool-image" src="{{dice.img}}" alt="dices"></a></span>
           {{/each}}
         </div>
       </div>
 
+      <div class="dice-pool-div">
+        <span>
+          <h3 class="dice-pool-label">Hindrance Dice</h3>
+        </span>
+        <div class="flexrow dice-pool-stack">
+          {{#for 1 hindranceDices 1}}
+          <span><a class="pool-remove-hindrance-dice" data-dice-idx="{{idx}}" data-dice-level="2" data-dice-key="d6"><img class="dice-pool-image"
+                src="systems/fvtt-pegasus-rpg/images/dice/hindrance-dice.png" alt="dices"></a></span>
+          {{/for}}
+        </div>
+      </div>
+
       {{#if noBonusDice}}
       <div class="flexrow">
         No bonus dice due to effect !
@@ -99,12 +96,13 @@
       {{else}}
       <div class="flexrow">
         {{#each diceList as |dice idx|}}
-          <span><a class="pool-add-dice" data-dice-key="{{dice.key}}" data-dice-level="{{dice.level}}"><img class="dice-pool-image"
-                src="{{dice.img}}"></a></span>
+        <span><a class="pool-add-dice" data-dice-key="{{dice.key}}" data-dice-level="{{dice.level}}"><img
+              class="dice-pool-image-add" src="{{dice.img}}" alt="dices"></a></span>
         {{/each}}
       </div>
       {{/if}}
 
+
       <div class="flexrow">
 
         <span class="roll-dialog-label">Modifiers : </span>
@@ -130,18 +128,28 @@
           <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 d12<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="d12">Eyes/head d12
+          <option>
           <option value="none4">===== Impact DMG Bonus</option>
-          <option value="d4">Soft d4<option>
-          <option value="d6">Thin/Flimsy  d6<option>
-          <option value="d8">Solid Furniture d8<option>
-          <option value="d10">Thin Metal/Thick Wood d10<option>
-          <option value="d12">Solid Object/Concrete d12<option>
+          <option value="d4">Soft d4
+          <option>
+          <option value="d6">Thin/Flimsy d6
+          <option>
+          <option value="d8">Solid Furniture d8
+          <option>
+          <option value="d10">Thin Metal/Thick Wood d10
+          <option>
+          <option value="d12">Solid Object/Concrete d12
+          <option>
           <option value="none5">===== Other Circumstances</option>
-          <option value="d4">Concentrated<option>
-          <option value="d4">Off Hand d4<option>
+          <option value="d4">Concentrated
+          <option>
+          <option value="d4">Off Hand d4
+          <option>
+          <option value="d6">Higher Ground d6</option>
           {{/select}}
         </select>
       </div>
@@ -155,6 +163,15 @@
       {{> systems/fvtt-pegasus-rpg/templates/partial-roll-select-effects.html}}
       {{/if}}
 
+      {{#if isInit}}
+      {{#each TICs as |tic index|}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">TIC {{add index 1}}:</span>
+        <input class="roll-input-tic" id="roll-input-tic{{index}}" type="text" value="{{tic.text}}" data-dtype="String">
+      </div>
+      {{/each}}
+      {{/if}}
+
     </div>
 
   </div>