Support des propriétés d'items

Amélioration de l'interface d'édition d'items

css/bol.css

@@ -427,6 +427,9 @@ a:hover {
 .bol .property {
   margin-top: 2px;
 }
+.bol .inc-dec-btns {
+  color: #4b4a44;
+}
 /* Items List */
 .items-list {
   list-style: none;

lang/en.json

@@ -24,21 +24,22 @@
 
   "BOL.ui.tab.stats": "Attributs",
   "BOL.ui.tab.combat": "Combat",
+  "BOL.ui.tab.actions": "Actions",
   "BOL.ui.tab.features": "Traits",
   "BOL.ui.tab.equipment": "Equipement",
   "BOL.ui.tab.description": "Description",
   "BOL.ui.tab.details": "Details",
 
-  "BOL.ui.properties": "Proprietes",
+  "BOL.ui.properties": "Propriétés",
   "BOL.ui.description": "Description",
   "BOL.ui.actions": "Actions",
+  "BOL.ui.capacities": "Capacités",
   "BOL.ui.damages": "Dommages",
   "BOL.ui.details": "Détails",
   "BOL.ui.category": "Catégorie",
   "BOL.ui.subcategory": "Sous-catégorie",
   "BOL.ui.type": "Type",
   "BOL.ui.subtype": "Sous-type",
-  "BOL.ui.properties": "Propriétés",
   "BOL.ui.attribute" :  "Attribut",
   "BOL.ui.aptitude" :  "Aptitude",
   "BOL.ui.advantages" : "Avantages/Désavantages",
@@ -46,11 +47,16 @@
   "BOL.ui.item": "Objet",
   "BOL.ui.edit": "Editer",
   "BOL.ui.unequip": "Déséquiper",
-  "BOL.ui.equip": "Equiper",
+  "BOL.ui.equip": "Équiper",
   "BOL.ui.delete": "Supprimer",
   "BOL.ui.roll" : "Utiliser",
   "BOL.ui.equipment" : "Équipement",
+  "BOL.ui.equipmentProperties" : "Propiétés d'équipement",
+  "BOL.ui.weaponProperties" : "Propiétés offensives",
+  "BOL.ui.protectionProperties" : "Protection",
+  "BOL.ui.magicalProperties" : "Propriétés magiques",
   "BOL.ui.armor" : "Armure",
+  "BOL.ui.reach" : "Allonge",
   "BOL.ui.weapon" : "Arme",
   "BOL.ui.melee" : "Arme de contact",
   "BOL.ui.ranged" : "Arme à distance",
@@ -59,6 +65,8 @@
   "BOL.ui.blocking" : "Blocage",
   "BOL.ui.range" : "Portée",
   "BOL.ui.quantity" : "Quantité",
+  "BOL.ui.qty" : "Qté",
+  "BOL.ui.slot" : "Empl.",
   "BOL.ui.weight" : "Poids",
   "BOL.ui.price": "Prix",
   "BOL.ui.cancel": "Annuler",
@@ -77,6 +85,13 @@
   "BOL.ui.critical" : "Succès critique",
   "BOL.ui.maneuvers" : "Actions de combat",
   "BOL.ui.stacksize" : "Taille de pile (max)",
+  "BOL.ui.weapons" : "Armes",
+  "BOL.ui.protections" : "Protections",
+  "BOL.ui.ammos" : "Munitions",
+  "BOL.ui.containers" : "Conteneurs",
+  "BOL.ui.treasure" : "Trésor",
+  "BOL.ui.vehicles" : "Véhicules/Montures",
+  "BOL.ui.misc" : "Divers",
 
   "BOL.featureCategory.origins": "Origines",
   "BOL.featureCategory.races": "Races",
@@ -140,7 +155,7 @@
   "BOL.itemProperty.bashing": "Dégâts non létaux",
   "BOL.itemProperty.stackable": "Empilable",
   "BOL.itemProperty.ranged": "A distance",
-  "BOL.itemProperty.weapon": "Arme",
+  "BOL.itemProperty.weapon": "Offensive",
   "BOL.itemProperty.reloadable": "Rechargeable",
   "BOL.itemProperty.worn": "Équipé",
   "BOL.itemProperty.spell" : "Sort",
@@ -169,7 +184,8 @@
   "BOL.itemProperty.blockingAttacksBlocked" : "Attaques bloquée",
   "BOL.itemProperty.blocking1Attack" : "Bloque 1 attaque",
   "BOL.itemProperty.blockingAllAttacks" : "Bloque toutes les attaques",
-
+  "BOL.itemProperty.slot" : "Emplacement utilisé",
+  "BOL.itemProperty.reload": "Rechargement (Actions)",
 
   "BOL.itemStat.quantity": "Quantité",
   "BOL.itemStat.weight": "Poids",
@@ -208,6 +224,23 @@
   "BOL.armorQuality.heavySup" : "Lourde Supérieure",
   "BOL.armorQuality.heavyLeg" : "Lourde Légendaire",
 
+  "BOL.equipmentSlots.none" : "-",
+  "BOL.equipmentSlots.head" : "Tête",
+  "BOL.equipmentSlots.neck" : "Cou",
+  "BOL.equipmentSlots.shoulders" : "Épaules",
+  "BOL.equipmentSlots.body" : "Corps",
+  "BOL.equipmentSlots.rhand" : "Main droite",
+  "BOL.equipmentSlots.lhand" : "Main gauche",
+  "BOL.equipmentSlots.2hands" : "2 mains",
+  "BOL.equipmentSlots.rarm" : "Bras droit",
+  "BOL.equipmentSlots.larm" : "Bras gauche",
+  "BOL.equipmentSlots.chest" : "Torse",
+  "BOL.equipmentSlots.belt" : "Ceinture",
+  "BOL.equipmentSlots.legs" : "Jambes",
+  "BOL.equipmentSlots.feet" : "Pieds",
+  "BOL.equipmentSlots.finder" : "Doigt",
+  "BOL.equipmentSlots.ear" : "Oreille",
+
 
   "BOL.range.PointBlank": "Bout portant",
   "BOL.range.Short": "Courte",

lang/fr.json

@@ -24,21 +24,22 @@
 
   "BOL.ui.tab.stats": "Attributs",
   "BOL.ui.tab.combat": "Combat",
+  "BOL.ui.tab.actions": "Actions",
   "BOL.ui.tab.features": "Traits",
   "BOL.ui.tab.equipment": "Equipement",
   "BOL.ui.tab.description": "Description",
   "BOL.ui.tab.details": "Details",
 
-  "BOL.ui.properties": "Proprietes",
+  "BOL.ui.properties": "Propriétés",
   "BOL.ui.description": "Description",
   "BOL.ui.actions": "Actions",
+  "BOL.ui.capacities": "Capacités",
   "BOL.ui.damages": "Dommages",
   "BOL.ui.details": "Détails",
   "BOL.ui.category": "Catégorie",
   "BOL.ui.subcategory": "Sous-catégorie",
   "BOL.ui.type": "Type",
   "BOL.ui.subtype": "Sous-type",
-  "BOL.ui.properties": "Propriétés",
   "BOL.ui.attribute" :  "Attribut",
   "BOL.ui.aptitude" :  "Aptitude",
   "BOL.ui.advantages" : "Avantages/Désavantages",
@@ -46,11 +47,16 @@
   "BOL.ui.item": "Objet",
   "BOL.ui.edit": "Editer",
   "BOL.ui.unequip": "Déséquiper",
-  "BOL.ui.equip": "Equiper",
+  "BOL.ui.equip": "Équiper",
   "BOL.ui.delete": "Supprimer",
   "BOL.ui.roll" : "Utiliser",
   "BOL.ui.equipment" : "Équipement",
+  "BOL.ui.equipmentProperties" : "Propiétés d'équipement",
+  "BOL.ui.weaponProperties" : "Propiétés offensives",
+  "BOL.ui.protectionProperties" : "Protection",
+  "BOL.ui.magicalProperties" : "Propriétés magiques",
   "BOL.ui.armor" : "Armure",
+  "BOL.ui.reach" : "Allonge",
   "BOL.ui.weapon" : "Arme",
   "BOL.ui.melee" : "Arme de contact",
   "BOL.ui.ranged" : "Arme à distance",
@@ -59,6 +65,8 @@
   "BOL.ui.blocking" : "Blocage",
   "BOL.ui.range" : "Portée",
   "BOL.ui.quantity" : "Quantité",
+  "BOL.ui.qty" : "Qté",
+  "BOL.ui.slot" : "Empl.",
   "BOL.ui.weight" : "Poids",
   "BOL.ui.price": "Prix",
   "BOL.ui.cancel": "Annuler",
@@ -77,6 +85,15 @@
   "BOL.ui.critical" : "Succès critique",
   "BOL.ui.maneuvers" : "Actions de combat",
   "BOL.ui.stacksize" : "Taille de pile (max)",
+  "BOL.ui.weapons" : "Armes",
+  "BOL.ui.protections" : "Protections",
+  "BOL.ui.ammos" : "Munitions",
+  "BOL.ui.containers" : "Conteneurs",
+  "BOL.ui.treasure" : "Trésor",
+  "BOL.ui.vehicles" : "Véhicules/Montures",
+  "BOL.ui.misc" : "Divers",
+  "BOL.ui.vehicleProperties" : " Propriétés de véhicule",
+  "BOL.ui.speed" : "Vitesse",
 
   "BOL.featureCategory.origins": "Origines",
   "BOL.featureCategory.races": "Races",
@@ -140,7 +157,7 @@
   "BOL.itemProperty.bashing": "Dégâts non létaux",
   "BOL.itemProperty.stackable": "Empilable",
   "BOL.itemProperty.ranged": "A distance",
-  "BOL.itemProperty.weapon": "Arme",
+  "BOL.itemProperty.weapon": "Offensive",
   "BOL.itemProperty.reloadable": "Rechargeable",
   "BOL.itemProperty.worn": "Équipé",
   "BOL.itemProperty.spell" : "Sort",
@@ -169,7 +186,8 @@
   "BOL.itemProperty.blockingAttacksBlocked" : "Attaques bloquée",
   "BOL.itemProperty.blocking1Attack" : "Bloque 1 attaque",
   "BOL.itemProperty.blockingAllAttacks" : "Bloque toutes les attaques",
-
+  "BOL.itemProperty.slot" : "Emplacement utilisé",
+  "BOL.itemProperty.reload": "Rechargement (Actions)",
 
   "BOL.itemStat.quantity": "Quantité",
   "BOL.itemStat.weight": "Poids",
@@ -208,6 +226,28 @@
   "BOL.armorQuality.heavySup" : "Lourde Supérieure",
   "BOL.armorQuality.heavyLeg" : "Lourde Légendaire",
 
+  "BOL.equipmentSlots.none" : "-",
+  "BOL.equipmentSlots.head" : "Tête",
+  "BOL.equipmentSlots.neck" : "Cou",
+  "BOL.equipmentSlots.shoulders" : "Épaules",
+  "BOL.equipmentSlots.body" : "Corps",
+  "BOL.equipmentSlots.rhand" : "Main droite",
+  "BOL.equipmentSlots.lhand" : "Main gauche",
+  "BOL.equipmentSlots.2hands" : "2 mains",
+  "BOL.equipmentSlots.rarm" : "Bras droit",
+  "BOL.equipmentSlots.larm" : "Bras gauche",
+  "BOL.equipmentSlots.chest" : "Torse",
+  "BOL.equipmentSlots.belt" : "Ceinture",
+  "BOL.equipmentSlots.legs" : "Jambes",
+  "BOL.equipmentSlots.feet" : "Pieds",
+  "BOL.equipmentSlots.finder" : "Doigt",
+  "BOL.equipmentSlots.ear" : "Oreille",
+
+  "BOL.vehicleCategory.mount" : "Monture terrestre",
+  "BOL.vehicleCategory.flying" : "Monture volante",
+  "BOL.vehicleCategory.boat" : "Bateau",
+  "BOL.vehicleCategory.other" : "Autre",
+
 
   "BOL.range.PointBlank": "Bout portant",
   "BOL.range.Short": "Courte",

module/actor/actor-sheet.js

@@ -38,11 +38,53 @@ export class BoLActorSheet extends ActorSheet {
     // Equip/Unequip item
     html.find('.item-equip').click(this._onToggleEquip.bind(this));
 
+    // Incr./Decr. career ranks
+    html.find(".inc-dec-btns").click((ev) => {
+      const li = $(ev.currentTarget).parents(".item");
+      if(li){
+        const item = this.actor.items.get(li.data("itemId"));
+        if(item){
+          const dataset = ev.currentTarget.dataset;
+          const operator = dataset.operator;
+          const target = dataset.target;
+          const incr = parseInt(dataset.incr);
+          const min = parseInt(dataset.min);
+          const max = parseInt(dataset.max);
+          const itemData = item.data;
+          let value = eval("itemData."+target);
+          if(operator === "minus"){
+            if(value >= min + incr) value -= incr;
+            else value = min;
+          }
+          if(operator === "plus"){
+            if(value <= max - incr) value += incr;
+            else value = max;
+          }
+          let update = {};
+          update[target] = value;
+          item.update(update);
+        }
+      }
+      // const input = html.find("#" + type);
+      // let value = parseInt(input.val(), 10) || 0;
+      // value += operator === "plus" ? 1 : -1;
+      // input.val(value > 0 ? value : 0);
+    });
+
+
     // Delete Inventory Item
     html.find('.item-delete').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
+      Dialog.confirm({
-      this.actor.deleteEmbeddedDocuments("Item", [li.data("itemId")])
+        title: "Suppression",
-      li.slideUp(200, () => this.render(false));
+        content: `Vous êtes sûr de vouloir supprimer cet item ?`,
+        yes: () => {
+          const li = $(ev.currentTarget).parents(".item");
+          this.actor.deleteEmbeddedDocuments("Item", [li.data("itemId")])
+          li.slideUp(200, () => this.render(false));
+        },
+        no: () => {},
+        defaultYes: false,
+      });
     });
 
     // Rollable abilities.
@@ -65,17 +107,28 @@ export class BoLActorSheet extends ActorSheet {
 
   /** @override */
   getData(options) {
-    const actorData = super.getData(options);
+    const data = super.getData(options);
-    actorData.data = {
+    const actorData = data.data;
-      details : this.actor.details,
+    data.config = game.bol.config;
-      attributes : this.actor.attributes,
+    data.data = actorData.data;
-      aptitudes : this.actor.aptitudes,
+    data.details = this.actor.details;
-      resources : this.actor.resources,
+    data.attributes = this.actor.attributes;
-      equipment : this.actor.equipment,
+    data.aptitudes = this.actor.aptitudes;
-      combat : this.actor.buildCombat(),
+    data.resources = this.actor.resources;
-      features : this.actor.buildFeatures()
+    data.equipment = this.actor.equipment;
-    };
+    data.weapons = this.actor.weapons;
-    return actorData;
+    data.protections = this.actor.protections;
+    data.containers = this.actor.containers;
+    data.treasure = this.actor.treasure;
+    data.vehicles = this.actor.vehicles;
+    data.ammos = this.actor.ammos;
+    data.misc = this.actor.misc;
+    data.combat = this.actor.buildCombat();
+    data.features = this.actor.buildFeatures();
+    data.isGM = game.user.isGM;
+
+    console.log("ACTORDATA", data);
+    return data;
   }
   /* -------------------------------------------- */
 

module/actor/actor.js

@@ -68,27 +68,50 @@ export class BoLActor extends Actor {
   get equipment() {
     return this.itemData.filter(i => i.type === "item");
   }
-  get weapons() {
-    return this.itemData.filter(i => i.type === "item" && i.data.subtype === "weapon");
-  }
   get armors() {
-    return this.itemData.filter(i => i.type === "item" && i.data.subtype === "armor" && i.data.worn === true);
+    return this.itemData.filter(i => i.type === "item"  && i.data.category === "equipment" && i.data.subtype === "armor");
   }
   get helms() {
-    return this.itemData.filter(i => i.type === "item" && i.data.subtype === "helm" && i.data.worn === true);
+    return this.itemData.filter(i => i.type === "item" && i.data.category === "equipment" && i.data.subtype === "helm");
   }
   get shields() {
-    return this.itemData.filter(i => i.type === "item" && i.data.subtype === "shield" && i.data.worn === true);
+    return this.itemData.filter(i => i.type === "item" && i.data.category === "equipment" && i.data.subtype === "shield");
+  }
+
+  get weapons() {
+    return this.itemData.filter(i => i.type === "item" && i.data.category === "equipment" && i.data.subtype === "weapon");
   }
   get protections() {
-    return this.armors.concat(this.helms)
+    return this.armors.concat(this.helms).concat(this.shields)
   }
+
   get melee() {
-    return this.weapons.filter(i => i.data.properties.melee === true && i.data.worn === true);
+    return this.weapons.filter(i => i.data.properties.melee === true);
   }
   get ranged() {
-    return this.weapons.filter(i => i.data.properties.ranged === true && i.data.worn === true);
+    return this.weapons.filter(i => i.data.properties.ranged === true);
   }
+
+  get containers() {
+    return this.itemData.filter(i => i.type === "item" && i.data.category === "equipment" && i.data.subtype === "container");
+  }
+
+  get treasure() {
+    return this.itemData.filter(i => i.type === "item" && i.data.category === "equipment" && i.data.subtype === "currency");
+  }
+
+  get vehicles() {
+    return this.itemData.filter(i => i.type === "item" && i.data.category === "vehicle");
+  }
+
+  get ammos() {
+    return this.itemData.filter(i => i.type === "item" && i.data.category === "equipment" && i.data.subtype === "ammunition");
+  }
+
+  get misc() {
+    return this.itemData.filter(i => i.type === "item" && i.data.category === "equipment" && (i.data.subtype === "other" ||i.data.subtype === "container" ||i.data.subtype === "scroll" || i.data.subtype === "jewel"));
+  }
+
   buildFeatures(){
     return {
       "careers": {

module/controllers/bol-rolls.js

@@ -34,9 +34,9 @@ export class BoLRoll {
             adv:adv,
             mod: mod,
             attr:attribute,
-            careers:actorData.data.features.careers,
+            careers:actorData.features.careers,
-            boons:actorData.data.features.boons,
+            boons:actorData.features.boons,
-            flaws:actorData.data.features.flaws
+            flaws:actorData.features.flaws
         };
         const rollOptionContent = await renderTemplate(rollOptionTpl, dialogData);
         let d = new Dialog({
@@ -80,9 +80,9 @@ export class BoLRoll {
             adv:adv,
             mod: mod,
             apt:aptitude,
-            careers:actorData.data.features.careers,
+            careers:actorData.features.careers,
-            boons:actorData.data.features.boons,
+            boons:actorData.features.boons,
-            flaws:actorData.data.features.flaws
+            flaws:actorData.features.flaws
         };
         const rollOptionContent = await renderTemplate(rollOptionTpl, dialogData);
         let d = new Dialog({

module/system/config.js

@@ -17,6 +17,25 @@ BOL.damageValues = {
     "d6BB" : "d6B + dé bonus",
 }
 
+BOL.equipmentSlots = {
+    "none" : "BOL.equipmentSlots.none",
+    "head" : "BOL.equipmentSlots.head",
+    "neck" : "BOL.equipmentSlots.neck",
+    "shoulders" : "BOL.equipmentSlots.shoulders",
+    "body" : "BOL.equipmentSlots.body",
+    "rhand" : "BOL.equipmentSlots.rhand",
+    "lhand" : "BOL.equipmentSlots.lhand",
+    "2hands" : "BOL.equipmentSlots.2hands",
+    "rarm" : "BOL.equipmentSlots.rarm",
+    "larm" : "BOL.equipmentSlots.larm",
+    "chest" : "BOL.equipmentSlots.chest",
+    "belt" : "BOL.equipmentSlots.belt",
+    "legs" : "BOL.equipmentSlots.legs",
+    "feet" : "BOL.equipmentSlots.feet",
+    "finder" : "BOL.equipmentSlots.finder",
+    "ear" : "BOL.equipmentSlots.ear"
+}
+
 BOL.armorQualities = {
     "none" : "BOL.armorQuality.none",
     "light" : "BOL.armorQuality.light",
@@ -83,13 +102,6 @@ BOL.itemCategories = {
 }
 
 BOL.itemSubtypes = {
-    "equipment" : "BOL.equipmentCategory.equipment",
-    "protection" : "BOL.equipmentCategory.protection",
-    "weapon" : "BOL.equipmentCategory.weapon",
-    "magical" : "BOL.equipmentCategory.magical"
-}
-
-BOL.equipmentCategories = {
     "armor" : "BOL.equipmentCategory.armor",
     "weapon" : "BOL.equipmentCategory.weapon",
     "shield" : "BOL.equipmentCategory.shield",
@@ -102,6 +114,26 @@ BOL.equipmentCategories = {
     "other" : "BOL.equipmentCategory.other"
 }
 
+BOL.vehicleSubtypes = {
+    "mount" : "BOL.vehicleCategory.mount",
+    "flying" : "BOL.vehicleCategory.flying",
+    "boat" : "BOL.vehicleCategory.boat",
+    "other" : "BOL.vehicleCategory.other"
+}
+
+// BOL.equipmentCategories = {
+//     "armor" : "BOL.equipmentCategory.armor",
+//     "weapon" : "BOL.equipmentCategory.weapon",
+//     "shield" : "BOL.equipmentCategory.shield",
+//     "helm" : "BOL.equipmentCategory.helm",
+//     "jewel" : "BOL.equipmentCategory.jewel",
+//     "scroll" : "BOL.equipmentCategory.scroll",
+//     "container" : "BOL.equipmentCategory.container",
+//     "ammunition" : "BOL.equipmentCategory.ammunition",
+//     "currency" : "BOL.equipmentCategory.currency",
+//     "other" : "BOL.equipmentCategory.other"
+// }
+
 BOL.protectionCategories = {
     "armor" : "BOL.protectionCategory.armor",
     "shield" : "BOL.protectionCategory.shield",

module/system/templates.js

@@ -11,6 +11,7 @@ export const preloadHandlebarsTemplates = async function () {
         "systems/bol/templates/actor/parts/actor-header.hbs",
         "systems/bol/templates/actor/parts/tabs/actor-stats.hbs",
         "systems/bol/templates/actor/parts/tabs/actor-combat.hbs",
+        "systems/bol/templates/actor/parts/tabs/actor-actions.hbs",
         "systems/bol/templates/actor/parts/tabs/actor-features.hbs",
         "systems/bol/templates/actor/parts/tabs/actor-equipment.hbs",
         // ITEMS
@@ -18,6 +19,7 @@ export const preloadHandlebarsTemplates = async function () {
         "systems/bol/templates/item/parts/properties/feature-properties.hbs",
         "systems/bol/templates/item/parts/properties/item-properties.hbs",
         "systems/bol/templates/item/parts/properties/item/equipment-properties.hbs",
+        "systems/bol/templates/item/parts/properties/item/vehicle-properties.hbs",
         "systems/bol/templates/item/parts/properties/item/protection-properties.hbs",
         "systems/bol/templates/item/parts/properties/item/weapon-properties.hbs",
         "systems/bol/templates/item/parts/properties/item/magical-properties.hbs",

styles/global/forms.less

@@ -238,11 +238,11 @@
   }
 
   :-ms-input-placeholder { /* Internet Explorer 10-11 */
-    color: lightgray;;
+    color: lightgray;
   }
 
   ::-ms-input-placeholder { /* Microsoft Edge */
-    color: lightgray;;
+    color: lightgray;
   }
 
   input::placeholder {
@@ -252,4 +252,8 @@
   .property {
     margin-top: 2px;
   }
+
+  .inc-dec-btns {
+    color:@colorOlive;
+  }
 }

template.json

@@ -140,6 +140,7 @@
         "quantity": 1,
         "weight": 0,
         "price": 0,
+        "worn": false,
         "properties" : {
           "ranged": false,
           "melee": false,

templates/actor/actor-sheet.hbs

@@ -9,7 +9,7 @@
             {{!-- Sheet Tab Navigation --}}
             <nav class="sheet-tabs tabs" data-group="primary">
                 <a class="item" data-tab="stats">{{localize "BOL.ui.tab.stats"}}</a>
-                <a class="item" data-tab="combat">{{localize "BOL.ui.tab.combat"}}</a>
+                <a class="item" data-tab="actions">{{localize "BOL.ui.tab.actions"}}</a>
                 <a class="item" data-tab="features">{{localize "BOL.ui.tab.features"}}</a>
                 <a class="item" data-tab="equipment">{{localize "BOL.ui.tab.equipment"}}</a>
                 <a class="item" data-tab="description">{{localize "BOL.ui.tab.description"}}</a>
@@ -17,6 +17,9 @@
             {{!-- Sheet Body --}}
             <section class="sheet-body">
                 <div class="tab stats" data-group="primary" data-tab="stats">{{> "systems/bol/templates/actor/parts/tabs/actor-stats.hbs"}}</div>
+                <div class="tab actions" data-group="primary" data-tab="actions">
+                    {{> "systems/bol/templates/actor/parts/tabs/actor-actions.hbs"}}
+                </div>
                 <div class="tab combat" data-group="primary" data-tab="combat">
                     {{> "systems/bol/templates/actor/parts/tabs/actor-combat.hbs"}}
                 </div>

templates/actor/parts/tabs/actor-actions.hbs

@@ -0,0 +1,7 @@
+<ol class="items-list">
+    <li class="item flexrow item-header">
+        <div class="item-name flex2">{{localize "BOL.ui.maneuvers"}}</div>
+    </li>
+    <li class="item flexrow"><div class="item-image roll-weapon"><img src="icons/skills/melee/unarmed-punch-fist.webp" title="Attaque à mains nues"/></div><h4 class="item-name flex2"><a class="item-edit">Attaque à mains nues</a></h4></li>
+</ol>
+

templates/actor/parts/tabs/actor-combat.hbs

@@ -2,7 +2,10 @@
     <li class="item flexrow item-header">
         <div class="item-name flex2">{{localize "BOL.ui.maneuvers"}}</div>
     </li>
-    <li class="item flexrow"><div class="item-image roll-weapon"><img src="icons/skills/melee/unarmed-punch-fist.webp" title="Attaque à mains nues"/></div><h4 class="item-name flex2"><a class="item-edit">Attaque à mains nues</a></h4></li>
+    <li class="item flexrow">
+        <div class="item-image roll-weapon"><img src="icons/skills/melee/unarmed-punch-fist.webp" title="Attaque à mains nues"/></div>
+        <h4 class="item-name flex2"><a class="item-edit">Attaque à mains nues</a></h4>
+    </li>
 </ol>
 
 {{#each data.combat as | combat id|}}

templates/actor/parts/tabs/actor-equipment.hbs

@@ -1,22 +1,326 @@
+<!--ARMES-->
 <ol class="items-list">
     <li class="item flexrow item-header">
-        <div class="item-name flex3">{{localize "BOL.itemCategory.equipment"}}</div>
+        <div class="item-name flex4 left">{{localize "BOL.ui.weapons"}}</div>
-        <div class="item-field">{{localize "BOL.ui.quantity"}}</div>
+        <div class="item-field flex2 center">{{localize "BOL.ui.slot"}}</div>
-        <div class="item-field"></div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.qty"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.price"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.equip"}}</div>
+        <div class="item-field flex1 right"></div>
     </li>
-    {{#each data.equipment as |item id|}}
+{{#each weapons as |item id|}}
-        <li class="item flexrow" data-item-id="{{item._id}}">
+    <li class="item flexrow" data-item-id="{{item._id}}">
+        <h4 class="item-name flex4 left">
             <div class="item-image"><img src="{{item.img}}" title="{{item.name}}"/></div>
-            <h4 class="item-name flex3"><a class="item-edit">{{item.name}}</a></h4>
+            <a class="item-edit">{{item.name}}</a>
-            <div class="item-field">{{item.data.quantity}}</div>
+        </h4>
+        <div class="item-field flex2 center">
+    {{#if item.data.properties.equipable}}
+            <span class="item-field" style="font-size: smaller; font-style: italic; color:#4b4a44">{{localize (concat "BOL.equipmentSlots." item.data.properties.slot)}}</span>
+    {{/if}}
+        </div>
+        <div class="item-field group-btns flex1 center">
+        {{#if item.data.properties.stackable}}
+            <a class="inc-dec-btns" data-operator="minus" data-target="data.quantity" data-incr="1" data-min="0" data-max="{{item.data.properties.stacksize}}"><i class="fas fa-minus-square"></i></a>&nbsp;
+            <span class="item-field">{{item.data.quantity}}</span>&nbsp;
+            <a class="inc-dec-btns" data-operator="plus" data-target="data.quantity" data-incr="1" data-min="0" data-max="{{item.data.properties.stacksize}}"><i class="fas fa-plus-square"></i></a>
+        {{/if}}
+        </div>
+        <div class="item-field flex1 center">
+            <span class="item-field">{{item.data.price}}</span>
+        </div>
+        <div class="item-field flex1 center">
             {{#if data.properties.equipable}}
                 {{#if data.worn}}
-                    <div class="item-controls-1"><a class="item-control item-equip" title="{{localize "BOL.ui.unequip"}}"><i class="fas fa-shield-alt"></i></a></div>
+                    <span class="item-field"><a class="item-control item-equip" title="{{localize "BOL.ui.unequip"}}"><i class="fas fa-shield-alt"></i></a></span>
                 {{else}}
-                    <div class="item-controls-1"><a class="item-control item-equip" title="{{localize "BOL.ui.equip"}}" style="color:lightgray;"><i class="fas fa-shield-alt"></i></a></div>
+                    <span class="item-field"><a class="item-control item-equip" title="{{localize "BOL.ui.equip"}}" style="color:lightgray;"><i class="fas fa-shield-alt"></i></a></span>
                 {{/if}}
             {{/if}}
-            <div class="item-controls-1">
+        </div>
+        <div class="item-field flex1 right">
+            <a class="item-control item-delete" title="{{localize "BOL.ui.delete"}}"><i class="fas fa-trash"></i></a>
+        </div>
+</li>
+{{/each}}
+</ol>
+
+<!--PROTECTIONS-->
+<ol class="items-list">
+    <li class="item flexrow item-header">
+        <div class="item-name flex4 left">{{localize "BOL.ui.protections"}}</div>
+        <div class="item-field flex2 center">{{localize "BOL.ui.slot"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.qty"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.price"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.equip"}}</div>
+        <div class="item-field flex1 right"></div>
+    </li>
+    {{#each protections as |item id|}}
+        <li class="item flexrow" data-item-id="{{item._id}}">
+            <h4 class="item-name flex4 left">
+                <div class="item-image"><img src="{{item.img}}" title="{{item.name}}"/></div>
+                <a class="item-edit">{{item.name}}</a>
+            </h4>
+            <div class="item-field flex2 center">
+                {{#if item.data.properties.equipable}}
+                    <span class="item-field" style="font-size: smaller; font-style: italic; color:#4b4a44">{{localize (concat "BOL.equipmentSlots." item.data.properties.slot)}}</span>
+                {{/if}}
+            </div>
+            <div class="item-field group-btns flex1 center">
+                {{#if item.data.properties.stackable}}
+                    <a class="inc-dec-btns" data-operator="minus" data-target="data.quantity" data-incr="1" data-min="0" data-max="{{item.data.properties.stacksize}}"><i class="fas fa-minus-square"></i></a>&nbsp;
+                    <span class="item-field">{{item.data.quantity}}</span>&nbsp;
+                    <a class="inc-dec-btns" data-operator="plus" data-target="data.quantity" data-incr="1" data-min="0" data-max="{{item.data.properties.stacksize}}"><i class="fas fa-plus-square"></i></a>
+                {{/if}}
+            </div>
+            <div class="item-field flex1 center">
+                <span class="item-field">{{item.data.price}}</span>
+            </div>
+            <div class="item-field flex1 center">
+                {{#if data.properties.equipable}}
+                    {{#if data.worn}}
+                        <span class="item-field"><a class="item-control item-equip" title="{{localize "BOL.ui.unequip"}}"><i class="fas fa-shield-alt"></i></a></span>
+                    {{else}}
+                        <span class="item-field"><a class="item-control item-equip" title="{{localize "BOL.ui.equip"}}" style="color:lightgray;"><i class="fas fa-shield-alt"></i></a></span>
+                    {{/if}}
+                {{/if}}
+            </div>
+            <div class="item-field flex1 right">
+                <a class="item-control item-delete" title="{{localize "BOL.ui.delete"}}"><i class="fas fa-trash"></i></a>
+            </div>
+        </li>
+    {{/each}}
+</ol>
+
+<!--MUNITIONS-->
+<ol class="items-list">
+    <li class="item flexrow item-header">
+        <div class="item-name flex4 left">{{localize "BOL.ui.ammos"}}</div>
+        <div class="item-field flex2 center">{{localize "BOL.ui.slot"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.qty"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.price"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.equip"}}</div>
+        <div class="item-field flex1 right"></div>
+    </li>
+    {{#each ammos as |item id|}}
+        <li class="item flexrow" data-item-id="{{item._id}}">
+            <h4 class="item-name flex4 left">
+                <div class="item-image"><img src="{{item.img}}" title="{{item.name}}"/></div>
+                <a class="item-edit">{{item.name}}</a>
+            </h4>
+            <div class="item-field flex2 center">
+                {{#if item.data.properties.equipable}}
+                    <span class="item-field" style="font-size: smaller; font-style: italic; color:#4b4a44">{{localize (concat "BOL.equipmentSlots." item.data.properties.slot)}}</span>
+                {{/if}}
+            </div>
+            <div class="item-field group-btns flex1 center">
+                {{#if item.data.properties.stackable}}
+                    <a class="inc-dec-btns" data-operator="minus" data-target="data.quantity" data-incr="1" data-min="0" data-max="{{item.data.properties.stacksize}}"><i class="fas fa-minus-square"></i></a>&nbsp;
+                    <span class="item-field">{{item.data.quantity}}</span>&nbsp;
+                    <a class="inc-dec-btns" data-operator="plus" data-target="data.quantity" data-incr="1" data-min="0" data-max="{{item.data.properties.stacksize}}"><i class="fas fa-plus-square"></i></a>
+                {{/if}}
+            </div>
+            <div class="item-field flex1 center">
+                <span class="item-field">{{item.data.price}}</span>
+            </div>
+            <div class="item-field flex1 center">
+                {{#if data.properties.equipable}}
+                    {{#if data.worn}}
+                        <span class="item-field"><a class="item-control item-equip" title="{{localize "BOL.ui.unequip"}}"><i class="fas fa-shield-alt"></i></a></span>
+                    {{else}}
+                        <span class="item-field"><a class="item-control item-equip" title="{{localize "BOL.ui.equip"}}" style="color:lightgray;"><i class="fas fa-shield-alt"></i></a></span>
+                    {{/if}}
+                {{/if}}
+            </div>
+            <div class="item-field flex1 right">
+                <a class="item-control item-delete" title="{{localize "BOL.ui.delete"}}"><i class="fas fa-trash"></i></a>
+            </div>
+        </li>
+    {{/each}}
+</ol>
+
+<!--CONTENEURS-->
+<ol class="items-list">
+    <li class="item flexrow item-header">
+        <div class="item-name flex4 left">{{localize "BOL.ui.containers"}}</div>
+        <div class="item-field flex2 center">{{localize "BOL.ui.slot"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.qty"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.price"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.equip"}}</div>
+        <div class="item-field flex1 right"></div>
+    </li>
+    {{#each containers as |item id|}}
+        <li class="item flexrow" data-item-id="{{item._id}}">
+            <h4 class="item-name flex4 left">
+                <div class="item-image"><img src="{{item.img}}" title="{{item.name}}"/></div>
+                <a class="item-edit">{{item.name}}</a>
+            </h4>
+            <div class="item-field flex2 center">
+                {{#if item.data.properties.equipable}}
+                    <span class="item-field" style="font-size: smaller; font-style: italic; color:#4b4a44">{{localize (concat "BOL.equipmentSlots." item.data.properties.slot)}}</span>
+                {{/if}}
+            </div>
+            <div class="item-field group-btns flex1 center">
+                {{#if item.data.properties.stackable}}
+                    <a class="inc-dec-btns" data-operator="minus" data-target="data.quantity" data-incr="1" data-min="0" data-max="{{item.data.properties.stacksize}}"><i class="fas fa-minus-square"></i></a>&nbsp;
+                    <span class="item-field">{{item.data.quantity}}</span>&nbsp;
+                    <a class="inc-dec-btns" data-operator="plus" data-target="data.quantity" data-incr="1" data-min="0" data-max="{{item.data.properties.stacksize}}"><i class="fas fa-plus-square"></i></a>
+                {{/if}}
+            </div>
+            <div class="item-field flex1 center">
+                <span class="item-field">{{item.data.price}}</span>
+            </div>
+            <div class="item-field flex1 center">
+                {{#if data.properties.equipable}}
+                    {{#if data.worn}}
+                        <span class="item-field"><a class="item-control item-equip" title="{{localize "BOL.ui.unequip"}}"><i class="fas fa-shield-alt"></i></a></span>
+                    {{else}}
+                        <span class="item-field"><a class="item-control item-equip" title="{{localize "BOL.ui.equip"}}" style="color:lightgray;"><i class="fas fa-shield-alt"></i></a></span>
+                    {{/if}}
+                {{/if}}
+            </div>
+            <div class="item-field flex1 right">
+                <a class="item-control item-delete" title="{{localize "BOL.ui.delete"}}"><i class="fas fa-trash"></i></a>
+            </div>
+        </li>
+    {{/each}}
+</ol>
+
+<!--TRESOR-->
+<ol class="items-list">
+    <li class="item flexrow item-header">
+        <div class="item-name flex4 left">{{localize "BOL.ui.treasure"}}</div>
+        <div class="item-field flex2 center">{{localize "BOL.ui.slot"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.qty"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.price"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.equip"}}</div>
+        <div class="item-field flex1 right"></div>
+    </li>
+    {{#each treasure as |item id|}}
+        <li class="item flexrow" data-item-id="{{item._id}}">
+            <h4 class="item-name flex4 left">
+                <div class="item-image"><img src="{{item.img}}" title="{{item.name}}"/></div>
+                <a class="item-edit">{{item.name}}</a>
+            </h4>
+            <div class="item-field flex2 center">
+                {{#if item.data.properties.equipable}}
+                    <span class="item-field" style="font-size: smaller; font-style: italic; color:#4b4a44">{{localize (concat "BOL.equipmentSlots." item.data.properties.slot)}}</span>
+                {{/if}}
+            </div>
+            <div class="item-field group-btns flex1 center">
+                {{#if item.data.properties.stackable}}
+                    <a class="inc-dec-btns" data-operator="minus" data-target="data.quantity" data-incr="1" data-min="0" data-max="{{item.data.properties.stacksize}}"><i class="fas fa-minus-square"></i></a>&nbsp;
+                    <span class="item-field">{{item.data.quantity}}</span>&nbsp;
+                    <a class="inc-dec-btns" data-operator="plus" data-target="data.quantity" data-incr="1" data-min="0" data-max="{{item.data.properties.stacksize}}"><i class="fas fa-plus-square"></i></a>
+                {{/if}}
+            </div>
+            <div class="item-field flex1 center">
+                <span class="item-field">{{item.data.price}}</span>
+            </div>
+            <div class="item-field flex1 center">
+                {{#if data.properties.equipable}}
+                    {{#if data.worn}}
+                        <span class="item-field"><a class="item-control item-equip" title="{{localize "BOL.ui.unequip"}}"><i class="fas fa-shield-alt"></i></a></span>
+                    {{else}}
+                        <span class="item-field"><a class="item-control item-equip" title="{{localize "BOL.ui.equip"}}" style="color:lightgray;"><i class="fas fa-shield-alt"></i></a></span>
+                    {{/if}}
+                {{/if}}
+            </div>
+            <div class="item-field flex1 right">
+                <a class="item-control item-delete" title="{{localize "BOL.ui.delete"}}"><i class="fas fa-trash"></i></a>
+            </div>
+        </li>
+    {{/each}}
+</ol>
+
+<!--VEHICULES-->
+<ol class="items-list">
+    <li class="item flexrow item-header">
+        <div class="item-name flex4 left">{{localize "BOL.ui.vehicles"}}</div>
+        <div class="item-field flex2 center">{{localize "BOL.ui.slot"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.qty"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.price"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.equip"}}</div>
+        <div class="item-field flex1 right"></div>
+    </li>
+    {{#each vehicles as |item id|}}
+        <li class="item flexrow" data-item-id="{{item._id}}">
+            <h4 class="item-name flex4 left">
+                <div class="item-image"><img src="{{item.img}}" title="{{item.name}}"/></div>
+                <a class="item-edit">{{item.name}}</a>
+            </h4>
+            <div class="item-field flex2 center">
+                {{#if item.data.properties.equipable}}
+                    <span class="item-field" style="font-size: smaller; font-style: italic; color:#4b4a44">{{localize (concat "BOL.equipmentSlots." item.data.properties.slot)}}</span>
+                {{/if}}
+            </div>
+            <div class="item-field group-btns flex1 center">
+                {{#if item.data.properties.stackable}}
+                    <a class="inc-dec-btns" data-operator="minus" data-target="data.quantity" data-incr="1" data-min="0" data-max="{{item.data.properties.stacksize}}"><i class="fas fa-minus-square"></i></a>&nbsp;
+                    <span class="item-field">{{item.data.quantity}}</span>&nbsp;
+                    <a class="inc-dec-btns" data-operator="plus" data-target="data.quantity" data-incr="1" data-min="0" data-max="{{item.data.properties.stacksize}}"><i class="fas fa-plus-square"></i></a>
+                {{/if}}
+            </div>
+            <div class="item-field flex1 center">
+                <span class="item-field">{{item.data.price}}</span>
+            </div>
+            <div class="item-field flex1 center">
+                {{#if data.properties.equipable}}
+                    {{#if data.worn}}
+                        <span class="item-field"><a class="item-control item-equip" title="{{localize "BOL.ui.unequip"}}"><i class="fas fa-shield-alt"></i></a></span>
+                    {{else}}
+                        <span class="item-field"><a class="item-control item-equip" title="{{localize "BOL.ui.equip"}}" style="color:lightgray;"><i class="fas fa-shield-alt"></i></a></span>
+                    {{/if}}
+                {{/if}}
+            </div>
+            <div class="item-field flex1 right">
+                <a class="item-control item-delete" title="{{localize "BOL.ui.delete"}}"><i class="fas fa-trash"></i></a>
+            </div>
+        </li>
+    {{/each}}
+</ol>
+
+<!--DIVERS-->
+<ol class="items-list">
+    <li class="item flexrow item-header">
+        <div class="item-name flex4 left">{{localize "BOL.ui.misc"}}</div>
+        <div class="item-field flex2 center">{{localize "BOL.ui.slot"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.qty"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.price"}}</div>
+        <div class="item-field flex1 center">{{localize "BOL.ui.equip"}}</div>
+        <div class="item-field flex1 right"></div>
+    </li>
+    {{#each misc as |item id|}}
+        <li class="item flexrow" data-item-id="{{item._id}}">
+            <h4 class="item-name flex4 left">
+                <div class="item-image"><img src="{{item.img}}" title="{{item.name}}"/></div>
+                <a class="item-edit">{{item.name}}</a>
+            </h4>
+            <div class="item-field flex2 center">
+                {{#if item.data.properties.equipable}}
+                    <span class="item-field" style="font-size: smaller; font-style: italic; color:#4b4a44">{{localize (concat "BOL.equipmentSlots." item.data.properties.slot)}}</span>
+                {{/if}}
+            </div>
+            <div class="item-field group-btns flex1 center">
+                {{#if item.data.properties.stackable}}
+                    <a class="inc-dec-btns" data-operator="minus" data-target="data.quantity" data-incr="1" data-min="0" data-max="{{item.data.properties.stacksize}}"><i class="fas fa-minus-square"></i></a>&nbsp;
+                    <span class="item-field">{{item.data.quantity}}</span>&nbsp;
+                    <a class="inc-dec-btns" data-operator="plus" data-target="data.quantity" data-incr="1" data-min="0" data-max="{{item.data.properties.stacksize}}"><i class="fas fa-plus-square"></i></a>
+                {{/if}}
+            </div>
+            <div class="item-field flex1 center">
+                <span class="item-field">{{item.data.price}}</span>
+            </div>
+            <div class="item-field flex1 center">
+                {{#if data.properties.equipable}}
+                    {{#if data.worn}}
+                        <span class="item-field"><a class="item-control item-equip" title="{{localize "BOL.ui.unequip"}}"><i class="fas fa-shield-alt"></i></a></span>
+                    {{else}}
+                        <span class="item-field"><a class="item-control item-equip" title="{{localize "BOL.ui.equip"}}" style="color:lightgray;"><i class="fas fa-shield-alt"></i></a></span>
+                    {{/if}}
+                {{/if}}
+            </div>
+            <div class="item-field flex1 right">
                 <a class="item-control item-delete" title="{{localize "BOL.ui.delete"}}"><i class="fas fa-trash"></i></a>
             </div>
         </li>

templates/actor/parts/tabs/actor-features.hbs

@@ -1,20 +1,28 @@
-{{#each data.features as | features key|}}
+{{#each features as | features key|}}
     {{#if (gt (count features.items) 0)}}
         <ol class="items-list">
             <li class="item flexrow item-header">
-                <div class="item-name flex2">{{localize features.label}}</div>
+                <div class="item-name flex4 left">{{localize features.label}}</div>
                 {{#if ranked}}
-                    <div class="item-field">{{localize "BOL.ui.rank"}}</div>
+                    <div class="item-field flex2 center">{{localize "BOL.ui.rank"}}</div>
                 {{/if}}
+                <div class="item-field flex1 right"></div>
             </li>
             {{#each features.items as |item id|}}
                 <li class="item flexrow" data-item-id="{{item._id}}">
-                    <div class="item-image {{#if (equals key "careers")}}roll-career{{/if}}"><img src="{{item.img}}" title="{{item.name}}"/></div>
+                    <h4 class="item-name flex4 left">
-                    <h4 class="item-name flex2"><a class="item-edit">{{item.name}}</a></h4>
+                        <div class="item-image {{#if (equals key "careers")}}roll-career{{/if}}"><img src="{{item.img}}" title="{{item.name}}"/></div>
+                        <a class="item-edit">{{item.name}}</a>
+                    </h4>
+                    <div class="item-field group-btns center flex2">
                     {{#if (equals key "careers")}}
-                        <span class="item-field">{{item.data.rank}}</span>
+                        <a class="inc-dec-btns" data-operator="minus" data-target="data.rank" data-incr="1" data-min="0" data-max="5"><i class="fas fa-minus-square"></i></a>&nbsp;
+                        <span class="item-field">{{item.data.rank}}</span>&nbsp;
+                        <a class="inc-dec-btns" data-operator="plus" data-target="data.rank" data-incr="1" data-min="0" data-max="5"><i class="fas fa-plus-square"></i></a>
                     {{/if}}
-                    <div class="item-controls-1">
+                    </div>
+                    <div class="item-field flex1 right">
+                        <a class="item-control item-log" title="Log Item"><i class="far fa-comment"></i></a>
                         <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
                     </div>
                 </li>

templates/item/item-armor-sheet.hbs

@@ -1,97 +0,0 @@
-<form class="{{cssClass}}" autocomplete="off">
-  <header class="sheet-header">
-    <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
-    <div class="header-fields">
-      <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
-    </div>
-  </header>
-
-  {{!-- Sheet Tab Navigation --}}
-  <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="description">{{localize "Description"}}</a>
-    <a class="item" data-tab="properties">{{localize "Properties"}}</a>
-  </nav>
-
-  {{!-- Sheet Body --}}
-  <section class="sheet-body">
-
-    {{!-- Description Tab --}}
-    <div class="tab" data-group="primary" data-tab="description">
-      <div class="property flexrow">
-        <label class="property-label">{{localize "subtype"}}</label>
-        <select name="data.subtype" value="{{data.subtype}}" data-dtype="String">
-          {{#select data.subtype}}
-          <option value="light">{{localize "Light Armor"}}</option>
-          <option value="medium">{{localize "Medium Armor"}}</option>
-          <option value="heavy">{{localize "Heavy Armor"}}</option>
-          <option value="helm">{{localize "Helm"}}</option>
-          <option value="smallshield">{{localize "Small Shield"}}</option>
-          <option value="bigshield">{{localize "Big Shield"}}</option>
-          {{/select}}
-        </select>
-      </div>
-
-      {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
-    </div>
-
-    {{!-- Attributes Tab --}}
-    <div class="tab properties" data-group="primary" data-tab="properties">
-      {{!-- As you add new fields, add them in here! --}}
-      <!--            <div class="grid grid-2col">-->
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Quantity"}}</label>
-        <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number" />
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Weight"}}</label>
-        <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number" />
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Protection Roll"}}</label>
-        <select name="data.damage" value="{{data.damage}}" data-dtype="String">
-          {{#select data.damage}}
-          <option value="none">{{localize "None"}}</option>
-          <option value="1d6-3">d6-3</option>
-          <option value="1d6-2">d6-2</option>
-          <option value="1d6-1">d6-1</option>
-          {{/select}}
-        </select>
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Protection Fixed"}}</label>
-        <input type="text" name="data.protectionfixed" value="{{data.protectionfixed}}" data-dtype="Number" />
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Social Malus"}}</label>
-        <label class="attribute-value checkbox"><input type="checkbox" name="data.socialmalus" value="{{data.socialmalus}}" data-dtype="checkbox" {{checked
-            data.socialmalus}}/></label>
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Agility Malus"}}</label>
-        <input type="text" name="data.agilitymalus" value="{{data.agilitymalus}}" data-dtype="Number" />
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Initiative Malus"}}</label>
-        <input type="text" name="data.initmalus" value="{{data.initmalus}}" data-dtype="Number" />
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Power Cost"}}</label>
-        <input type="text" name="data.powercost" value="{{data.powercost}}" data-dtype="Number" />
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Equipped"}}</label>
-        <label class="attribute-value checkbox"><input type="checkbox" class="checkbox" name="data.equipped" value="{{data.equipped}}" data-dtype="checkbox" {{checked
-            data.equipped}}/></label>
-      </div>
-
-      <!--            </div>-->
-      {{#each data.properties as |property key|}}
-      <div class="property flexrow">
-        <label class="property-label">{{localize key}}</label>
-        <label class="attribute-value checkbox"><input type="checkbox" name="data.properties.{{key}}" {{checked
-            property}} /></label>
-      </div>
-      {{/each}}
-    </div>
-  </section>
-</form>

templates/item/item-feature-sheet.hbs

@@ -1,65 +0,0 @@
-<form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-
-    {{!-- Sheet Tab Navigation --}}
-    <nav class="sheet-tabs tabs" data-group="primary">
-        <a class="item" data-tab="description">Description</a>
-        <a class="item" data-tab="properties">Properties</a>
-    </nav>
-
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-
-        {{!-- Description Tab --}}
-        <div class="tab" data-group="primary" data-tab="description">
-
-            <div class="property flexrow">
-              <label class="property-label">{{localize "subtype"}}</label>
-              <select name="data.subtype" value="{{data.subtype}}" data-dtype="String">
-                {{#select data.subtype}}
-                <option value="boon">{{localize "Avantage"}}</option>
-                <option value="flaw">{{localize "Flaw"}}</option>
-                <option value="career">{{localize "Career"}}</option>
-                <option value="language">{{localize "Language"}}</option>
-                {{/select}}
-              </select>
-            </div>
-            
-            {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
-        </div>
-
-        {{!-- Attributes Tab --}}
-        <div class="tab properties" data-group="primary" data-tab="properties">
-            {{!-- As you add new fields, add them in here! --}}
-<!--            <div class="grid grid-2col">-->
-                {{#if (eq data.subtype "career")}}
-                <div class="property flexrow">
-                    <label class="property-label">{{localize "rank"}}</label>
-                    <input type="text" name="data.rank" value="{{data.rank}}" data-dtype="Number"/>
-                </div>
-                {{else}}
-                <div class="property flexrow">
-                    <label class="property-label">Quantity</label>
-                    <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/>
-                </div>
-                <div class="property flexrow">
-                    <label class="property-label">Weight</label>
-                    <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number"/>
-                </div>
-                {{/if}}
-
-<!--            </div>-->
-            {{#each data.properties as |property key|}}
-                <div class="property flexrow">
-                    <label class="property-label">{{localize key}}</label>
-                    <label class="attribute-value checkbox"><input type="checkbox" name="data.properties.{{key}}" {{checked property}}/></label>
-                </div>
-            {{/each}}
-        </div>
-    </section>
-</form>

templates/item/item-item-sheet.hbs

@@ -1,57 +0,0 @@
-<form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-
-    {{!-- Sheet Tab Navigation --}}
-    <nav class="sheet-tabs tabs" data-group="primary">
-        <a class="item" data-tab="description">Description</a>
-        <a class="item" data-tab="properties">Properties</a>
-    </nav>
-
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-
-        {{!-- Description Tab --}}
-        <div class="tab" data-group="primary" data-tab="description">
-
-            <div class="property flexrow">
-              <label class="property-label">{{localize "subtype"}}</label>
-              <select name="data.subtype" value="{{data.subtype}}" data-dtype="String">
-                {{#select data.subtype}}
-                <option value="boon">{{localize "Avantage"}}</option>
-                <option value="flaw">{{localize "Flaw"}}</option>
-                <option value="career">{{localize "Career"}}</option>
-                <option value="language">{{localize "Language"}}</option>
-                {{/select}}
-              </select>
-            </div>
-            
-            {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
-        </div>
-
-        {{!-- Attributes Tab --}}
-        <div class="tab properties" data-group="primary" data-tab="properties">
-            {{!-- As you add new fields, add them in here! --}}
-<!--            <div class="grid grid-2col">-->
-                <div class="property flexrow">
-                    <label class="property-label">Quantity</label>
-                    <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number"/>
-                </div>
-                <div class="property flexrow">
-                    <label class="property-label">Weight</label>
-                    <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number"/>
-                </div>
-<!--            </div>-->
-            {{#each data.properties as |property key|}}
-                <div class="property flexrow">
-                    <label class="property-label">{{localize key}}</label>
-                    <label class="attribute-value checkbox"><input type="checkbox" name="data.properties.{{key}}" {{checked property}}/></label>
-                </div>
-            {{/each}}
-        </div>
-    </section>
-</form>

templates/item/item-weapon-sheet.hbs

@@ -1,111 +0,0 @@
-<form class="{{cssClass}}" autocomplete="off">
-  <header class="sheet-header">
-    <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
-    <div class="header-fields">
-      <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
-    </div>
-  </header>
-
-  {{!-- Sheet Tab Navigation --}}
-  <nav class="sheet-tabs tabs" data-group="primary">
-    <a class="item" data-tab="description">{{localize "Description"}}</a>
-    <a class="item" data-tab="properties">{{localize "Properties"}}</a>
-  </nav>
-
-  {{!-- Sheet Body --}}
-  <section class="sheet-body">
-
-    {{!-- Description Tab --}}
-    <div class="tab" data-group="primary" data-tab="description">
-
-      <div class="property flexrow">
-        <label class="property-label">{{localize "subtype"}}</label>
-        <select name="data.subtype" value="{{data.subtype}}" data-dtype="String">
-          {{#select data.subtype}}
-          <option value="melee">{{localize "Melee"}}</option>
-          <option value="ranged">{{localize "Ranged"}}</option>
-          {{/select}}
-        </select>
-      </div>
-
-      {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
-    </div>
-
-    {{!-- Attributes Tab --}}
-    <div class="tab properties" data-group="primary" data-tab="properties">
-      {{!-- As you add new fields, add them in here! --}}
-      <!--            <div class="grid grid-2col">-->
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Quantity"}}</label>
-        <input type="text" name="data.quantity" value="{{data.quantity}}" data-dtype="Number" />
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Weight"}}</label>
-        <input type="text" name="data.weight" value="{{data.weight}}" data-dtype="Number" />
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Damage"}}</label>
-        <select name="data.damage" value="{{data.damage}}" data-dtype="String">
-          {{#select data.damage}}
-          <option value="1d3">d3</option>
-          <option value="1d6">d6</option>
-          <option value="1d6M">d6M</option>
-          <option value="1d6B">d6B</option>
-          {{/select}}
-        </select>
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Improvised"}}</label>
-        <label class="attribute-value checkbox"><input type="checkbox" name="data.improvised" value="{{data.improvised}}" data-dtype="checkbox" {{checked
-            data.improvised}}/></label>
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Range"}}</label>
-        <input type="text" name="data.range" value="{{data.range}}" data-dtype="Number" />
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Thrown"}}</label>
-        <label class="attribute-value checkbox"><input type="checkbox" name="data.thrown" value="{{data.thrown}}" data-dtype="checkbox" {{checked
-            data.thrown}}/></label>
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Two Hands"}}</label>
-        <label class="attribute-value checkbox"><input type="checkbox" name="data.twohands" value="{{data.twohands}}" data-dtype="checkbox" {{checked
-            data.twohands}}/></label>
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Reload"}}</label>
-        <label class="attribute-value checkbox"><input type="checkbox" name="data.reload" value="{{data.reload}}" data-dtype="checkbox" {{checked
-            data.reload}}/></label>
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Reload Duration"}}</label>
-        <input type="text" name="data.reloadduration" value="{{data.reloadduration}}" data-dtype="Number"/>
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Can be hidden"}}</label>
-        <label class="attribute-value checkbox"><input type="checkbox" name="data.canbehidden" value="{{data.canbehidden}}" data-dtype="checkbox" {{checked
-            data.canbehidden}}/></label>
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Ignore Shield"}}</label>
-        <label class="attribute-value checkbox"><input type="checkbox" class="checkbox" name="data.ignoreshield" value="{{data.ignoreshield}}" data-dtype="checkbox" {{checked
-            data.ignoreshield}}/></label>
-      </div>
-      <div class="property flexrow">
-        <label class="property-label">{{localize "Equipped ?"}}</label>
-        <label class="attribute-value checkbox"><input type="checkbox" class="checkbox" name="data.equipped" value="{{data.equipped}}" data-dtype="checkbox" {{checked
-            data.equipped}}/></label>
-      </div>
-
-      <!--            </div>-->
-      {{#each data.properties as |property key|}}
-      <div class="property flexrow">
-        <label class="property-label">{{localize key}}</label>
-        <label class="attribute-value checkbox"><input type="checkbox" name="data.properties.{{key}}" {{checked
-            property}} /></label>
-      </div>
-      {{/each}}
-    </div>
-  </section>
-</form>

templates/item/parts/properties/item-properties.hbs

@@ -11,30 +11,9 @@
     </div>
 </div>
 
-<div class="form-group">
-    <label class="property-label">Type</label>
-    <div class="form-fields">
-        <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.weapon" {{checked data.properties.weapon}}> {{localize "BOL.itemProperty.weapon"}}
-        </label>
-        <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.protection" {{checked data.properties.protection}}> {{localize "BOL.itemProperty.protection"}}
-        </label>
-        <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.magical" {{checked data.properties.magical}}> {{localize "BOL.itemProperty.magical"}}
-        </label>
-    </div>
-</div>
-
 {{#if (equals data.category "equipment")}}
     {{> "systems/bol/templates/item/parts/properties/item/equipment-properties.hbs"}}
 {{/if}}
-{{#if data.properties.weapon}}
+{{#if (equals data.category "vehicle")}}
-    {{> "systems/bol/templates/item/parts/properties/item/weapon-properties.hbs"}}
+    {{> "systems/bol/templates/item/parts/properties/item/vehicle-properties.hbs"}}
-{{/if}}
-{{#if data.properties.protection}}
-    {{> "systems/bol/templates/item/parts/properties/item/protection-properties.hbs"}}
-{{/if}}
-{{#if data.properties.magical}}
-    {{> "systems/bol/templates/item/parts/properties/item/magical-properties.hbs"}}
 {{/if}}

templates/item/parts/properties/item/equipment-properties.hbs

@@ -1,17 +1,35 @@
-<h3 class="form-header">{{localize "BOL.ui.equipment"}}</h3>
+<h3 class="form-header">{{localize "BOL.ui.equipmentProperties"}}</h3>
-<!--<div class="property flexrow">-->
-<!--    <label class="property-label">{{!localize "BOL.ui.subtype"}}</label>-->
-<!--    <select name="data.subtype" data-dtype="String">-->
-<!--        {{!#select data.subtype}}-->
-<!--            {{!#each config.equipmentCategories as |item id|}}-->
-<!--                <option value="{{!id}}" {{!#if (equals data.subtype id)}}selected{{!/if}}>{{!localize item}}</option>-->
-<!--            {{!/each}}-->
-<!--        {{!/select}}-->
-<!--    </select>-->
-<!--</div>-->
 
 <div class="form-group">
     <label class="property-label">{{localize "BOL.ui.subtype"}}</label>
+    <div class="form-fields">
+        <select name="data.subtype" data-dtype="String">
+            {{#select data.subtype}}
+                {{#each config.itemSubtypes as |item id|}}
+                    <option value="{{id}}">{{localize item}}</option>
+                {{/each}}
+            {{/select}}
+        </select>
+    </div>
+</div>
+<hr/>
+<div class="form-group">
+    <label class="property-label">{{localize "BOL.ui.capacities"}}</label>
+    <div class="form-fields">
+        <label class="checkbox">
+            <input class="field-value" type="checkbox" name="data.properties.weapon" {{checked data.properties.weapon}}> {{localize "BOL.itemProperty.weapon"}}
+        </label>
+        <label class="checkbox">
+            <input class="field-value" type="checkbox" name="data.properties.protection" {{checked data.properties.protection}}> {{localize "BOL.itemProperty.protection"}}
+        </label>
+        <label class="checkbox">
+            <input class="field-value" type="checkbox" name="data.properties.magical" {{checked data.properties.magical}}> {{localize "BOL.itemProperty.magical"}}
+        </label>
+    </div>
+</div>
+<hr/>
+<div class="form-group">
+    <label class="property-label">{{localize "BOL.ui.properties"}}</label>
     <div class="form-fields">
         <label class="checkbox">
             <input class="field-value" type="checkbox" name="data.properties.equipable" {{checked data.properties.equipable}}> {{localize "BOL.itemProperty.equipable"}}
@@ -24,16 +42,28 @@
         </label>
     </div>
 </div>
-
+<hr/>
 {{#if data.properties.equipable}}
 <div class="form-group">
-    <label>Équipé</label>
+    <label>{{localize "BOL.itemProperty.worn"}}</label>
     <div class="form-fields">
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.worn" {{checked data.properties.worn}}> {{localize "BOL.itemProperty.worn"}}
+            <input class="field-value" type="checkbox" name="data.worn" {{checked data.worn}}> {{localize "BOL.itemProperty.worn"}}
         </label>
     </div>
 </div>
+<div class="form-group">
+    <label>{{localize "BOL.itemProperty.slot"}}</label>
+    <div class="form-fields center">
+        <select class="field-value" name="data.properties.slot" data-dtype="String">
+            {{#select data.properties.slot}}
+                {{#each config.equipmentSlots as |value id|}}
+                    <option value="{{id}}">{{localize value}}</option>
+                {{/each}}
+            {{/select}}
+        </select>
+    </div>
+</div>
 {{/if}}
 
 {{#if data.properties.stackable}}
@@ -63,3 +93,14 @@
         <input class="field-value" type="text" name="data.price" value="{{data.price}}" data-dtype="Number"/>
     </div>
 </div>
+
+
+{{#if data.properties.weapon}}
+    {{> "systems/bol/templates/item/parts/properties/item/weapon-properties.hbs"}}
+{{/if}}
+{{#if data.properties.protection}}
+    {{> "systems/bol/templates/item/parts/properties/item/protection-properties.hbs"}}
+{{/if}}
+{{#if data.properties.magical}}
+    {{> "systems/bol/templates/item/parts/properties/item/magical-properties.hbs"}}
+{{/if}}

templates/item/parts/properties/item/magical-properties.hbs

@@ -1 +1 @@
-<h3 class="form-header">{{localize "BOL.itemProperty.magical"}}</h3>
+<h3 class="form-header">{{localize "BOL.itemProperty.magicalProperties"}}</h3>

templates/item/parts/properties/item/protection-properties.hbs

@@ -1,4 +1,4 @@
-<h3 class="form-header">{{localize "BOL.ui.armor"}}</h3>
+<h3 class="form-header">{{localize "BOL.ui.protectionProperties"}}</h3>
 <div class="form-group">
     <label>{{localize "BOL.ui.subtype"}}</label>
     <div class="form-fields">

templates/item/parts/properties/item/vehicle-properties.hbs

@@ -0,0 +1,28 @@
+<h3 class="form-header">{{localize "BOL.ui.vehicleProperties"}}</h3>
+
+<div class="form-group">
+    <label class="property-label">{{localize "BOL.ui.subtype"}}</label>
+    <div class="form-fields">
+        <select name="data.subtype" data-dtype="String">
+            {{#select data.subtype}}
+                {{#each config.vehicleSubtypes as |item id|}}
+                    <option value="{{id}}">{{localize item}}</option>
+                {{/each}}
+            {{/select}}
+        </select>
+    </div>
+</div>
+<hr/>
+<div class="form-group">
+    <label class="property-label">{{localize "BOL.ui.speed"}}</label>
+    <div class="form-fields">
+        <input class="field-value" type="text" name="data.properties.speed" value="{{data.properties.speed}}" data-dtype="Number"/>
+    </div>
+</div>
+
+<div class="form-group">
+    <label class="property-label">{{localize "BOL.ui.price"}}</label>
+    <div class="form-fields">
+        <input class="field-value" type="text" name="data.price" value="{{data.price}}" data-dtype="Number"/>
+    </div>
+</div>

templates/item/parts/properties/item/weapon-properties.hbs

@@ -1,6 +1,6 @@
-<h3 class="form-header">{{localize "BOL.ui.weapon"}}</h3>
+<h3 class="form-header">{{localize "BOL.ui.weaponProperties"}}</h3>
 <div class="form-group">
-    <label>{{localize "BOL.ui.subtype"}}</label>
+    <label>{{localize "BOL.ui.reach"}}</label>
     <div class="form-fields">
         <label class="checkbox">
             <input class="field-value" type="checkbox" name="data.properties.melee" {{checked data.properties.melee}}> {{localize "BOL.itemProperty.melee"}}
@@ -17,9 +17,6 @@
 <div class="form-group">
     <label>{{localize "BOL.ui.properties"}}</label>
     <div class="form-fields">
-        <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.throwable" {{checked data.properties.throwable}}> {{localize "BOL.itemProperty.throwable"}}
-        </label>
         <label class="checkbox">
             <input class="field-value" type="checkbox" name="data.properties.2H" {{checked data.properties.2H}}> {{localize "BOL.itemProperty.2H"}}
         </label>
@@ -29,12 +26,19 @@
         <label class="checkbox">
             <input class="field-value" type="checkbox" name="data.properties.ignoreshield" {{checked data.properties.ignoreshield}}> {{localize "BOL.itemProperty.ignoreshield"}}
         </label>
+    {{#if data.properties.ranged}}
+        <label class="checkbox">
+            <input class="field-value" type="checkbox" name="data.properties.reloadable" {{checked data.properties.reloadable}}> {{localize "BOL.itemProperty.reloadable"}}
+        </label>
+    {{/if}}
+    {{#if data.properties.melee}}
         <label class="checkbox">
             <input class="field-value" type="checkbox" name="data.properties.bashing" {{checked data.properties.bashing}}> {{localize "BOL.itemProperty.bashing"}}
         </label>
         <label class="checkbox">
-            <input class="field-value" type="checkbox" name="data.properties.reloadable" {{checked data.properties.reloadable}}> {{localize "BOL.itemProperty.reloadable"}}
+            <input class="field-value" type="checkbox" name="data.properties.throwable" {{checked data.properties.throwable}}> {{localize "BOL.itemProperty.throwable"}}
         </label>
+    {{/if}}
     </div>
 </div>
 <hr/>