Minor fixes

images/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2022,9,12,23,3,3.4699999999999998
+Version=4
+VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_creationtime,CustomizedDetails

images/icons/feats/.directory

@@ -1,6 +1,5 @@
 [Dolphin]
 SortOrder=1
-Timestamp=2022,7,27,18,56,49.607
+Timestamp=2022,9,12,23,4,32.409
 Version=4
-ViewMode=1
 VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_creationtime,CustomizedDetails

modules/crucible-actor-sheet.js

@@ -24,16 +24,15 @@ export class CrucibleActorSheet extends ActorSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = CrucibleUtility.data(this.object);
+    const objectData = this.object.system
-    
+    let actorData = duplicate(objectData)
-    let actorData = duplicate(CrucibleUtility.templateData(this.object));
 
     let formData = {
       title: this.title,
-      id: objectData.id,
+      id: this.actor.id,
-      type: objectData.type,
+      type: this.actor.type,
-      img: objectData.img,
+      img: this.actor.img,
-      name: objectData.name,
+      name: this.actor.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
       data: actorData,
@@ -53,6 +52,7 @@ export class CrucibleActorSheet extends ActorSheet {
       moneys: duplicate(this.actor.getMoneys()),
       encCapacity: this.actor.getEncumbranceCapacity(),
       saveRolls: this.actor.getSaveRoll(),
+      conditions: this.actor.getConditions(),
       containersTree: this.actor.containersTree,
       encCurrent: this.actor.encCurrent,
       options: this.options,
@@ -119,7 +119,6 @@ export class CrucibleActorSheet extends ActorSheet {
       let actorId = li.data("actor-id");
       this.actor.delSubActor(actorId);
     });
-    
     html.find('.quantity-minus').click(event => {
       const li = $(event.currentTarget).parents(".item");
       this.actor.incDecQuantity( li.data("item-id"), -1 );
@@ -143,10 +142,11 @@ export class CrucibleActorSheet extends ActorSheet {
       this.actor.rollAbility(abilityKey);
     });
     html.find('.roll-skill').click((event) => {
-      const li = $(event.currentTarget).parents(".item");
+      const li = $(event.currentTarget).parents(".item")
       const skillId = li.data("item-id")
       this.actor.rollSkill(skillId)
-    });
+    });    
+
     html.find('.roll-weapon').click((event) => {
       const li = $(event.currentTarget).parents(".item");
       const skillId = li.data("item-id")
@@ -158,6 +158,9 @@ export class CrucibleActorSheet extends ActorSheet {
     html.find('.roll-shield-die').click((event) => {
       this.actor.rollShieldDie()
     });
+    html.find('.roll-target-die').click((event) => {
+      this.actor.rollDefenseRanged()
+    });
     
     html.find('.roll-save').click((event) => {
       const saveKey = $(event.currentTarget).data("save-key")
@@ -200,9 +203,9 @@ export class CrucibleActorSheet extends ActorSheet {
   /* -------------------------------------------- */
   async _onDropItem(event, dragData) {
     console.log(">>>>>> DROPPED!!!!")
-    let item = await CrucibleUtility.searchItem( dragData)
+    const item = fromUuidSync(dragData.uuid)
     if (item == undefined) {
-      item = this.actor.items.get( dragData.data._id )
+      item = this.actor.items.get( item.id )
     }
     let ret = await this.actor.preprocessItem( event, item, true )
     if ( ret ) {

modules/crucible-actor.js

@@ -63,22 +63,26 @@ export class CrucibleActor extends Actor {
 
   /* -------------------------------------------- */
   computeHitPoints() {
-    let hp = duplicate(this.data.data.secondary.hp)
+    if (this.type == "character") {
-    let max = (this.data.data.abilities.str.value + this.data.data.abilities.con.value) * 6
+      let hp = duplicate(this.system.secondary.hp)
-    if (max != hp.max || hp.value > max) {
+      let max = (this.system.abilities.str.value + this.system.abilities.con.value) * 6
-      hp.max = max
+      if (max != hp.max || hp.value > max) {
-      hp.value = max // Init case
+        hp.max = max
-      this.update({ 'data.secondary.hp': hp })
+        hp.value = max // Init case
+        this.update({ 'system.secondary.hp': hp })
+      }
     }
   }
   /* -------------------------------------------- */
   computeEffortPoints() {
-    let effort = duplicate(this.data.data.secondary.effort)
+    if (this.type == "character") {
-    let max = (this.data.data.abilities.con.value + this.data.data.abilities.int.value) * 6
+      let effort = duplicate(this.system.secondary.effort)
-    if (max != effort.max || effort.value > max) {
+      let max = (this.system.abilities.con.value + this.system.abilities.int.value) * 6
-      effort.max = max
+      if (max != effort.max || effort.value > max) {
-      effort.value = max // Init case
+        effort.max = max
-      this.update({ 'data.secondary.effort': effort })
+        effort.value = max // Init case
+        this.update({ 'system.secondary.effort': effort })
+      }
     }
   }
 
@@ -86,7 +90,7 @@ export class CrucibleActor extends Actor {
   prepareDerivedData() {
 
     if (this.type == 'character' || game.user.isGM) {
-      this.data.data.encCapacity = this.getEncumbranceCapacity()
+      this.system.encCapacity = this.getEncumbranceCapacity()
       this.buildContainerTree()
       this.computeHitPoints()
       this.computeEffortPoints()
@@ -108,46 +112,46 @@ export class CrucibleActor extends Actor {
 
   /* -------------------------------------------- */
   getMoneys() {
-    let comp = this.data.items.filter(item => item.type == 'money');
+    let comp = this.items.filter(item => item.type == 'money');
     CrucibleUtility.sortArrayObjectsByName(comp)
     return comp;
   }
   /* -------------------------------------------- */
   getFeats() {
-    let comp = duplicate(this.data.items.filter(item => item.type == 'feat') || []);
+    let comp = duplicate(this.items.filter(item => item.type == 'feat') || []);
     CrucibleUtility.sortArrayObjectsByName(comp)
     return comp;
   }
   /* -------------------------------------------- */
   getFeatsWithDie() {
-    let comp = duplicate(this.data.items.filter(item => item.type == 'feat' && item.data.data.isfeatdie) || []);
+    let comp = duplicate(this.items.filter(item => item.type == 'feat' && item.system.isfeatdie) || []);
     CrucibleUtility.sortArrayObjectsByName(comp)
     return comp;
   }
   getFeatsWithSL() {
-    let comp = duplicate(this.data.items.filter(item => item.type == 'feat' && item.data.data.issl) || []);
+    let comp = duplicate(this.items.filter(item => item.type == 'feat' && item.system.issl) || []);
     CrucibleUtility.sortArrayObjectsByName(comp)
     return comp;
   }
   /* -------------------------------------------- */
   getLore() {
-    let comp = duplicate(this.data.items.filter(item => item.type == 'spell') || []);
+    let comp = duplicate(this.items.filter(item => item.type == 'spell') || []);
     CrucibleUtility.sortArrayObjectsByName(comp)
     return comp;
   }
   getEquippedWeapons() {
-    let comp = duplicate(this.data.items.filter(item => item.type == 'weapon' && item.data.data.equipped) || []);
+    let comp = duplicate(this.items.filter(item => item.type == 'weapon' && item.system.equipped) || []);
     CrucibleUtility.sortArrayObjectsByName(comp)
     return comp;
   }
   /* -------------------------------------------- */
   getArmors() {
-    let comp = duplicate(this.data.items.filter(item => item.type == 'armor') || []);
+    let comp = duplicate(this.items.filter(item => item.type == 'armor') || []);
     CrucibleUtility.sortArrayObjectsByName(comp)
     return comp;
   }
   getEquippedArmor() {
-    let comp = this.data.items.find(item => item.type == 'armor' && item.data.data.equipped)
+    let comp = this.items.find(item => item.type == 'armor' && item.system.equipped)
     if (comp) {
       return duplicate(comp)
     }
@@ -155,12 +159,12 @@ export class CrucibleActor extends Actor {
   }
   /* -------------------------------------------- */
   getShields() {
-    let comp = duplicate(this.data.items.filter(item => item.type == 'shield') || []);
+    let comp = duplicate(this.items.filter(item => item.type == 'shield') || []);
     CrucibleUtility.sortArrayObjectsByName(comp)
     return comp;
   }
   getEquippedShield() {
-    let comp = this.data.items.find(item => item.type == 'shield' && item.data.data.equipped)
+    let comp = this.items.find(item => item.type == 'shield' && item.system.equipped)
     if (comp) {
       return duplicate(comp)
     }
@@ -168,7 +172,7 @@ export class CrucibleActor extends Actor {
   }
   /* -------------------------------------------- */
   getRace() {
-    let race = this.data.items.filter(item => item.type == 'race')
+    let race = this.items.filter(item => item.type == 'race')
     return race[0] ?? [];
   }
   /* -------------------------------------------- */
@@ -183,27 +187,30 @@ export class CrucibleActor extends Actor {
     return listItem
   }
 
+  /* -------------------------------------------- */
+  getConditions() {
+    let comp = duplicate(this.items.filter(item => item.type == 'condition') || []);
+    CrucibleUtility.sortArrayObjectsByName(comp)
+    return comp;
+  }
   /* -------------------------------------------- */
   getWeapons() {
-    let comp = duplicate(this.data.items.filter(item => item.type == 'weapon') || []);
+    let comp = duplicate(this.items.filter(item => item.type == 'weapon') || []);
     CrucibleUtility.sortArrayObjectsByName(comp)
     return comp;
   }
   /* -------------------------------------------- */
   getItemById(id) {
-    let item = this.data.items.find(item => item.id == id);
+    let item = this.items.find(item => item.id == id);
     if (item) {
       item = duplicate(item)
-      if (item.type == 'specialisation') {
-        item.data.dice = CrucibleUtility.getDiceFromLevel(item.data.level);
-      }
     }
     return item;
   }
 
   /* -------------------------------------------- */
   getSkills() {
-    let comp = duplicate(this.data.items.filter(item => item.type == 'skill') || [])
+    let comp = duplicate(this.items.filter(item => item.type == 'skill') || [])
     for (let skill of comp) {
       CrucibleUtility.updateSkill(skill)
     }
@@ -213,30 +220,30 @@ export class CrucibleActor extends Actor {
 
   /* -------------------------------------------- */
   getRelevantAbility(statKey) {
-    let comp = duplicate(this.data.items.filter(item => item.type == 'skill' && item.data.data.ability == ability) || []);
+    let comp = duplicate(this.items.filter(item => item.type == 'skill' && item.system.ability == ability) || []);
     return comp;
   }
 
 
   /* -------------------------------------------- */
   async equipItem(itemId) {
-    let item = this.data.items.find(item => item.id == itemId)
+    let item = this.items.find(item => item.id == itemId)
-    if (item && item.data.data) {
+    if (item && item.system) {
       if (item.type == "armor") {
-        let armor = this.data.items.find(item => item.id != itemId && item.type == "armor" && item.data.data.equipped)
+        let armor = this.items.find(item => item.id != itemId && item.type == "armor" && item.system.equipped)
         if (armor) {
           ui.notifications.warn("You already have an armor equipped!")
           return
         }
       }
       if (item.type == "shield") {
-        let shield = this.data.items.find(item => item.id != itemId && item.type == "shield" && item.data.data.equipped)
+        let shield = this.items.find(item => item.id != itemId && item.type == "shield" && item.system.equipped)
         if (shield) {
           ui.notifications.warn("You already have a shield equipped!")
           return
         }
       }
-      let update = { _id: item.id, "data.equipped": !item.data.data.equipped };
+      let update = { _id: item.id, "system.equipped": !item.system.equipped };
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
   }
@@ -254,11 +261,11 @@ export class CrucibleActor extends Actor {
 
   /* ------------------------------------------- */
   getEquipments() {
-    return this.data.items.filter(item => item.type == 'shield' || item.type == 'armor' || item.type == "weapon" || item.type == "equipment");
+    return this.items.filter(item => item.type == 'shield' || item.type == 'armor' || item.type == "weapon" || item.type == "equipment");
   }
   /* ------------------------------------------- */
   getEquipmentsOnly() {
-    return duplicate(this.data.items.filter(item => item.type == "equipment") || [])
+    return duplicate(this.items.filter(item => item.type == "equipment") || [])
   }
 
   /* ------------------------------------------- */
@@ -267,33 +274,33 @@ export class CrucibleActor extends Actor {
       reflex: {
         "label": "Reflex Save",
         "img": "systems/fvtt-crucible-rpg/images/icons/saves/reflex_save.webp",
-        "value": this.data.data.abilities.agi.value + this.data.data.abilities.wit.value
+        "value": this.system.abilities.agi.value + this.system.abilities.wit.value
       },
       fortitude: {
         "label": "Fortitude Save",
         "img": "systems/fvtt-crucible-rpg/images/icons/saves/fortitude_save.webp",
-        "value": this.data.data.abilities.str.value + this.data.data.abilities.con.value
+        "value": this.system.abilities.str.value + this.system.abilities.con.value
       },
       willpower: {
         "label": "Willpower Save",
         "img": "systems/fvtt-crucible-rpg/images/icons/saves/will_save.webp",
-        "value": this.data.data.abilities.int.value + this.data.data.abilities.cha.value
+        "value": this.system.abilities.int.value + this.system.abilities.cha.value
       }
     }
   }
 
   /* ------------------------------------------- */
   async buildContainerTree() {
-    let equipments = duplicate(this.data.items.filter(item => item.type == "equipment") || [])
+    let equipments = duplicate(this.items.filter(item => item.type == "equipment") || [])
     for (let equip1 of equipments) {
-      if (equip1.data.iscontainer) {
+      if (equip1.system.iscontainer) {
-        equip1.data.contents = []
+        equip1.system.contents = []
-        equip1.data.contentsEnc = 0
+        equip1.system.contentsEnc = 0
         for (let equip2 of equipments) {
-          if (equip1._id != equip2._id && equip2.data.containerid == equip1._id) {
+          if (equip1._id != equip2.id && equip2.system.containerid == equip1.id) {
-            equip1.data.contents.push(equip2)
+            equip1.system.contents.push(equip2)
-            let q = equip2.data.quantity ?? 1
+            let q = equip2.system.quantity ?? 1
-            equip1.data.contentsEnc += q * equip2.data.weight
+            equip1.system.contentsEnc += q * equip2.system.weight
           }
         }
       }
@@ -303,52 +310,71 @@ export class CrucibleActor extends Actor {
     let enc = 0
     for (let item of equipments) {
       //item.data.idrDice = CrucibleUtility.getDiceFromLevel(Number(item.data.idr))
-      if (item.data.equipped) {
+      if (item.system.equipped) {
-        if (item.data.iscontainer) {
+        if (item.system.iscontainer) {
-          enc += item.data.contentsEnc
+          enc += item.system.contentsEnc
-        } else if (item.data.containerid == "") {
+        } else if (item.system.containerid == "") {
-          let q = item.data.quantity ?? 1
+          let q = item.system.quantity ?? 1
-          enc += q * item.data.weight
+          enc += q * item.system.weight
         }
       }
     }
-    for (let item of this.data.items) { // Process items/shields/armors
+    for (let item of this.items) { // Process items/shields/armors
-      if ((item.type == "weapon" || item.type == "shield" || item.type == "armor") && item.data.data.equipped) {
+      if ((item.type == "weapon" || item.type == "shield" || item.type == "armor") && item.system.equipped) {
-        let q = item.data.data.quantity ?? 1
+        let q = item.system.quantity ?? 1
-        enc += q * item.data.data.weight
+        enc += q * item.system.weight
       }
     }
 
     // Store local values
     this.encCurrent = enc
-    this.containersTree = equipments.filter(item => item.data.containerid == "") // Returns the root of equipements without container
+    this.containersTree = equipments.filter(item => item.system.containerid == "") // Returns the root of equipements without container
 
   }
 
+  /* -------------------------------------------- */
+  async rollArmor(rollData) {
+    let armor = this.getEquippedArmor()
+    if (armor) {
+
+    }
+    return { armor: "none" }
+  }
+
+  /* -------------------------------------------- */
+  async incDecHP(formula) {
+    let dmgRoll = new Roll(formula).roll({ async: false })
+    await CrucibleUtility.showDiceSoNice(dmgRoll, game.settings.get("core", "rollMode"))
+    let hp = duplicate(this.system.secondary.hp)
+    hp.value = Number(hp.value) + Number(dmgRoll.total)
+    this.update({ 'system.secondary.hp': hp })
+    return Number(dmgRoll.total)
+  }
+
   /* -------------------------------------------- */
   getAbility(abilKey) {
-    return this.data.data.abilities[abilKey];
+    return this.system.abilities[abilKey];
   }
 
   /* -------------------------------------------- */
   async addObjectToContainer(itemId, containerId) {
-    let container = this.data.items.find(item => item.id == containerId && item.data.data.iscontainer)
+    let container = this.items.find(item => item.id == containerId && item.system.iscontainer)
-    let object = this.data.items.find(item => item.id == itemId)
+    let object = this.items.find(item => item.id == itemId)
     if (container) {
-      if (object.data.data.iscontainer) {
+      if (object.system.iscontainer) {
         ui.notifications.warn("Only 1 level of container allowed")
         return
       }
-      let alreadyInside = this.data.items.filter(item => item.data.data.containerid && item.data.data.containerid == containerId);
+      let alreadyInside = this.items.filter(item => item.system.containerid && item.system.containerid == containerId);
-      if (alreadyInside.length >= container.data.data.containercapacity) {
+      if (alreadyInside.length >= container.system.containercapacity) {
         ui.notifications.warn("Container is already full !")
         return
       } else {
-        await this.updateEmbeddedDocuments("Item", [{ _id: object.id, 'data.containerid': containerId }])
+        await this.updateEmbeddedDocuments("Item", [{ _id: object.id, 'system.containerid': containerId }])
       }
-    } else if (object && object.data.data.containerid) { // remove from container
+    } else if (object && object.system.containerid) { // remove from container
       console.log("Removeing: ", object)
-      await this.updateEmbeddedDocuments("Item", [{ _id: object.id, 'data.containerid': "" }]);
+      await this.updateEmbeddedDocuments("Item", [{ _id: object.id, 'system.containerid': "" }]);
     }
   }
 
@@ -362,9 +388,9 @@ export class CrucibleActor extends Actor {
 
   /* -------------------------------------------- */
   async equipGear(equipmentId) {
-    let item = this.data.items.find(item => item.id == equipmentId);
+    let item = this.items.find(item => item.id == equipmentId);
-    if (item && item.data.data) {
+    if (item && item.system) {
-      let update = { _id: item.id, "data.equipped": !item.data.data.equipped };
+      let update = { _id: item.id, "system.equipped": !item.system.equipped };
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
   }
@@ -380,26 +406,26 @@ export class CrucibleActor extends Actor {
   /* -------------------------------------------- */
   getSubActors() {
     let subActors = [];
-    for (let id of this.data.data.subactors) {
+    for (let id of this.system.subactors) {
       subActors.push(duplicate(game.actors.get(id)))
     }
     return subActors;
   }
   /* -------------------------------------------- */
   async addSubActor(subActorId) {
-    let subActors = duplicate(this.data.data.subactors);
+    let subActors = duplicate(this.system.subactors);
     subActors.push(subActorId);
-    await this.update({ 'data.subactors': subActors });
+    await this.update({ 'system.subactors': subActors });
   }
   /* -------------------------------------------- */
   async delSubActor(subActorId) {
     let newArray = [];
-    for (let id of this.data.data.subactors) {
+    for (let id of this.system.subactors) {
       if (id != subActorId) {
         newArray.push(id);
       }
     }
-    await this.update({ 'data.subactors': newArray });
+    await this.update({ 'system.subactors': newArray });
   }
 
   /* -------------------------------------------- */
@@ -410,7 +436,7 @@ export class CrucibleActor extends Actor {
 
   /* -------------------------------------------- */
   getOneSkill(skillId) {
-    let skill = this.data.items.find(item => item.type == 'skill' && item.id == skillId)
+    let skill = this.items.find(item => item.type == 'skill' && item.id == skillId)
     if (skill) {
       skill = duplicate(skill);
     }
@@ -419,13 +445,13 @@ export class CrucibleActor extends Actor {
 
   /* -------------------------------------------- */
   async deleteAllItemsByType(itemType) {
-    let items = this.data.items.filter(item => item.type == itemType);
+    let items = this.items.filter(item => item.type == itemType);
     await this.deleteEmbeddedDocuments('Item', items);
   }
 
   /* -------------------------------------------- */
   async addItemWithoutDuplicate(newItem) {
-    let item = this.data.items.find(item => item.type == newItem.type && item.name.toLowerCase() == newItem.name.toLowerCase())
+    let item = this.items.find(item => item.type == newItem.type && item.name.toLowerCase() == newItem.name.toLowerCase())
     if (!item) {
       await this.createEmbeddedDocuments('Item', [newItem]);
     }
@@ -433,23 +459,23 @@ export class CrucibleActor extends Actor {
 
   /* -------------------------------------------- */
   async incrementSkillExp(skillId, inc) {
-    let skill = this.data.items.get(skillId)
+    let skill = this.items.get(skillId)
     if (skill) {
-      await this.updateEmbeddedDocuments('Item', [{ _id: skill.id, 'data.exp': skill.data.data.exp + inc }])
+      await this.updateEmbeddedDocuments('Item', [{ _id: skill.id, 'system.exp': skill.system.exp + inc }])
       let chatData = {
         user: game.user.id,
         rollMode: game.settings.get("core", "rollMode"),
         whisper: [game.user.id].concat(ChatMessage.getWhisperRecipients('GM')),
-        content: `<div>${this.name} has gained 1 exp in the skill ${skill.name} (exp = ${skill.data.data.exp})</div`
+        content: `<div>${this.name} has gained 1 exp in the skill ${skill.name} (exp = ${skill.system.exp})</div`
       }
       ChatMessage.create(chatData)
-      if (skill.data.data.exp >= 25) {
+      if (skill.system.exp >= 25) {
-        await this.updateEmbeddedDocuments('Item', [{ _id: skill.id, 'data.exp': 0, 'data.explevel': skill.data.data.explevel + 1 }])
+        await this.updateEmbeddedDocuments('Item', [{ _id: skill.id, 'system.exp': 0, 'system.explevel': skill.system.explevel + 1 }])
         let chatData = {
           user: game.user.id,
           rollMode: game.settings.get("core", "rollMode"),
           whisper: [game.user.id].concat(ChatMessage.getWhisperRecipients('GM')),
-          content: `<div>${this.name} has gained 1 exp SL in the skill ${skill.name} (new exp SL :  ${skill.data.data.explevel}) !</div`
+          content: `<div>${this.name} has gained 1 exp SL in the skill ${skill.name} (new exp SL :  ${skill.system.explevel}) !</div`
         }
         ChatMessage.create(chatData)
       }
@@ -458,27 +484,62 @@ export class CrucibleActor extends Actor {
 
   /* -------------------------------------------- */
   async incDecQuantity(objetId, incDec = 0) {
-    let objetQ = this.data.items.get(objetId)
+    let objetQ = this.items.get(objetId)
     if (objetQ) {
-      let newQ = objetQ.data.data.quantity + incDec
+      let newQ = objetQ.system.quantity + incDec
       if (newQ >= 0) {
-        const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'data.quantity': newQ }]) // pdates one EmbeddedEntity
+        const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.quantity': newQ }]) // pdates one EmbeddedEntity
       }
     }
   }
   /* -------------------------------------------- */
   async incDecAmmo(objetId, incDec = 0) {
-    let objetQ = this.data.items.get(objetId)
+    let objetQ = this.items.get(objetId)
     if (objetQ) {
-      let newQ = objetQ.data.data.ammocurrent + incDec;
+      let newQ = objetQ.system.ammocurrent + incDec;
-      if (newQ >= 0 && newQ <= objetQ.data.data.ammomax) {
+      if (newQ >= 0 && newQ <= objetQ.system.ammomax) {
-        const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'data.ammocurrent': newQ }]); // pdates one EmbeddedEntity
+        const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.ammocurrent': newQ }]); // pdates one EmbeddedEntity
       }
     }
   }
 
+  /* -------------------------------------------- */
+  isForcedAdvantage() {
+    return this.items.find(cond => cond.type == "condition" && cond.system.advantage)
+  }
+  isForcedDisadvantage() {
+    return this.items.find(cond => cond.type == "condition" && cond.system.disadvantage)
+  }
+  isForcedRollAdvantage() {
+    return this.items.find(cond => cond.type == "condition" && cond.system.rolladvantage)
+  }
+  isForcedRollDisadvantage() {
+    return this.items.find(cond => cond.type == "condition" && cond.system.rolldisadvantage)
+  }
+  isNoAdvantage() {
+    return this.items.find(cond => cond.type == "condition" && cond.system.noadvantage)
+  }
+  isNoAction() {
+    return this.items.find(cond => cond.type == "condition" && cond.system.noaction)
+  }
+  isAttackDisadvantage() {
+    return this.items.find(cond => cond.type == "condition" && cond.system.attackdisadvantage)
+  }
+  isDefenseDisadvantage() {
+    return this.items.find(cond => cond.type == "condition" && cond.system.defensedisadvantage)
+  }
+  isAttackerAdvantage() {
+    return this.items.find(cond => cond.type == "condition" && cond.system.targetadvantage)
+  }
+
   /* -------------------------------------------- */
   getCommonRollData(abilityKey = undefined) {
+    let noAction = this.isNoAction()
+    if (noAction) {
+      ui.notifications.warn("You can't do any actions du to the condition : " + noAction.name)
+      return
+    }
+
     let rollData = CrucibleUtility.getBasicRollData()
     rollData.alias = this.name
     rollData.actorImg = this.img
@@ -487,15 +548,42 @@ export class CrucibleActor extends Actor {
     rollData.featsDie = this.getFeatsWithDie()
     rollData.featsSL = this.getFeatsWithSL()
     rollData.armors = this.getArmors()
+    rollData.conditions = this.getConditions()
     rollData.featDieName = "none"
     rollData.featSLName = "none"
     rollData.rollAdvantage = "none"
     rollData.advantage = "none"
     rollData.disadvantage = "none"
+    rollData.forceAdvantage = this.isForcedAdvantage()
+    rollData.forceDisadvantage = this.isForcedDisadvantage()
+    rollData.forceRollAdvantage = this.isForcedRollAdvantage()
+    rollData.forceRollDisadvantage = this.isForcedRollDisadvantage()
+    rollData.noAdvantage = this.isNoAdvantage()
+    if (rollData.defenderTokenId) {
+      let defenderToken = game.canvas.tokens.get(rollData.defenderTokenId)
+      let defender = defenderToken.actor
+
+      // Distance management
+      let token = this.token
+      if (!token) {
+        let tokens = this.getActiveTokens()
+        token = tokens[0]
+      }
+      if (token) {
+        const ray = new Ray(token.object?.center || token.center, defenderToken.center)
+        rollData.tokensDistance = canvas.grid.measureDistances([{ ray }], { gridSpaces: false })[0] / canvas.grid.grid.options.dimensions.distance
+      } else {
+        ui.notifications.info("No token connected to this actor, unable to compute distance.")
+        return
+      }
+      if (defender) {
+        rollData.forceAdvantage = defender.isAttackerAdvantage()
+        rollData.advantageFromTarget = true
+      }
+    }
 
     if (abilityKey) {
       rollData.ability = this.getAbility(abilityKey)
-      //rollData.skillList = this.getRelevantSkill(abilityKey)
       rollData.selectedKill = undefined
     }
 
@@ -508,45 +596,58 @@ export class CrucibleActor extends Actor {
   rollAbility(abilityKey) {
     let rollData = this.getCommonRollData(abilityKey)
     rollData.mode = "ability"
+    if (rollData.target) {
+      ui.notifications.warn("You are targetting a token with a skill : please use a Weapon instead.")
+      return
+    }
     CrucibleUtility.rollCrucible(rollData)
   }
 
   /* -------------------------------------------- */
   rollSkill(skillId) {
-    let skill = this.data.items.get(skillId)
+    let skill = this.items.get(skillId)
     if (skill) {
-      if (skill.data.islore && skill.data.level == 0) {
+      if (skill.system.islore && skill.system.level == 0) {
         ui.notifications.warn("You can't use Lore Skills with a SL of 0.")
         return
       }
       skill = duplicate(skill)
       CrucibleUtility.updateSkill(skill)
-      let abilityKey = skill.data.ability
+      let abilityKey = skill.system.ability
       let rollData = this.getCommonRollData(abilityKey)
       rollData.mode = "skill"
       rollData.skill = skill
       rollData.img = skill.img
-
+      if (rollData.target) {
+        ui.notifications.warn("You are targetting a token with a skill : please use a Weapon instead.")
+        return
+      }
       this.startRoll(rollData)
     }
   }
 
   /* -------------------------------------------- */
   rollWeapon(weaponId) {
-    let weapon = this.data.items.get(weaponId)
+    let weapon = this.items.get(weaponId)
     if (weapon) {
       weapon = duplicate(weapon)
-      let skill = this.data.items.find(item => item.name.toLowerCase() == weapon.data.skill.toLowerCase())
+      let skill = this.items.find(item => item.name.toLowerCase() == weapon.system.skill.toLowerCase())
       if (skill) {
         skill = duplicate(skill)
         CrucibleUtility.updateSkill(skill)
-        let abilityKey = skill.data.ability
+        let abilityKey = skill.system.ability
         let rollData = this.getCommonRollData(abilityKey)
         rollData.mode = "weapon"
         rollData.skill = skill
         rollData.weapon = weapon
         rollData.img = weapon.img
-
+        if (!rollData.forceDisadvantage) { // This is an attack, check if disadvantaged
+          rollData.forceDisadvantage = this.isAttackDisadvantage()
+        }
+        /*if (rollData.weapon.system.isranged && rollData.tokensDistance > CrucibleUtility.getWeaponMaxRange(rollData.weapon) ) {
+          ui.notifications.warn(`Your target is out of range of your weapon (max: ${CrucibleUtility.getWeaponMaxRange(rollData.weapon)}  - current : ${rollData.tokensDistance})` )
+          return
+        }*/
         this.startRoll(rollData)
       } else {
         ui.notifications.warn("Unable to find the relevant skill for weapon " + weapon.name)
@@ -554,6 +655,56 @@ export class CrucibleActor extends Actor {
     }
   }
 
+  /* -------------------------------------------- */
+  rollDefenseMelee(attackRollData) {
+    let weapon = this.items.get(attackRollData.defenseWeaponId)
+    if (weapon) {
+      weapon = duplicate(weapon)
+      let skill = this.items.find(item => item.name.toLowerCase() == weapon.system.skill.toLowerCase())
+      if (skill) {
+        skill = duplicate(skill)
+        CrucibleUtility.updateSkill(skill)
+        let abilityKey = skill.system.ability
+        let rollData = this.getCommonRollData(abilityKey)
+        rollData.defenderTokenId = undefined // Cleanup
+        rollData.mode = "weapondefense"
+        rollData.shield = this.getEquippedShield()
+        rollData.attackRollData = duplicate(attackRollData)
+        rollData.skill = skill
+        rollData.weapon = weapon
+        rollData.img = weapon.img
+        if (!rollData.forceDisadvantage) { // This is an attack, check if disadvantaged
+          rollData.forceDisadvantage = this.isDefenseDisadvantage()
+        }
+
+        this.startRoll(rollData)
+      } else {
+        ui.notifications.warn("Unable to find the relevant skill for weapon " + weapon.name)
+      }
+    } else {
+      ui.notifications.warn("Weapon not found ! ")
+    }
+  }
+
+  /* -------------------------------------------- */
+  rollDefenseRanged(attackRollData) {
+    let rollData = this.getCommonRollData()
+    rollData.defenderTokenId = undefined // Cleanup
+    rollData.mode = "rangeddefense"
+    if ( attackRollData) {
+      rollData.attackRollData = duplicate(attackRollData)
+      rollData.effectiveRange = CrucibleUtility.getWeaponRange(attackRollData.weapon)
+      rollData.tokensDistance = attackRollData.tokensDistance // QoL copy
+    }
+    rollData.sizeDice = CrucibleUtility.getSizeDice(this.system.biodata.size)
+    rollData.distanceBonusDice = 0 //Math.max(0, Math.floor((rollData.tokensDistance - rollData.effectiveRange) + 0.5))
+    rollData.hasCover = "none"
+    rollData.situational = "none"
+    rollData.useshield = false
+    rollData.shield = this.getEquippedShield()
+    this.startRoll(rollData)
+  }
+
   /* -------------------------------------------- */
   rollShieldDie() {
     let shield = this.getEquippedShield()
@@ -562,20 +713,72 @@ export class CrucibleActor extends Actor {
       let rollData = this.getCommonRollData()
       rollData.mode = "shield"
       rollData.shield = shield
+      rollData.useshield = true
       rollData.img = shield.img
       this.startRoll(rollData)
     }
   }
 
   /* -------------------------------------------- */
-  rollArmorDie() {
+  async rollArmorDie(rollData = undefined) {
     let armor = this.getEquippedArmor()
     if (armor) {
       armor = duplicate(armor)
-      let diceColor = armor.data.absorprionroll
+      let reduce = 0
-      let rollTable = CrucibleUtility.getRollTableFromDiceColor( diceColor)
+      let multiply = 1
-      
+      let disadvantage = false
+      let advantage = false
+      let messages = ["Armor applied"]
+
+      if (rollData) {
+        if (CrucibleUtility.isArmorLight(armor) && CrucibleUtility.isWeaponPenetrating(rollData.attackRollData.weapon)) {
+          return { armorIgnored: true, nbSuccess: 0, messages: ["Armor ignored : Penetrating weapons ignore Light Armors."] }
+        }
+        if (CrucibleUtility.isWeaponPenetrating(rollData.attackRollData.weapon)) {
+          messages.push("Armor reduced by 1 (Penetrating weapon)")
+          reduce = 1
+        }
+        if (CrucibleUtility.isWeaponLight(rollData.attackRollData.weapon)) {
+          messages.push("Armor with advantage (Light weapon)")
+          advantage = true
+        }
+        if (CrucibleUtility.isWeaponHeavy(rollData.attackRollData.weapon)) {
+          messages.push("Armor with disadvantage (Heavy weapon)")
+          disadvantage = true
+        }
+        if (CrucibleUtility.isWeaponHack(rollData.attackRollData.weapon)) {
+          messages.push("Armor reduced by 1 (Hack weapon)")
+          reduce = 1
+        }
+        if (CrucibleUtility.isWeaponUndamaging(rollData.attackRollData.weapon)) {
+          messages.push("Armor multiplied by 2 (Undamaging weapon)")
+          multiply = 2
+        }
+      }
+      let diceColor = armor.system.absorprionroll
+      let armorResult = await CrucibleUtility.getRollTableFromDiceColor(diceColor, false)
+      console.log("Armor log", armorResult)
+      let armorValue = Math.max(0, (Number(armorResult.text) + reduce) * multiply)
+      if (advantage || disadvantage) {
+        let armorResult2 = await CrucibleUtility.getRollTableFromDiceColor(diceColor, false)
+        let armorValue2 = Math.max(0, (Number(armorResult2.text) + reduce) * multiply)
+        if (advantage) {
+          armorValue = (armorValue2 > armorValue) ? armorValue2 : armorValue
+          messages.push(`Armor advantage - Roll 1 = ${armorValue} - Roll 2 = ${armorValue2}`)
+        }
+        if (disadvantage) {
+          armorValue = (armorValue2 < armorValue) ? armorValue2 : armorValue
+          messages.push(`Armor disadvantage - Roll 1 = ${armorValue} - Roll 2 = ${armorValue2}`)
+        }
+      }
+      armorResult.armorValue = armorValue
+      if (!rollData) {
+        ChatMessage.create({ content: "Armor result : " + armorValue })
+      }
+      messages.push("Armor result : " + armorValue)
+      return { armorIgnored: false, nbSuccess: armorValue, rawArmor: armorResult.text, messages: messages }
     }
+    return { armorIgnored: true, nbSuccess: 0, messages: ["No armor equipped."] }
   }
 
   /* -------------------------------------------- */
@@ -587,8 +790,10 @@ export class CrucibleActor extends Actor {
       let rollData = this.getCommonRollData()
       rollData.mode = "save"
       rollData.save = save
-      //rollData.img = skill.img
+      if (rollData.target) {
-
+        ui.notifications.warn("You are targetting a token with a save roll - Not authorized.")
+        return
+      }
       this.startRoll(rollData)
     }
 

modules/crucible-item-sheet.js

@@ -48,19 +48,19 @@ export class CrucibleItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = CrucibleUtility.data(this.object);
+    
-    if ( objectData.type == "skill") {
+    if ( this.object.type == "skill") {
-      console.log(objectData)
+      CrucibleUtility.updateSkill(this.object)
-      CrucibleUtility.updateSkill(objectData)
     }
+    let objectData = duplicate(this.object.system)
 
-    let itemData = foundry.utils.deepClone(CrucibleUtility.templateData(this.object))
+    let itemData = objectData
     let formData = {
       title: this.title,
       id: this.id,
-      type: objectData.type,
+      type: this.object.type,
-      img: objectData.img,
+      img: this.object.img,
-      name: objectData.name,
+      name: this.object.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
       weaponSkills: CrucibleUtility.getWeaponSkills(),
@@ -72,7 +72,7 @@ export class CrucibleItemSheet extends ItemSheet {
       isGM: game.user.isGM
     }
 
-    this.options.editable = !(this.object.data.origin == "embeddedItem");
+    this.options.editable = !(this.object.origin == "embeddedItem");
     console.log("ITEM DATA", formData, this);
     return formData;
   }
@@ -136,13 +136,6 @@ export class CrucibleItemSheet extends ItemSheet {
       this.deleteSubitem(ev);
     });
 
-    html.find('.stat-choice-flag').click(ev => {
-      let idx = $(ev.currentTarget).data("stat-idx");
-      let array = duplicate(this.object.data.data.statincreasechoice);
-      array[Number(idx)].flag = !array[Number(idx)].flag;
-      this.object.update({ "data.statincreasechoice": array });
-    });
-
     // Update Inventory Item
     html.find('.item-delete').click(ev => {
       const li = $(ev.currentTarget).parents(".item");

modules/crucible-npc-sheet.js

@@ -18,30 +18,43 @@ export class CrucibleNPCSheet extends ActorSheet {
       height: 720,
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "stats" }],
       dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
-      editScore: false
+      editScore: true
     });
   }
 
   /* -------------------------------------------- */
   async getData() {
-    const objectData = CrucibleUtility.data(this.object);
+    const objectData = this.object.system
-    
+    let actorData = duplicate(objectData)
-    this.actor.prepareTraitsAttributes();
-    let actorData = duplicate(CrucibleUtility.templateData(this.object));
 
     let formData = {
       title: this.title,
-      id: objectData.id,
+      id: this.actor.id,
-      type: objectData.type,
+      type: this.actor.type,
-      img: objectData.img,
+      img: this.actor.img,
-      name: objectData.name,
+      name: this.actor.name,
       editable: this.isEditable,
       cssClass: this.isEditable ? "editable" : "locked",
       data: actorData,
-      effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
       limited: this.object.limited,
-      equipments: this.actor.getEquipments(),
+      skills: this.actor.getSkills( ),
-      weapons: this.actor.getWeapons(),
+      weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ),
+      armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())),
+      shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())),
+      spells: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getLore())),
+      equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsOnly()) ),
+      equippedWeapons: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquippedWeapons()) ),
+      equippedArmor: this.actor.getEquippedArmor(),
+      equippedShield: this.actor.getEquippedShield(),
+      feats: duplicate(this.actor.getFeats()),
+      subActors: duplicate(this.actor.getSubActors()),
+      race: duplicate(this.actor.getRace()),
+      moneys: duplicate(this.actor.getMoneys()),
+      encCapacity: this.actor.getEncumbranceCapacity(),
+      saveRolls: this.actor.getSaveRoll(),
+      conditions: this.actor.getConditions(),
+      containersTree: this.actor.containersTree,
+      encCurrent: this.actor.encCurrent,
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,
@@ -49,7 +62,7 @@ export class CrucibleNPCSheet extends ActorSheet {
     }
     this.formData = formData;
 
-    console.log("NPC : ", formData, this.object);
+    console.log("PC : ", formData, this.object);
     return formData;
   }
 
@@ -60,43 +73,100 @@ export class CrucibleNPCSheet extends ActorSheet {
 
     // Everything below here is only needed if the sheet is editable
     if (!this.options.editable) return;
+    
+    html.bind("keydown", function(e) { // Ignore Enter in actores sheet
+      if (e.keyCode === 13) return false;
+    });  
 
     // Update Inventory Item
     html.find('.item-edit').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
+      const li = $(ev.currentTarget).parents(".item")
-      let itemId = li.data("item-id");
+      let itemId = li.data("item-id")
       const item = this.actor.items.get( itemId );
       item.sheet.render(true);
     });
     // Delete Inventory Item
     html.find('.item-delete').click(ev => {
+      const li = $(ev.currentTarget).parents(".item")
+      CrucibleUtility.confirmDelete(this, li)
+    })
+    html.find('.item-add').click(ev => {
+      let dataType = $(ev.currentTarget).data("type")
+      this.actor.createEmbeddedDocuments('Item', [{ name: "NewItem", type: dataType }], { renderSheet: true })
+    })
+        
+    html.find('.equip-activate').click(ev => {
+      const li = $(ev.currentTarget).parents(".item")
+      let itemId = li.data("item-id")
+      this.actor.equipActivate( itemId)
+    });      
+    html.find('.equip-deactivate').click(ev => {
+      const li = $(ev.currentTarget).parents(".item")
+      let itemId = li.data("item-id")
+      this.actor.equipDeactivate( itemId)
+    });      
+
+    html.find('.subactor-edit').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
-      FraggedKingdomUtility.confirmDelete(this, li);
+      let actorId = li.data("actor-id");
+      let actor = game.actors.get( actorId );
+      actor.sheet.render(true);
+    });
+    
+    html.find('.subactor-delete').click(ev => {
+      const li = $(ev.currentTarget).parents(".item");
+      let actorId = li.data("actor-id");
+      this.actor.delSubActor(actorId);
+    });
+    html.find('.quantity-minus').click(event => {
+      const li = $(event.currentTarget).parents(".item");
+      this.actor.incDecQuantity( li.data("item-id"), -1 );
+    } );
+    html.find('.quantity-plus').click(event => {
+      const li = $(event.currentTarget).parents(".item");
+      this.actor.incDecQuantity( li.data("item-id"), +1 );
+    } );
+
+    html.find('.ammo-minus').click(event => {
+      const li = $(event.currentTarget).parents(".item")
+      this.actor.incDecAmmo( li.data("item-id"), -1 );
+    } );
+    html.find('.ammo-plus').click(event => {
+      const li = $(event.currentTarget).parents(".item")
+      this.actor.incDecAmmo( li.data("item-id"), +1 )
+    } );
+            
+    html.find('.roll-ability').click((event) => {
+      const abilityKey = $(event.currentTarget).data("ability-key");
+      this.actor.rollAbility(abilityKey);
+    });
+    html.find('.roll-skill').click((event) => {
+      const li = $(event.currentTarget).parents(".item")
+      const skillId = li.data("item-id")
+      this.actor.rollSkill(skillId)
+    });    
+
+    html.find('.roll-weapon').click((event) => {
+      const li = $(event.currentTarget).parents(".item");
+      const skillId = li.data("item-id")
+      this.actor.rollWeapon(skillId)
+    });
+    html.find('.roll-armor-die').click((event) => {
+      this.actor.rollArmorDie()
+    });
+    html.find('.roll-shield-die').click((event) => {
+      this.actor.rollShieldDie()
+    });
+    html.find('.roll-target-die').click((event) => {
+      this.actor.rollDefenseRanged()
     });
 
-    html.find('.trait-link').click((event) => {
+    html.find('.roll-save').click((event) => {
-      const itemId = $(event.currentTarget).data("item-id");
+      const saveKey = $(event.currentTarget).data("save-key")
-      const item = this.actor.getOwnedItem(itemId);
+      this.actor.rollSave(saveKey)
-      item.sheet.render(true);
-    }); 
-    
-    html.find('.competence-label a').click((event) => {
-      const li = $(event.currentTarget).parents(".item");
-      const competenceId = li.data("item-id");
-      this.actor.rollSkill(competenceId);
     });
-    html.find('.weapon-label a').click((event) => {
+    
-      const li = $(event.currentTarget).parents(".item");
+    
-      const armeId = li.data("item-id");
-      const statId = li.data("stat-id");
-      this.actor.rollWeapon(armeId, statId);
-    });    
-    html.find('.npc-fight-roll').click((event) => {
-      this.actor.rollNPCFight();
-    });        
-    html.find('.npc-skill-roll').click((event) => {
-      this.actor.rollGenericSkill();
-    });        
     html.find('.lock-unlock-sheet').click((event) => {
       this.options.editScore = !this.options.editScore;
       this.render(true);
@@ -109,9 +179,15 @@ export class CrucibleNPCSheet extends ActorSheet {
     html.find('.item-equip').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
       this.actor.equipItem( li.data("item-id") );
-      this.render(true);
+      this.render(true);      
     });
 
+    html.find('.update-field').change(ev => {
+      const fieldName = $(ev.currentTarget).data("field-name");
+      let value = Number(ev.currentTarget.value);
+      this.actor.update( { [`${fieldName}`]: value } );
+    });    
+
   }
 
   /* -------------------------------------------- */

modules/crucible-roll-dialog.js

@@ -67,12 +67,18 @@ export class CrucibleRollDialog extends Dialog {
     html.find('#rollAdvantage').change((event) => {
       this.rollData.rollAdvantage = event.currentTarget.value
     })
-    /*html.find('#featDieName').change((event) => {
+    html.find('#useshield').change((event) => {
-      this.rollData.featDieName = event.currentTarget.value
+      this.rollData.useshield = event.currentTarget.checked
+    })
+    html.find('#hasCover').change((event) => {
+      this.rollData.hasCover = event.currentTarget.value
+    })
+    html.find('#situational').change((event) => {
+      this.rollData.situational = event.currentTarget.value
+    })
+    html.find('#distanceBonusDice').change((event) => {
+      this.rollData.distanceBonusDice = Number(event.currentTarget.value)
     })
-    html.find('#featDieSL').change((event) => {
-      this.rollData.featDieSL = event.currentTarget.value
-    })*/
     
   }
 }

modules/crucible-utility.js

@@ -5,9 +5,12 @@ import { CrucibleCommands } from "./crucible-commands.js";
 /* -------------------------------------------- */
 const __level2Dice = ["d0", "d4", "d6", "d8", "d10", "d12"];
 const __name2DiceValue = { "0": 0, "d0": 0, "d4": 4, "d6": 6, "d8": 8, "d10": 10, "d12": 12 }
-const __skillLevel2Dice = ["0d8", "1d8", "2d8","3d8", "4d8", '6d8', "8d8", "10d8"]
+const __skillLevel2Dice = ["0d8", "1d8", "2d8", "3d8", "4d8", '6d8', "8d8", "10d8"]
-const __color2RollTable = { blue: "Blue Armor Die", black: "Black Armor Die", green: "Green Armor Die", purple: "Purple Armor Die",
+const __color2RollTable = {
-    white: "White Armor Die", red: "Red Armor Die", blackgreen: "Black & Green Armor Dice"}
+  blue: "Blue Armor Die", black: "Black Armor Die", green: "Green Armor Die", purple: "Purple Armor Die",
+  white: "White Armor Die", red: "Red Armor Die", blackgreen: "Black & Green Armor Dice"
+}
+const __size2Dice = [ { nb: 0, dice: "d0" }, { nb: 5, dice: "d8" }, { nb: 3, dice: "d8" }, { nb: 2, dice: "d8" }, { nb: 1, dice: "d8" }, { nb: 1, dice: "d6" }, { nb: 1, noAddFirst: true, dice: "d6" }]
 
 /* -------------------------------------------- */
 export class CrucibleUtility {
@@ -16,11 +19,12 @@ export class CrucibleUtility {
   /* -------------------------------------------- */
   static async init() {
     Hooks.on('renderChatLog', (log, html, data) => CrucibleUtility.chatListeners(html));
-    Hooks.on("dropCanvasData", (canvas, data) => {
+    /*Hooks.on("dropCanvasData", (canvas, data) => {
       CrucibleUtility.dropItemOnToken(canvas, data)
-    });
+    });*/
 
-    this.rollDataStore = {}    
+    this.rollDataStore = {}
+    this.defenderStore = {}
 
     CrucibleCommands.init();
 
@@ -48,6 +52,11 @@ export class CrucibleUtility {
     })
   }
 
+  /*-------------------------------------------- */
+  static upperFirst(text) {
+    if (typeof text !== 'string') return text
+    return text.charAt(0).toUpperCase() + text.slice(1)
+  }
 
   /*-------------------------------------------- */
   static getSkills() {
@@ -61,13 +70,13 @@ export class CrucibleUtility {
   static getShieldSkills() {
     return duplicate(this.shieldSkills)
   }
-  
+
   /* -------------------------------------------- */
   static async ready() {
     const skills = await CrucibleUtility.loadCompendium("fvtt-crucible-rpg.skills")
     this.skills = skills.map(i => i.toObject())
-    this.weaponSkills = duplicate( this.skills.filter( item => item.data.isweaponskill))
+    this.weaponSkills = duplicate(this.skills.filter(item => item.system.isweaponskill))
-    this.shieldSkills = duplicate( this.skills.filter( item => item.data.isshieldskill))
+    this.shieldSkills = duplicate(this.skills.filter(item => item.system.isshieldskill))
 
     const rollTables = await CrucibleUtility.loadCompendium("fvtt-crucible-rpg.rolltables")
     this.rollTables = rollTables.map(i => i.toObject())
@@ -87,16 +96,103 @@ export class CrucibleUtility {
   }
 
   /* -------------------------------------------- */
-  static async getRollTableFromDiceColor( diceColor) {
+  static isArmorLight(armor) {
+    if (armor && (armor.system.armortype.includes("light") || armor.system.armortype.includes("clothes"))) {
+      return true
+    }
+    return false
+  }
+  /* -------------------------------------------- */
+  static isWeaponPenetrating(weapon) {
+    if (weapon && weapon.system.qualities.toLowerCase().includes("penetrating")) {
+      return true
+    }
+    return false
+  }
+  /* -------------------------------------------- */
+  static isWeaponLight(weapon) {
+    if (weapon && weapon.system.qualities.toLowerCase().includes("light")) {
+      return true
+    }
+    return false
+  }
+  /* -------------------------------------------- */
+  static isWeaponHeavy(weapon) {
+    if (weapon && weapon.system.qualities.toLowerCase().includes("heavy")) {
+      return true
+    }
+    return false
+  }
+  /* -------------------------------------------- */
+  static isWeaponHack(weapon) {
+    if (weapon && weapon.system.qualities.toLowerCase().includes("hack")) {
+      return true
+    }
+    return false
+  }
+  /* -------------------------------------------- */
+  static isWeaponUndamaging(weapon) {
+    if (weapon && weapon.system.qualities.toLowerCase().includes("undamaging")) {
+      return true
+    }
+    return false
+  }
+  /* -------------------------------------------- */
+  static isWeaponDangerous(weapon) {
+    if (weapon && weapon.system.qualities.toLowerCase().includes("dangerous")) {
+      return true
+    }
+    return false
+  }
+  /* -------------------------------------------- */
+  static isWeaponDeadly(weapon) {
+    if (weapon && weapon.system.qualities.toLowerCase().includes("deadly")) {
+      return true
+    }
+    return false
+  }
+  static getWeaponRange(weapon) {
+    if (weapon && weapon.system.isranged) {
+      let rangeValue = weapon.system.range.replace(/[^0-9]/g, '')
+      return Number(rangeValue)
+    }
+    return false
+  }
+  static getWeaponMaxRange(weapon) {
+    if (weapon && weapon.system.isranged) {
+      let rangeValue = weapon.system.maxrange.replace(/[^0-9]/g, '')
+      return Number(rangeValue)
+    }
+    return false
+  }
+
+  /* -------------------------------------------- */
+  static async getRollTableFromDiceColor(diceColor, displayChat = true) {
     let rollTableName = __color2RollTable[diceColor]
     if (rollTableName) {
       const pack = game.packs.get("fvtt-crucible-rpg.rolltables")
       const index = await pack.getIndex()
       const entry = index.find(e => e.name === rollTableName)
       let table = await pack.getDocument(entry._id)
-      const draw = await table.draw({ displayChat: true, rollMode: "gmroll"})
+      const draw = await table.draw({ displayChat: displayChat, rollMode: "gmroll" })
       return draw.results.length > 0 ? draw.results[0] : undefined
-    }    
+    }
+  }
+  /* -------------------------------------------- */
+  static getSizeDice(sizeValue) {
+    return __size2Dice[sizeValue]
+  }
+
+  /* -------------------------------------------- */
+  static async getCritical(level, weapon) {
+    const pack = game.packs.get("fvtt-crucible-rpg.rolltables")
+
+    let tableName = "Crit " + level + " (" + this.upperFirst(weapon.system.damage) + ")"
+    const index = await pack.getIndex()
+    const entry = index.find(e => e.name === tableName)
+    let table = await pack.getDocument(entry._id)
+    const draw = await table.draw({ displayChat: false, rollMode: "gmroll" })
+    return draw.results.length > 0 ? draw.results[0] : undefined
   }
 
   /* -------------------------------------------- */
@@ -105,6 +201,24 @@ export class CrucibleUtility {
     html.on("click", '.view-item-from-chat', event => {
       game.system.crucible.creator.openItemView(event)
     })
+    html.on("click", '.roll-defense-melee', event => {
+      let rollId = $(event.currentTarget).data("roll-id")
+      let rollData = CrucibleUtility.getRollData(rollId)
+      rollData.defenseWeaponId = $(event.currentTarget).data("defense-weapon-id")
+      let actor = game.canvas.tokens.get(rollData.defenderTokenId).actor
+      if (actor && (game.user.isGM || actor.isOwner)) {
+        actor.rollDefenseMelee(rollData)
+      }
+    })
+    html.on("click", '.roll-defense-ranged', event => {
+      let rollId = $(event.currentTarget).data("roll-id")
+      let rollData = CrucibleUtility.getRollData(rollId)
+      let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
+      if (defender && (game.user.isGM || defender.isOwner)) {
+        defender.rollDefenseRanged(rollData)
+      }
+    })
+
   }
 
   /* -------------------------------------------- */
@@ -152,18 +266,6 @@ export class CrucibleUtility {
     return undefined;
   }
 
-  /* -------------------------------------------- */
-  static templateData(it) {
-    return CrucibleUtility.data(it)?.data ?? {}
-  }
-
-  /* -------------------------------------------- */
-  static data(it) {
-    if (it instanceof Actor || it instanceof Item || it instanceof Combatant) {
-      return it.data;
-    }
-    return it;
-  }
 
   /* -------------------------------------------- */
   static createDirectOptionList(min, max) {
@@ -185,12 +287,12 @@ export class CrucibleUtility {
 
   /* -------------------------------------------- */
   static getTarget() {
-    if (game.user.targets && game.user.targets.size == 1) {
+    if (game.user.targets) {
       for (let target of game.user.targets) {
-        return target;
+        return target
       }
     }
-    return undefined;
+    return undefined
   }
 
   /* -------------------------------------------- */
@@ -214,15 +316,142 @@ export class CrucibleUtility {
     return this.rollDataStore[id]
   }
 
+  /* -------------------------------------------- */
+  static async displayDefenseMessage(rollData) {
+    if (rollData.mode == "weapon" && rollData.defenderTokenId) {
+      let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
+      if (game.user.isGM || (game.user.character && game.user.character.id == defender.id)) {
+        rollData.defender = defender
+        rollData.defenderWeapons = defender.getEquippedWeapons()
+        rollData.isRangedAttack = rollData.weapon?.system.isranged
+        this.createChatWithRollMode(defender.name, {
+          name: defender.name,
+          alias: defender.name,
+          //user: defender.id,
+          content: await renderTemplate(`systems/fvtt-crucible-rpg/templates/chat-request-defense.html`, rollData),
+          whisper: [defender.id].concat(ChatMessage.getWhisperRecipients('GM')),
+        })
+      }
+    }
+  }
+
+  /* -------------------------------------------- */
+  static getSuccessResult(rollData) {
+    if (rollData.sumSuccess <= -3) {
+      if (rollData.attackRollData.weapon.system.isranged ) {
+        return { result: "miss", fumble: true, hpLossType: "melee" }
+      } else {
+        return { result: "miss", fumble: true, attackerHPLoss: "2d3", hpLossType: "melee" }
+      }
+    }
+    if (rollData.sumSuccess == -2) {
+      if (rollData.attackRollData.weapon.system.isranged ) {
+        return { result: "miss", dangerous_fumble: true }
+      } else {
+        return { result: "miss", dangerous_fumble: true, attackerHPLoss: "1d3", hpLossType: "melee" }
+      }
+    }
+    if (rollData.sumSuccess == -1) {
+      return { result: "miss" }
+    }
+    if (rollData.sumSuccess == 0) {
+      if (rollData.attackRollData.weapon.system.isranged) {
+        return { result: "target_space", aoe: true }
+      } else {
+        return { result: "clash", hack_vs_shields: true }
+      }
+    }
+    if (rollData.sumSuccess == 1) {
+      return { result: "hit", defenderDamage: "1", entangle: true, knockback: true }
+    }
+    if (rollData.sumSuccess == 2) {
+      return { result: "hit", defenderDamage: "2", critical_1: true, entangle: true, knockback: true, penetrating_impale: true, hack_armors: true }
+    }
+    if (rollData.sumSuccess >= 3) {
+      return { result: "hit", defenderDamage: "3", critical_2: true, entangle: true, knockback: true, penetrating_impale: true, hack_armors: true }
+    }
+  }
+
+  /* -------------------------------------------- */
+  static async getFumble(weapon) {
+    const pack = game.packs.get("fvtt-crucible-rpg.rolltables")
+    const index = await pack.getIndex()
+    let entry
+
+    if (weapon.isranged) {
+      entry = index.find(e => e.name === "Fumble! (ranged)")
+    }
+    if (!weapon.isranged) {
+      entry = index.find(e => e.name === "Fumble! (melee)")
+    }
+    let table = await pack.getDocument(entry._id)
+    const draw = await table.draw({ displayChat: false, rollMode: "gmroll" })
+    return draw.results.length > 0 ? draw.results[0] : undefined
+  }
+
+  /* -------------------------------------------- */
+  static async processSuccessResult(rollData) {
+    if (game.user.isGM) { // Only GM process this
+      let result = rollData.successDetails
+      let attacker = game.actors.get(rollData.actorId)
+      let defender = game.canvas.tokens.get(rollData.attackRollData.defenderTokenId).actor
+
+      if (attacker && result.attackerHPLoss) {
+        result.attackerHPLossValue = await attacker.incDecHP("-" + result.attackerHPLoss)
+      }
+      if (attacker && defender && result.defenderDamage) {
+        let dmgDice = (rollData.attackRollData.weapon.system.isranged) ? "d6" : "d8"
+        result.damageWeaponFormula = result.defenderDamage + dmgDice
+        result.defenderHPLossValue = await defender.incDecHP("-" + result.damageWeaponFormula)
+      }
+      if (result.fumble || (result.dangerous_fumble && CrucibleUtility.isWeaponDangerous(rollData.attackRollData.weapon))) {
+        result.fumbleDetails = await this.getFumble(rollData.weapon)
+      }
+      if (result.critical_1 || result.critical_2) {
+        let isDeadly = CrucibleUtility.isWeaponDeadly(rollData.attackRollData.weapon)
+        result.critical = await this.getCritical((result.critical_1) ? "I" : "II", rollData.attackRollData.weapon)
+        result.criticalText = result.critical.text
+      }
+      this.createChatWithRollMode(rollData.alias, {
+        content: await renderTemplate(`systems/fvtt-crucible-rpg/templates/chat-attack-defense-result.html`, rollData)
+      })
+      console.log("Results processed", rollData)
+    }
+  }
+
+  /* -------------------------------------------- */
+  static async processAttackDefense(rollData) {
+    if (rollData.attackRollData) {
+      //console.log("Defender token, ", rollData, rollData.defenderTokenId)
+      let defender = game.canvas.tokens.get(rollData.attackRollData.defenderTokenId).actor
+      let sumSuccess = rollData.attackRollData.nbSuccess - rollData.nbSuccess
+      if (sumSuccess > 0) {
+        let armorResult = await defender.rollArmorDie(rollData)
+        rollData.armorResult = armorResult
+        sumSuccess += rollData.armorResult.nbSuccess
+        if (sumSuccess < 0) { // Never below 0
+          sumSuccess = 0
+        }
+      }
+      rollData.sumSuccess = sumSuccess
+      rollData.successDetails = this.getSuccessResult(rollData)
+      if (game.user.isGM) {
+        this.processSuccessResult(rollData)
+      } else {
+        game.socket.emit("system.fvtt-crucible-rpg", { msg: "msg_gm_process_attack_defense", data: rollData });
+      }
+    }
+  }
+
   /* -------------------------------------------- */
   static async onSocketMesssage(msg) {
     console.log("SOCKET MESSAGE", msg.name)
-    if (msg.name == "msg_update_defense_state") {
-      this.updateDefenseState(msg.data.defenderId, msg.data.rollId)
-    }
     if (msg.name == "msg_update_roll") {
       this.updateRollData(msg.data)
     }
+    if (msg.name == "msg_gm_process_attack_defense") {
+      this.processSuccessResult(msg.data)
+    }
     if (msg.name == "msg_gm_item_drop" && game.user.isGM) {
       let actor = game.actors.get(msg.data.actorId)
       let item
@@ -233,9 +462,6 @@ export class CrucibleUtility {
       }
       this.addItemDropToActor(actor, item)
     }
-    if (msg.name == "msg_reroll_hero") {
-      this.rerollHeroRemaining(msg.data.userId, msg.data.rollId)
-    }
   }
 
   /* -------------------------------------------- */
@@ -284,10 +510,24 @@ export class CrucibleUtility {
   }
 
   /* -------------------------------------------- */
-  static updateSkill( skill) {
+  static updateSkill(skill) {
-    skill.data.level = skill.data.background + skill.data.basic + skill.data.class + skill.data.explevel
+    skill.system.level = skill.system.background + skill.system.basic + skill.system.class + skill.system.explevel
-    if (skill.data.level > 7) { skill.data.level = 7}
+    if (skill.system.level > 7) { skill.system.level = 7 }
-    skill.data.skilldice = __skillLevel2Dice[skill.data.level]
+    skill.system.skilldice = __skillLevel2Dice[skill.system.level]
+  }
+
+  /* -------------------------------------------- */
+  static getDiceFromCover(cover) {
+    if (cover == "cover50") return 1
+    return 0
+  }
+  /* -------------------------------------------- */
+  static getDiceFromSituational(cover) {
+    if (cover == "prone") return 1
+    if (cover == "dodge") return 1
+    if (cover == "moving") return 1
+    if (cover == "engaged") return 1
+    return 0
   }
 
   /* -------------------------------------------- */
@@ -295,17 +535,18 @@ export class CrucibleUtility {
 
     let actor = game.actors.get(rollData.actorId)
 
-    // ability/save => 0
+    // ability/save/size => 0
     let diceFormula
     let startFormula = "0d6cs>=5"
-    if ( rollData.ability) {
+    if (rollData.ability) {
       startFormula = String(rollData.ability.value) + "d6cs>=5"
     }
-    if ( rollData.save) {
+    if (rollData.save) {
       startFormula = String(rollData.save.value) + "d6cs>=5"
     }
-    if ( rollData.shield) {
+    if (rollData.sizeDice) {
-      startFormula = "1" + String(rollData.shield.data.shielddie) + "cs>=5"
+      let nb = rollData.sizeDice.nb + rollData.distanceBonusDice + this.getDiceFromCover(rollData.hasCover) + this.getDiceFromSituational(rollData.situational)       
+      startFormula = String(nb) + String(rollData.sizeDice.dice) + "cs>=5"
     }
     diceFormula = startFormula
 
@@ -313,52 +554,52 @@ export class CrucibleUtility {
     // feat => 4
     // bonus => 6
     if (rollData.skill) {
-      let level = rollData.skill.data.level
+      let level = rollData.skill.system.level
-      if (rollData.skill.data.issl2 ) {
+      if (rollData.skill.system.issl2) {
         rollData.hasSLBonus = true
         level += 2
-        if (level > 7) { level = 7}
+        if (level > 7) { level = 7 }
       }
-      rollData.skill.data.skilldice = __skillLevel2Dice[level]
+      rollData.skill.system.skilldice = __skillLevel2Dice[level]
-      diceFormula += "+" + String(rollData.skill.data.skilldice) + "cs>=5"
+      diceFormula += "+" + String(rollData.skill.system.skilldice) + "cs>=5"
 
-      if (rollData.skill.data.skilltype == "complex" && rollData.skill.data.level == 0) {
+      if (rollData.skill.system.skilltype == "complex" && rollData.skill.system.level == 0) {
         rollData.complexSkillDisadvantage = true
         rollData.rollAdvantage = "roll-disadvantage"
       }
 
-      if (rollData.skill.data.isfeatdie) {
+      if (rollData.skill.system.isfeatdie) {
         rollData.hasFeatDie = true
         diceFormula += "+ 1d10cs>=5"
       } else {
         diceFormula += `+ 0d10cs>=5`
       }
-      if (rollData.skill.data.bonusdice != "none") {
+      if (rollData.skill.system.bonusdice != "none") {
-        rollData.hasBonusDice = rollData.skill.data.bonusdice
+        rollData.hasBonusDice = rollData.skill.system.bonusdice
         diceFormula += `+ ${rollData.hasBonusDice}cs>=5`
       } else {
         diceFormula += `+ 0d6cs>=5`
       }
-    } else {  
+    } else {
       diceFormula += `+ 0d8cs=>5 + 0d10cs>=5 + 0d6cs>=5`
     }
-    
+
     // advantage => 8
     let advFormula = "+ 0d8cs>=5"
-    if(rollData.advantage == "advantage1") {
+    if (rollData.advantage == "advantage1" || rollData.forceAdvantage) {
       advFormula = "+ 1d8cs>=5"
     }
-    if(rollData.advantage == "advantage2") {
+    if (rollData.advantage == "advantage2") {
       advFormula = "+ 2d8cs>=5"
     }
     diceFormula += advFormula
 
     // disadvantage => 10
     let disFormula = "- 0d8cs>=5"
-    if(rollData.disadvantage == "disadvantage1") {
+    if (rollData.disadvantage == "disadvantage1" || rollData.forceDisadvantage) {
       disFormula = "- 1d8cs>=5"
     }
-    if(rollData.disadvantage == "disadvantage2") {
+    if (rollData.disadvantage == "disadvantage2") {
       disFormula = "- 2d8cs>=5"
     }
     diceFormula += disFormula
@@ -366,17 +607,24 @@ export class CrucibleUtility {
     // armor => 12
     let skillArmorPenalty = 0
     for (let armor of rollData.armors) {
-      if (armor.data.equipped) {
+      if (armor.system.equipped) {
-        skillArmorPenalty += armor.data.skillpenalty
+        skillArmorPenalty += armor.system.skillpenalty
       }
     }
-    if (rollData.skill && rollData.skill.data.armorpenalty && skillArmorPenalty > 0 ) {
+    if (rollData.skill && rollData.skill.system.armorpenalty && skillArmorPenalty > 0) {
       rollData.skillArmorPenalty = skillArmorPenalty
       diceFormula += `- ${skillArmorPenalty}d8cs>=5`
     } else {
       diceFormula += `- 0d8cs>=5`
     }
 
+    // shield => 14
+    if (rollData.useshield && rollData.shield) {
+      diceFormula += "+ 1" + String(rollData.shield.system.shielddie) + "cs>=5"
+    } else {
+      diceFormula += " + 0d6cs>=5"
+    }
+
     // Performs roll
     console.log("Roll formula", diceFormula)
     let myRoll = rollData.roll
@@ -384,43 +632,78 @@ export class CrucibleUtility {
       myRoll = new Roll(diceFormula).roll({ async: false })
       await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
     }
+    rollData.rollOrder = 0
     rollData.roll = myRoll
     rollData.nbSuccess = myRoll.total
+
+    if (rollData.rollAdvantage == "none" && rollData.forceRollAdvantage) {
+      rollData.rollAdvantage = "roll-advantage"
+    }
+    if (rollData.rollAdvantage == "none" && rollData.forceRollDisadvantage) {
+      rollData.rollAdvantage = "roll-disadvantage"
+    }
     if (rollData.rollAdvantage != "none") {
+
+      rollData.rollOrder = 1
+      rollData.rollType = (rollData.rollAdvantage == "roll-advantage") ? "Advantage" : "Disadvantage"
+      this.createChatWithRollMode(rollData.alias, {
+        content: await renderTemplate(`systems/fvtt-crucible-rpg/templates/chat-generic-result.html`, rollData)
+      })
+
+      rollData.rollOrder = 2
       let myRoll2 = new Roll(diceFormula).roll({ async: false })
-      await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
+      await this.showDiceSoNice(myRoll2, game.settings.get("core", "rollMode"))
+
+      rollData.roll = myRoll2 // Tmp switch to display the proper results
+      rollData.nbSuccess = myRoll2.total
+      this.createChatWithRollMode(rollData.alias, {
+        content: await renderTemplate(`systems/fvtt-crucible-rpg/templates/chat-generic-result.html`, rollData)
+      })
+      rollData.roll = myRoll // Revert the tmp switch
+      rollData.nbSuccess = myRoll.total
+
       if (rollData.rollAdvantage == "roll-advantage") {
-        if ( myRoll2.total > rollData.nbSuccess) {
+        if (myRoll2.total > rollData.nbSuccess) {
+          hasChanged = true
           rollData.roll = myRoll2
           rollData.nbSuccess = myRoll2.total
         }
       } else {
-        if ( myRoll2.total < rollData.nbSuccess) {
+        if (myRoll2.total < rollData.nbSuccess) {
           rollData.roll = myRoll2
           rollData.nbSuccess = myRoll2.total
         }
       }
+      rollData.rollOrder = 3
     }
+    rollData.nbSuccess = Math.max(0, rollData.nbSuccess)
+
+    rollData.isFirstRollAdvantage = false
     // Manage exp
-    if (rollData.skill && rollData.skill.data.level > 0) {
+    if (rollData.skill && rollData.skill.system.level > 0) {
       let nbSkillSuccess = rollData.roll.terms[2].total
-      if ( nbSkillSuccess == 0 || nbSkillSuccess == rollData.skill.data.level) {
+      if (nbSkillSuccess == 0 || nbSkillSuccess == rollData.skill.system.level) {
-        actor.incrementSkillExp(rollData.skill._id, 1)
+        actor.incrementSkillExp(rollData.skill.id, 1)
       }
     }
 
+    this.saveRollData(rollData)
+    actor.lastRoll = rollData
+
     this.createChatWithRollMode(rollData.alias, {
       content: await renderTemplate(`systems/fvtt-crucible-rpg/templates/chat-generic-result.html`, rollData)
     })
     console.log("Rolldata result", rollData)
 
-    // And save the roll
+    // Message response
-    this.saveRollData(rollData)
+    this.displayDefenseMessage(rollData)
-    actor.lastRoll = rollData
+
+    // Manage defense result
+    this.processAttackDefense(rollData)
   }
 
   /* -------------------------------------------- */
-  static sortArrayObjectsByName( myArray) {
+  static sortArrayObjectsByName(myArray) {
     myArray.sort((a, b) => {
       let fa = a.name.toLowerCase();
       let fb = b.name.toLowerCase();
@@ -436,7 +719,7 @@ export class CrucibleUtility {
 
   /* -------------------------------------------- */
   static getUsers(filter) {
-    return game.users.filter(filter).map(user => user.data._id);
+    return game.users.filter(filter).map(user => user.id);
   }
   /* -------------------------------------------- */
   static getWhisperRecipients(rollMode, name) {
@@ -459,7 +742,7 @@ export class CrucibleUtility {
     chatGM.whisper = this.getUsers(user => user.isGM);
     chatGM.content = "Blinde message of " + game.user.name + "<br>" + chatOptions.content;
     console.log("blindMessageToGM", chatGM);
-    game.socket.emit("system.fvtt-crucible-rgp", { msg: "msg_gm_chat_message", data: chatGM });
+    game.socket.emit("system.fvtt-crucible-rpg", { msg: "msg_gm_chat_message", data: chatGM });
   }
 
 
@@ -526,22 +809,15 @@ export class CrucibleUtility {
 
   /* -------------------------------------------- */
   static updateWithTarget(rollData) {
-    let objectDefender
+    let target = CrucibleUtility.getTarget()
-    let target = CrucibleUtility.getTarget();
     if (target) {
-      let defenderActor = game.actors.get(target.data.actorId)
+      rollData.defenderTokenId = target.id
-      objectDefender = CrucibleUtility.data(defenderActor)
-      objectDefender = mergeObject(objectDefender, target.data.actorData)
-      rollData.defender = objectDefender
-      rollData.attackerId = this.id
-      rollData.defenderId = objectDefender._id
-      defenderActor.addHindrancesList(rollData.effectsList)
     }
   }
 
   /* -------------------------------------------- */
   static createChatWithRollMode(name, chatOptions) {
-    this.createChatMessage(name, game.settings.get("core", "rollMode"), chatOptions);
+    this.createChatMessage(name, game.settings.get("core", "rollMode"), chatOptions)
   }
 
   /* -------------------------------------------- */

packs/conditions.db

@@ -1,27 +1,27 @@
-{"_id":"0AHv6Z0khWiLFdUl","name":"Grappled","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Grappled.webp","data":{"description":"<p>While Grappled you are considered Immobilized and may not Move.</p>\n<p>&nbsp;</p>\n<p>May only use Unarmed, Close, and Natural weapons to attack and defend.</p>\n<p>&nbsp;</p>\n<p>To enter a Grapple you must make an Unarmed attack with a Result &gt;= +1 (max 1d6 damage).</p>\n<p>&nbsp;</p>\n<p>To break out of the Grapple you must win an opposed Brawn Check.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"0AHv6Z0khWiLFdUl","name":"Grappled","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Grappled.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.0AHv6Z0khWiLFdUl"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>While Grappled you are considered Immobilized and may not Move.</p>\n<p>&nbsp;</p>\n<p>May only use Unarmed, Close, and Natural weapons to attack and defend.</p>\n<p>&nbsp;</p>\n<p>To enter a Grapple you must make an Unarmed attack with a Result &gt;= +1 (max 1d6 damage).</p>\n<p>&nbsp;</p>\n<p>To break out of the Grapple you must win an opposed Brawn Check.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380262,"modifiedTime":1660683556881,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"1TY72kY9xGSUNQwP","name":"Bleed 1","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/BLEED%201.webp","data":{"description":"<p>You will lose 1 hit point each Action Round until First Aid Check [1] or Healed.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"1TY72kY9xGSUNQwP","name":"Bleed 1","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/BLEED%201.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.1TY72kY9xGSUNQwP"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":true,"loohproundvalue":1,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>You will lose 1 hit point each Action Round until First Aid Check [1] or Healed.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380263,"modifiedTime":1660683556881,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"1kBjvUrFoUcq8yM3","name":"Mind Controlled","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Mind-Controlled.webp","data":{"description":"<p>It's as if your mind has a mind of its own.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"1kBjvUrFoUcq8yM3","name":"Mind Controlled","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Mind-Controlled.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.1kBjvUrFoUcq8yM3"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>It's as if your mind has a mind of its own.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380263,"modifiedTime":1660683556881,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"3O4iHNnbi3vqVn4M","name":"Confused","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Confused.webp","data":{"description":"<p>You just can't decide what to do...</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"3O4iHNnbi3vqVn4M","name":"Confused","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Confused.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.3O4iHNnbi3vqVn4M"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>You just can't decide what to do...</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380263,"modifiedTime":1660683556881,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"6gqso22fam06A6tf","name":"Bleed 2","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/BLEED%202.webp","data":{"description":"<p>You will lose 2 hit points each Action Round until First Aid Check [2] or Healed.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"6gqso22fam06A6tf","name":"Bleed 2","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/BLEED%202.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.6gqso22fam06A6tf"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":true,"loohproundvalue":2,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>You will lose 2 hit points each Action Round until First Aid Check [2] or Healed.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380264,"modifiedTime":1660683556881,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"6vmPDpS0bWNKT0NQ","name":"Slow","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/SLOW.webp","data":{"description":"<p>Add +1 required Success to all Movement Actions.</p>\n<p>&nbsp;</p>\n<p>Recieving a second Slowed Condition will impose the Immobilized Condition.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"6vmPDpS0bWNKT0NQ","name":"Slow","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/SLOW.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.6vmPDpS0bWNKT0NQ"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>Add +1 required Success to all Movement Actions.</p>\n<p>&nbsp;</p>\n<p>Recieving a second Slowed Condition will impose the Immobilized Condition.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380264,"modifiedTime":1660683556881,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"name":"Surprised","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Surprised.webp","data":{"description":"<p>You are Surprised and will take no Action during the Surprise Round.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.jZQcR817ClNapdsJ"}},"_id":"8RLFbC4gNk76xs8k"}
+{"name":"Surprised","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Surprised.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Item.jZQcR817ClNapdsJ"}},"_id":"8RLFbC4gNk76xs8k","system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":true,"description":"<p>You are Surprised and will take no Action during the Surprise Round.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380265,"modifiedTime":1660683556881,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"HcdvCx4MN8JuE9Jg","name":"Staggered","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/STAGGERED.webp","data":{"description":"<p>Staggered combatants act last each round.</p>\n<p>&nbsp;</p>\n<p>You may not gain Advantage nor Ready an Action.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"HcdvCx4MN8JuE9Jg","name":"Staggered","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/STAGGERED.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.HcdvCx4MN8JuE9Jg"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":true,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>Staggered combatants act last each round.</p>\n<p>&nbsp;</p>\n<p>You may not gain Advantage nor Ready an Action.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380265,"modifiedTime":1660683556882,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"IyVJpGD52l75lqjx","name":"Frightened","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Frightened.webp","data":{"description":"<p>Your eyes are as big as saucers.</p>\n<p>&nbsp;</p>\n<p>Spend all Actions to flee from the source of your fear until out of sight and then cower in place until you pass a Will [X] Check.&nbsp; X is dependant on the source of fear and will be assigned by the GM.</p>\n<p>&nbsp;</p>\n<p>You may not attack but may defend normally.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"IyVJpGD52l75lqjx","name":"Frightened","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Frightened.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.IyVJpGD52l75lqjx"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>Your eyes are as big as saucers.</p>\n<p>&nbsp;</p>\n<p>Spend all Actions to flee from the source of your fear until out of sight and then cower in place until you pass a Will [X] Check.&nbsp; X is dependant on the source of fear and will be assigned by the GM.</p>\n<p>&nbsp;</p>\n<p>You may not attack but may defend normally.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380265,"modifiedTime":1660683556882,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"name":"Invisible","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Invisible.webp","data":{"description":"<p>You are invisible but not silenced or scentless......</p>\n<p>&nbsp;</p>\n<p>+2 Successes to Stealth Checks.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.E5ufZpqiZ9jmkbf3"}},"_id":"JOgHtIBhQpRRW13F"}
+{"name":"Invisible","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Invisible.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Item.E5ufZpqiZ9jmkbf3"}},"_id":"JOgHtIBhQpRRW13F","system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>You are invisible but not silenced or scentless......</p>\n<p>&nbsp;</p>\n<p>+2 Successes to Stealth Checks.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380265,"modifiedTime":1660683556882,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"JRRxP9t2MxLJaoAc","name":"Charmed","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Charmed.webp","data":{"description":"<p>Who's your new best friend?</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"JRRxP9t2MxLJaoAc","name":"Charmed","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Charmed.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.JRRxP9t2MxLJaoAc"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>Who's your new best friend?</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380266,"modifiedTime":1660683556882,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"LP1ZFGCRKUZ6LOHw","name":"Poisoned","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Poisoned.webp","data":{"description":"<p>See Poison Type for specific effects</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"LP1ZFGCRKUZ6LOHw","name":"Poisoned","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Poisoned.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.LP1ZFGCRKUZ6LOHw"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>See Poison Type for specific effects</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380266,"modifiedTime":1660683556882,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"Px67J2Vj59X11HW5","name":"Blinded","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/BLINDED.webp","data":{"description":"<p>Disadvantage to all actions for d6 Actions OR until GM removes this Condition.</p>\n<p>&nbsp;</p>\n<p>Add 2 Successes to all Move Actions.</p>\n<p>&nbsp;</p>\n<p>May not gain Advantage.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"Px67J2Vj59X11HW5","name":"Blinded","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/BLINDED.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.Px67J2Vj59X11HW5"}},"system":{"advantage":false,"disadvantage":true,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":true,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>Disadvantage to all actions for d6 Actions OR until GM removes this Condition.</p>\n<p>&nbsp;</p>\n<p>Add 2 Successes to all Move Actions.</p>\n<p>&nbsp;</p>\n<p>May not gain Advantage.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380266,"modifiedTime":1660683556882,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"name":"Disadvantage DIe","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Disadvantage%20Die.webp","data":{"description":"<p>Add a Disdvantage Die (d8) to your Dice Pool.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.RmEdbgDIhA6MrEnP"}},"_id":"R2heBzkHodkhiHLO"}
+{"name":"Disadvantage DIe","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Disadvantage%20Die.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Item.RmEdbgDIhA6MrEnP"}},"_id":"R2heBzkHodkhiHLO","system":{"advantage":false,"disadvantage":true,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>Add a Disdvantage Die (d8) to your Dice Pool.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380266,"modifiedTime":1660683556882,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"WpYWLQoOGnItC6We","name":"Incapacitated","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Incapacitated.webp","data":{"description":"<p>You lose consciousness.</p>\n<p>You may not take any Actions, not even defend.</p>\n<p>All attacks against you are made with Advantage.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"WpYWLQoOGnItC6We","name":"Incapacitated","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Incapacitated.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.WpYWLQoOGnItC6We"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":true,"noaction":true,"description":"<p>You lose consciousness.</p>\n<p>You may not take any Actions, not even defend.</p>\n<p>All attacks against you are made with Advantage.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380267,"modifiedTime":1660683556882,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"Wyi7tytkPG6vP6oY","name":"Entangled","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Immobilized.webp","data":{"description":"<p>No Movement.&nbsp; Attack and Defend at Disadvantage.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"Wyi7tytkPG6vP6oY","name":"Entangled","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Immobilized.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.Wyi7tytkPG6vP6oY"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":true,"defensedisadvantage":true,"targetadvantage":false,"noaction":false,"description":"<p>No Movement.&nbsp; Attack and Defend at Disadvantage.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380267,"modifiedTime":1660683556883,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"hQcRjgsagfwHTUBT","name":"Immobilized","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Immobilized.webp","data":{"description":"<p>No Movement.&nbsp; Attack and Defend at Disadvantage.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"hQcRjgsagfwHTUBT","name":"Immobilized","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Immobilized.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.hQcRjgsagfwHTUBT"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":true,"defensedisadvantage":true,"targetadvantage":false,"noaction":false,"description":"<p>No Movement.&nbsp; Attack and Defend at Disadvantage.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380267,"modifiedTime":1660683556883,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"name":"Roll with Disadvantage","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Roll%20with%20Disadvantage.webp","data":{"description":"<p>Roll the entire Dice Pool twice and take the worst roll.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.aOjxzeNf0ZrPv8VM"}},"_id":"lemANOHMtBZIVISV"}
+{"name":"Roll with Disadvantage","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Roll%20with%20Disadvantage.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Item.aOjxzeNf0ZrPv8VM"}},"_id":"lemANOHMtBZIVISV","system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":true,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>Roll the entire Dice Pool twice and take the worst roll.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380267,"modifiedTime":1660683556883,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"nusz5OpyDDq3KkcK","name":"Sickened","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Sickened.webp","data":{"description":"<p>You are Slowed and Staggered while you have the Sickened Conditon.</p>\n<p>&nbsp;</p>\n<p>Usually the result of being Poisoned.</p>\n<p>&nbsp;</p>\n<p>GM will assign the duration and Skill Check [X] to remove the Sickened Condition.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"nusz5OpyDDq3KkcK","name":"Sickened","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Sickened.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.nusz5OpyDDq3KkcK"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>You are Slowed and Staggered while you have the Sickened Conditon.</p>\n<p>&nbsp;</p>\n<p>Usually the result of being Poisoned.</p>\n<p>&nbsp;</p>\n<p>GM will assign the duration and Skill Check [X] to remove the Sickened Condition.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380267,"modifiedTime":1660683556883,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"qn1Pn6DIBfVw7l6U","name":"Impaled","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Impaled.webp","data":{"description":"<p>You are Slowed and all Actions are at Disadvantage until an Action is taken by you or an ally to remove the impaling weapon for an additional 1d3 damage.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"qn1Pn6DIBfVw7l6U","name":"Impaled","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Impaled.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.qn1Pn6DIBfVw7l6U"}},"system":{"advantage":false,"disadvantage":true,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>You are Slowed and all Actions are at Disadvantage until an Action is taken by you or an ally to remove the impaling weapon for an additional 1d3 damage.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380267,"modifiedTime":1660683556883,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"rKFpOFHoL6Foh7nW","name":"Deafened","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Deafened.webp","data":{"description":"<p>You can't hear a thing.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"rKFpOFHoL6Foh7nW","name":"Deafened","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Deafened.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.rKFpOFHoL6Foh7nW"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>You can't hear a thing.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380267,"modifiedTime":1660683556883,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"rXlpsE3T6srIIawV","name":"On Fire","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/On%20Fire.webp","data":{"description":"<p>You or an ally must spend 1 Action to douse the flames else roll d10 when you take your Action each round.</p>\n<hr />\n<p><span style=\"text-decoration: underline;\">d10 Roll</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style=\"text-decoration: underline;\">Effect</span></p>\n<p>1-2&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; No additional damage; flames die on thier own</p>\n<p>3-5&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 1d6 damage; flames die</p>\n<p>6-8&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2d6 damage; flames die</p>\n<p>9-10&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;2d6 damage; remain on fire - roll again next round</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"rXlpsE3T6srIIawV","name":"On Fire","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/On%20Fire.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.rXlpsE3T6srIIawV"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>You or an ally must spend 1 Action to douse the flames else roll d10 when you take your Action each round.</p>\n<hr />\n<p><span style=\"text-decoration: underline;\">d10 Roll</span>&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; <span style=\"text-decoration: underline;\">Effect</span></p>\n<p>1-2&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; No additional damage; flames die on thier own</p>\n<p>3-5&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 1d6 damage; flames die</p>\n<p>6-8&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 2d6 damage; flames die</p>\n<p>9-10&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;2d6 damage; remain on fire - roll again next round</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380268,"modifiedTime":1660683556884,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"ubONqFGa9lnslnee","name":"Prone","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/PRONE.webp","data":{"description":"<p>1 Action to stand.</p>\n<p>1 AD to Target Roll.</p>\n<p>&nbsp;</p>\n<p>Melee attacks against you are made with Advantage.</p>\n<p>&nbsp;</p>\n<p>You make take an Action to voluntarily go Prone.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"ubONqFGa9lnslnee","name":"Prone","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/PRONE.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.ubONqFGa9lnslnee"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":true,"noaction":false,"description":"<p>1 Action to stand.</p>\n<p>1 AD to Target Roll.</p>\n<p>&nbsp;</p>\n<p>Melee attacks against you are made with Advantage.</p>\n<p>&nbsp;</p>\n<p>You make take an Action to voluntarily go Prone.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380268,"modifiedTime":1660683556884,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"name":"Roll with Advantage","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Roll%20with%20Advantage.webp","data":{"description":"<p>Roll the entire Dice Pool twice and take the best roll.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.ULQT0l8kANCb0JLc"}},"_id":"vOwfS9wOkw67QDlr"}
+{"name":"Roll with Advantage","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Roll%20with%20Advantage.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Item.ULQT0l8kANCb0JLc"}},"_id":"vOwfS9wOkw67QDlr","system":{"advantage":false,"disadvantage":false,"rolladvantage":true,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>Roll the entire Dice Pool twice and take the best roll.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380268,"modifiedTime":1660683556884,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"name":"Advantage Die","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Advantage%20Die.webp","data":{"description":"<p>Add an Advantage Die (d8) to your Dice Pool.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.Mi2gRswry1OIMVKB"}},"_id":"vjBwwXTRPofOOTRu"}
+{"name":"Advantage Die","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Advantage%20Die.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Item.Mi2gRswry1OIMVKB"}},"_id":"vjBwwXTRPofOOTRu","system":{"advantage":true,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>Add an Advantage Die (d8) to your Dice Pool.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380268,"modifiedTime":1660683556884,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"_id":"yoZHhZSCXvnUznD4","name":"Stunned","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/STUNNED.webp","data":{"description":"<p>You may not take any Actions, not even defend.</p>\n<p>All attacks against you are made with Advantage.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"yoZHhZSCXvnUznD4","name":"Stunned","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/STUNNED.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Compendium.fvtt-crucible-rpg.conditions.yoZHhZSCXvnUznD4"}},"system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":true,"noaction":true,"description":"<p>You may not take any Actions, not even defend.</p>\n<p>All attacks against you are made with Advantage.</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380269,"modifiedTime":1660683556884,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}
-{"name":"Diseased","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Diseased.webp","data":{"description":"<p>You have contracted a nasty Disease.</p>\n<p>&nbsp;</p>\n<p>GM will provide the details...</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.f74u7Z5XqRINjsjT"}},"_id":"ytPS0bkGhCon6njB"}
+{"name":"Diseased","type":"condition","img":"systems/fvtt-crucible-rpg/images/icons/conditions/Diseased.webp","effects":[],"folder":null,"sort":0,"flags":{"core":{"sourceId":"Item.f74u7Z5XqRINjsjT"}},"_id":"ytPS0bkGhCon6njB","system":{"advantage":false,"disadvantage":false,"rolladvantage":false,"rolldisadvantage":false,"loosehpround":false,"loohproundvalue":0,"noadvantage":false,"attackdisadvantage":false,"defensedisadvantage":false,"targetadvantage":false,"noaction":false,"description":"<p>You have contracted a nasty Disease.</p>\n<p>&nbsp;</p>\n<p>GM will provide the details...</p>"},"ownership":{"default":0,"Up3b6rNa3VKAFQC3":3},"_stats":{"systemId":"fvtt-crucible-rpg","systemVersion":"10.0.2","coreVersion":"10.277","createdTime":1660683380269,"modifiedTime":1660683556885,"lastModifiedBy":"9ipXkGgB8bOlYOlU"}}

packs/skills.db

@@ -1,25 +1,57 @@
 {"_id":"0EsFFhDpU4U1qfbr","name":"First Aid","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/First%20Aid.webp","data":{"ability":"int","armorpenalty":false,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>Stop the bleeding; save a life.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"name":"Weapon - Dagger (Thrown)","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Dagger.webp","data":{"ability":"dex","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Dagger (Thrown)</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.7cPkH6PHAUt3Rb6P"}},"_id":"0rWkbtidDH1K6ITt"}
+{"name":"Weapon - Javelin","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Javelin.webp","data":{"ability":"agi","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"complex","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Javelin</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.i6PWAx9ltJU8E1Rh"}},"_id":"21t5PTOa2jnzaOYa"}
+{"name":"Weapon - Improvised (Thrown)","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Improvised.webp","data":{"ability":"dex","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Improvised (Thrown)</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.VTHoe7dg9tYbUUyj"}},"_id":"3yFefS2kH9BvsnKn"}
 {"_id":"4UYwQiRMi6b9Voif","name":"Ride Mount","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Ride%20Mount.png","data":{"ability":"str","armorpenalty":false,"bonusdice":"none","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>Help me back up. I know I can tame him.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
 {"_id":"6C4CHsYkDBY05f4W","name":"Stealth","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Stealth.webp","data":{"ability":"agi","armorpenalty":true,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>Stay on your toes and don't breath so loud.....</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"name":"Weapon - Staff (2-H)","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Staff.webp","data":{"ability":"agi","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Staff (2-H)</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.iAtfHjejCVAwxEYo"}},"_id":"6Waaz1ZFUNXUeXyh"}
 {"_id":"6b9cpqdptAKFwy16","name":"Locks & Pockets","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Locks%20and%20Pockets.webp","data":{"ability":"dex","armorpenalty":false,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>...and every lock that ain't locked when no one's around.....</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
 {"_id":"6jzbwKOKvNUbXYxN","name":"Perception","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Perception.webp","data":{"ability":"wit","armorpenalty":false,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>I think I heard a noise. Would you go check?</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
 {"_id":"8o812uFRJbtKrbvc","name":"Blessings Lore","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Blessing%20Lore.png","data":{"ability":"cha","armorpenalty":false,"bonusdice":"none","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>Chaplain Class Only</p>\n<p>&nbsp;</p>\n<p>You can use the Chaplain Blessings Class Power</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
 {"_id":"BKRHCd3kMfmQ7tcI","name":"Water Lore","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Water%20Lore.webp","data":{"ability":"int","armorpenalty":true,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>You can cast Water Lore spells.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"name":"Weapon - Sling","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Sling.webp","data":{"ability":"dex","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Sling</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.vy6naa893l5Aymob"}},"_id":"EZe1zQpE9HRzT4af"}
+{"name":"Weapon - Dagger (Melee)","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Dagger.webp","data":{"ability":"agi","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Dagger (Melee)</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.Tx4P13eAWKL0BIkW"}},"_id":"Eh9SVpPr67aoTQsN"}
+{"name":"Weapon - Hand Axe (Thrown)","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Hand%20Axe.webp","data":{"ability":"dex","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Hand Axe (Thrown)</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.U9Xw60VzASxnjVMU"}},"_id":"FbhQrbQyrqV79Oxo"}
+{"name":"Weapon - Pick","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Pick.webp","data":{"ability":"str","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Pick</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.7uUMjdxMtDUlpWpa"}},"_id":"GALESupI5E30akg0"}
+{"name":"Weapon - Bite","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Bite.webp","data":{"ability":"agi","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Bite</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.SGNfVsHXxyAJP7wr"}},"_id":"KBF3iDyTtJP07xye"}
 {"_id":"KR9JDNO8QkeNPa8W","name":"Haggle","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Haggle.png","data":{"ability":"wit","armorpenalty":false,"bonusdice":"none","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>I'll give you half of your asking price and make you like it.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"name":"Weapon - Improvised (Melee)","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Improvised.webp","data":{"ability":"str","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Improvised (Melee)</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.DC1NNVuYqTvzmQXE"}},"_id":"NlWc5EL5nkKDBUvk"}
+{"name":"Weapon - Hammer (Melee)","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Hammer.webp","data":{"ability":"str","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Hammer (Melee)</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.VLI9GowNHKnLOVwQ"}},"_id":"PoTWGYCwpR0RhN33"}
+{"name":"Weapon - Flail","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Flail.webp","data":{"ability":"agi","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"complex","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Flail</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.tYHPGbI889W9Du4c"}},"_id":"QzuChpDhqpo6Ohtp"}
+{"name":"Weapon - Claw","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Claw.webp","data":{"ability":"agi","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Claw</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.Iu2Rl4DVjIN9HjFg"}},"_id":"Rr4QvLeHr1Ncz1yb"}
+{"name":"Weapon - 2-H Axe","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Axe.webp","data":{"ability":"str","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>2-H Axe Skill</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.tlkHANCqXC6kAeiL"}},"_id":"S9Ncgj01q9OeZDL3"}
+{"name":"Weapon - Club","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Club.webp","data":{"ability":"str","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Club</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.fy88HBHUxVqyhJNP"}},"_id":"SGRK1VDSJdzQZhnn"}
 {"_id":"SyaqDmAk6PEG2wZI","name":"Air Lore","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Air%20Lore.webp","data":{"ability":"int","armorpenalty":true,"bonusdice":"none","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>You can cast Air Lore Spells.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
 {"_id":"T4YzMBGXyDrzEaBA","name":"Earth Lore","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Earth%20Lore.webp","data":{"ability":"int","armorpenalty":true,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>You can cast Earth Lore spells.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"name":"Weapon - 2-H Flail","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Flail.webp","data":{"ability":"agi","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"complex","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>2-H Flail</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.W6vO8BJIvF0nCxnV"}},"_id":"TUrqTyqWvbEYconB"}
+{"name":"Weapon - Hand Axe (Melee)","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Hand%20Axe.webp","data":{"ability":"str","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Hand Axe (Melee)</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.xflr49mcYQeRBIxy"}},"_id":"WgWDvVHrUqfxAoWu"}
 {"_id":"XenGlvxetLv0A92F","name":"Acrobatics","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Acrobatics.webp","data":{"ability":"agi","armorpenalty":true,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>Handy for swinging from Chandaliers, sliding down stair rails, rolling between the legs of a Giant, and other feats of astonishing balance and agility.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
 {"_id":"XurQCYDVwEA0yxcv","name":"Fire Lore","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Fire%20Lore.webp","data":{"ability":"int","armorpenalty":true,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>You can cast Fire Lore spells.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
 {"_id":"Y4o571K5DQseDaGT","name":"Swim","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Swim.webp","data":{"ability":"str","armorpenalty":true,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>Kick you feet and don't forget to breathe!</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"name":"Weapon - Spear (2-H)","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Spear.webp","data":{"ability":"agi","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"complex","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Spear (2-H)</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.qLngjNAnvcXd3tPM"}},"_id":"YwKCavta5WywBRJX"}
 {"_id":"ZfIwXZwaBKaVoYbG","name":"Athletics","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Athletics.png","data":{"ability":"agi","armorpenalty":true,"bonusdice":"none","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>Your ability to run, jump, and climb; a measure of your physical coordination.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"name":"Weapon - 2-H Pick","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Pick.webp","data":{"ability":"str","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>2-H Pick</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.qSMQv1DjDxw7Vd2C"}},"_id":"a8qGglAc1HvfKnGI"}
+{"name":"Weapon - Spear (1-H)","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Spear.webp","data":{"ability":"agi","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"complex","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Spear (1-H)</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.UuErSkE8ZazgIB9P"}},"_id":"aKjpVHrl9ElworLE"}
+{"name":"Weapon - 2-H Hammer","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Hammer.webp","data":{"ability":"str","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.YvMOONergKAsFykG"}},"_id":"cZ4s6yFOXhXWHJlw"}
 {"_id":"cc74gHSQK4hRR8Vj","name":"Brawn","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Brawn.png","data":{"ability":"str","armorpenalty":false,"bonusdice":"none","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>A combination of your Size and Strength.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
 {"_id":"fJjXMpUILcN983XV","name":"Axe","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/icon_skill.webp","data":{"ability":"agi","armorpenalty":false,"isproficient":true,"isweaponskill":true,"isshieldskill":true,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"complex","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"","isshiedskill":false,"level":2},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.Cnw8keaxD1SI3vun"}}}
 {"_id":"fegRI4Vsyr0Us1Ga","name":"Research","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Research.webp","data":{"ability":"int","armorpenalty":false,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>Give me a moment to look that up....</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"name":"Weapon - Mace","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Mace.webp","data":{"ability":"str","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Mace</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.339HJIWywPl0qSn5"}},"_id":"gfytCFPUYbstfKe8"}
+{"name":"Weapon - Hammer (Thrown)","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Hammer.webp","data":{"ability":"dex","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Hammer (Thrown)</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.dHQrYqolZ01IOgzv"}},"_id":"gyo68qDFHgH2qWvz"}
+{"name":"Weapon - Spear (Thrown)","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Spear.webp","data":{"ability":"agi","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"complex","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Spear (Thrown)</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.6rblok4g1WxoKrLs"}},"_id":"hgUwebJwwSd73lVz"}
+{"name":"Weapon - Sting","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Sting.webp","data":{"ability":"agi","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Sting</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.uT9FTZj8Snh7MEsI"}},"_id":"i7YP54Xto6d8bEdt"}
 {"_id":"i8eeE2I9vv2kHwdJ","name":"Shadow Lore","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Shadow%20Lore.webp","data":{"ability":"int","armorpenalty":true,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>You can cast Shadow Lore spells.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"name":"Weapon - 2-H Club","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Club.webp","data":{"ability":"str","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>2-H Club</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.hnKcAnoDCwFWq7tN"}},"_id":"iXNVpHBqwrOEeoK0"}
+{"name":"Weapon - 2-H Sword","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Sword.webp","data":{"ability":"str","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"complex","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>2-H Sword</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.D7qVkw7L76GZXp20"}},"_id":"ledzUQVgUoqEBB8b"}
 {"_id":"lfB80K2lFSzQH442","name":"Intuition","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Intuition.png","data":{"ability":"wit","armorpenalty":false,"bonusdice":"none","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>I see what you did there.&nbsp; I think you're up to something....</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
 {"_id":"mVIFRdqNRfAItR8f","name":"Persuade","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Persuade.webp","data":{"ability":"int","armorpenalty":false,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>I'm sure you'll see it my way....</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"name":"Weapon - Unarmed","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Unarmed.webp","data":{"ability":"agi","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"complex","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Unarmed</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.GXMNTHOjPuR3VNfT"}},"_id":"mnK0xBbU27xFFDR5"}
 {"_id":"obASqfQt8xUsbTmB","name":"Intimidate","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Intimidate.webp","data":{"ability":"cha","armorpenalty":false,"bonusdice":"none","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>Because I said so; that's why!</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
 {"_id":"qoAzYlPOHVKBd77S","name":"Miracles Lore","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Miracle%20Lore.png","data":{"ability":"cha","armorpenalty":false,"bonusdice":"none","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>Chaplain Class Only</p>\n<p>&nbsp;</p>\n<p>You can use the Chaplain Miracles Class Power.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
 {"_id":"s2AAQviLttcHul3X","name":"Charm","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Charm.png","data":{"ability":"cha","armorpenalty":false,"bonusdice":"none","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>Getting someone to do what you want because they want to do it.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"name":"Weapon - Crossbow","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Crossbow.webp","data":{"ability":"dex","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Crossbow</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.xSjJZ1Tpn9YpAxcu"}},"_id":"tK4kShJlVbab8ZXK"}
+{"name":"Weapon - Bow","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Bow.webp","data":{"ability":"dex","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"complex","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Bow</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.gg26YIMHy7tvPLlA"}},"_id":"tKFIJQ8iQctSeBAi"}
+{"name":"Weapon - Sword","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Sword.webp","data":{"ability":"agi","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"complex","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Sword</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.zQ1a0p0pZmctlMQA"}},"_id":"um3wZAmgXQEoRCp9"}
 {"_id":"xlYUHAUSfQrsjQoi","name":"Survival","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Survival.webp","data":{"ability":"wit","armorpenalty":false,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>Help me set this snare and we'll eat like kings in the morning.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
 {"_id":"yAhtkgqf7pKyjJTA","name":"Poison Use","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Poison%20Use.webp","data":{"ability":"dex","armorpenalty":false,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"<p>Let me apply this to my blade.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"name":"Weapon - Gore","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Gore.webp","data":{"ability":"agi","armorpenalty":false,"isproficient":false,"isweaponskill":true,"isshieldskill":false,"isfeatdie":false,"issl2":false,"islore":false,"skilltype":"simple","isinnate":false,"bonusdice":"none","background":0,"basic":0,"class":0,"exp":0,"explevel":0,"description":"<p>Gore</p>","level":0},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.eQjP8IlzcdTr3ca7"}},"_id":"yWSVh4SOTFRbplwN"}

packs/weapons.db

@@ -1,33 +1,33 @@
-{"_id":"3QGyPwA2H8RwtFBr","name":"Hand Axe (Thrown)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Hand%20Axe.webp","data":{"ability":"dex","isproficient":false,"qualities":"","flaws":"Light","damage":"Slashing","range":"Same Zone","maxrange":"1 Zone","minstr":0,"cost":0,"equipped":false,"description":"<p>Hand Axe</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"3QGyPwA2H8RwtFBr","name":"Hand Axe (Thrown)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Hand%20Axe.webp","data":{"isproficient":false,"skill":"Weapon - Hand Axe (Thrown)","qualities":"","flaws":"Light","damage":"Slashing","isranged":true,"range":"Same Zone","maxrange":"1 Zone","minstr":0,"cost":0,"equipped":false,"description":"<p>Hand Axe</p>","ability":"dex"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"3VT9Bgs1lpFRqgWt","name":"2-H Pick","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Pick.webp","data":{"ability":"str","isproficient":false,"qualities":"Heavy,Penetrating","flaws":"","damage":"Piercing","range":"Melee","maxrange":"","minstr":2,"cost":0,"equipped":false,"description":"<p>2-H Pick</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"3VT9Bgs1lpFRqgWt","name":"2-H Pick","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Pick.webp","data":{"isproficient":false,"skill":"Weapon - 2-H Pick","qualities":"Heavy,Penetrating","flaws":"","damage":"Piercing","isranged":false,"range":"Melee","maxrange":"","minstr":2,"cost":0,"equipped":false,"description":"<p>2-H Pick</p>","ability":"str"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"6B8kMi1FHv5njtbD","name":"2-H Flail","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Flail.webp","data":{"ability":"agi","isproficient":false,"qualities":"Heavy,Reach,Entangle","flaws":"Dangerous","damage":"Bludgeoning","range":"Melee","maxrange":"","minstr":2,"cost":0,"equipped":false,"description":"<p>2-H Flail</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"6B8kMi1FHv5njtbD","name":"2-H Flail","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Flail.webp","data":{"isproficient":false,"skill":"Weapon - 2-H Flail","qualities":"Heavy,Reach,Entangle","flaws":"Dangerous","damage":"Bludgeoning","isranged":false,"range":"Melee","maxrange":"","minstr":2,"cost":0,"equipped":false,"description":"<p>2-H Flail</p>","ability":"agi"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"A4O9ISnyCqtckanV","name":"Dagger (Melee)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Dagger.webp","data":{"ability":"agi","isproficient":false,"qualities":"","flaws":"Light","damage":"Piercing","range":"Close","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Dagger</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"A4O9ISnyCqtckanV","name":"Dagger (Melee)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Dagger.webp","data":{"isproficient":false,"skill":"Weapon - Dagger (Melee)","qualities":"","flaws":"Light","damage":"Piercing","isranged":false,"range":"Close","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Dagger</p>","ability":"agi"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"Czf55rIkPBsaLLfN","name":"Hammer (Thrown)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Hammer.webp","data":{"ability":"dex","isproficient":false,"qualities":"","flaws":"","damage":"Bludgeoning","range":"Same Zone","maxrange":"1 Zone","minstr":0,"cost":0,"equipped":false,"description":"<p>Hammer</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"Czf55rIkPBsaLLfN","name":"Hammer (Thrown)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Hammer.webp","data":{"isproficient":false,"skill":"Weapon - Hammer (Thrown)","qualities":"","flaws":"","damage":"Bludgeoning","isranged":true,"range":"Same Zone","maxrange":"1 Zone","minstr":0,"cost":0,"equipped":false,"description":"<p>Hammer</p>","ability":"dex"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"GrjekQXKaFnFODXK","name":"Unarmed","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Unarmed.webp","data":{"ability":"agi","isproficient":false,"qualities":"","flaws":"Undamaging","damage":"Bludgeoning","range":"Close","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Unarmed</p>\n<p>&nbsp;</p>\n<p>As an UNDAMAGING attack the maximum Result is +2.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"GrjekQXKaFnFODXK","name":"Unarmed","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Unarmed.webp","data":{"isproficient":false,"skill":"Weapon - Unarmed","qualities":"","flaws":"Undamaging","damage":"Bludgeoning","isranged":false,"range":"Close","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Unarmed</p>\n<p>&nbsp;</p>\n<p>As an UNDAMAGING attack the maximum Result is +2.</p>","ability":"agi"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"JXK1qP9uqlxvcnxB","name":"2-H Club","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Club.webp","data":{"ability":"str","isproficient":false,"qualities":"","flaws":"","damage":"Bludgeoning","range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>2-H Club</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"JXK1qP9uqlxvcnxB","name":"2-H Club","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Club.webp","data":{"isproficient":false,"skill":"Weapon - 2-H Club","qualities":"","flaws":"","damage":"Bludgeoning","isranged":false,"range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>2-H Club</p>","ability":"str"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"LATr6R7cNOtYJgaO","name":"Hammer (Melee)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Hammer.webp","data":{"ability":"str","isproficient":false,"qualities":"","flaws":"","damage":"Bludgeoning","range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Hammer</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"LATr6R7cNOtYJgaO","name":"Hammer (Melee)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Hammer.webp","data":{"isproficient":false,"skill":"Weapon - Hammer (Melee)","qualities":"","flaws":"","damage":"Bludgeoning","isranged":false,"range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Hammer</p>","ability":"str"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"MpzJvauaq7UKdyi5","name":"Sling","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Sling.webp","data":{"ability":"dex","isproficient":false,"qualities":"","flaws":"","damage":"Bludgeoning","range":"2 Zones","maxrange":"3 Zones","minstr":0,"cost":0,"equipped":false,"description":"<p>Sling</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"MpzJvauaq7UKdyi5","name":"Sling","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Sling.webp","data":{"isproficient":false,"skill":"Weapon - Sling","qualities":"","flaws":"","damage":"Bludgeoning","isranged":true,"range":"2 Zones","maxrange":"3 Zones","minstr":0,"cost":0,"equipped":false,"description":"<p>Sling</p>","ability":"dex"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"PDXDPlqck6VURcGB","name":"2-H Axe","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Axe.webp","data":{"ability":"str","isproficient":false,"qualities":"Heavy,Hack","flaws":"","damage":"Slashing","range":"","maxrange":"","minstr":2,"cost":0,"equipped":false,"description":"<p>2-H Axe</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"PDXDPlqck6VURcGB","name":"2-H Axe","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Axe.webp","data":{"isproficient":false,"skill":"Weapon - 2-H Axe","qualities":"Heavy,Hack","flaws":"","damage":"Slashing","isranged":false,"range":"","maxrange":"","minstr":2,"cost":0,"equipped":false,"description":"<p>2-H Axe</p>","ability":"str"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"Q4tpJZV4HAsyVAWT","name":"2-H Mace","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Mace.webp","data":{"ability":"str","isproficient":false,"qualities":"Heavy","flaws":"","damage":"Bludgeoning","range":"Melee","maxrange":"","minstr":2,"cost":0,"equipped":false,"description":"<p>2-H Mace</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"Q4tpJZV4HAsyVAWT","name":"2-H Mace","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Mace.webp","data":{"isproficient":false,"skill":"Weapon - 2-H Hammer","qualities":"Heavy","flaws":"","damage":"Bludgeoning","isranged":false,"range":"Melee","maxrange":"","minstr":2,"cost":0,"equipped":false,"description":"<p>2-H Mace</p>","ability":"str"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"QRMIOZHBrauWQjTb","name":"Bite","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Bite.webp","data":{"ability":"agi","isproficient":false,"qualities":"","flaws":"","damage":"Piercing","range":"Close","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Bite - natural weapon</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"QRMIOZHBrauWQjTb","name":"Bite","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Bite.webp","data":{"isproficient":false,"skill":"Weapon - Bite","qualities":"","flaws":"","damage":"Piercing","isranged":false,"range":"Close","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Bite - natural weapon</p>","ability":"agi"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"QzJZr6guDrUjsuTU","name":"Spear (1-H)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Spear.webp","data":{"ability":"agi","isproficient":false,"qualities":"Reach","flaws":"","damage":"Piercing","range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Spear</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"QzJZr6guDrUjsuTU","name":"Spear (1-H)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Spear.webp","data":{"isproficient":false,"skill":"Weapon - Spear (1-H)","qualities":"Reach","flaws":"","damage":"Piercing","isranged":false,"range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Spear</p>","ability":"agi"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"Sm3Pze2LY6BnoTBq","name":"Mace","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Mace.webp","data":{"ability":"str","isproficient":false,"qualities":"","flaws":"","damage":"Bludgeoning","range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Mace</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"Sm3Pze2LY6BnoTBq","name":"Mace","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Mace.webp","data":{"isproficient":false,"skill":"Weapon - Mace","qualities":"","flaws":"","damage":"Bludgeoning","isranged":false,"range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Mace</p>","ability":"str"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"VOg1kpjhJ7h3XsSk","name":"Club","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Club.webp","data":{"ability":"str","isproficient":false,"qualities":"","flaws":"Light","damage":"Bludgeoning","range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Club</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"VOg1kpjhJ7h3XsSk","name":"Club","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Club.webp","data":{"isproficient":false,"skill":"Weapon - Club","qualities":"","flaws":"Light","damage":"Bludgeoning","isranged":false,"range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Club</p>","ability":"str"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"WvqALDHVEVt6TskF","name":"Javelin","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Javelin.webp","data":{"ability":"agi","isproficient":false,"qualities":"Penetrating","flaws":"","damage":"Piercing","range":"2 Zones","maxrange":"4 Zones","minstr":0,"cost":0,"equipped":false,"description":"<p>Javelin</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"WvqALDHVEVt6TskF","name":"Javelin","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Javelin.webp","data":{"isproficient":false,"skill":"Weapon - Javelin","qualities":"Penetrating","flaws":"","damage":"Piercing","isranged":true,"range":"2 Zones","maxrange":"4 Zones","minstr":0,"cost":0,"equipped":false,"description":"<p>Javelin</p>","ability":"agi"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"XTfw2cefPXucQgMG","name":"Crossbow","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Crossbow.webp","data":{"isproficient":false,"skill":"Axe","qualities":"Penetrating","flaws":"Reload","damage":"Piercing","range":"3 Zones","maxrange":"5 Zones","minstr":0,"cost":0,"equipped":false,"description":"<p>Crossbow</p>\n<p>Requires 1 Action to reload after shooting - So you can only shoot every other Action Round.</p>","ability":"dex"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"XTfw2cefPXucQgMG","name":"Crossbow","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Crossbow.webp","data":{"isproficient":false,"skill":"Weapon - Crossbow","qualities":"Penetrating","flaws":"Reload","damage":"Piercing","isranged":true,"range":"3 Zones","maxrange":"5 Zones","minstr":0,"cost":0,"equipped":false,"description":"<p>Crossbow</p>\n<p>Requires 1 Action to reload after shooting - So you can only shoot every other Action Round.</p>","ability":"dex"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"XUAMSiOmPHi1LEHs","name":"2-H Hammer","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Hammer.webp","data":{"ability":"str","isproficient":false,"qualities":"Heavy","flaws":"","damage":"Bludgeoning","range":"Melee","maxrange":"","minstr":2,"cost":0,"equipped":false,"description":"<p>2-H Hammer</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"XUAMSiOmPHi1LEHs","name":"2-H Hammer","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Hammer.webp","data":{"isproficient":false,"skill":"Weapon - 2-H Hammer","qualities":"Heavy","flaws":"","damage":"Bludgeoning","isranged":false,"range":"Melee","maxrange":"","minstr":2,"cost":0,"equipped":false,"description":"<p>2-H Hammer</p>","ability":"str"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"ZfBqMaYjg5z8Kh97","name":"Hand Axe (Melee)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Hand%20Axe.webp","data":{"ability":"str","isproficient":false,"qualities":"Hack","flaws":"Light","damage":"Slashing","range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Hand Axe</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"ZfBqMaYjg5z8Kh97","name":"Hand Axe (Melee)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Hand%20Axe.webp","data":{"isproficient":false,"skill":"Weapon - Hand Axe (Melee)","qualities":"Hack","flaws":"Light","damage":"Slashing","isranged":false,"range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Hand Axe</p>","ability":"str"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"ZoooviRlvZIQR6d2","name":"Sting","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Sting.webp","data":{"ability":"agi","isproficient":false,"qualities":"","flaws":"","damage":"Piercing","range":"Close","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Sting - natural weapon</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"ZoooviRlvZIQR6d2","name":"Sting","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Sting.webp","data":{"isproficient":false,"skill":"Weapon - Sting","qualities":"","flaws":"","damage":"Piercing","isranged":false,"range":"Close","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Sting - natural weapon</p>","ability":"agi"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"cC3xXzzZ8UpDGONs","name":"2-H Sword","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Sword.webp","data":{"ability":"str","isproficient":false,"qualities":"Heavy,Reach,Hack","flaws":"","damage":"Slashing","range":"Melee","maxrange":"","minstr":2,"cost":0,"equipped":false,"description":"<p>2-Handed Sword</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"cC3xXzzZ8UpDGONs","name":"2-H Sword","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/2-H%20Sword.webp","data":{"isproficient":false,"skill":"Weapon - 2-H Sword","qualities":"Heavy,Reach,Hack","flaws":"","damage":"Slashing","isranged":false,"range":"Melee","maxrange":"","minstr":2,"cost":0,"equipped":false,"description":"<p>2-Handed Sword</p>","ability":"str"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"cMMWV7HusxfUfL4E","name":"Flail","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Flail.webp","data":{"ability":"agi","isproficient":false,"qualities":"Entangle","flaws":"Dangerous","damage":"Bludgeoning","range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Flail</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"cMMWV7HusxfUfL4E","name":"Flail","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Flail.webp","data":{"isproficient":false,"skill":"Weapon - Flail","qualities":"Entangle","flaws":"Dangerous","damage":"Bludgeoning","isranged":false,"range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Flail</p>","ability":"agi"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"fE5cUHjc5GYGRdty","name":"Spear (Thrown)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Spear.webp","data":{"ability":"agi","isproficient":false,"qualities":"Penetrating","flaws":"","damage":"Piercing","range":"2 Zones","maxrange":"3 Zones","minstr":0,"cost":0,"equipped":false,"description":"<p>Spear</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"fE5cUHjc5GYGRdty","name":"Spear (Thrown)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Spear.webp","data":{"isproficient":false,"skill":"Weapon - Spear (Thrown)","qualities":"Penetrating","flaws":"","damage":"Piercing","isranged":true,"range":"2 Zones","maxrange":"3 Zones","minstr":0,"cost":0,"equipped":false,"description":"<p>Spear</p>","ability":"agi"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
 {"_id":"hR0EtMiIy5ybcS84","name":"Staff (2-H)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Staff.webp","data":{"ability":"str","isproficient":false,"qualities":"Reach","flaws":"","damage":"Bludgeoning","range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Staff - always used 2-handed.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"ivLgdf33xEk9IWAW","name":"Pick","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Pick.webp","data":{"ability":"str","isproficient":false,"qualities":"Penetrating","flaws":"","damage":"Piercing","range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Pick</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"ivLgdf33xEk9IWAW","name":"Pick","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Pick.webp","data":{"isproficient":false,"skill":"Weapon - Pick","qualities":"Penetrating","flaws":"","damage":"Piercing","isranged":false,"range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Pick</p>","ability":"str"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"lH54F6LNWMYg5dNt","name":"Claw","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Claw.webp","data":{"ability":"agi","isproficient":false,"qualities":"","flaws":"","damage":"Slashing","range":"Close","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Claw - natural weapon</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"lH54F6LNWMYg5dNt","name":"Claw","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Claw.webp","data":{"isproficient":false,"skill":"Weapon - Claw","qualities":"","flaws":"","damage":"Slashing","isranged":false,"range":"Close","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Claw - natural weapon</p>","ability":"agi"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"mMCl8JZboWUYZgvB","name":"Dagger (Thrown)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Dagger.webp","data":{"ability":"dex","isproficient":false,"qualities":"","flaws":"Light","damage":"Piercing","range":"1 Zone","maxrange":"2 Zones","minstr":0,"cost":0,"equipped":false,"description":"<p>Dagger</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"mMCl8JZboWUYZgvB","name":"Dagger (Thrown)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Dagger.webp","data":{"isproficient":false,"skill":"Weapon - Dagger (Thrown)","qualities":"","flaws":"Light","damage":"Piercing","isranged":true,"range":"1 Zone","maxrange":"2 Zones","minstr":0,"cost":0,"equipped":false,"description":"<p>Dagger</p>","ability":"dex"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"oSBtSHos9aQvbhfm","name":"Improvised (Thrown)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Improvised-_Thrown_.webp","data":{"ability":"dex","isproficient":false,"qualities":"","flaws":"Light","damage":"Bludgeoning","range":"Same Zone","maxrange":"1 Zone","minstr":0,"cost":0,"equipped":false,"description":"<p>An Improvised ranged weapon such as a bottle or a rock.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"oSBtSHos9aQvbhfm","name":"Improvised (Thrown)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Improvised-_Thrown_.webp","data":{"isproficient":false,"skill":"Weapon - Improvised (Thrown)","qualities":"","flaws":"Light","damage":"Bludgeoning","isranged":true,"range":"Same Zone","maxrange":"1 Zone","minstr":0,"cost":0,"equipped":false,"description":"<p>An Improvised ranged weapon such as a bottle or a rock.</p>","ability":"dex"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"qz2f2DO4HOZFrv2k","name":"Spear (2-H)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Spear.webp","data":{"ability":"agi","isproficient":false,"qualities":"Heavy,Reach,Penetrating","flaws":"","damage":"Piercing","range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Spear, used with both hands.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"qz2f2DO4HOZFrv2k","name":"Spear (2-H)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Spear.webp","data":{"isproficient":false,"skill":"Weapon - Spear (2-H)","qualities":"Heavy,Reach,Penetrating","flaws":"","damage":"Piercing","isranged":false,"range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Spear, used with both hands.</p>","ability":"agi"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"u4vvzNFSNluNdyn0","name":"Bow","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Bow.webp","data":{"ability":"dex","isproficient":false,"qualities":"Penetrating","flaws":"","damage":"Piercing","range":"4 Zones","maxrange":"6 Zones","minstr":0,"cost":0,"equipped":false,"description":"<p>Bow with arrows</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"u4vvzNFSNluNdyn0","name":"Bow","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Bow.webp","data":{"isproficient":false,"skill":"Weapon - Bow","qualities":"Penetrating","flaws":"","damage":"Piercing","isranged":true,"range":"4 Zones","maxrange":"6 Zones","minstr":0,"cost":0,"equipped":false,"description":"<p>Bow with arrows</p>","ability":"dex"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"name":"Gore","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Gore.webp","data":{"ability":"agi","isproficient":false,"qualities":"Heavy","flaws":"","damage":"Piercing","range":"Close","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Horns</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.h3ezFIKi5PR1POfT"}},"_id":"uCxCoRfH7KwVRt8d"}
+{"_id":"uCxCoRfH7KwVRt8d","name":"Gore","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Gore.webp","data":{"isproficient":false,"skill":"Weapon - Gore","qualities":"Heavy","flaws":"","damage":"Piercing","isranged":false,"range":"Close","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Horns</p>","ability":"agi"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.h3ezFIKi5PR1POfT"}}}
-{"_id":"uJs7IdVvomKVXlV9","name":"Improvised (Melee)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Improvised.webp","data":{"ability":"agi","isproficient":false,"qualities":"","flaws":"Light","damage":"Bludgeoning","range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>An Improvised melee weapon such as a broken bottle, a chair leg, or a stick.</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"uJs7IdVvomKVXlV9","name":"Improvised (Melee)","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Improvised.webp","data":{"isproficient":false,"skill":"Weapon - Improvised (Melee)","qualities":"","flaws":"Light","damage":"Bludgeoning","isranged":false,"range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>An Improvised melee weapon such as a broken bottle, a chair leg, or a stick.</p>","ability":"agi"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
-{"_id":"x6wkZiE2G2QP41S2","name":"Sword","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Sword.webp","data":{"ability":"agi","isproficient":false,"qualities":"Deadly","flaws":"","damage":"Slashing","range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Sword</p>"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}
+{"_id":"x6wkZiE2G2QP41S2","name":"Sword","type":"weapon","img":"systems/fvtt-crucible-rpg/images/icons/weapons/Sword.webp","data":{"isproficient":false,"skill":"Weapon - Sword","qualities":"Deadly","flaws":"","damage":"Slashing","isranged":false,"range":"Melee","maxrange":"","minstr":0,"cost":0,"equipped":false,"description":"<p>Sword</p>","ability":"agi"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}}

system.json

@@ -1,6 +1,10 @@
 {
-  "author": "Uberwald",
+  "authors": [
-  "compatibleCoreVersion": "9",
+    {
+      "name": "Uberwald",
+      "flags": {}
+    }
+  ],
   "description": "Crucible RPG system for FoundryVTT",
   "esmodules": [
     "modules/crucible-main.js"
@@ -11,205 +15,182 @@
     {
       "lang": "en",
       "name": "English",
-      "path": "lang/en.json"
+      "path": "lang/en.json",
+      "flags": {}
     }
   ],
-  "library": false,
   "license": "LICENSE.txt",
-  "manifestPlusVersion": "1.0.0",
-  "media": [],
-  "minimumCoreVersion": "0.8.0",
-  "name": "fvtt-crucible-rpg",
   "packs": [
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Armors",
       "name": "armor",
-      "path": "./packs/armor.db",
+      "path": "packs/armor.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "armour"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Equipments",
       "name": "equipment",
-      "path": "./packs/equipment.db",
+      "path": "packs/equipment.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "equipment"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Shields",
       "name": "shields",
-      "path": "./packs/shields.db",
+      "path": "packs/shields.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "shield"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Weapons",
       "name": "weapons",
-      "path": "./packs/weapons.db",
+      "path": "packs/weapons.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "weapon", "melee", "ranged"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Conditions",
       "name": "conditions",
-      "path": "./packs/conditions.db",
+      "path": "packs/conditions.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "condition"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Currency",
       "name": "currency",
-      "path": "./packs/currency.db",
+      "path": "packs/currency.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "currency", "money"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Lore - Air",
       "name": "lore-air",
-      "path": "./packs/lore-air.db",
+      "path": "packs/lore-air.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "lore", "air"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Lore - Earth",
       "name": "lore-earth",
-      "path": "./packs/lore-earth.db",
+      "path": "packs/lore-earth.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "lore", "earth"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Lore - Fire",
       "name": "lore-fire",
-      "path": "./packs/lore-fire.db",
+      "path": "packs/lore-fire.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "lore", "fire"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Lore - Water",
       "name": "lore-water",
-      "path": "./packs/lore-water.db",
+      "path": "packs/lore-water.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "lore", "water"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Lore - Shadow",
       "name": "lore-shadow",
-      "path": "./packs/lore-shadow.db",
+      "path": "packs/lore-shadow.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "lore", "shadow"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Skills",
       "name": "skills",
-      "path": "./packs/skills.db",
+      "path": "packs/skills.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "skill"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Feats",
       "name": "feats",
-      "path": "./packs/feats.db",
+      "path": "packs/feats.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "feat"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Poisons",
       "name": "poisons",
-      "path": "./packs/poisons.db",
+      "path": "packs/poisons.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "poison"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Powers - Class",
       "name": "classpowers",
-      "path": "./packs/classpowers.db",
+      "path": "packs/classpowers.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "powers"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Tricks & Traps",
       "name": "trickstraps",
-      "path": "./packs/trickstraps.db",
+      "path": "packs/trickstraps.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "tricks", "traps"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Action Tokens",
       "name": "action-tokens",
-      "path": "./packs/action-tokens.db",
+      "path": "packs/action-tokens.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "action"
+      "flags": {}
-      ]
     },
     {
-      "entity": "Item",
+      "type": "Item",
       "label": "Powers - Monsters",
       "name": "monster-powers",
-      "path": "./packs/monster-powers.db",
+      "path": "packs/monster-powers.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "power"
+      "flags": {}
-      ]
     },
     {
-      "entity": "RollTable",
+      "type": "RollTable",
       "label": "Rolltables",
       "name": "rolltables",
-      "path": "./packs/rolltables.db",
+      "path": "packs/rolltables.db",
       "system": "fvtt-crucible-rpg",
-      "tags": [
+      "private": false,
-        "rolltable"
+      "flags": {}
-      ]
     }
   ],
   "primaryTokenAttribute": "secondary.hp",
@@ -218,11 +199,16 @@
   "styles": [
     "styles/simple.css"
   ],
-  "templateVersion": 14,
+  "version": "10.0.12",
+  "compatibility": {
+    "minimum": "10",
+    "verified": "10.285",
+    "maximum": "10"
+  },
   "title": "Crucible RPG",
   "manifest": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg/raw/master/system.json",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg/archive/fvtt-crucible-rpg-v0.1.24.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg/archive/fvtt-crucible-rpg-v10.0.12.zip",
   "url": "https://www.uberwald.me/gitea/public/fvtt-crucible-rpg",
-  "version": "0.1.24",
+  "background": "images/ui/crucible_welcome_page.webp",
-  "background" : "./images/ui/crucible_welcome_page.webp"
+  "id": "fvtt-crucible-rpg"
-}
+}

template.json

@@ -6,8 +6,9 @@
         "biodata": {
           "class": "",
           "age": 0,
-          "size": "",
+          "size": 0,
           "weight": "",
+          "height": "",
           "hair": "",
           "sex": "",
           "eyes": "",
@@ -97,7 +98,7 @@
       "templates": [ "biodata", "core" ]
     },
     "npc": {
-      "templates": [ "npccore" ]
+      "templates": [ "biodata", "core" ]
    }
   },
   "Item": {
@@ -106,6 +107,17 @@
       "description": ""
     },
     "condition": {
+      "advantage": false,
+      "disadvantage": false,
+      "rolladvantage": false,
+      "rolldisadvantage": false,
+      "loosehpround": false,
+      "loohproundvalue": 0,
+      "noadvantage": false,
+      "attackdisadvantage": false,
+      "defensedisadvantage": false,
+      "targetadvantage": false,
+      "noaction": false,
       "description": ""
     },
     "race": {
@@ -175,6 +187,7 @@
       "qualities": "",
       "flaws": "",
       "damage": "",
+      "isranged": false,
       "range": "",
       "maxrange": "",
       "minstr": 0,

templates/actor-sheet.html

@@ -22,7 +22,7 @@
                 <span class="ability-label " name="class">
                   <h4 class="ability-text-white ability-margin">Class</h4>
                 </span>
-                <select class="competence-base flexrow" type="text" name="data.biodata.class" value="{{data.biodata.class}}" data-dtype="String">
+                <select class="competence-base flexrow" type="text" name="system.biodata.class" value="{{data.biodata.class}}" data-dtype="String">
                   {{#select data.biodata.class}}
                   <option value="chaplain">Chaplain</option>
                   <option value="magus">Magus</option>
@@ -59,6 +59,12 @@
                   </span>
                 </li>
                 {{/if}}
+                <li class="item flexrow list-item" data-attr-key="class">              
+                  <img class="sheet-competence-img" src="systems/fvtt-crucible-rpg/images/icons/feats/Marksman (Ballistic).webp" />
+                  <span class="ability-label " name="rollTarget">
+                    <h4 class="ability-text-white ability-margin"><a class="roll-target-die ability-margin">Target Roll</a></h4>
+                  </span>
+                </li>
 
               </ul>
             </div>
@@ -108,8 +114,8 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{skill.img}}" /></a>
           <span class="item-name-label"><a class="roll-skill">{{skill.name}}</a></span>
-          <span class="item-field-label-short">{{upper skill.data.ability}}</span>
+          <span class="item-field-label-short">{{upper skill.system.ability}}</span>
-          <span class="item-field-label-short">{{skill.data.skilldice}}</span>
+          <span class="item-field-label-short">{{skill.system.skilldice}}</span>
           <span class="item-field-label-long">&nbsp;-&nbsp;</span>
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
@@ -143,9 +149,9 @@
                   src="{{weapon.img}}" /></a>
               <span class="item-name-label-long"><a class ="roll-weapon">{{weapon.name}}</a></span>
 
-              <span class="item-field-label-short">{{weapon.data.ability}}</span>
+              <span class="item-field-label-short">{{weapon.system.ability}}</span>
 
-              <span class="item-field-label-medium">{{perk.data.range}}</span>
+              <span class="item-field-label-medium">{{perk.system.range}}</span>
 
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
@@ -178,9 +184,9 @@
                   src="{{feat.img}}" /></a>
               <span class="item-name-label-long">{{feat.name}}</span>
 
-              <span class="item-field-label-medium">{{upperFirst feat.data.isfeatdie}}</span>
+              <span class="item-field-label-medium">{{upperFirst feat.system.isfeatdie}}</span>
-              <span class="item-field-label-medium">{{upperFirst feat.data.issl}}</span>
+              <span class="item-field-label-medium">{{upperFirst feat.system.issl}}</span>
-              <span class="item-field-label-medium">{{feat.data.sl}}</span>
+              <span class="item-field-label-medium">{{feat.system.sl}}</span>
 
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
@@ -191,6 +197,27 @@
           </ul>
         </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">Conditions</label></h3>
+              </span>
+            </li>
+            {{#each conditions as |condition key|}}
+            <li class="item flexrow list-item list-item-shadow" data-item-id="{{condition._id}}">
+              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                  src="{{condition.img}}" /></a>
+              <span class="item-name-label-long">{{condition.name}}</span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+        </div>
+
       </div>
     </div>
 
@@ -223,9 +250,9 @@
             <span class="item-name-label">
               <a class="power-roll">{{spell.name}}</a>
             </span>
-            <span class="item-field-label-medium">{{upperFirst spell.data.lore}}</span>
+            <span class="item-field-label-medium">{{upperFirst spell.system.lore}}</span>
-            <span class="item-field-label-short">{{upperFirst spell.data.circle}}</span>
+            <span class="item-field-label-short">{{upperFirst spell.system.circle}}</span>
-            <span class="item-field-label-medium">{{upperFirst spell.data.range}}</span>
+            <span class="item-field-label-medium">{{upperFirst spell.system.range}}</span>
             <div class="item-filler">&nbsp;</div>
             <div class="item-controls item-controls-fixed">
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@@ -273,16 +300,16 @@
           <span class="item-name-label">{{money.name}}</span>
 
           <span class="item-field-label-long"><label>
-              {{money.data.quantity}}
+              {{money.system.quantity}}
               (<a class="quantity-minus plus-minus-button"> -</a>/<a class="quantity-plus plus-minus-button">+</a>)
             </label>
           </span>
           <span class="item-field-label-medium">
-            <label>{{money.data.weight}}</label>
+            <label>{{money.system.weight}}</label>
           </span>
           <span class="item-field-label-medium">
-            {{#if money.data.idrDice}}
+            {{#if money.system.idrDice}}
-            <a class="roll-idr" data-dice-value="{{money.data.idrDice}}">{{money.data.idrDice}}</a>
+            <a class="roll-idr" data-dice-value="{{money.data.idrDice}}">{{money.system.idrDice}}</a>
             {{else}}
             &nbsp;-&nbsp;
             {{/if}}
@@ -316,12 +343,12 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{weapon.img}}" /></a>
           <span class="item-name-label">{{weapon.name}}</span>
-          <span class="item-field-label-short"><label>{{upper weapon.data.ability}}</label></span>
+          <span class="item-field-label-short"><label>{{upper weapon.system.ability}}</label></span>
-          <span class="item-field-label-short"><label>{{upper weapon.data.damage}}</label></span>
+          <span class="item-field-label-short"><label>{{upper weapon.system.damage}}</label></span>
 
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if weapon.data.equipped}}<i
+            <a class="item-control item-equip" title="Worn">{{#if weapon.system.equipped}}<i
                 class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
@@ -351,12 +378,12 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{armor.img}}" /></a>
           <span class="item-name-label">{{armor.name}}</span>
-          <span class="item-field-label-short">{{upper armor.data.armortype}}</span>
+          <span class="item-field-label-short">{{upper armor.system.armortype}}</span>
-          <span class="item-field-label-short">{{armor.data.absorprionroll}}</span>
+          <span class="item-field-label-short">{{armor.system.absorprionroll}}</span>
 
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if armor.data.equipped}}<i
+            <a class="item-control item-equip" title="Worn">{{#if armor.system.equipped}}<i
                 class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
@@ -382,11 +409,11 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{shield.img}}" /></a>
           <span class="item-name-label">{{shield.name}}</span>
-          <span class="item-field-label-short">{{shield.data.levelDice}}</span>
+          <span class="item-field-label-short">{{shield.system.levelDice}}</span>
 
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if shield.data.equipped}}<i
+            <a class="item-control item-equip" title="Worn">{{#if shield.system.equipped}}<i
                 class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
@@ -429,217 +456,71 @@
           <ul class="item-list alternate-list">
             <li class="item flexrow">
               <label class="generic-label">Origin</label>
-              <input type="text" class="" name="data.biodata.origin" value="{{data.biodata.origin}}"
+              <input type="text" class="" name="system.biodata.origin" value="{{data.biodata.origin}}"
                 data-dtype="String" />
             </li>
             <li class="item flexrow">
               <label class="generic-label">Age</label>
-              <input type="text" class="" name="data.biodata.age" value="{{data.biodata.age}}" data-dtype="String" />
+              <input type="text" class="" name="system.biodata.age" value="{{data.biodata.age}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
               <label class="generic-label">Height</label>
-              <input type="text" class="" name="data.biodata.size" value="{{data.biodata.size}}" data-dtype="String" />
+              <input type="text" class="" name="system.biodata.height" value="{{data.biodata.height}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
               <label class="generic-label">Eyes</label>
-              <input type="text" class="" name="data.biodata.eyes" value="{{data.biodata.eyes}}" data-dtype="String" />
+              <input type="text" class="" name="system.biodata.eyes" value="{{data.biodata.eyes}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
               <label class="generic-label">Hair</label>
-              <input type="text" class="" name="data.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
+              <input type="text" class="" name="system.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
             </li>
           </ul>
         </div>
        <div>
           <ul>
             <li class="flexrow item">
-              <label class="generic-label">Weight</label>
+              <label class="generic-label">Size</label>
-              <input type="text" class="" name="data.biodata.weight" value="{{data.biodata.weight}}"
+              <select class="competence-base flexrow" type="text" name="system.biodata.size" value="{{data.biodata.size}}" data-dtype="Number">
-                data-dtype="String" />
+                {{#select data.biodata.size}}
+                <option value="1">Tiny</option>
+                <option value="2">Small</option>
+                <option value="3">Medium</option>
+                <option value="4">Large</option>
+                <option value="5">Huge</option>
+                <option value="6">Gargantuan</option>
+                {{/select}}
+              </select> 
             </li>
             <li class="flexrow item">
               <label class="generic-label">Sex</label>
-              <input type="text" class="" name="data.biodata.sex" value="{{data.biodata.sex}}" data-dtype="String" />
+              <input type="text" class="" name="system.biodata.sex" value="{{data.biodata.sex}}" data-dtype="String" />
             </li>
             <li class="flexrow item">
               <label class="generic-label">Preferred Hand</label>
-              <input type="text" class="" name="data.biodata.preferredhand" value="{{data.biodata.preferredhand}}"
+              <input type="text" class="" name="system.biodata.preferredhand" value="{{data.biodata.preferredhand}}"
                 data-dtype="String" />
             </li>
             <li class="flexrow item" data-item-id="{{race._id}}">
               <label class="generic-label">Race</label>
               <a class="item-edit"><img class="stat-icon" src="{{race.img}}"></a>
-              <input type="text" class="" name="data.biodata.racename" value="{{race.name}}" disabled
+              <input type="text" class="" name="system.biodata.racename" value="{{data.biodata.racename}}" data-dtype="String" />
-                data-dtype="String" />
-              <div class="item-controls">
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>
-            <li class="flexrow item" data-item-id="{{role._id}}">
-              <label class="generic-label">Role</label>
-              <a class="item-edit"><img class="stat-icon" src="{{role.img}}"></a>
-              <input type="text" class="" name="data.biodata.rolename" value="{{role.name}}" disabled
-                data-dtype="String" />
-              <div class="item-controls">
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-              </div>
             </li>
           </ul>
         </div>
       </div>
 
-      <div>
-        <ul class="stat-list alternate-list">
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Virtues</label></h3>
-          </span>
-          <span class="item-field-label-short">Status</label></span>
-        </li>
-        {{#each virtues as |virtue key|}}
-        <li class="item stat flexrow list-item list-item-shadow" data-arme-id="{{virtue.id}}"
-          data-item-id="{{virtue._id}}">
-          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{virtue.img}}" /></a>
-          <span class="item-name-label">{{virtue.name}}</span>
-          <span class="item-field-label-short"><label class="short-label">
-            {{#if virtue.data.activated}}
-            Activated
-            {{else}}
-            &nbsp;-&nbsp;
-            {{/if}}
-            </label>
-          </span>
-          <div class="item-filler">&nbsp;</div>
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control vice-virtue-activate" title="Activated">{{#if virtue.data.activated}}<i
-              class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-          </div>
-        </li>
-        {{/each}}
-        </ul>
-      </div>
-
-      <div>
-        <ul class="stat-list alternate-list">
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Vices</label></h3>
-          </span>
-          <span class="item-field-label-short">Status</label></span>
-        </li>
-        {{#each vices as |vice key|}}
-        <li class="item stat flexrow list-item list-item-shadow" data-arme-id="{{vice.id}}"
-          data-item-id="{{vice._id}}">
-          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{vice.img}}" /></a>
-          <span class="item-name-label">{{vice.name}}</span>
-          <span class="item-field-label-short"><label class="short-label">
-            {{#if vice.data.activated}}
-            Activated
-            {{else}}
-            &nbsp;-&nbsp;
-            {{/if}}
-            </label>
-          </span>
-
-          <div class="item-filler">&nbsp;</div>
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control vice-virtue-activate" title="Activated">{{#if vice.data.activated}}<i
-              class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-          </div>
-        </li>
-        {{/each}}
-        </ul>
-      </div>
-
-      <ul>
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Psychology</label></h3>
-          </span>
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Worst Fear </label>
-          <input type="text" class="" name="data.biodata.worstfear" value="{{data.biodata.worstfear}}"
-            data-dtype="String" />
-          <label class="attribute-value checkbox"><input type="checkbox" class="change-worstfear"
-              name="data.biodata.worstfearactive" {{checked data.biodata.worstfearactive}} /> Active ?</label>
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Desires </label>
-          <input type="text" class="" name="data.biodata.desires" value="{{data.biodata.desires}}"
-            data-dtype="String" />
-          <label class="attribute-value checkbox"><input type="checkbox" class="change-desires"
-              name="data.biodata.desiresactive" {{checked data.biodata.desiresactive}} /> Active ?</label>
-        </li>
-      </ul>
-
-      <h3>Catchphrase : </h3>
-      <ul>
-        <li class="flexrow">
-          <label class="short-label">Catchphrase </label>
-          <input type="text" class="" name="data.biodata.catchphrase" value="{{data.biodata.catchphrase}}"
-            data-dtype="String" />
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Catchphrase Trigger : </label>
-          <input type="text" class="" name="data.biodata.catchphrasetrigger" value="{{data.biodata.catchphrasetrigger}}"
-            data-dtype="String" />
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Catchphrase used </label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="data.biodata.catchphraseused" {{checked
-              data.biodata.catchphraseused}} /></label>
-        </li>
-      </ul>
-
-      <ul>
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Development</label></h3>
-          </span>
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Character Value : </label>
-          <input type="text" class="" name="data.biodata.charactervalue" value="{{data.biodata.charactervalue}}"
-            data-dtype="String" />
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Character Development Points Total (CDP total) : </label>
-          <input type="text" class="" name="data.biodata.cdp" value="{{data.biodata.cdp}}" data-dtype="Number" />
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Hero Level (max) : </label>
-          <input type="text" class="" name="data.biodata.maxlevelremaining" value="{{data.biodata.maxlevelremaining}}" data-dtype="Number" />
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Hero Levels Remaining : </label>
-          <select class="status-small-label color-class-common" type="text" name="data.biodata.currentlevelremaining" value="{{data.biodata.currentlevelremaining}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
-            {{#select data.biodata.currentlevelremaining}}
-            {{{@root.levelRemainingList}}}
-            {{/select}}
-          </select>
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Threat Level : </label>
-          <input type="text" class="" name="data.biodata.threatlevel" value="{{data.biodata.threatlevel}}"
-            data-dtype="Number" />
-        </li>
-      </ul>
 
       <hr>
       <h3>Background : </h3>
       <div class="form-group editor">
-        {{editor content=data.biodata.description target="data.biodata.description" button=true owner=owner
+        {{editor data.biodata.description target="system.biodata.description" button=true owner=owner
         editable=editable}}
       </div>
       <hr>
       <h3>Notes : </h3>
       <div class="form-group editor">
-        {{editor content=data.biodata.notes target="data.biodata.notes" button=true owner=owner editable=editable}}
+        {{editor data.biodata.notes target="system.biodata.notes" button=true owner=owner editable=editable}}
       </div>
       <hr>
       </article>

templates/chat-attack-defense-result.html

@@ -0,0 +1,75 @@
+<div class="chat-message-header">
+  {{#if actorImg}}
+  <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
+  {{/if}}
+  <h4 class=chat-actor-name>{{alias}}</h4>
+</div>
+
+  <hr>
+  
+  {{#if img}}
+  <div >
+    <img class="chat-icon" src="{{img}}" alt="{{name}}" />
+  </div>
+  {{/if}}
+
+  <div class="flexcol">
+    </div>
+
+    <div>
+      <ul>
+        <li><strong>Fight result !</strong></li>
+        {{#if successDetails.fumbleDetails}}
+        <li>Fumble ! :  {{successDetails.fumbleDetails.data.text}} </li>
+        {{/if}}
+
+
+        {{#if armorResult}}
+          <li>Armor initial result : {{armorResult.rawArmor}}</li>
+          {{#each armorResult.messages as |message idx|}}
+            <li>{{message}}</li>
+          {{/each}}
+        {{/if}}
+
+        {{#if successDetails.hack_vs_shields}} 
+        <li>Hack weapon : check shield !</li>
+        {{/if}}
+
+        {{#if successDetails.entangle}} 
+        <li>Entangle weapon : attacker can entangle !</li>
+        {{/if}}
+        
+        {{#if successDetails.knockback}} 
+        <li>Knockback weapon : check knockback !</li>
+        {{/if}}
+        
+        {{#if successDetails.hack_armors}} 
+        <li>Hack weapon : check armor damage !</li>
+        {{/if}}
+
+        {{#if successDetails.penetrating_impale}} 
+        <li>Penetrating weapon : apply the Impale condition !</li>
+        {{/if}}
+
+        {{#if (or successDetails.critical_1 successDetails.critical_2)}} 
+        <li>Critical {{#if successDetails.critical_1}} 1 {{else}} 2 {{/if}} : {{successDetails.criticalText}} </li>
+        {{/if}}
+
+        {{#if successDetails.attackerHPLossValue}}
+        <li>Attacker has lost HP :  {{successDetails.attackerHPLossValue}} HP </li>
+        {{/if}}
+
+        {{#if successDetails.defenderHPLossValue}}
+        <li>Defender has lost HP :  {{successDetails.defenderHPLossValue}} HP </li>
+        {{/if}}
+
+        <li>Success details : {{successDetails.result}} </li>
+
+        <li><strong>Final successes</strong> {{sumSuccess}} </li>
+
+        <!-- <button class="chat-card-button reroll-level-remaining" data-roll-id="{{rollId}}">Reroll</button> -->
+
+      </ul>  
+    </div>
+
+  </div>

templates/chat-generic-result.html

@@ -18,6 +18,16 @@
 
     <div>
       <ul>
+        {{#if (eq rollOrder 1)}}
+        <li><strong>Roll with {{rollType}} - Roll 1</strong></li>
+        {{/if}}
+        {{#if (eq rollOrder 2)}}
+        <li><strong>Roll with {{rollType}} - Roll 2</strong></li>
+        {{/if}}
+        {{#if (eq rollOrder 3)}}
+        <li><strong>Roll with {{rollType}} - Final result !</strong></li>
+        {{/if}}
+
         {{#if save}}  
         <li>Save : {{save.label}} - {{save.value}}d6 
           ({{#each roll.terms.0.results as |die idx|}}
@@ -26,8 +36,8 @@
         </li>
         {{/if}}
 
-        {{#if shield}}  
+        {{#if sizeDice}}
-        <li>Shield : {{shield.name}} - {{shield.data.shieldie}} 
+        <li>Size/Range/Cover/Situational dices 
           ({{#each roll.terms.0.results as |die idx|}}
           {{die.result}}&nbsp;
           {{/each}})
@@ -53,21 +63,26 @@
         </li>
         {{/if}}
 
-        {{#if (eq advantage "advantage1")}}
+        {{#if noAdvantage}} 
-        <li>1 Advantage Die !
+          <li>No advantage due to condition : {{noAdvantage.name}}</li>
-          &nbsp;({{#each roll.terms.8.results as |die idx|}}
+        {{else}}
-          {{die.result}}&nbsp;
+          {{#if (or (eq advantage "advantage1") forceAdvantage)}}
-          {{/each}})
+          <li>1 Advantage Die !
-        </li>
+            &nbsp;({{#each roll.terms.8.results as |die idx|}}
+            {{die.result}}&nbsp;
+            {{/each}})
+          </li>
+          {{/if}}
+          {{#if (eq advantage "advantage2") }}
+          <li>2 Advantage Dice !
+            &nbsp;({{#each roll.terms.8.results as |die idx|}}
+            {{die.result}}&nbsp;
+            {{/each}})
+          </li>
+          {{/if}}
         {{/if}}
-        {{#if (eq advantage "advantage2")}}
+
-        <li>2 Advantage Dice !
+        {{#if (or (eq disadvantage "disadvantage1") forceDisadvantage)}}
-          &nbsp;({{#each roll.terms.8.results as |die idx|}}
-          {{die.result}}&nbsp;
-          {{/each}})
-        </li>
-        {{/if}}
-        {{#if (eq disadvantage "disadvantage1")}}
         <li>1 Disadvantage Die !
           &nbsp;({{#each roll.terms.10.results as |die idx|}}
           {{die.result}}&nbsp;
@@ -116,6 +131,14 @@
         </li>
         {{/if}}
         
+        {{#if useshield}}  
+        <li>Shield : {{shield.name}} - {{shield.data.shielddie}} 
+          ({{#each roll.terms.14.results as |die idx|}}
+          {{die.result}}&nbsp;
+          {{/each}})
+        </li>
+        {{/if}}
+
         <li><strong>Number of successes</strong> {{nbSuccess}} </li>
 
         <!-- <button class="chat-card-button reroll-level-remaining" data-roll-id="{{rollId}}">Reroll</button> -->

templates/chat-request-defense.html

@@ -0,0 +1,46 @@
+<div class="chat-message-header">
+  {{#if actorImg}}
+  <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
+  {{/if}}
+  <h4 class=chat-actor-name>{{alias}}</h4>
+</div>
+
+<hr>
+
+{{#if img}}
+<div>
+  <img class="chat-icon" src="{{img}}" alt="{{name}}" />
+</div>
+{{/if}}
+
+<div class="flexcol">
+</div>
+
+<div>
+  
+  {{#if isRangedAttack}}
+  <div>{{defender.name}} is under Ranged attack. He must roll a Target Roll to defend himself.</div>
+  {{else}}
+  <div>{{defender.name}} is under Melee attack. He must roll a Defense Roll to defend himself.</div>
+  {{/if}}
+
+  <ul>
+    {{#if isRangedAttack}}
+      <li>
+        <button class="chat-card-button roll-defense-ranged" data-roll-id="{{@root.rollId}}">Roll Target !</button>
+      </li>
+    {{else}}
+      <li>
+        {{#each defenderWeapons as |weapon idx|}}
+        <button class="chat-card-button roll-defense-melee" data-defense-weapon-id="{{weapon._id}}"
+          data-roll-id="{{@root.rollId}}">{{weapon.name}}</button>
+        {{/each}}
+      </li>
+    {{/if}}
+    </ul>
+  <!-- <button class="chat-card-button reroll-level-remaining" data-roll-id="{{rollId}}">Reroll</button> -->
+
+  </ul>
+</div>
+
+</div>

templates/item-armor-sheet.html

@@ -19,7 +19,7 @@
         <div class="tab" data-group="primary">
           <ul>
             <li class="flexrow"><label class="generic-label">Type</label>
-              <select class="competence-base flexrow" type="text" name="data.armortype" value="{{data.armortype}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.armortype" value="{{data.armortype}}" data-dtype="String">
                 {{#select data.armortype}}
                 <option value="clothes">Clothes</option>
                 <option value="paddedlight">Padded (Light)</option>
@@ -35,7 +35,7 @@
             </li>
 
             <li class="flexrow"><label class="generic-label">Absorption roll</label>
-              <select class="competence-base flexrow" type="text" name="data.absorprionroll" value="{{data.absorprionroll}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.absorprionroll" value="{{data.absorprionroll}}" data-dtype="String">
                 {{#select data.absorprionroll}}
                 <option value="none">None</option>
                 <option value="white">White</option>
@@ -50,7 +50,7 @@
             </li>
 
             <li class="flexrow"><label class="generic-label">Damaged roll</label>
-              <select class="competence-base flexrow" type="text" name="data.damagedroll" value="{{data.damagedroll}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.damagedroll" value="{{data.damagedroll}}" data-dtype="String">
                 {{#select data.damagedroll}}
                 <option value="none">None</option>
                 <option value="white">White</option>
@@ -65,23 +65,23 @@
             </li>
 
             <li class="flexrow"><label class="generic-label">Is proficient ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.isproficient" {{checked data.isproficient}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.isproficient" {{checked data.isproficient}}/></label>
             </li>
 
             <li class="flexrow"><label class="generic-label">Minimum strength</label>
-              <input type="text" class="input-numeric-short padd-right" name="data.minstr" value="{{data.minstr}}" data-dtype="Number"/>
+              <input type="text" class="input-numeric-short padd-right" name="system.minstr" value="{{data.minstr}}" data-dtype="Number"/>
             </li>
 
             <li class="flexrow"><label class="generic-label">Skill penalty</label>
-              <input type="text" class="input-numeric-short padd-right" name="data.skillpenalty" value="{{data.skillpenalty}}" data-dtype="Number"/>
+              <input type="text" class="input-numeric-short padd-right" name="system.skillpenalty" value="{{data.skillpenalty}}" data-dtype="Number"/>
             </li>
 
             <li class="flexrow"><label class="generic-label">Equipped ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.equipped" {{checked data.equipped}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.equipped" {{checked data.equipped}}/></label>
             </li>
 
             <li class="flexrow"><label class="generic-label">Cost</label>
-              <input type="text" class="input-numeric-short padd-right" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+              <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
             </li>
 
           </ul>

templates/item-condition-sheet.html

@@ -14,12 +14,48 @@
 
       <label class="generic-label">Description</label>
       <div class="medium-editor item-text-long-line">
-        {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+        {{editor data.description target="system.description" button=true owner=owner editable=editable}}
       </div>
     </div>
 
     <div class="tab details" data-group="primary" data-tab="details">
-      <ul>
+      <ul>  
+        <li class="flexrow"><label class="generic-label">Provides 1 Advantage ?</label>
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.advantage" {{checked data.advantage}}/></label>
+        </li>
+        <li class="flexrow"><label class="generic-label">Provides 1 Disadvantage ?</label>
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.disadvantage" {{checked data.disadvantage}}/></label>
+        </li>
+        <li class="flexrow"><label class="generic-label">Provides Roll Advantage ?</label>
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.rolladvantage" {{checked data.rolladvantage}}/></label>
+        </li>
+        <li class="flexrow"><label class="generic-label">Provides Roll Disadvantage ?</label>
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.rolldisadvantage" {{checked data.rolldisadvantage}}/></label>
+        </li>
+        <li class="flexrow"><label class="generic-label">Loose HP per round ?</label>
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.loosehpround" {{checked data.loosehpround}}/></label>
+        </li>
+        {{#if data.loosehpround}}
+          <li class="flexrow"><label class="generic-label">Number of HP : </label>
+            <input type="text" class="input-numeric-short padd-right" name="system.loohproundvalue" value="{{data.loohproundvalue}}" data-dtype="Number"/>
+          </li>
+        {{/if}}
+        <li class="flexrow"><label class="generic-label">No advantage possible ?</label>
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.noadvantage" {{checked data.noadvantage}}/></label>
+        </li>
+        <li class="flexrow"><label class="generic-label">Disadvantage on attack ?</label>
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.attackdisadvantage" {{checked data.attackdisadvantage}}/></label>
+        </li>
+        <li class="flexrow"><label class="generic-label">Disadvantage on defense ?</label>
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.defensedisadvantage" {{checked data.defensedisadvantage}}/></label>
+        </li>
+        <li class="flexrow"><label class="generic-label">Provides advantage to attacker ?</label>
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.targetadvantage" {{checked data.targetadvantage}}/></label>
+        </li>
+        <li class="flexrow"><label class="generic-label">No action possible ?</label>
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.noaction" {{checked data.noaction}}/></label>
+        </li>
+
       </ul>
 
     </div>

templates/item-equipment-sheet.html

@@ -16,13 +16,13 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
           <li class="flexrow"><label class="generic-label">Equipped ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.equipped" {{checked data.equipped}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.equipped" {{checked data.equipped}}/></label>
           </li>
           <li class="flexrow"><label class="generic-label">Quantity</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.quantity" value="{{data.quantity}}" data-dtype="Number"/>
           </li>
           <li class="flexrow"><label class="generic-label">Cost</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
           </li>
       </ul>
     </div>

templates/item-feat-sheet.html

@@ -16,16 +16,16 @@
       <div class="tab details" data-group="primary" data-tab="details">
         <ul>
             <li class="flexrow"><label class="generic-label">Add feat die  ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.isfeatdie" {{checked data.isfeatdie}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.isfeatdie" {{checked data.isfeatdie}}/></label>
             </li>
 
             <li class="flexrow"><label class="generic-label">Add SL  ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.issl" {{checked data.issl}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.issl" {{checked data.issl}}/></label>
             </li>
 
             {{#if data.issl}}
             <li class="flexrow"><label class="generic-label">SL value</label>
-              <input type="text" class="" name="data.sl" value="{{data.sl}}" data-dtype="Number"/>
+              <input type="text" class="" name="data.sl" value="{{system.sl}}" data-dtype="Number"/>
             </li>
             {{/if}}
 

templates/item-money-sheet.html

@@ -16,10 +16,10 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
           <li class="flexrow"><label class="generic-label">Quantity</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.quantity" value="{{data.quantity}}" data-dtype="Number"/>
           </li>
           <li class="flexrow"><label class="generic-label">Unit value</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.value" value="{{data.value}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.value" value="{{data.value}}" data-dtype="Number"/>
           </li>
       </ul>
     </div>

templates/item-shield-sheet.html

@@ -19,7 +19,7 @@
         <div class="tab" data-group="primary">
           <ul>
             <li class="flexrow"><label class="generic-label">Shield die</label>
-              <select class="competence-base flexrow" type="text" name="data.shielddie" value="{{data.shielddie}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.shielddie" value="{{data.shielddie}}" data-dtype="String">
                 {{#select data.shielddie}}
                 <option value="d6">d6</option>
                 <option value="d8">d8</option>
@@ -29,7 +29,7 @@
             </li>
 
             <li class="flexrow"><label class="generic-label">Associated skill</label>
-              <select class="competence-base flexrow" type="text" name="data.skill" value="{{data.skill}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.skill" value="{{data.skill}}" data-dtype="String">
                 {{#select data.skill}}
                   {{#each shieldSkills as |skill idx|}}
                   <option value="{{skill.name}}">{{skill.name}}</option>
@@ -40,11 +40,11 @@
   
   
             <li class="flexrow"><label class="generic-label">Equipped ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.equipped" {{checked data.equipped}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.equipped" {{checked data.equipped}}/></label>
             </li>
 
             <li class="flexrow"><label class="generic-label">Cost</label>
-              <input type="text" class="input-numeric-short padd-right" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+              <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
             </li>
 
           </ul>

templates/item-skill-sheet.html

@@ -16,7 +16,7 @@
       <div class="tab details" data-group="primary" data-tab="details">
         <ul>
             <li class="flexrow"><label class="generic-label">Ability</label>
-              <select class="competence-base flexrow" type="text" name="data.ability" value="{{data.ability}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.ability" value="{{data.ability}}" data-dtype="String">
                 {{#select data.ability}}
                 {{> systems/fvtt-crucible-rpg/templates/partial-options-abilities.html}}
                 {{/select}}
@@ -24,18 +24,18 @@
             </li>
 
             <li class="flexrow"><label class="generic-label">Is Feat Die ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.isfeatdie" {{checked data.isfeatdie}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.isfeatdie" {{checked data.isfeatdie}}/></label>
             </li>
             <li class="flexrow"><label class="generic-label">Is SL +2 ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.issl2" {{checked data.issl2}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.issl2" {{checked data.issl2}}/></label>
             </li>
 
             <li class="flexrow"><label class="generic-label">Subject to Armor Penalty ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.armorpenalty" {{checked data.armorpenalty}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.armorpenalty" {{checked data.armorpenalty}}/></label>
             </li>
 
             <li class="flexrow"><label class="generic-label">Skill Type</label>
-              <select class="competence-base flexrow" type="text" name="data.skilltype" value="{{data.skilltype}}" data-dtype="string">
+              <select class="competence-base flexrow" type="text" name="system.skilltype" value="{{data.skilltype}}" data-dtype="string">
                 {{#select data.skilltype}}
                 <option value="simple">Simple</option>
                 <option value="complex">Complex</option>
@@ -44,27 +44,27 @@
             </li>
 
             <li class="flexrow"><label class="generic-label">Skill Dice</label>
-              <input type="text" class="" name="data.skilldice" value="{{data.skilldice}} (level {{data.level}})" data-dtype="String" disabled/>
+              <input type="text" class="" name="system.skilldice" value="{{data.skilldice}} (level {{data.level}})" data-dtype="String" disabled/>
             </li>
 
             <li class="flexrow"><label class="generic-label">Is Innate ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.isinnate" {{checked data.isinnate}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.isinnate" {{checked data.isinnate}}/></label>
             </li>
             
             <li class="flexrow"><label class="generic-label">Is Lore ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.islore" {{checked data.islore}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.islore" {{checked data.islore}}/></label>
             </li>
 
             <li class="flexrow"><label class="generic-label">Is Weapon Skill ?</label>
-              <label class="attribute-value checkbox"><input type="checkbox" name="data.isweaponskill" {{checked data.isweaponskill}}/></label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.isweaponskill" {{checked data.isweaponskill}}/></label>
             </li>
 
-            <li class="flexrow"><label class="generic-label">Is Shield Skill ?</label>
+            <!-- <li class="flexrow"><label class="generic-label">Is Shield Skill ?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="data.isshieldskill" {{checked data.isshieldskill}}/></label>
-            </li>
+            </li> -->
 
             <li class="flexrow"><label class="generic-label">Bonus dice</label>
-              <select class="competence-base flexrow" type="text" name="data.bonusdice" value="{{data.bonusdice}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.bonusdice" value="{{data.bonusdice}}" data-dtype="String">
                 {{#select data.bonusdice}}
                 <option value="none">None</option>
                 <option value="1d6">1d6</option>
@@ -80,23 +80,23 @@
             </li>
 
             <li class="flexrow"><label class="generic-label">Background</label>
-              <input type="text" class="" name="data.background" value="{{data.background}}" data-dtype="Number"/>
+              <input type="text" class="" name="system.background" value="{{data.background}}" data-dtype="Number"/>
             </li>
 
             <li class="flexrow"><label class="generic-label">Basic</label>
-              <input type="text" class="" name="data.basic" value="{{data.basic}}" data-dtype="Number"/>
+              <input type="text" class="" name="system.basic" value="{{data.basic}}" data-dtype="Number"/>
             </li>
 
             <li class="flexrow"><label class="generic-label">Class</label>
-              <input type="text" class="" name="data.class" value="{{data.class}}" data-dtype="Number"/>
+              <input type="text" class="" name="system.class" value="{{data.class}}" data-dtype="Number"/>
             </li>
 
             <li class="flexrow"><label class="generic-label">Exp level</label>
-              <input type="text" class="" name="data.explevel" value="{{data.explevel}}" data-dtype="Number"/>
+              <input type="text" class="" name="system.explevel" value="{{data.explevel}}" data-dtype="Number"/>
             </li>
 
             <li class="flexrow"><label class="generic-label">Gained exp (+1 to Exp level at 25)</label>
-              <input type="text" class="" name="data.exp" value="{{data.exp}}" data-dtype="Number"/>
+              <input type="text" class="" name="system.exp" value="{{data.exp}}" data-dtype="Number"/>
             </li>
 
           </ul>

templates/item-spell-sheet.html

@@ -16,7 +16,7 @@
       <div class="tab details" data-group="primary" data-tab="details">
         <ul>
             <li class="flexrow"><label class="generic-label">Lore</label>
-              <select class="competence-base flexrow" type="text" name="data.lore" value="{{data.lore}}" data-dtype="String">
+              <select class="competence-base flexrow" type="text" name="system.lore" value="{{data.lore}}" data-dtype="String">
                 {{#select data.lore}}
                 <option value="earth">Earth</option>
                 <option value="air">Air</option>
@@ -28,7 +28,7 @@
             </li>
 
             <li class="flexrow"><label class="generic-label">Circle</label>
-              <select class="competence-base flexrow" type="text" name="data.circle" value="{{data.circle}}" data-dtype="Number">
+              <select class="competence-base flexrow" type="text" name="system.circle" value="{{data.circle}}" data-dtype="Number">
                 {{#select data.circle}}
                 <option value="1">1</option>
                 <option value="2">2</option>
@@ -40,7 +40,7 @@
             </li>
 
             <li class="flexrow"><label class="generic-label">Range</label>
-              <input type="text" class="" name="data.range" value="{{data.range}}" data-dtype="String"/>
+              <input type="text" class="" name="system.range" value="{{data.range}}" data-dtype="String"/>
             </li>
 
           </ul>

templates/item-weapon-sheet.html

@@ -27,11 +27,11 @@
           </li> -->
 
           <li class="flexrow"><label class="generic-label">Is proficient ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.isproficient" {{checked data.isproficient}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.isproficient" {{checked data.isproficient}}/></label>
           </li>
 
           <li class="flexrow"><label class="generic-label">Associated skill</label>
-            <select class="competence-base flexrow" type="text" name="data.skill" value="{{data.skill}}" data-dtype="String">
+            <select class="competence-base flexrow" type="text" name="system.skill" value="{{data.skill}}" data-dtype="String">
               {{#select data.skill}}
                 {{#each weaponSkills as |skill idx|}}
                 <option value="{{skill.name}}">{{skill.name}}</option>
@@ -41,32 +41,39 @@
           </li>
 
           <li class="flexrow"><label class="generic-label">Qualities (comma separated list)</label>
-            <input type="text" class="padd-right" name="data.qualities" value="{{data.qualities}}" data-dtype="String"/>
+            <input type="text" class="padd-right" name="system.qualities" value="{{data.qualities}}" data-dtype="String"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">Flaws (comma separated list)</label>
-            <input type="text" class="padd-right" name="data.flaws" value="{{data.flaws}}" data-dtype="String"/>
+            <input type="text" class="padd-right" name="system.flaws" value="{{data.flaws}}" data-dtype="String"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">Damage</label>
-            <input type="text" class="right" name="data.damage" value="{{data.damage}}" data-dtype="String"/>
+            <input type="text" class="right" name="system.damage" value="{{data.damage}}" data-dtype="String"/>
           </li>
-          <li class="flexrow"><label class="generic-label">Range</label>
+
-            <input type="text" class="right" name="data.range" value="{{data.range}}" data-dtype="String"/>
+          <li class="flexrow"><label class="generic-label">Is ranged weapon ?</label>
-          </li>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.isranged" {{checked data.isranged}}/></label>
-          <li class="flexrow"><label class="generic-label">Max range</label>
-            <input type="text" class="right" name="data.maxrange" value="{{data.maxrange}}" data-dtype="String"/>
           </li>
+          {{#if data.isranged}}
+            <li class="flexrow"><label class="generic-label">Effective Range</label>
+              <input type="text" class="right" name="system.range" value="{{data.range}}" data-dtype="String"/>
+            </li>
+            <li class="flexrow"><label class="generic-label">Max range</label>
+              <input type="text" class="right" name="system.maxrange" value="{{data.maxrange}}" data-dtype="String"/>
+            </li>
+          {{/if}}
+
           <li class="flexrow"><label class="generic-label">Minimum strength</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.minstr" value="{{data.minstr}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.minstr" value="{{data.minstr}}" data-dtype="Number"/>
           </li>
 
           <li class="flexrow"><label class="generic-label">Equipped ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="data.equipped" {{checked data.equipped}}/></label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.equipped" {{checked data.equipped}}/></label>
           </li>
 
           <li class="flexrow"><label class="generic-label">Cost</label>
-            <input type="text" class="input-numeric-short padd-right" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+            <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{data.cost}}" data-dtype="Number"/>
           </li>
 
         </ul>

templates/npc-sheet.html

@@ -1,184 +1,413 @@
 <form class="{{cssClass}}" autocomplete="off">
 
-    {{!-- Sheet Header --}}
+  {{!-- Sheet Header --}}
-    <header class="sheet-header">
+  <header class="sheet-header">
-      <div class="header-fields">
+    <div class="header-fields">
-        <div class="flexrow">
+      <h1 class="charname margin-right"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
-          <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
+      <div class="flexrow">
-          <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
+        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
-        </div>
-      </div>
-    </header>
-
-    {{!-- Sheet Tab Navigation --}}
-    <nav class="sheet-tabs tabs" data-group="primary">
-        <a class="item" data-tab="attribute">Main</a>
-        <a class="item" data-tab="defence">Defence/Weapons</a>
-        <a class="item" data-tab="equipment">Equipment</a>
-        <a class="item" data-tab="notes">Notes</a>
-    </nav>
-
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-
-        {{!-- Carac Tab --}}
-        <div class="tab items" data-group="primary" data-tab="attribute">
-          <span><a class="lock-unlock-sheet"><img class="small-button-container" 
-            src="systems/fvtt-fragged-kingdom/images/icons/{{#if editScore}}unlocked.svg{{else}}locked.svg{{/if}}" alt="Unlocked/Locked"
-            >{{#if editScore}}Unlocked{{else}}Locked{{/if}}</a>
-          </span>
-          <div class="grid grid-2col">
-            <div class="">
-
-              <span class="generic-label"><h3>Type</h3>
-              <select class="competence-base flexrow" type="text" name="data.npctype" value="{{data.npctype}}" data-dtype="String" {{#unless @root.editScore}}disabled{{/unless}}>
-                {{#select data.npctype}}
-                <option value="henchman">Henchman</option>
-                <option value="drone">Troop</option>
-                {{/select}}
-              </select> </span>
-
-              <button class="npc-skill-roll">Generic Skill roll</button>
-
-              <div>
-              <span class="generic-label"><h3>Traits List</h3></span>
-              <ul>
-                {{#each traits as |trait key|}}
-                <li class="item flexrow list-item" data-item-id="{{trait.id}}">
-                  <img class="sheet-competence-img" src="{{trait.img}}"/>
-                  <span class="competence-label">{{trait.name}}</span>
-                  <span class="competence-label">{{trait.data.data.type}}</span>
-                  <div class="item-controls">
-                    <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-                  </div>
-                </li>                  
-                {{/each}}
-              </ul> 
-            </div>
-
-            </div>
-
-            <div class="">
-              <span class="generic-label"><h3>Stats & Numbers</h3></span>
-              <ul>
-                {{#each data.spec as |spec key|}}
-                <li class="item flexrow list-item stack-left" data-attr-key="{{key}}">
-                  <span class="stat-label padd-right npc-stat-label" name="{{key}}">{{spec.label}}</span>
-                  <input type="text" class="input-numeric-short padd-right" name="data.spec.{{key}}.value" value="{{spec.value}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}/>
-                </li>
-                {{/each}}
-              </ul>    
-            </div>
-
-          </div>
-        </div>
-        
-
-      {{!-- Defence Tab --}}
-      <div class="tab defence" data-group="primary" data-tab="defence">
         <div class="flexcol">
 
-          <div class="">     
+          <div class="flexrow">
-            {{#each data.fight as |fight key|}}   
+            <div class="ability-item">
-            <ul>
+              <ul>
-              <li class="item flexrow list-item stack-left">
+                {{#each data.abilities as |ability key|}}
-                <span class="stat-label padd-right"><strong>{{fight.label}}</strong></span>                
+                {{#if (eq ability.col 1)}}
-                <input type="text" class="input-numeric-short padd-right" name="data.fight.{{key}}.value" value="{{fight.value}}" data-dtype="Number"/>
+                {{> systems/fvtt-crucible-rpg/templates/partial-actor-ability-block.html ability=ability key=key}}
-              </li>
+                {{/if}}
-              {{#each fight.derivated as |derivated keydev|}}   
+                {{/each}}
-              <li class="item flexrow list-item">
+              </ul>
-                <span class="stat-label flexrow ">{{derivated.label}}</span>
+
-                <input type="text" class="input-numeric-short padd-right"  name="data.fight.{{key}}.derivated.{{keydev}}.value" value="{{derivated.value}}" data-dtype="Number"/>
+              <li class="item flexrow list-item" data-attr-key="class">
-              </li>
+                <span class="ability-label " name="class">
-              {{/each}}
+                  <h4 class="ability-text-white ability-margin">Class</h4>
-            </ul>    
+                </span>
-            {{/each}}
+                <select class="competence-base flexrow" type="text" name="system.biodata.class" value="{{data.biodata.class}}" data-dtype="String">
-          </div>
+                  {{#select data.biodata.class}}
+                  <option value="none">None</option>
+                  <option value="chaplain">Chaplain</option>
+                  <option value="magus">Magus</option>
+                  <option value="martial">Martial</option>
+                  <option value="skalawag">Skalawag</option>
+                  <option value="warden">Warden</option>
+                  {{/select}}
+                </select>
+              </li>
+            
+            </div>
+
+            <div class="ability-item">
+              <ul>
+                {{#each data.abilities as |ability key|}}
+                {{#if (eq ability.col 2)}}
+                {{> systems/fvtt-crucible-rpg/templates/partial-actor-ability-block.html ability=ability key=key}}
+                {{/if}}
+                {{/each}}
+
+                {{#if equippedArmor}}
+                <li class="item flexrow list-item" data-attr-key="class">
+                  <img class="sheet-competence-img" src="{{equippedArmor.img}}" />
+                  <span class="ability-label " name="class">
+                    <h4 class="ability-text-white ability-margin"><a class="roll-armor-die ability-margin">{{equippedArmor.name}}</a></h4>
+                  </span>
+                </li>
+                {{/if}}
+                {{#if equippedShield}}
+                <li class="item flexrow list-item" data-attr-key="class">              
+                  <img class="sheet-competence-img" src="{{equippedShield.img}}" />
+                  <span class="ability-label " name="equippedShield">
+                    <h4 class="ability-text-white ability-margin"><a class="roll-shield-die ability-margin">{{equippedShield.name}}</a></h4>
+                  </span>
+                </li>
+                {{/if}}
+                <li class="item flexrow list-item" data-attr-key="class">              
+                  <img class="sheet-competence-img" src="systems/fvtt-crucible-rpg/images/icons/feats/Marksman (Ballistic).webp" />
+                  <span class="ability-label " name="rollTarget">
+                    <h4 class="ability-text-white ability-margin"><a class="roll-target-die ability-margin">Target Roll</a></h4>
+                  </span>
+                </li>
+
+              </ul>
+            </div>
+
+            <div class="ability-item status-block">
+              {{> systems/fvtt-crucible-rpg/templates/partial-actor-status.html}}
+            </div>
+
+          </div>
+        </div>
+      </div>
+    </div>
+  </header>
+
+  {{!-- Sheet Tab Navigation --}}
+  <nav class="sheet-tabs tabs" data-group="primary">
+    <a class="item" data-tab="details">Details</a>
+    <a class="item" data-tab="biodata">Biography</a>
+  </nav>
+
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+
+    {{!-- Skills Tab --}}
+    <div class="tab skills" data-group="primary" data-tab="details">
+
+      <ul class="stat-list alternate-list item-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header">
+            <h3><label class="items-title-text">Skills</label></h3>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Ability</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Dice</label>
+          </span>
+          <span class="item-field-label-long">
+            <label class="short-label">Background</label>
+          </span>
+        </li>
+        {{#each skills as |skill key|}}
+        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{skill._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{skill.img}}" /></a>
+          <span class="item-name-label"><a class="roll-skill">{{skill.name}}</a></span>
+          <span class="item-field-label-short">{{upper skill.system.ability}}</span>
+          <span class="item-field-label-short">{{skill.system.skilldice}}</span>
+          <span class="item-field-label-long">&nbsp;-&nbsp;</span>
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+
+      <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">Combat</label></h3>
+            </span>
+            <span class="item-field-label-short">
+              <label class="short-label">Ability</label>
+            </span>
+            <span class="item-field-label-medium">
+              <label class="short-label">Range</label>
+            </span>
+          </li>
+          {{#each equippedWeapons as |weapon key|}}
+          <li class="item flexrow list-item list-item-shadow" data-item-id="{{weapon._id}}">
+            <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                src="{{weapon.img}}" /></a>
+            <span class="item-name-label-long"><a class ="roll-weapon">{{weapon.name}}</a></span>
+
+            <span class="item-field-label-short">{{weapon.system.ability}}</span>
+
+            <span class="item-field-label-medium">{{perk.system.range}}</span>
+
+            <div class="item-filler">&nbsp;</div>
+            <div class="item-controls item-controls-fixed">
+              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+            </div>
+          </li>
+          {{/each}}
+        </ul>
+
+        <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">Monster Powers</label></h3>
+            </span>
+            <span class="item-field-label-medium">
+              <label class="short-label">Feature Die?</label>
+            </span>
+            <span class="item-field-label-medium">
+              <label class="short-label">SL?</label>
+            </span>
+            <span class="item-field-label-medium">
+              <label class="short-label">SL</label>
+            </span>
+          </li>
+          {{#each feats as |feat key|}}
+          <li class="item flexrow list-item list-item-shadow" data-item-id="{{feat._id}}">
+            <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                src="{{feat.img}}" /></a>
+            <span class="item-name-label-long">{{feat.name}}</span>
+
+            <span class="item-field-label-medium">{{upperFirst feat.system.isfeatdie}}</span>
+            <span class="item-field-label-medium">{{upperFirst feat.system.issl}}</span>
+            <span class="item-field-label-medium">{{feat.system.sl}}</span>
+
+            <div class="item-filler">&nbsp;</div>
+            <div class="item-controls item-controls-fixed">
+              <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+            </div>
+          </li>
+          {{/each}}
+        </ul>
 
-          <span class="generic-label"><h3>Weapons</h3></span>
           <ul class="stat-list alternate-list">
-            {{#each weapons as |weapon key|}}
+            <li class="item flexrow list-item items-title-bg">
-            <li class="item stat flexrow list-item" data-arme-id="{{weapon.id}}" data-item-id="{{weapon.id}}">
+              <span class="item-name-label-header-long">
-              <img class="sheet-competence-img" src="{{weapon.img}}"/>
+                <h3><label class="items-title-text">Conditions</label></h3>
-              <span class="stat-label">{{weapon.name}}</span>
+              </span>
-              <div class="item-controls">
+            </li>
-                <a class="item-control item-equip" title="Worn">{{#if weapon.data.data.equipped}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+            {{#each conditions as |condition key|}}
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+            <li class="item flexrow list-item list-item-shadow" data-item-id="{{condition._id}}">
+              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                  src="{{condition.img}}" /></a>
+              <span class="item-name-label-long">{{condition.name}}</span>
+
+              <div class="item-filler">&nbsp;</div>              
+                <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
             </li>
-            <li class="item stat flexrow list-item stats-table" data-armure-id="{{weapon.id}}" data-item-id="{{weapon.id}}">
+            {{/each}}
-              {{#each weapon.data.data.weaponstats as |weaponstat statkey|}}
+          </ul>
-              <ul>
+
-                <li class="item stat flexrow list-item" data-item-id="{{weapon.id}}" data-stat-id={{statkey}}><span class="stat-label weapon-label"><a name="{{weapon.name}}">Attack with {{weaponstat.name}}</a></span>
+          <ul class="item-list alternate-list">
-                </li>
+            <li class="item flexrow list-item items-title-bg">
-                <li>{{> "systems/fvtt-fragged-kingdom/templates/weapon-stats-section.html" stats=weaponstat.data.statstotal isfinal=false header=true}}
+              <span class="item-name-label-header">
-                </li>
+                <h3><label class="items-title-text">Weapons</label></h3>
-              </ul>
+              </span>
-              {{/each}}
+              <span class="item-field-label-short">
+                <label class="short-label">Attack</label>
+              </span>
+              <span class="item-field-label-short">
+                <label class="short-label">Damage</label>
+              </span>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a>
+              </div>
             </li>
-            {{/each}}                
+            {{#each weapons as |weapon key|}}
-          </ul>          
+            <li class="item flexrow list-item list-item-shadow" data-item-id="{{weapon._id}}">
-
+              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-        </div>
+                  src="{{weapon.img}}" /></a>
-      </div>
+              <span class="item-name-label">{{weapon.name}}</span>
-
+              <span class="item-field-label-short"><label>{{upper weapon.system.ability}}</label></span>
-      {{!-- Traits Tab --}}
+              <span class="item-field-label-short"><label>{{upper weapon.system.damage}}</label></span>
-      <div class="tab traits" data-group="primary" data-tab="traits">
+    
-
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-equip" title="Worn">{{#if weapon.system.equipped}}<i
+                    class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+    
+          <ul class="item-list alternate-list">
+            <li class="item flexrow list-item items-title-bg">
+              <span class="item-name-label-header">
+                <h3><label class="items-title-text">Armors</label></h3>
+              </span>
+              <span class="item-field-label-short">
+                <label class="short-label">Type</label>
+              </span>
+              <span class="item-field-label-short">
+                <label class="short-label">Absorption</label>
+              </span>
+    
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="armor" title="Create Item"><i class="fas fa-plus"></i></a>
+              </div>
+            </li>
+            {{#each armors as |armor key|}}
+            <li class="item list-item flexrow list-item-shadow" data-item-id="{{armor._id}}">
+              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                  src="{{armor.img}}" /></a>
+              <span class="item-name-label">{{armor.name}}</span>
+              <span class="item-field-label-short">{{upper armor.system.armortype}}</span>
+              <span class="item-field-label-short">{{armor.system.absorprionroll}}</span>
+    
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-equip" title="Worn">{{#if armor.system.equipped}}<i
+                    class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+    
+          <ul class="item-list alternate-list">
+            <li class="item flexrow list-item items-title-bg">
+              <span class="item-name-label-header">
+                <h3><label class="items-title-text">Shields</label></h3>
+              </span>
+              <span class="item-field-label-short">
+                <label class="short-label">Dice</label>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="shield" title="Create Item"><i class="fas fa-plus"></i></a>
+              </div>
+            </li>
+            {{#each shields as |shield key|}}
+            <li class="item flexrow list-item list-item-shadow" data-item-id="{{shield._id}}">
+              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+                  src="{{shield.img}}" /></a>
+              <span class="item-name-label">{{shield.name}}</span>
+              <span class="item-field-label-short">{{shield.system.levelDice}}</span>
+    
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-equip" title="Worn">{{#if shield.system.equipped}}<i
+                    class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}
+          </ul>
+    
+          <ul class="item-list alternate-list">
+            <li class="item flexrow list-item items-title-bg">
+              <span class="item-name-label-header">
+                <h3><label class="items-title-text">Equipment</label></h3>
+              </span>
+              <span class="item-field-label-long">
+                <label class="short-label">Quantity</label>
+              </span>
+              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="equipment" title="Create Item"><i class="fas fa-plus"></i></a>
+              </div>
+    
+            </li>
+            {{#each containersTree as |equip key|}}
+            {{> systems/fvtt-crucible-rpg/templates/partial-actor-equipment.html equip=equip level=1}}
+            <ul class="item-list list-item-shadow2 list-item-margin1">
+              {{#each equip.data.contents as |subgear key|}}
+              {{> systems/fvtt-crucible-rpg/templates/partial-actor-equipment.html equip=subgear level=2}}
+              {{/each}}
+            </ul>
+            {{/each}}
+          </ul>    
+    </div>
 
     </div>
 
-      {{!-- Features Tab --}}
+    {{!-- Biography Tab --}}
-      <div class="tab equipment" data-group="primary" data-tab="equipment">
+    <div class="tab biodata" data-group="primary" data-tab="biodata">
-        <div class="flexcol">
+      <div class="grid grid-2col">
-
+        <div>
-          <div><h4>Equipment</h4></div>
           <ul class="item-list alternate-list">
-            <li class="item flexrow list-item">
+            <li class="item flexrow">
-              <span class="equipement-label">Name</span>
+              <label class="generic-label">Origin</label>
-              <span class="equipement-label">Type</span>
+              <input type="text" class="" name="system.biodata.origin" value="{{data.biodata.origin}}"
-              <div class="item-controls">
+                data-dtype="String" />
-                <span class="equipement-label">&nbsp;</span>
+            </li>
-                <span class="equipement-label">&nbsp;</span>
+            <li class="item flexrow">
-                <span class="equipement-label">&nbsp;</span>
+              <label class="generic-label">Age</label>
-              </div>
+              <input type="text" class="" name="system.biodata.age" value="{{data.biodata.age}}" data-dtype="String" />
+            </li>
+            <li class="item flexrow">
+              <label class="generic-label">Height</label>
+              <input type="text" class="" name="system.biodata.height" value="{{data.biodata.height}}" data-dtype="String" />
+            </li>
+            <li class="item flexrow">
+              <label class="generic-label">Eyes</label>
+              <input type="text" class="" name="system.biodata.eyes" value="{{data.biodata.eyes}}" data-dtype="String" />
+            </li>
+            <li class="item flexrow">
+              <label class="generic-label">Hair</label>
+              <input type="text" class="" name="system.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
+            </li>
+          </ul>
+        </div>
+       <div>
+          <ul>
+            <li class="flexrow item">
+              <label class="generic-label">Size</label>
+              <select class="competence-base flexrow" type="text" name="system.biodata.size" value="{{data.biodata.size}}" data-dtype="Number">
+                {{#select data.biodata.size}}
+                <option value="1">Tiny</option>
+                <option value="2">Small</option>
+                <option value="3">Medium</option>
+                <option value="4">Large</option>
+                <option value="5">Huge</option>
+                <option value="6">Gargantuan</option>
+                {{/select}}
+              </select> 
+            </li>
+            <li class="flexrow item">
+              <label class="generic-label">Sex</label>
+              <input type="text" class="" name="system.biodata.sex" value="{{data.biodata.sex}}" data-dtype="String" />
+            </li>
+            <li class="flexrow item">
+              <label class="generic-label">Preferred Hand</label>
+              <input type="text" class="" name="system.biodata.preferredhand" value="{{data.biodata.preferredhand}}"
+                data-dtype="String" />
+            </li>
+            <li class="flexrow item" data-item-id="{{race._id}}">
+              <label class="generic-label">Race</label>
+              <a class="item-edit"><img class="stat-icon" src="{{race.img}}"></a>
+              <input type="text" class="" name="system.biodata.racename" value="{{data.biodata.racename}}" data-dtype="String" />
             </li>
-            {{#each equipments as |equip key|}}
-            <li class="item flexrow list-item" data-item-id="{{equip.id}}">
-              <img class="sheet-competence-img" src="{{equip.img}}"/>
-              <span class="equipement-label">{{equip.name}}</span>
-              <span class="equipement-label">{{equip.type}}</span>
-              <div class="item-controls">
-                <a class="item-control item-equip" title="Worn">{{#if equip.data.data.equipped}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>                  
-          {{/each}}
           </ul>
-
         </div>
       </div>
 
-      {{!-- Notes Tab --}}
+
-      <div class="tab notes" data-group="primary" data-tab="notes">        
+      <hr>
-        <article class="flexcol">
+      <h3>Background : </h3>
-          <h3>Description : </h3>
+      <div class="form-group editor">
-          <div class="form-group editor">
+        {{editor data.biodata.description target="system.biodata.description" button=true owner=owner
-            {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+        editable=editable}}
-          </div>
-          <hr>
-          <h3>Notes : </h3>
-          <div class="form-group editor">
-            {{editor content=data.notes target="data.notes" button=true owner=owner editable=editable}}
-          </div>
-          <hr>
-          {{>"systems/fvtt-fragged-kingdom/templates/editor-notes-gm.html"}}
-        </article>
       </div>
+      <hr>
+      <h3>Notes : </h3>
+      <div class="form-group editor">
+        {{editor data.biodata.notes target="system.biodata.notes" button=true owner=owner editable=editable}}
+      </div>
+      <hr>
+      </article>
+    </div>
 
-    </section>
+  </section>
-</form>
+</form>
-

templates/partial-actor-ability-block.html

@@ -2,7 +2,7 @@
   <span class="ability-label ability-margin" name="{{key}}">
     <h4 class="ability-text-white ability-margin"><a class="roll-ability ability-margin" data-ability-key="{{key}}">{{ability.label}}</a></h4>
   </span>
-  <select class="status-small-label color-class-common" type="text" name="data.abilities.{{key}}.value" value="{{ability.value}}"
+  <select class="status-small-label color-class-common" type="text" name="system.abilities.{{key}}.value" value="{{ability.value}}"
     data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
     {{#select ability.value}}
       <option value="0">0</option>

templates/partial-actor-equipment.html

@@ -7,7 +7,7 @@
   {{/if}}
 
   <span class="item-field-label-long"><label>
-    {{equip.data.quantity}}
+    {{equip.system.quantity}}
     (<a class="quantity-minus plus-minus-button">&nbsp;-</a>/<a class="quantity-plus plus-minus-button">+</a>)
   </label>
   </span>          
@@ -16,10 +16,10 @@
     &nbsp;-&nbsp;
   </span>
   <span class="item-field-label-short">
-    {{#if equip.data.iscontainer}}
+    {{#if equip.system.iscontainer}}
-      {{equip.data.contentsEnc}}
+      {{equip.system.contentsEnc}}
     {{else}}
-      {{mul equip.data.weight equip.data.quantity}}
+      {{mul equip.system.weight equip.system.quantity}}
     {{/if}}
   </span>
   <span class="item-field-label-medium">
@@ -29,7 +29,7 @@
   <div class="item-filler">&nbsp;</div>
   <div class="item-controls item-controls-fixed">
     {{#if (eq level 1)}}
-    <a class="item-control item-equip" title="Worn">{{#if equip.data.equipped}}<i
+    <a class="item-control item-equip" title="Worn">{{#if equip.system.equipped}}<i
         class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
     {{/if}}
     <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>

templates/partial-actor-status.html

@@ -3,15 +3,25 @@
     <span class="ability-label " name="hp">
       <h4 class="ability-text-white ability-margin">HP</h4>
     </span>
-    <span class="ability-label ability-margin"><input class="input-numeric-short" name="data.secondary.hp.value" value="{{data.secondary.hp.value}}"></span>
+    <span class="ability-label ability-margin">
-    <span class="ability-label ability-margin"> / {{data.secondary.hp.max}}</span>
+      <input class="input-numeric-short" name="system.secondary.hp.value" value="{{data.secondary.hp.value}}"></span>
+      {{#if (eq type "character")}}
+      <span class="ability-label ability-margin"> / {{data.secondary.hp.max}}</span>
+      {{else}}
+      <span class="ability-label ability-margin">/<input class="input-numeric-short" name="system.secondary.hp.max" value="{{data.secondary.hp.max}}"></span>
+    {{/if}}
   </li>
   <li class="item flexrow list-item" data-attr-key="hp">
     <span class="ability-label " name="hp">
       <h4 class="ability-text-white ability-margin">Effort</h4>
     </span>
-    <span class="ability-label ability-margin"><input class="input-numeric-short" name="data.secondary.effort.value" value="{{data.secondary.effort.value}}"></span>
+    <span class="ability-label ability-margin">
+      <input class="input-numeric-short" name="system.secondary.effort.value" value="{{data.secondary.effort.value}}"></span>
+    {{#if (eq type "character")}}
     <span class="ability-label ability-margin"> / {{data.secondary.effort.max}}</span>
+    {{else}}
+    <span class="ability-label ability-margin">/<input class="input-numeric-short" name="system.secondary.effort.max" value="{{data.secondary.effort.max}}"></span>
+    {{/if}}
   </li>
 
   <li>&nbsp;</li>

templates/partial-item-description.html

@@ -2,7 +2,7 @@
   <div>
     <label class="generic-label">Description</label>
     <div class="medium-editor item-text-long-line">
-    {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
+    {{editor data.description target="system.description" button=true owner=owner editable=editable}}
     </div>
   </div>
 </div>

templates/roll-dialog-generic.html

@@ -7,14 +7,55 @@
   </header>
 
     <div class="flexcol">
-
+      
-      {{#if shield}}
+      {{#if sizeDice}}
       <div class="flexrow">
-        <span class="roll-dialog-label">{{shield.name}} : </span>
+        <span class="roll-dialog-label">Size basic dices : </span>
-        <span class="roll-dialog-label">{{shield.data.shielddie}}</span>
+        <span class="roll-dialog-label">{{sizeDice.nb}}{{sizeDice.dice}}</span>
+      </div>
+
+      <div class="flexrow">
+        <span class="roll-dialog-label">Distance bonus dice(s) : </span>
+        <select class="status-small-label color-class-common" type="text" id="distanceBonusDice" value="{{distanceBonusDice}}" data-dtype="String" >
+          {{#select distanceBonusDice}}
+          <option value="0">0</option>
+          <option value="1">1</option>
+          <option value="2">2</option>
+          <option value="3">3</option>
+          <option value="4">4</option>
+          {{/select}}
+        </select>
       </div>
       {{/if}}
 
+      {{#if hasCover}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">Cover : </span>
+        <select class="status-small-label color-class-common" type="text" id="hasCover" value="{{hasCover}}" data-dtype="String" >
+          {{#select hasCover}}
+          <option value="none">None</option>
+          <option value="cover50">Cover at 50% (+1 dice)</option>
+          {{/select}}
+        </select>
+      </div>
+      {{/if}}
+
+      {{#if situational}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">Situational : </span>
+        <select class="status-small-label color-class-common" type="text" id="situational" value="{{situational}}" data-dtype="String" >
+          {{#select situational}}
+          <option value="none">None</option>
+          <option value="dodge">Dodge (+1 dice)</option>
+          <option value="prone">Prone (+1 dice)</option>
+          <option value="moving">Moving (+1 dice)</option>
+          <option value="Engaged">Engaged (+1 dice)</option>
+          {{/select}}
+        </select>
+      </div>
+      {{/if}}
+
+
       {{#if save}}
       <div class="flexrow">
         <span class="roll-dialog-label">{{save.label}} : </span>
@@ -36,6 +77,17 @@
       </div>
       {{/if}}
 
+      {{#if shield}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">Use shield ? : </span>
+        <span class="roll-dialog-label"><input type="checkbox" id="useshield" name="useshield" {{checked useshield}}/></span>
+      </div>
+      <div class="flexrow">
+        <span class="roll-dialog-label">{{shield.name}} : </span>
+        <span class="roll-dialog-label">{{shield.data.shielddie}}</span>
+      </div>
+      {{/if}}
+
       {{#if skill}}
       <div class="flexrow">
         <span class="roll-dialog-label">Skill : </span>
@@ -47,21 +99,27 @@
       </div>
       {{/if}}
 
-      <div class="flexrow">
+      {{#if noAdvantage}} 
-        <span class="roll-dialog-label">Advantage : </span>
+        <div>
-        <select class="status-small-label color-class-common" type="text" id="advantage" value="{{advantage}}" data-dtype="String" >
+          <span class="roll-dialog-label">No advantage due to condition : {{noAdvantage.name}}</span>
-          {{#select advantage}}
+        </div>
-          <option value="none">None</option>
+      {{else}}
-          <option value="advantage1">1 Advantage</option>
+        <div class="flexrow">
-          <option value="advantage2">2 Advantages</option>
+          <span class="roll-dialog-label">Advantage : </span>
-          {{/select}}
+          <select class="status-small-label color-class-common" type="text" id="advantage" value="{{advantage}}" data-dtype="String" >
-        </select>
+            {{#select advantage}}
-      </div>
+            <option value="none">None</option>
-
+            <option value="advantage1">1 Advantage</option>
+            <option value="advantage2">2 Advantages</option>
+            {{/select}}
+          </select>
+        </div>
+      {{/if}}
+      
       <div class="flexrow">
         <span class="roll-dialog-label">Disadvantage : </span>
         <select class="status-small-label color-class-common" type="text" id="disadvantage" value="{{disadvantage}}" data-dtype="String" >
-          {{#select isadvantage}}
+          {{#select disadvantage}}
           <option value="none">None</option>
           <option value="disadvantage1">1 Disadvantage</option>
           <option value="disadvantage2">2 Disadvantages</option>
@@ -80,6 +138,30 @@
         </select>
       </div>
 
+      {{#if forceAdvantage}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">1 Advantage from condition : {{forceAdvantage.name}} 
+          {{#if advantageFromTarget}} (Provided by targetted actor) {{/if}}
+        </span>
+      </div>
+      {{/if}}
+      {{#if forceDisadvantage}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">1 Disadvantage from condition : {{forceDisadvantage.name}} </span>
+      </div>
+      {{/if}}
+      {{#if forceRollAdvantage}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">Roll Advantage from condition : {{forceRollAdvantage.name}} </span>
+      </div>
+      {{/if}}
+      {{#if forceRollDisadvantage}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">Roll Disadvantage from condition : {{forceRollDisadvantage.name}} </span>
+      </div>
+      {{/if}}
+
+
   </div>
 
 </form>