Corrections sur creatures/npc et armes de vehicules

README.md

@@ -40,4 +40,4 @@ Maps : Emmanuel Roudier.
 
 # Developmement 
 
-Zigmund, LeRatierBretonnien
+LeRatierBretonnien, Zigmund (historical) 

css/bol.css

@@ -389,16 +389,16 @@ ul.no-bullets {
   background-color: lightgray;
 }
 .bol h1.form-header {
-  font-size: 2.5em;
+  font-size: 2.2em;
   font-weight: 700;
 }
 .bol h2.form-header {
-  font-size: 2em;
+  font-size: 1.8em;
   font-weight: 500;
   border-bottom: 1px groove #eeede0;
 }
 .bol h3.form-header {
-  font-size: 1.5em;
+  font-size: 1.2em;
   font-weight: 500;
   border-bottom: 1px groove #eeede0;
 }
@@ -769,7 +769,7 @@ body.system-bol img#logo {
   min-height: 700px;
   height: 700px;
 }
-.bol.sheet.actor .window-content form {
+.bol.sheet.actor .window-content .bol-actor-form {
   background-image: url("/systems/bol/ui/logo.webp");
   background-repeat: no-repeat;
   background-size: 190px 115px;
@@ -1051,3 +1051,7 @@ body.system-bol img#logo {
 .bol-hud-menu label {
   font-size: 0.75rem;
 }
+.bol-margin-tb-2 {
+  margin-top: 2px;
+  margin-bottom: 2px;
+}

images/.directory

@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2022,7,17,14,58,4.757
+Version=4
+VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_creationtime,CustomizedDetails

lang/fr.json

@@ -1,6 +1,7 @@
 {
   "ACTOR.TypeCharacter": "Personnage",
   "ACTOR.TypeEncounter": "Rencontre",
+  "ACTOR.TypeVehicle": "Véhicule",
   "ITEM.TypeItem": "Objet",
   "ITEM.TypeFeature": "Trait",
   "ITEM.TypeWeapon": "Arme",
@@ -10,6 +11,10 @@
   "BOL.attributes.agility": "Agilité",
   "BOL.attributes.mind": "Esprit",
   "BOL.attributes.appeal": "Aura",
+  "BOL.attributes.hull": "Coque",
+  "BOL.attributes.crew": "Equipage",
+  "BOL.attributes.resources": "Resources",
+  "BOL.attributes.row": "Rames",
   "BOL.aptitudes.init": "Initiative",
   "BOL.aptitudes.melee": "Mêlée",
   "BOL.aptitudes.ranged": "Tir",
@@ -151,6 +156,10 @@
   "BOL.ui.armorAgiMalus": "Malus d'Armure+Bouclier (Agi)",
   "BOL.ui.armorInitMalus": "Malus d'Armure (Init)",
   "BOL.ui.attackValue": "Valeur d'attaque",
+  "BOL.ui.vehicleWeapons": "Armes de véhicules",
+  "BOL.ui.hullDamage": "D.coque",
+  "BOL.ui.crewDamage": "D.équipage",
+  "BOL.ui.fireDamage": "Feu ?",
   "BOL.featureCategory.origins": "Origines",
   "BOL.featureCategory.races": "Races",
   "BOL.featureCategory.careers": "Carrières",
@@ -186,6 +195,7 @@
   "BOL.itemCategory.other": "Autre",
   "BOL.itemCategory.capacity": "Capacité",
   "BOL.itemCategory.alchemy": "Préparation Alchimique",
+  "BOL.itemCategory.vehicleweapon": "Armes de Véhicule",
   "BOL.combatCategory.protections": "Protections",
   "BOL.combatCategory.shields": "Boucliers",
   "BOL.combatCategory.melee": "Armes de contact",
@@ -270,6 +280,17 @@
   "BOL.itemProperty.difficulty": "Difficulté",
   "BOL.itemProperty.natural": "Arme naturelle",
   "BOL.itemProperty.onlymodifier": "Modificateur uniquement (ie attaques de créatures)",
+  "BOL.itemProperty.vehicleDamageType": "Type de dommages de véhicules",
+  "BOL.itemProperty.isfiredamage": "Dommages de Feu",
+  "BOL.itemProperty.ishulldamage": "Dommages à la coque",
+  "BOL.itemProperty.iscrewdamage": "Dommages à l'équipage",
+  "BOL.itemProperty.hulldamage": "Valeur des dommages à la coque",
+  "BOL.itemProperty.crewdamage": "Valeur des dommages à l'équipage",
+  "BOL.itemProperty.hullDamageMultiplier": "Multiplicateur",
+  "BOL.itemProperty.crewDamageMultiplier": "Multiplicateur",
+  "BOL.itemProperty.isboarding": "Abordage",
+  "BOL.itemProperty.isspur": "Eperonnage",
+  "BOL.itemProperty.isbreakrow": "Briser les rames",  
   "BOL.itemStat.quantity": "Quantité",
   "BOL.itemStat.weight": "Poids",
   "BOL.itemStat.price": "Prix",
@@ -391,6 +412,21 @@
   "BOL.chat.spellremaining": "Points de Pouvoir restants",
   "BOL.chat.nodamagesummary": "Aucun dégats n'a été subi ....",
   "BOL.chat.damageresume": "{name} a subi des blessures ...",
+  "BOL.chat.fumblemessage": "Si vous acceptez les conséquences d'un echec catastrophique (au choix du MJ), vous pourrez bénéficier d'1 point d'Héroïsme supplémentaire",
+  "BOL.chat.rangeinfo": "Tir/Lancer de {attackerName} vers {defenderName}",
+  "BOL.chat.rangeweaponinfo": "Arme : {weaponName} - Portée de base {weaponRange}",
+  "BOL.chat.rangeout": "Modificateur : Hors de portée",
+  "BOL.chat.range0": "Modificateur : Bout portant (+1)",
+  "BOL.chat.range1": "Modificateur : Portée courte (0)",
+  "BOL.chat.range2": "Modificateur : Portée moyenne (-1)",
+  "BOL.chat.range3": "Modificateur : Portée longue (-2)",
+  "BOL.chat.range4": "Modificateur : Portée très longue (-4)",
+  "BOL.chat.range5": "Modificateur : Portée extrême (-6)",
+  "BOL.chat.range6": "Modificateur : Portée maximale (-8)",
+  "BOL.chat.rangeprefix": "Distance évaluée : ",
+  "BOL.chat.rangevisible": "La ligne de vue est dégagée entre les protagonistes.",
+  "BOL.chat.rangenotvisible": "La ligne de vue est bloquée entre les protagonistes.",
+  "BOL.chat.rangetitle": "Information MJ",
 
   "BOL.dialog.soeasy": "Inmanquable (+4)",
   "BOL.dialog.veryeasy": "Trés Facile (+2)",

module/actor/actor-sheet.js

@@ -12,7 +12,7 @@ export class BoLActorSheet extends ActorSheet {
     return mergeObject(super.defaultOptions, {
       classes: ["bol", "sheet", "actor"],
       template: "systems/bol/templates/actor/actor-sheet.hbs",
-      width: 600,
+      width: 860,
       height: 600,
       dragDrop: [{ dragSelector: ".items-list .item", dropSelector: null }],
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "stats" }]
@@ -25,6 +25,13 @@ export class BoLActorSheet extends ActorSheet {
   activateListeners(html) {
     super.activateListeners(html);
 
+    function onLoad() {
+      let logoSheet = BoLUtility.getLogoActorSheet()
+      $(".bol-actor-form").css("backgroundImage",`url(${logoSheet})`)
+    }
+    // Setup everything onload
+    $(function () { onLoad(); });
+
     // Everything below here is only needed if the sheet is editable
     if (!this.options.editable) return;
 
@@ -107,7 +114,7 @@ export class BoLActorSheet extends ActorSheet {
   /* -------------------------------------------- */
 
   /** @override */
-  getData(options) {
+  async getData(options) {
     const data = super.getData(options)
     const actorData = duplicate(data)
     let formData = duplicate(data)
@@ -118,6 +125,7 @@ export class BoLActorSheet extends ActorSheet {
     formData.attributes = this.actor.attributes
     formData.aptitudes = this.actor.aptitudes
     formData.resources = this.actor.getResourcesFromType()
+    formData.xp = this.actor.system.xp
     formData.equipment = this.actor.equipment
     formData.equipmentCreature = this.actor.equipmentCreature
     formData.weapons = this.actor.weapons
@@ -132,7 +140,7 @@ export class BoLActorSheet extends ActorSheet {
     formData.ammos = this.actor.ammos
     formData.misc = this.actor.misc
     formData.combat = this.actor.buildCombat()
-    formData.combatCreature = this.actor.buildCombatCreature()
+    //formData.combatCreature = this.actor.buildCombatCreature()
     formData.features = this.actor.buildFeatures()
     formData.isGM = game.user.isGM
     formData.options = this.options
@@ -140,8 +148,9 @@ export class BoLActorSheet extends ActorSheet {
     formData.editScore = this.options.editScore
     formData.useBougette = BoLUtility.getUseBougette()
     formData.charType = this.actor.getCharType()
-    formData.villainy = this.actor.getVillainy()
-
+    formData.villainy = this.actor.getVillainy()    
+    formData.biography = await TextEditor.enrichHTML(this.object.system.details.biography, {async: true})
+    formData.notes = await TextEditor.enrichHTML(this.object.system.details.notes, {async: true})
     formData.isSorcerer = this.actor.isSorcerer()
     formData.isAlchemist = this.actor.isAlchemist()
     formData.isPriest = this.actor.isPriest()

module/actor/actor.js

@@ -26,7 +26,7 @@ export class BoLActor extends Actor {
     if (this.type === 'character') {
       return 'player'
     }
-    return 'tough'
+    return this.system.chartype
   }
   /* -------------------------------------------- */
   getVillainy() {
@@ -52,9 +52,13 @@ export class BoLActor extends Actor {
 
   /* -------------------------------------------- */
   prepareDerivedData() {
-    super.prepareDerivedData()
-    this.updateResourcesData()
-    this.manageHealthState();
+    if ( this.type == "vehicle") {
+
+    } else {
+      super.prepareDerivedData()
+      this.updateResourcesData()
+      this.manageHealthState();
+    }
   }
 
   /* -------------------------------------------- */
@@ -244,9 +248,11 @@ export class BoLActor extends Actor {
   get shields() {
     return this.items.filter(i => i.type === "item" && i.system.category === "equipment" && i.system.subtype === "shield");
   }
-
+  get vehicleWeapons() {
+    return this.items.filter(i => i.type === "item" && i.system.category === "vehicleweapon" )
+  }
   get weapons() {
-    return this.items.filter(i => i.type === "item" && i.system.category === "equipment" && i.system.subtype === "weapon");
+    return this.items.filter(i => i.type === "item" && i.system.category === "equipment" && i.system.subtype === "weapon")
   }
   get protections() {
     return this.armors.concat(this.helms).concat(this.shields)
@@ -347,7 +353,7 @@ export class BoLActor extends Actor {
   spendPowerPoint(ppCost) {
     let newPP = this.system.resources.power.value - ppCost
     newPP = (newPP < 0) ? 0 : newPP
-    this.update({ 'data.resources.power.value': newPP })
+    this.update({ 'system.resources.power.value': newPP })
     return newPP
   }
 
@@ -355,7 +361,7 @@ export class BoLActor extends Actor {
   resetAlchemyStatus(alchemyId) {
     let alchemy = this.items.get(alchemyId)
     if (alchemy) {
-      this.updateEmbeddedDocuments('Item', [{ _id: alchemy.id, 'data.properties.pccurrent': 0 }])
+      this.updateEmbeddedDocuments('Item', [{ _id: alchemy.id, 'system.properties.pccurrent': 0 }])
     }
   }
 
@@ -369,7 +375,7 @@ export class BoLActor extends Actor {
         newPC = (newPC < 0) ? 0 : newPC
         this.update({ 'data.resources.alchemypoints.value': newPC })
         newPC = alchemy.system.properties.pccurrent + pcCost
-        await this.updateEmbeddedDocuments('Item', [{ _id: alchemy.id, 'data.properties.pccurrent': newPC }])
+        await this.updateEmbeddedDocuments('Item', [{ _id: alchemy.id, 'system.properties.pccurrent': newPC }])
       } else {
         ui.notifications.warn("Plus assez de Points de Création !")
       }
@@ -395,25 +401,26 @@ export class BoLActor extends Actor {
 
   /*-------------------------------------------- */
   heroReroll() {
-    if (this.type == 'character') {
+    if (this.villainy == 'character') {
       return this.system.resources.hero.value > 0;
     } else {
-      if (this.system.type == 'adversary') {
+      if (this.system.villainy == 'adversary') {
         return this.system.resources.hero.value > 0;
       }
     }
     return false
   }
 
+  /*-------------------------------------------- */
   getResourcesFromType() {
     let resources = {};
     if (this.type == 'encounter') {
       resources['hp'] = this.system.resources.hp;
-      if (this.system.type != 'base') {
+      if (this.system.chartype != 'base') {
         resources['faith'] = this.system.resources.faith
         resources['power'] = this.system.resources.power
       }
-      if (this.system.type == 'adversary') {
+      if (this.system.chartype == 'adversary') {
         resources['hero'] = duplicate(this.system.resources.hero)
         resources['hero'].label = "BOL.resources.villainy"
       }
@@ -479,6 +486,15 @@ export class BoLActor extends Actor {
         "options": false,
         "items": this.melee
       },
+      "natural": {
+        "label": "BOL.combatCategory.natural",
+        "weapon": true,
+        "protection": false,
+        "blocking": false,
+        "ranged": false,
+        "options": false,
+        "items": this.natural
+      },
       "ranged": {
         "label": "BOL.combatCategory.ranged",
         "weapon": true,
@@ -518,28 +534,6 @@ export class BoLActor extends Actor {
     }
   }
 
-  buildCombatCreature() {
-    return {
-      "natural": {
-        "label": "BOL.combatCategory.natural",
-        "weapon": true,
-        "protection": false,
-        "blocking": false,
-        "ranged": false,
-        "options": false,
-        "items": this.natural
-      },
-      "protections": {
-        "label": "BOL.combatCategory.protections",
-        "weapon": false,
-        "protection": true,
-        "blocking": false,
-        "ranged": false,
-        "options": false,
-        "items": this.protections
-      },
-    }
-  }
 
   /*-------------------------------------------- */
   buildRollList() {

module/actor/vehicle-sheet.js

@@ -0,0 +1,229 @@
+/**
+ * Extend the basic ActorSheet with some very simple modifications
+ * @extends {ActorSheet}
+ */
+import { BoLRoll } from "../controllers/bol-rolls.js";
+import { BoLUtility } from "../system/bol-utility.js";
+
+export class BoLVehicleSheet extends ActorSheet {
+
+  /** @override */
+  static get defaultOptions() {
+    return mergeObject(super.defaultOptions, {
+      classes: ["bol", "sheet", "actor"],
+      template: "systems/bol/templates/actor/vehicle-sheet.hbs",
+      width: 860,
+      height: 600,
+      dragDrop: [{ dragSelector: ".items-list .item", dropSelector: null }],
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "stats" }]
+    });
+  }
+
+  /* -------------------------------------------- */
+
+  /** @override */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    function onLoad() {
+      let logoSheet = BoLUtility.getLogoActorSheet()
+      $(".bol-actor-form").css("backgroundImage",`url(${logoSheet})`)
+    }
+    // Setup everything onload
+    $(function () { onLoad(); });
+
+    // Everything below here is only needed if the sheet is editable
+    if (!this.options.editable) return;
+
+    // Add Inventory Item
+    html.find('.item-create').click(this._onItemCreate.bind(this));
+
+    // Update Inventory Item
+    html.find('.item-edit').click(ev => {
+      const li = $(ev.currentTarget).parents(".item");
+      const item = this.actor.items.get(li.data("itemId"));
+      item.sheet.render(true);
+    })
+    // Equip/Unequip item
+    html.find('.item-equip').click(this._onToggleEquip.bind(this));
+
+    html.find('.create_item').click(ev => {
+      this.actor.createEmbeddedDocuments('Item', [{ name: "Nouvel Equipement", type: "item" }], { renderSheet: true });
+    });
+
+    html.find(".toggle-fight-option").click((ev) => {
+      const li = $(ev.currentTarget).parents(".item")
+      this.actor.toggleFightOption(li.data("itemId"))
+    })
+
+    html.find(".inc-dec-btns-alchemy").click((ev) => {
+      const li = $(ev.currentTarget).parents(".item");
+      this.actor.spendAlchemyPoint(li.data("itemId"), 1)
+    })
+
+    // 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) || 10000
+          let value = eval("item." + target)
+          value = value || 0
+          //console.log("IncDec", item, target, value, operator, min, max)
+          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 = { [`${target}`]: value };
+          item.update(update);
+        }
+      }
+    });
+
+
+    // Delete Inventory Item
+    html.find('.item-delete').click(ev => {
+      Dialog.confirm({
+        title: "Suppression",
+        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.
+    html.find('.rollable').click(this._onRoll.bind(this));
+
+  }
+
+  /* -------------------------------------------- */
+
+  /** @override */
+  async getData(options) {
+    const data = super.getData(options)
+    const actorData = duplicate(data)
+    let formData = duplicate(data)
+
+    formData.config = game.bol.config
+    formData.name = this.actor.name
+    formData.img = this.actor.img
+    formData.system = duplicate(this.actor.system)
+    formData.weapons = this.actor.vehicleWeapons
+    formData.isGM = game.user.isGM
+    formData.options = this.options
+    formData.owner = this.document.isOwner
+    formData.editScore = this.options.editScore
+    formData.description = await TextEditor.enrichHTML(this.actor.system.description, {async: true})
+
+    formData.isGM = game.user.isGM
+
+    console.log("VEHICLEDATA", formData)
+    return formData;
+  }
+  /* -------------------------------------------- */
+
+  /**
+   * Handle creating a new Owned Item for the actor using initial data defined in the HTML dataset
+   * @param {Event} event   The originating click event
+   * @private
+   */
+  _onItemCreate(event) {
+    event.preventDefault();
+    const header = event.currentTarget;
+    // Get the type of item to create.
+    const type = header.dataset.type;
+    // Grab any data associated with this control.
+    const data = duplicate(header.dataset);
+    // Initialize a default name.
+    const name = `New ${type.capitalize()}`;
+    // Prepare the item object.
+    const itemData = {
+      name: name,
+      type: type,
+      data: data
+    };
+    // Remove the type from the dataset since it's in the itemData.type prop.
+    delete itemData.data["type"];
+
+    // Finally, create the item!
+    return this.actor.createEmbeddedDocuments("Item", [itemData]);
+  }
+
+  _onToggleEquip(event) {
+    event.preventDefault();
+    const li = $(event.currentTarget).closest(".item");
+    const item = this.actor.items.get(li.data("itemId"));
+    return this.actor.toggleEquipItem(item);
+  }
+
+  /**
+   * Handle clickable rolls.
+   * @param {Event} event   The originating click event
+   * @private
+   */
+  _onRoll(event) {
+    event.preventDefault();
+    const element = event.currentTarget
+    const dataset = element.dataset
+    const rollType = dataset.rollType
+    const li = $(event.currentTarget).closest(".item")
+    switch (rollType) {
+      case "attribute":
+        BoLRoll.attributeCheck(this.actor, dataset.key, event)
+        break;
+      case "aptitude":
+        BoLRoll.aptitudeCheck(this.actor, dataset.key, event)
+        break;
+      case "weapon":
+        BoLRoll.weaponCheck(this.actor, event)
+        break;
+      case "spell":
+        BoLRoll.spellCheck(this.actor, event)
+        break;
+      case "alchemy":
+        BoLRoll.alchemyCheck(this.actor, event)
+        break;
+      case "protection":
+        this.actor.rollProtection(li.data("item-id"))
+        break;
+      case "damage":
+        this.actor.rollWeaponDamage(li.data("item-id"))
+        break;
+      case "aptitudexp":
+        this.actor.incAptitudeXP(dataset.key)
+        break;
+      case "attributexp":
+        this.actor.incAttributeXP(dataset.key)
+        break;
+      case "careerxp":
+        this.actor.incCareerXP( li.data("item-id"))
+        break;
+
+      default: break;
+    }
+  }
+
+  /** @override */
+  setPosition(options = {}) {
+    const position = super.setPosition(options);
+    const sheetBody = this.element.find(".sheet-body");
+    const bodyHeight = position.height - 192;
+    sheetBody.css("height", bodyHeight);
+    return position;
+  }
+}

module/bol.js

@@ -2,6 +2,7 @@
 // Import Modules
 import { BoLActor } from "./actor/actor.js"
 import { BoLActorSheet } from "./actor/actor-sheet.js"
+import { BoLVehicleSheet } from "./actor/vehicle-sheet.js"
 import { BoLItem } from "./item/item.js"
 import { BoLItemSheet } from "./item/item-sheet.js"
 import { System, BOL } from "./system/config.js"
@@ -49,7 +50,9 @@ Hooks.once('init', async function () {
 
   // Register sheet application classes
   Actors.unregisterSheet("core", ActorSheet);
-  Actors.registerSheet("bol", BoLActorSheet, { makeDefault: true });
+  Actors.registerSheet("bol", BoLActorSheet, { types: ["character", "encounter"], makeDefault: true })
+  Actors.registerSheet("bol", BoLVehicleSheet, { types: ["vehicle"], makeDefault: true })
+
   Items.unregisterSheet("core", ItemSheet);
   Items.registerSheet("bol", BoLItemSheet, { makeDefault: true });
 
@@ -90,6 +93,9 @@ function registerUsageCount( registerKey ) {
     }
     // Simple API counter
     let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.version}"`
+    //$.ajaxSetup({
+      //headers: { 'Access-Control-Allow-Origin': '*' }
+    //})
     $.ajax(regURL)
   }
 }
@@ -110,8 +116,10 @@ function welcomeMessage() {
 
 /* -------------------------------------------- */
 Hooks.once('ready', async function () {
+  BoLUtility.ready()
   registerUsageCount('bol')
 
+
   welcomeMessage()
 })
 

module/controllers/bol-rolls.js

@@ -67,6 +67,44 @@ export class BoLRoll {
       })
   }
 
+  /* -------------------------------------------- */
+  static async detectDistance( weapon, target ) {
+    let visible, dist
+    if (weapon.system.properties.ranged || weapon.system.properties.throwing) {
+      console.log("target", target, weapon)
+      visible = canvas.effects.visibility.testVisibility(target.center, { object: _token })
+      dist = Number(canvas.grid.measureDistances([{ ray: new Ray(_token.center, target.center) }], { gridSpaces: false })).toFixed(2)
+      let range = Number(weapon.system.properties.range)
+      let rangeMsg = "BOL.chat.rangeout"
+      if ( dist <= range) {
+        rangeMsg = "BOL.chat.range0"
+      } else if (dist < range*2) {
+        rangeMsg = "BOL.chat.range1"
+      } else if (dist < range*3) {
+        rangeMsg = "BOL.chat.range2"
+      } else if (dist < range*4) {
+        rangeMsg = "BOL.chat.range3"
+      } else if (dist < range*5) {
+        rangeMsg = "BOL.chat.range4"
+      } else if (dist < range*6) {
+        rangeMsg = "BOL.chat.range5"
+      } else if (dist < range*7) {
+        rangeMsg = "BOL.chat.range6"
+      }
+      ChatMessage.create({
+        content: await renderTemplate('systems/bol/templates/chat/chat-info-range.hbs', {
+          weapon: weapon,
+          attackerName: _token.actor.name,
+          defenderName: target.actor.name,
+          weaponRange: weapon.system.properties.range,
+          visible: visible,
+          distance: dist,
+          rangeMsg: rangeMsg
+        })
+      })
+    } 
+  }
+
   /* -------------------------------------------- */
   static weaponCheckWithWeapon(actor, weapon) {
 
@@ -76,6 +114,9 @@ export class BoLRoll {
     let attribute = eval(`actor.system.attributes.${weaponData.properties.attackAttribute}`)
     let aptitude = eval(`actor.system.aptitudes.${weaponData.properties.attackAptitude}`)
 
+    // Compute distance
+    this.detectDistance( weapon, target)
+
     // Manage specific case
     let fightOption = actor.getActiveFightOption()
     if (fightOption && fightOption.system.fightoptiontype == "fulldefense") {
@@ -127,7 +168,7 @@ export class BoLRoll {
       return;
     }
     alchemy = duplicate(alchemy)
-    let alchemyData = alchemy.data
+    let alchemyData = alchemy.system
     if (alchemyData.properties.pccurrent < alchemyData.properties.pccost) {
       ui.notifications.warn("Pas assez de Points de Cration investis dans la Préparation !")
       return
@@ -488,6 +529,9 @@ export class BoLDefaultRoll {
     this.rollData.isLegendary = false
     this.rollData.isFumble = (diceTotal === 2)
     this.rollData.isFailure = !this.rollData.isSuccess
+    
+    //this.rollData.isRealCritical = true 
+    //this.rollData.isFumble = true
 
     let actor = game.actors.get( this.rollData.actorId)
     if (this.rollData.reroll == undefined) {
@@ -564,6 +608,7 @@ export class BoLDefaultRoll {
         speaker: ChatMessage.getSpeaker({ actor: actor }),
         flags: { msgType: "default" }
       })
+      this.rollData.actor = undefined // Cleanup
       msg.setFlag("world", "bol-roll-data", this.rollData)
     })
   }

module/item/item-sheet.js

@@ -19,7 +19,7 @@ export class BoLItemSheet extends ItemSheet {
 
   /* -------------------------------------------- */
   /** @override */
-  getData(options) {
+  async getData(options) {
     const data = super.getData(options)
     let itemData = duplicate(data.document)
     data.config = game.bol.config
@@ -27,6 +27,7 @@ export class BoLItemSheet extends ItemSheet {
     data.category = itemData.system.category
     data.isGM = game.user.isGM;
     data.itemProperties = this.item.itemProperties;
+    data.description = await TextEditor.enrichHTML(this.object.system.description, {async: true})
 
     // Dynamic default data fix/adapt
     if (itemData.type == "item") {

module/system/bol-combat.js

@@ -15,7 +15,7 @@ export class BoLCombatManager extends Combat {
 
   /************************************************************************************/
   async rollInitiative(ids, formula = undefined, messageOptions = {}) {
-    console.log(`${game.data.system.data.title} | Combat.rollInitiative()`, ids, formula, messageOptions);
+    console.log(`${game.system.title} | Combat.rollInitiative()`, ids, formula, messageOptions);
     // Structure input data
     ids = typeof ids === "string" ? [ids] : ids;
     const currentId = this.combatant._id;
@@ -24,6 +24,7 @@ export class BoLCombatManager extends Combat {
     for (let cId = 0; cId < ids.length; cId++) {
       const combatant = this.combatants.get(ids[cId]);
       let fvttInit = 5
+      //console.log("TYPE", combatant.actor.type)
       if (combatant.actor.type == 'character') {
         let initData = combatant.actor.getLastInitData()
         console.log("Init data !!!", initData)
@@ -37,11 +38,12 @@ export class BoLCombatManager extends Combat {
           fvttInit = 3
         }
       } else {
-        fvttInit = 4 // Pietaille par defaut
-        if ( combatant.actor.getSubtype == 'adversary') {
+        fvttInit = 4 // Pietaille par defautco
+        //console.log("ACTOR", combatant.actor.getCharType())
+        if ( combatant.actor.getCharType() == 'adversary') {
           fvttInit = 7
         } 
-        if ( combatant.actor.getSubtype == 'tough') {
+        if ( combatant.actor.getCharType() == 'tough') {
           fvttInit = 6
         } 
       }

module/system/bol-hotbar.js

@@ -2,6 +2,21 @@ import { BoLRoll } from "../controllers/bol-rolls.js";
 
 export class BoLHotbar {
 
+
+  static async assignToHotBar( item, slot) {
+    let command = `game.bol.BoLHotbar.rollMacro("${item.name}", "${item.type}");`
+    let macro = game.macros.contents.find(m => (m.name === item.name) && (m.command === command))
+    if (!macro) {
+      macro = await Macro.create({
+        name: item.name,
+        type: "script",
+        img: item.img,
+        command: command
+      }, { displaySheet: false })
+    }
+    await game.user.assignHotbarMacro(macro, slot);
+  }
+
   /**
    * Create a macro when dropping an entity on the hotbar
    * Item      - open roll dialog for item
@@ -10,55 +25,20 @@ export class BoLHotbar {
    */
   static init( ) {
 
-    Hooks.on("hotbarDrop", async (bar, documentData, slot) => {
+    Hooks.on("hotbarDrop", (bar, documentData, slot) => {
     // Create item macro if rollable item - weapon, spell, prayer, trait, or skill
     if (documentData.type == "Item") {
-      console.log("Drop done !!!", bar, documentData, slot)
-      let item = documentData.data
-      let command = `game.bol.BoLHotbar.rollMacro("${item.name}", "${item.type}");`
-      let macro = game.macros.contents.find(m => (m.name === item.name) && (m.command === command))
-      if (!macro) {
-        macro = await Macro.create({
-          name: item.name,
-          type: "script",
-          img: item.img,
-          command: command
-        }, { displaySheet: false })
+      let item = fromUuidSync(documentData.uuid)
+      if (item == undefined) {
+        item = this.actor.items.get(documentData.uuid)
       }
-      game.user.assignHotbarMacro(macro, slot);
-    }
-    // Create a macro to open the actor sheet of the actor dropped on the hotbar
-    else if (documentData.type == "Actor") {
-      let actor = game.actors.get(documentData.id);
-      let command = `game.actors.get("${documentData.id}").sheet.render(true)`
-      let macro = game.macros.contents.find(m => (m.name === actor.name) && (m.command === command));
-      if (!macro) {
-        macro = await Macro.create({
-          name: actor.data.name,
-          type: "script",
-          img: actor.data.img,
-          command: command
-        }, { displaySheet: false })
-        game.user.assignHotbarMacro(macro, slot);
+      if (item && (item.system.subtype === "weapon" || item.system.category === "spell")) {
+        this.assignToHotBar( item, slot )
+        return false
       }
     }
-    // Create a macro to open the journal sheet of the journal dropped on the hotbar
-    else if (documentData.type == "JournalEntry") {
-      let journal = game.journal.get(documentData.id);
-      let command = `game.journal.get("${documentData.id}").sheet.render(true)`
-      let macro = game.macros.contents.find(m => (m.name === journal.name) && (m.command === command));
-      if (!macro) {
-        macro = await Macro.create({
-          name: journal.data.name,
-          type: "script",
-          img: "systems/bol/icons/images/icone_parchement_vierge.webp",
-          command: command
-        }, { displaySheet: false })
-        game.user.assignHotbarMacro(macro, slot);
-      }
-    }
-    return false;
-  });
+    return true
+  })
   }
 
   /** Roll macro */
@@ -76,10 +56,10 @@ export class BoLHotbar {
       return ui.notifications.warn(`Impossible de trouver l'objet de cette macro`)
     }
     // Trigger the item roll
-    if  (item.data.data.category === "equipment" && item.data.data.subtype === "weapon") {
+    if  (item.system.category === "equipment" && item.system.subtype === "weapon") {
       return BoLRoll.weaponCheckWithWeapon( actor, item)
     }
-    if  (item.data.data.category === "spell") {
+    if  (item.system.category === "spell") {
       return BoLRoll.spellCheckWithSpell( actor, item)
     }
   }

module/system/bol-utility.js

@@ -18,7 +18,7 @@ export class BoLUtility {
       default: true,
       type: Boolean,
       onChange: lang => window.location.reload()
-    });
+    })
     game.settings.register("bol", "useBougette", {
       name: "Utiliser la Bougette (règle fan-made)",
       hint: "Utilise un indicateur de Bougette, comme décrit dans l'aide de jeu Gold&Glory du RatierBretonnien (https://www.lahiette.com/leratierbretonnien/)",
@@ -27,14 +27,32 @@ export class BoLUtility {
       default: false,
       type: Boolean,
       onChange: lang => window.location.reload()
-    });
+    })
+    game.settings.register("bol", "logoActorSheet", {
+      name: "Chemin du logo des fiches de perso",
+      hint: "Vous pouvez changer le logo BoL des fiches de perso, pour jouer dans un autre univers (idéalement 346 x 200, défaut : /systems/bol/ui/logo.webp)",
+      scope: "world",
+      config: true,
+      default: "/systems/bol/ui/logo.webp",
+      type: String,
+      onChange: lang => window.location.reload()
+    })
+    game.settings.register("bol", "logoTopLeft", {
+      name: "Chemin du logo haut gauche",
+      hint: "Vous pouvez changer le logo BoL en haut à gauche de chaque écran (idéalement 718 x 416, défaut : /systems/bol/ui/logo2.webp)",
+      scope: "world",
+      config: true,
+      default: "/systems/bol/ui/logo2.webp",
+      type: String,
+      onChange: lang => window.location.reload()
+    })
 
     this.rollArmor = game.settings.get("bol", "rollArmor") // Roll armor or not
     this.useBougette = game.settings.get("bol", "useBougette") // Use optionnal bougette rules
-
+    this.actorSheetLogo = game.settings.get("bol", "logoActorSheet") || "/systems/bol/ui/logo.webp"
+    this.logoTopLeft = game.settings.get("bol", "logoTopLeft") || "/systems/bol/ui/logo2.webp"
   }
 
-
   /* -------------------------------------------- */
   static getRollArmor() {
     return this.rollArmor
@@ -43,9 +61,19 @@ export class BoLUtility {
   static getUseBougette() {
     return this.useBougette
   }
-
+  /* -------------------------------------------- */
+  static getLogoActorSheet() {
+    return this.actorSheetLogo
+  }
+  /* -------------------------------------------- */
+  static getLogoTopLeft() {
+    return this.logoTopLeft
+  }
+  
   /* -------------------------------------------- */
   static async ready() {
+    //$("#logo").attr("src", this.getLogoTopLeft() )  
+    $("#logo").css("content",`url(${this.getLogoTopLeft()})`)
   }
 
   /* -------------------------------------------- */
@@ -131,7 +159,7 @@ export class BoLUtility {
     let users = []
     for (let user of game.users) {
       if (!user.isGM && user.name != name) {
-        users.push(user.data._id)
+        users.push(user.id)
       }
     }
     return users
@@ -484,11 +512,21 @@ export class BoLUtility {
           nbDice++
           modIndex = 4
         }
+        if (res[3] == 'MM') {
+          postForm = 'kl' + nbDice
+          nbDice += 2
+          modIndex = 4
+        }
         if (res[3] == 'B') {
           postForm = 'kh' + nbDice
           nbDice++
           modIndex = 4
         }
+        if (res[3] == 'BB') {
+          postForm = 'kh' + nbDice
+          nbDice += 2
+          modIndex = 4
+        }
       }
       formula = "(" + nbDice + "d" + res[2] + reroll + postForm + "+" + modifier + ") *" + multiplier
     }

module/system/config.js

@@ -25,6 +25,10 @@ BOL.damageMultiplier = {
   "2": "x2",
   "3": "x3",
   "4": "x4",
+  "5": "x5",
+  "6": "x6",
+  "7": "7",
+  "8": "x8"
 }
 
 BOL.spellType = {
@@ -131,6 +135,7 @@ BOL.itemCategories = {
     "spell" : "BOL.itemCategory.spell",
     "alchemy" : "BOL.itemCategory.alchemy",
     "vehicle" : "BOL.itemCategory.vehicle",
+    "vehicleweapon": "BOL.itemCategory.vehicleweapon",
     "other" : "BOL.itemCategory.other"
 }
 

module/system/templates.js

@@ -18,6 +18,9 @@ export const preloadHandlebarsTemplates = async function () {
         "systems/bol/templates/actor/parts/tabs/actor-biodata.hbs",
         "systems/bol/templates/actor/parts/tabs/creature-stats.hbs",
         "systems/bol/templates/actor/parts/tabs/creature-actions.hbs",
+        "systems/bol/templates/actor/parts/tabs/vehicle-stats.hbs",
+        "systems/bol/templates/actor/parts/tabs/vehicle-description.hbs",
+        "systems/bol/templates/actor/parts/tabs/vehicle-weapons.hbs",
         // ITEMS
         "systems/bol/templates/item/parts/item-header.hbs",
         "systems/bol/templates/item/parts/properties/feature-properties.hbs",
@@ -36,6 +39,7 @@ export const preloadHandlebarsTemplates = async function () {
         "systems/bol/templates/item/parts/properties/feature/origin-properties.hbs",
         "systems/bol/templates/item/parts/properties/feature/race-properties.hbs",
         "systems/bol/templates/item/parts/properties/feature/fightoption-properties.hbs",
+        "systems/bol/templates/item/parts/properties/item/weapon-vehicle-properties.hbs",
 
         // DIALOGS
         "systems/bol/templates/chat/rolls/attack-damage-card.hbs",

packs/equipment.db

@@ -6,6 +6,7 @@
 {"_id":"4GyTrBGnvlyqoh38","name":"Dague","type":"item","img":"icons/weapons/daggers/dagger-jeweled-purple.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Dague</h1><p>cette catégorie regroupe toutes les lames courtes destinées à lacérer ou poignarder un adversaire. Les dagues sont à un ou deux tranchants selon les modèles, et peuvent être lancées aussi bien qu’utilisées au corps à corps. Facilement dissimulable, la dague est l’arme favorite des truands et des assassins.</p>","properties":{"ranged":false,"melee":true,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":true,"activable":false,"concealable":true,"ignoreshield":false,"powder":false,"bashing":false,"throwable":false,"range":3,"damage":"d6M","slot":"none","stacksize":null,"attackBonusDice":false,"attackAttribute":"agility","attackAptitude":"melee","attackModifiers":null,"weaponSize":"light","damageAttribute":"vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"EEnCVoPAR7pMjRym":3},"flags":{}}
 {"_id":"4NEaikxe0k1vzeqI","name":"Morgenstern","type":"item","img":"icons/weapons/maces/flail-spiked-grey.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Morgenstern</h1><p>une grosse boule de métal hérissée de pointes, montée à l’extrémité d’une longue hampe de 1,20 à 1,50 m de long. Rudimentaire, mais efficace.</p>","properties":{"ranged":false,"melee":true,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":true,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":false,"damage":"d6B","slot":"none","attackBonusDice":false,"throwable":false,"attackAttribute":"agility","attackAptitude":"melee","attackModifiers":null,"weaponSize":"heavy","damageAttribute":"vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"EEnCVoPAR7pMjRym":3},"flags":{}}
 {"name":"Lance (Lancer)","type":"item","img":"icons/weapons/polearms/glaive-simple.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Lance</h1><p>une hampe de bois de 1,80 m de long (parfois davantage), pourvue d’une pointe, qui peut être lancée ou utilisée au corps à corps, notamment contre des adversaires montés.</p>","properties":{"ranged":true,"melee":false,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":true,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":false,"throwable":false,"range":6,"damage":"d6","slot":"none","attackBonusDice":false,"attackAttribute":"agility","attackAptitude":"ranged","attackModifiers":null,"weaponSize":"medium","damageAttribute":"half-vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"kQghu0tL1dft5xLu":3},"flags":{"core":{"sourceId":"Compendium.bol.equipment.3xSSlnw9CDhwg67c"}},"_id":"4k3SUYYCnqc9uNCm"}
+{"name":"Projectiles","type":"item","img":"icons/weapons/artillery/ballista-wood-green.webp","system":{"category":"vehicleweapon","subtype":"armor","description":"<p>L&rsquo;&eacute;quipage du navire envoie une vol&eacute;e de projectiles (javelines, fl&egrave;ches, billes de fronde) sur le vaisseau ennemi, &agrave; condition que ce dernier se trouve au maximum &agrave; port&eacute;e Longue.</p>","properties":{"ranged":false,"melee":false,"spell":false,"protection":false,"weapon":false,"armor":false,"helm":false,"shield":false,"equipable":false,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"isfiredamage":false,"ishulldamage":false,"iscrewdamage":true,"hulldamage":"d6","hullDamageMultiplier":"1","crewdamage":"d6","crewDamageMultiplier":"1"},"quantity":1,"weight":0,"price":0,"worn":false},"effects":[],"flags":{},"_stats":{"systemId":"bol","systemVersion":"10.2.1","coreVersion":"10.287","createdTime":1665332723905,"modifiedTime":1665384335829,"lastModifiedBy":"kQghu0tL1dft5xLu"},"_id":"55CWxwKSYgBCbLrG","folder":null,"sort":0,"ownership":{"default":0,"kQghu0tL1dft5xLu":3}}
 {"name":"Massue (Lancer)","type":"item","img":"icons/weapons/clubs/club-simple-stone-purple.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Massue</h1><p>la version lourde du gourdin. Une massue consiste en un solide manche en bois dont l’extrémité, plus volumineuse, sert à fracasser le crâne de ses adversaires, d’où son autre nom de casse-tête.</p>","properties":{"ranged":true,"melee":false,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":true,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":false,"throwable":true,"range":3,"damage":"d6","slot":"none","attackBonusDice":false,"attackAttribute":"agility","attackAptitude":"ranged","attackModifiers":null,"weaponSize":"medium","damageAttribute":"half-vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"kQghu0tL1dft5xLu":3},"flags":{"core":{"sourceId":"Compendium.bol.equipment.pncWIrD5z7mk6dbc"}},"_id":"9dk1DqMpZXCgvS2r"}
 {"_id":"9mDDJnPsOCZRGPJN","name":"Gourdin","type":"item","img":"icons/weapons/clubs/club-barbed-square-black.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Gourdin</h1><p>c’est l’arme la plus rudimentaire qui soit. Un gourdin consiste généralement en un bâton de bois noueux, extrêmement dur et mesurant moins de 90 cm de long. Par commodité, on regroupe sous ce terme toute autre arme contondante du même genre (matraque, etc.). Il est possible d’utiliser un gourdin pour infliger des dégâts non létaux et assommer son ennemi plutôt que de le tuer.</p>","properties":{"ranged":false,"melee":true,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":true,"damage":"d6M","slot":"none","attackBonusDice":false,"throwable":false,"attackAttribute":"agility","attackAptitude":"melee","attackModifiers":null,"weaponSize":"light","damageAttribute":"vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"EEnCVoPAR7pMjRym":3},"flags":{}}
 {"_id":"AMDFMOvMhdapUJJF","name":"Dague (Lancer)","type":"item","img":"icons/weapons/daggers/dagger-jeweled-purple.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Dague</h1><p>cette catégorie regroupe toutes les lames courtes destinées à lacérer ou poignarder un adversaire. Les dagues sont à un ou deux tranchants selon les modèles, et peuvent être lancées aussi bien qu’utilisées au corps à corps. Facilement dissimulable, la dague est l’arme favorite des truands et des assassins.</p>","properties":{"ranged":true,"melee":false,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":true,"stackable":true,"activable":false,"concealable":true,"ignoreshield":false,"powder":false,"bashing":false,"throwable":false,"range":3,"damage":"d6M","slot":"none","stacksize":null,"attackBonusDice":false,"attackAttribute":"agility","attackAptitude":"ranged","attackModifiers":null,"weaponSize":"light","damageAttribute":"half-vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"kQghu0tL1dft5xLu":3},"flags":{"core":{"sourceId":"Compendium.bol.equipment.4GyTrBGnvlyqoh38"}}}
@@ -15,16 +16,19 @@
 {"name":"Masse d’armes (Lancer)","type":"item","img":"icons/weapons/maces/mace-flanged-steel.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Masse d’armes</h1><p>cette arme a la même forme qu’un gourdin, mais possède une tête en métal, souvent agrémentée de pointes ou d’ailettes pour plus d’efficacité. Les masses d’armes à une main peuvent se lancer, mais à courte distance, car elles ne sont pas vraiment prévues pour cet usage.</p>","properties":{"ranged":true,"melee":false,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":true,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":false,"throwable":false,"range":1.5,"damage":"d6","slot":"none","attackBonusDice":false,"attackAttribute":"agility","attackAptitude":"ranged","attackModifiers":null,"weaponSize":"medium","damageAttribute":"half-vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"kQghu0tL1dft5xLu":3},"flags":{"core":{"sourceId":"Compendium.bol.equipment.AUqk1SXktM4iDXvr"}},"_id":"BcYQ4pigZSXp1jWb"}
 {"_id":"D1UjDptdZGFg6Ggx","name":"Hache (Lancer)","type":"item","img":"icons/weapons/axes/axe-broad-engraved.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Hache</h1><p>un fer à un ou deux tranchants (qui peut être en bronze, en fer ou en acier) monté sur un manche en bois.</p>","properties":{"ranged":true,"melee":false,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":true,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":false,"throwable":false,"range":3,"damage":"d6","slot":"none","attackBonusDice":false,"attackAttribute":"agility","attackAptitude":"ranged","attackModifiers":null,"weaponSize":"medium","damageAttribute":"half-vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"kQghu0tL1dft5xLu":3},"flags":{"core":{"sourceId":"Compendium.bol.equipment.3U9Gl7g8D5Ih72HQ"}}}
 {"_id":"E8XHWMpwVHjPZV3M","name":"Hâche à deux mains","type":"item","img":"icons/weapons/axes/axe-double-brown.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Hâche à deux mains</h1><p>Une lourde hache s’utilisant à deux mains.</p>","properties":{"ranged":false,"melee":true,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":true,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":false,"damage":"d6B","slot":"none","attackBonusDice":false,"throwable":false,"attackAttribute":"agility","attackAptitude":"melee","attackModifiers":null,"weaponSize":"heavy","damageAttribute":"vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"EEnCVoPAR7pMjRym":3},"flags":{}}
+{"name":"Catapulte (Pierre)","type":"item","img":"icons/weapons/artillery/catapult-simple.webp","system":{"category":"vehicleweapon","subtype":"armor","description":"<p>Les catapultes peuvent tirer des pierres ou des pots de goudron enflamm&eacute; jusqu&rsquo;&agrave; une port&eacute;e<br>Extr&ecirc;me. Les pierres font des d&eacute;g&acirc;ts &agrave; la coque et au gr&eacute;ement du navire, mais peuvent aussi<br>tuer des matelots. Un pot &agrave; feu qui explose sur le pont arrose la coque et l&rsquo;&eacute;quipage de goudron<br>enflamm&eacute;, qui continue &agrave; br&ucirc;ler jusqu&rsquo;&agrave; ce que l&rsquo;incendie soit ma&icirc;tris&eacute;.</p>","properties":{"ranged":false,"melee":false,"spell":false,"protection":false,"weapon":false,"armor":false,"helm":false,"shield":false,"equipable":false,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"isfiredamage":false,"ishulldamage":true,"iscrewdamage":true,"hulldamage":"d6","hullDamageMultiplier":"1","crewdamage":"d3","crewDamageMultiplier":"1"},"quantity":1,"weight":0,"price":0,"worn":false},"effects":[],"flags":{},"_stats":{"systemId":"bol","systemVersion":"10.2.1","coreVersion":"10.287","createdTime":1665332723905,"modifiedTime":1665384335828,"lastModifiedBy":"kQghu0tL1dft5xLu"},"_id":"FEEgNQr54HLmbxb4","folder":null,"sort":0,"ownership":{"default":0,"kQghu0tL1dft5xLu":3}}
 {"_id":"G0qpJmjQPSJshPsC","name":"Bâton-Fronde","type":"item","img":"icons/weapons/slings/slingshot-wood.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Bâton-Fronde</h1><p>Version plus puissante de la fronde, montée au bout d’un bâton (ce qui en fait une arme à deux mains), qui permet des tirs à plus longue portée.</p>","properties":{"ranged":true,"melee":false,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":true,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":false,"2h":true,"damage":"d6M","range":18,"reload":0,"slot":"none","attackBonusDice":false,"attackAttribute":"agility","attackAptitude":"ranged","attackModifiers":null,"weaponSize":"light","damageAttribute":"half-vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"EEnCVoPAR7pMjRym":3},"flags":{}}
 {"_id":"Gm8Qpfuay4hu2ihq","name":"Grand bouclier","type":"item","img":"icons/equipment/shield/wardoor-wooden-boss-brown.webp","data":{"category":"equipment","subtype":"shield","description":"<h1>Grand bouclier</h1><p>Un personnage ne peut bénéficier de son bouclier que s’il est conscient de l’attaque qui le vise, et donc s’il est prêt à la parer.</p>","properties":{"ranged":false,"melee":false,"spell":false,"protection":true,"weapon":false,"armor":false,"helm":false,"shield":true,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":false,"modifiers":{"agility":-1,"init":0,"powercost":0,"social":false},"blocking":{"malus":-1,"nbAttacksPerRound":"1","blocking1":false,"blockingAll":true},"slot":"none"},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"EEnCVoPAR7pMjRym":3},"flags":{}}
 {"name":"Outils de Crochetage","type":"item","img":"icons/sundries/misc/key-angular-white.webp","data":{"category":"equipment","subtype":"other","description":"","properties":{"ranged":false,"melee":false,"spell":false,"protection":false,"weapon":false,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"slot":"chest"},"quantity":1,"weight":0,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"zN9ZZg5J7XzNELjd":3},"flags":{"core":{"sourceId":"Item.rk4tvTBFlLe87mRM"}},"_id":"HZpsorw1Okd07bvh"}
 {"_id":"LDklxAUh1IPNPnyi","name":"Mains Nues","type":"item","img":"icons/skills/melee/unarmed-punch-fist.webp","data":{"category":"equipment","subtype":"weapon","description":"","properties":{"ranged":false,"melee":true,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":false,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"concealable":false,"ignoreshield":false,"attackBonusDice":false,"attackAttribute":"agility","attackAptitude":"melee","attackModifiers":null,"weaponSize":"unarmed","damage":"d3","damageAttribute":"half-vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false,"bashing":true,"throwable":false},"quantity":1,"weight":0,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"zN9ZZg5J7XzNELjd":3},"flags":{"core":{"sourceId":"Item.BSoDfbLMBtwZllDb"}}}
 {"name":"Corde + Grappin","type":"item","img":"icons/sundries/survival/rope-wrapped-brown.webp","data":{"category":"equipment","subtype":"armor","description":"","properties":{"ranged":false,"melee":false,"spell":false,"protection":false,"weapon":false,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"slot":"chest"},"quantity":1,"weight":0,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"zN9ZZg5J7XzNELjd":3},"flags":{"core":{"sourceId":"Item.rk4tvTBFlLe87mRM"}},"_id":"NRBT2VmdzhjDL4fW"}
 {"name":"Armes Improvisée (Lancer)","type":"item","img":"icons/tools/cooking/knife-cleaver-steel-grey.webp","data":{"category":"equipment","subtype":"weapon","description":"","properties":{"ranged":true,"melee":false,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":false,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":true,"stackable":false,"concealable":false,"ignoreshield":false,"attackBonusDice":false,"attackAttribute":"agility","attackAptitude":"ranged","attackModifiers":null,"weaponSize":"improvised","damage":"d3","damageAttribute":"half-vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false,"bashing":true,"throwable":false,"range":null},"quantity":1,"weight":0,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"zN9ZZg5J7XzNELjd":3},"flags":{"core":{"sourceId":"Item.BSoDfbLMBtwZllDb"}},"_id":"Oe330qkRSJAQ88mX"}
+{"name":"Abordage","type":"item","img":"icons/weapons/swords/scimitar-guard-gold.webp","system":{"category":"vehicleweapon","subtype":"armor","description":"<p>Une action d&rsquo;Abordage peut &ecirc;tre tent&eacute;e si deux navires sont bloqu&eacute;s l&rsquo;un contre l&rsquo;autre suite &agrave; une action r&eacute;ussie d&rsquo;&Eacute;peronner ou de Lancer les grappins. L&rsquo;Abordage est la seule action pour laquelle il n&rsquo;y a pas de limite aux points de ressources que vous pouvez engager afin d&rsquo;avoir un bonus au jet d&rsquo;attaque. L&rsquo;Abordage est aussi l&rsquo;occasion pour des h&eacute;ros d&rsquo;entreprendre des Actions h&eacute;ro&iuml;ques en mer, de la m&ecirc;me fa&ccedil;on qu&rsquo;ils peuvent le faire lors de batailles terrestres. Ces actions formeront une petite aventure &agrave; part enti&egrave;re, par exemple si les h&eacute;ros doivent fouiller le navire ennemi tout en affrontant son &eacute;quipage.</p>","properties":{"ranged":false,"melee":false,"spell":false,"protection":false,"weapon":false,"armor":false,"helm":false,"shield":false,"equipable":false,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"isfiredamage":false,"ishulldamage":false,"iscrewdamage":true,"hulldamage":"d6","hullDamageMultiplier":"1","crewdamage":"d6","crewDamageMultiplier":"1","isboarding":true,"isspur":false,"isbreakrow":false},"quantity":1,"weight":0,"price":0,"worn":false},"effects":[],"flags":{},"_stats":{"systemId":"bol","systemVersion":"10.2.1","coreVersion":"10.287","createdTime":1665332723905,"modifiedTime":1665384335827,"lastModifiedBy":"kQghu0tL1dft5xLu"},"_id":"Oyz8RcFNq6MzDUBO","folder":null,"sort":0,"ownership":{"default":0,"kQghu0tL1dft5xLu":3}}
 {"name":"Armes Improvisée","type":"item","img":"icons/tools/hand/shovel-spade-steel-grey.webp","data":{"category":"equipment","subtype":"weapon","description":"","properties":{"ranged":false,"melee":true,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":false,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"concealable":false,"ignoreshield":false,"attackBonusDice":false,"attackAttribute":"agility","attackAptitude":"melee","attackModifiers":null,"weaponSize":"improvised","damage":"d3","damageAttribute":"vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false,"bashing":true,"throwable":false},"quantity":1,"weight":0,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"zN9ZZg5J7XzNELjd":3},"flags":{"core":{"sourceId":"Item.BSoDfbLMBtwZllDb"}},"_id":"RNHBCCGlpPNIkbFu"}
 {"name":"Bottes","type":"item","img":"icons/equipment/feet/boots-collared-leather-brown.webp","data":{"category":"equipment","subtype":"armor","description":"","properties":{"ranged":false,"melee":false,"spell":false,"protection":false,"weapon":false,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"slot":"chest"},"quantity":1,"weight":0,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"zN9ZZg5J7XzNELjd":3},"flags":{"core":{"sourceId":"Item.rk4tvTBFlLe87mRM"}},"_id":"X3AR5En9mQhGUrOA"}
 {"_id":"Z2AaQKweMljBAgt6","name":"Arc","type":"item","img":"icons/weapons/bows/longbow-leather-green.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Arc</h1><p>une longue tige flexible en bois dont les extrémités sont reliées par une corde et qui permet de tirer des flèches. Il existe différentes formes d’arcs.</p>","properties":{"ranged":true,"melee":false,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":true,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":false,"2h":true,"damage":"d6","range":22,"reload":0,"slot":"none","attackAttribute":"agility","attackAptitude":"ranged","attackModifiers":null,"damageAttribute":"half-vigor","damageModifiers":null,"damageReroll1":false,"attackBonusDice":false,"weaponSize":"medium","damageMultiplier":"1"},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"EEnCVoPAR7pMjRym":3},"flags":{}}
 {"name":"Sac","type":"item","img":"icons/containers/bags/pack-leather-black-brown.webp","data":{"category":"equipment","subtype":"container","description":"","properties":{"ranged":false,"melee":false,"spell":false,"protection":false,"weapon":false,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"slot":"chest"},"quantity":1,"weight":0,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"zN9ZZg5J7XzNELjd":3},"flags":{"core":{"sourceId":"Item.rk4tvTBFlLe87mRM"}},"_id":"aclqGClakTbXVwAK"}
+{"name":"Briser les Rames","type":"item","img":"icons/tools/nautical/steering-wheel.webp","system":{"category":"vehicleweapon","subtype":"armor","description":"<p>Le navire attaquant fr&ocirc;le le navire ennemi dans le but de briser ses rang&eacute;es de rames afin de<br>l&rsquo;immobiliser sans le couler. Pour cette man&oelig;uvre, les navires doivent commencer le round &agrave; Bout<br>portant ou &agrave; port&eacute;e Courte. L&rsquo;attaquant effectue un jet d&rsquo;action. Le d&eacute;fenseur peut utiliser ses<br>ressources pour &eacute;viter l&rsquo;attaque (ce qui lui octroie un bonus en d&eacute;fense).</p>","properties":{"ranged":false,"melee":false,"spell":false,"protection":false,"weapon":false,"armor":false,"helm":false,"shield":false,"equipable":false,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"isfiredamage":false,"ishulldamage":true,"iscrewdamage":false,"hulldamage":"d6","hullDamageMultiplier":"1","crewdamage":"d6","crewDamageMultiplier":"1","isboarding":false,"isspur":false,"isbreakrow":true},"quantity":1,"weight":0,"price":0,"worn":false},"effects":[],"flags":{},"_stats":{"systemId":"bol","systemVersion":"10.2.1","coreVersion":"10.287","createdTime":1665332723905,"modifiedTime":1665384335828,"lastModifiedBy":"kQghu0tL1dft5xLu"},"_id":"c8XSKMNX8hFr1Lgf","folder":null,"sort":0,"ownership":{"default":0,"kQghu0tL1dft5xLu":3}}
 {"_id":"cS2LGlXLZegvRGOo","name":"Arbalète lourde","type":"item","img":"icons/weapons/crossbows/crossbow-golden-bolt.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Arbalète lourde</h1><p>plus lourde et plus puissante qu’une arbalète normale, l’arbalète lourde est peu usitée en Lémurie, sauf comme arme de siège portative. Il faut 2 rounds complets pour charger une arbalète lourde.</p>","properties":{"ranged":true,"melee":false,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":true,"reloadable":true,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":false,"2h":true,"damage":"d6B","range":45,"reload":2,"slot":"none","attackAttribute":"agility","attackAptitude":"ranged","attackModifiers":null,"damageAttribute":"half-vigor","damageModifiers":null,"damageReroll1":false,"attackBonusDice":false,"weaponSize":"heavy","damageMultiplier":"1"},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"EEnCVoPAR7pMjRym":3},"flags":{}}
 {"_id":"d7UV55xQXXfMiGQI","name":"Fronde","type":"item","img":"icons/weapons/slings/slingshot-wood.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Fronde</h1><p>simple pièce de cuir équipée de lanières, une fronde permet de projeter de petites pierres ou des billes de plomb avec une certaine force. C’est une arme peu coûteuse et facile à fabriquer. Il existe une version plus puissante, montée au bout d’un bâton (ce qui en fait une arme à deux mains), qui permet des tirs à plus longue portée.</p>","properties":{"ranged":true,"melee":false,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":true,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":false,"damage":"d6M","range":9,"reload":0,"slot":"none","attackBonusDice":false,"attackAttribute":"agility","attackAptitude":"ranged","attackModifiers":null,"weaponSize":"unarmed","damageAttribute":"half-vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"EEnCVoPAR7pMjRym":3},"flags":{}}
 {"_id":"gCbETPg0ROGdDfHS","name":"Arc Ghataï","type":"item","img":"icons/weapons/bows/longbow-recurve-brown.webp","data":{"category":"equipment","subtype":"weapon","description":"<p>L&rsquo;arme embl&eacute;matique des Ghata&iuml; est un arc composite, particuli&egrave;rement adapt&eacute; pour des cavaliers. Les archers de cavalerie forment le gros des forces gatha&iuml;, qui utilisent des tactiques de harc&egrave;lement plut&ocirc;t que de charge frontale.</p>","properties":{"ranged":true,"melee":false,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":true,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"concealable":false,"ignoreshield":false,"attackBonusDice":false,"attackAttribute":"agility","attackAptitude":"ranged","attackModifiers":null,"weaponSize":"unarmed","damage":"d6","damageAttribute":"half-vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false,"slot":"2hands","bashing":false,"throwable":false,"range":22},"quantity":1,"weight":0,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"vpqjUad9wWS9Gk5R":3},"flags":{"core":{"sourceId":"Item.ltAvk5pqfNeqF8gO"}}}
@@ -35,8 +39,10 @@
 {"_id":"pncWIrD5z7mk6dbc","name":"Massue","type":"item","img":"icons/weapons/clubs/club-simple-stone-purple.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Massue</h1><p>la version lourde du gourdin. Une massue consiste en un solide manche en bois dont l’extrémité, plus volumineuse, sert à fracasser le crâne de ses adversaires, d’où son autre nom de casse-tête.</p>","properties":{"ranged":false,"melee":true,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":false,"throwable":false,"range":3,"damage":"d6","slot":"none","attackBonusDice":false,"attackAttribute":"agility","attackAptitude":"melee","attackModifiers":null,"weaponSize":"medium","damageAttribute":"vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"EEnCVoPAR7pMjRym":3},"flags":{}}
 {"_id":"qG5Jlhjjh7vDtBB1","name":"Fléau","type":"item","img":"icons/weapons/maces/flail-triple-grey.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Fléau</h1><p>un fléau consiste en un manche de bois prolongé d’une chaîne, à l’extrémité de laquelle est fixée une boule hérissée de pointes métalliques. Les fléaux ne sont pas des armes employées couramment en Lémurie, mais les gladiateurs en utilisent parfois dans les arènes. Les attaques au fléau ignorent le bonus en défense accordé par l’emploi d’un bouclier.</p>","properties":{"ranged":false,"melee":true,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"activable":false,"concealable":false,"ignoreshield":true,"powder":false,"bashing":false,"damage":"d6","slot":"none","attackBonusDice":false,"throwable":false,"attackAttribute":"agility","attackAptitude":"melee","attackModifiers":null,"weaponSize":"medium","damageAttribute":"vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"EEnCVoPAR7pMjRym":3},"flags":{}}
 {"_id":"rVLqiqxtfsZ7z6Hw","name":"Rapière","type":"item","img":"icons/weapons/swords/greatsword-flamberge.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Rapière</h1><p>cette épée fine et légère est essentiellement utilisée par les bellâtres et les courtisans des cités-états de Lémurie, chez qui l’escrime a été élevé au rang d’art. La rapière s’utilise généralement en conjonction avec une dague de parade (aussi appelée main gauche), un petit bouclier, ou une simple cape roulée en boule.</p>","properties":{"ranged":false,"melee":true,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":false,"damage":"d6M","slot":"none","attackBonusDice":false,"throwable":false,"attackAttribute":"agility","attackAptitude":"melee","attackModifiers":null,"weaponSize":"light","damageAttribute":"vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"EEnCVoPAR7pMjRym":3},"flags":{}}
+{"name":"Crache Feu","type":"item","img":"icons/weapons/artillery/cannon-engraved-gold.webp","system":{"category":"vehicleweapon","subtype":"armor","description":"<p>L&rsquo;usage de cet appareil d&rsquo;alchimiste exige des comp&eacute;tences particuli&egrave;res. Sa conception comme<br>la formule du produit qui l&rsquo;alimente sont des secrets jalousement gard&eacute;s. Le crache-feu est un<br>gros r&eacute;servoir pressuris&eacute; &eacute;quip&eacute; d&rsquo;un tube &agrave; son sommet. La machine tire un jet de liquide br&ucirc;lant<br>&agrave; de grandes distances (jusqu&rsquo;&agrave; port&eacute;e Longue).</p>\n<p>Les flammes sont presque impossibles &agrave; &eacute;teindre.</p>","properties":{"ranged":false,"melee":false,"spell":false,"protection":false,"weapon":false,"armor":false,"helm":false,"shield":false,"equipable":false,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"isfiredamage":true,"ishulldamage":true,"iscrewdamage":true,"hulldamage":"d6","hullDamageMultiplier":"1","crewdamage":"d6","crewDamageMultiplier":"1","isboarding":false,"isspur":false,"isbreakrow":false},"quantity":1,"weight":0,"price":0,"worn":false},"effects":[],"flags":{},"_stats":{"systemId":"bol","systemVersion":"10.2.1","coreVersion":"10.287","createdTime":1665332723905,"modifiedTime":1665384335828,"lastModifiedBy":"kQghu0tL1dft5xLu"},"_id":"uBTjNOW9I8dAJPdv","folder":null,"sort":0,"ownership":{"default":0,"kQghu0tL1dft5xLu":3}}
 {"_id":"vN3CHxyOrXuXHQRY","name":"Bâton","type":"item","img":"icons/weapons/staves/staff-simple-gold.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Bâton</h1><p>une longueur de bois robuste (environ 1,80 m de hauteur), qui sert aussi bien de bâton de marche que d’arme.</p>","properties":{"ranged":false,"melee":true,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":true,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":true,"damage":"d6","slot":"none","throwable":false,"attackAttribute":"agility","attackAptitude":"melee","attackModifiers":null,"damageAttribute":"vigor","damageModifiers":null,"damageReroll1":false,"attackBonusDice":false,"weaponSize":"unarmed","damageMultiplier":"1"},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"EEnCVoPAR7pMjRym":3},"flags":{}}
 {"name":"Somnifère","type":"item","img":"icons/consumables/potions/bottle-bulb-corked-labeled-blue.webp","data":{"category":"equipment","subtype":"other","description":"","properties":{"ranged":false,"melee":false,"spell":false,"protection":false,"weapon":false,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"slot":"chest"},"quantity":1,"weight":0,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"zN9ZZg5J7XzNELjd":3},"flags":{"core":{"sourceId":"Item.rk4tvTBFlLe87mRM"}},"_id":"vgJSyqc6VVxfbWsC"}
+{"name":"Catapulte (Feu)","type":"item","img":"icons/weapons/artillery/catapult-simple.webp","system":{"category":"vehicleweapon","subtype":"armor","description":"<p>Les catapultes peuvent tirer des pierres ou des pots de goudron enflamm&eacute; jusqu&rsquo;&agrave; une port&eacute;e<br>Extr&ecirc;me. Les pierres font des d&eacute;g&acirc;ts &agrave; la coque et au gr&eacute;ement du navire, mais peuvent aussi<br>tuer des matelots. Un pot &agrave; feu qui explose sur le pont arrose la coque et l&rsquo;&eacute;quipage de goudron<br>enflamm&eacute;, qui continue &agrave; br&ucirc;ler jusqu&rsquo;&agrave; ce que l&rsquo;incendie soit ma&icirc;tris&eacute;.</p>","properties":{"ranged":false,"melee":false,"spell":false,"protection":false,"weapon":false,"armor":false,"helm":false,"shield":false,"equipable":false,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"isfiredamage":true,"ishulldamage":true,"iscrewdamage":true,"hulldamage":"d3","hullDamageMultiplier":"1","crewdamage":"d3","crewDamageMultiplier":"1"},"quantity":1,"weight":0,"price":0,"worn":false},"effects":[],"flags":{},"_stats":{"systemId":"bol","systemVersion":"10.2.1","coreVersion":"10.287","createdTime":1665332723905,"modifiedTime":1665384335828,"lastModifiedBy":"kQghu0tL1dft5xLu"},"_id":"vgyGk9PEKJOqfZH2","folder":null,"sort":0,"ownership":{"default":0,"kQghu0tL1dft5xLu":3}}
 {"name":"Lanterne + Huile + Silex","type":"item","img":"icons/sundries/lights/lantern-iron-yellow.webp","data":{"category":"equipment","subtype":"other","description":"","properties":{"ranged":false,"melee":false,"spell":false,"protection":false,"weapon":false,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":false,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"slot":"chest"},"quantity":1,"weight":0,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"zN9ZZg5J7XzNELjd":3},"flags":{"core":{"sourceId":"Item.rk4tvTBFlLe87mRM"}},"_id":"x86khXdimiKSujjy"}
 {"_id":"xH95daHpPAQWuiYp","name":"Arme d’hast","type":"item","img":"icons/weapons/polearms/halberd-crescent-small-spiked.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Arme d’hast</h1><p>ce nom recouvre une catégorie d’armes possédant toutes un fer destiné à frapper, fixé au bout d’une longue hampe en bois, qui offre à son utilisateur une grande allonge. Selon leur forme, ces armes à deux mains portent le nom de hallebarde, coutille, guisarme, vouge…</p>","properties":{"ranged":false,"melee":true,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":true,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":false,"damage":"d6B","slot":"none","throwable":false,"attackAttribute":"agility","attackAptitude":"melee","attackModifiers":null,"damageAttribute":"vigor","damageModifiers":null,"damageReroll1":false,"attackBonusDice":false,"weaponSize":"unarmed","damageMultiplier":"1"},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"EEnCVoPAR7pMjRym":3},"flags":{}}
 {"_id":"xYWeGSCfnPwTq0rV","name":"Épée à deux mains","type":"item","img":"icons/weapons/swords/greatsword-crossguard-silver.webp","data":{"category":"equipment","subtype":"weapon","description":"<h1>Épée à deux mains</h1><p>Une lourde épée pouvant mesurer jusqu’à 1,80 m de long pour les plus grandes, et s’utilisant à deux mains. Elle peut porter différents noms selon les modèles : claymore, espadon, épée bâtarde…</p>","properties":{"ranged":false,"melee":true,"spell":false,"protection":false,"weapon":true,"armor":false,"helm":false,"shield":false,"equipable":true,"consumable":false,"magical":false,"2H":true,"reloadable":false,"bow":false,"crossbow":false,"throwing":false,"stackable":false,"activable":false,"concealable":false,"ignoreshield":false,"powder":false,"bashing":false,"damage":"d6B","slot":"none","attackBonusDice":false,"throwable":false,"attackAttribute":"agility","attackAptitude":"melee","attackModifiers":null,"weaponSize":"heavy","damageAttribute":"vigor","damageModifiers":null,"damageMultiplier":"1","damageReroll1":false},"quantity":null,"weight":null,"price":0,"worn":false},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"EEnCVoPAR7pMjRym":3},"flags":{}}

system.json

@@ -2,23 +2,22 @@
   "id": "bol",
   "title": "Barbarians of Lemuria",
   "description": "The Barbarians of Lemuria system for FoundryVTT!",
-  "author": "LeRatierBretonnien,Zigmund",
   "authors": [
     {
-      "name": "LeRatierBretonnien"
+      "name": "LeRatierBretonnien",
+      "flags": {}
     },
     {
-      "name": "Zigmund"
+      "name": "Zigmund",
+      "flags": {}
     }
   ],
   "url": "https://www.uberwald.me/gitea/public/bol",
   "license": "LICENSE.txt",
-  "flags": {},
-  "version": "10.0.1",
+  "version": "10.3.0",
   "compatibility": {
-    "minimum": 10
+    "minimum": "10"
   },
-  "scripts": [],
   "esmodules": [
     "module/bol.js"
   ],
@@ -29,17 +28,20 @@
     {
       "lang": "en",
       "name": "English",
-      "path": "lang/en.json"
+      "path": "lang/en.json",
+      "flags": {}
     },
     {
       "lang": "fr",
       "name": "Français",
-      "path": "lang/fr.json"
+      "path": "lang/fr.json",
+      "flags": {}
     },
     {
       "lang": "de",
       "name": "Deutsch",
-      "path": "lang/de.json"
+      "path": "lang/de.json",
+      "flags": {}
     }
   ],
   "packs": [
@@ -47,64 +49,64 @@
       "name": "boons",
       "label": "Avantages",
       "system": "bol",
-      "path": "./packs/boons.db",
-      "tag": "boon",
+      "path": "packs/boons.db",
       "type": "Item",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "name": "boonsflawscreatures",
       "label": "Avantages/Désavantages de Créatures",
       "system": "bol",
-      "path": "./packs/boonsflawscreatures.db",
-      "tag": "boon",
+      "path": "packs/boonsflawscreatures.db",
       "type": "Item",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "name": "flaws",
       "label": "Désavantages",
       "system": "bol",
-      "path": "./packs/flaws.db",
-      "tag": "flaw",
+      "path": "packs/flaws.db",
       "type": "Item",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "name": "careers",
       "label": "Carrières héroïques",
       "system": "bol",
-      "path": "./packs/careers.db",
-      "tag": "career",
+      "path": "packs/careers.db",
       "type": "Item",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "name": "origins",
       "label": "Origines",
       "system": "bol",
-      "path": "./packs/origins.db",
-      "tag": "origin",
+      "path": "packs/origins.db",
       "type": "Item",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "name": "races",
       "label": "Races",
       "system": "bol",
-      "path": "./packs/races.db",
-      "tag": "race",
+      "path": "packs/races.db",
       "type": "Item",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "name": "equipment",
       "label": "Equipement",
       "system": "bol",
-      "path": "./packs/equipment.db",
-      "tag": "item",
+      "path": "packs/equipment.db",
       "type": "Item",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "label": "Aides de Jeu",
@@ -112,7 +114,8 @@
       "name": "aides-de-jeu",
       "path": "packs/aides-de-jeu.db",
       "system": "bol",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "label": "Cartes",
@@ -120,7 +123,8 @@
       "name": "cartes",
       "path": "packs/cartes.db",
       "system": "bol",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "label": "Langues",
@@ -128,7 +132,8 @@
       "name": "languages",
       "path": "packs/languages.db",
       "system": "bol",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "label": "Sorts",
@@ -136,7 +141,8 @@
       "name": "spells",
       "path": "packs/spells.db",
       "system": "bol",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "label": "Dieux",
@@ -144,7 +150,8 @@
       "name": "godsfaith",
       "path": "packs/godsfaith.db",
       "system": "bol",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "label": "Options de Combat",
@@ -152,7 +159,8 @@
       "name": "fightoptions",
       "path": "packs/fightoptions.db",
       "system": "bol",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "label": "Alchimie - Potions",
@@ -160,7 +168,8 @@
       "name": "potions-alchimie",
       "path": "packs/potions-alchimie.db",
       "system": "bol",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "label": "Alchimie - Objets",
@@ -168,7 +177,8 @@
       "name": "objets-alchimie",
       "path": "packs/objets-alchimie.db",
       "system": "bol",
-      "private": false
+      "private": false,
+      "flags": {}
     },
     {
       "label": "Créatures",
@@ -176,17 +186,16 @@
       "name": "creatures",
       "path": "packs/creatures.db",
       "system": "bol",
-      "private": false
+      "private": false,
+      "flags": {}
     }
   ],
-  "relationships": { },
   "socket": true,
   "manifest": "https://www.uberwald.me/gitea/public/bol/raw/v10/system.json",
-  "download": "https://www.uberwald.me/gitea/public/bol/archive/bol-v10.0.1.zip",
-  "protected": false,
-  "background": "images/map_lemurie.webp",
+  "download": "https://www.uberwald.me/gitea/public/bol/archive/bol-v10.3.0.zip",
+  "background": "systems/images/map_lemurie.webp",
   "gridDistance": 1.5,
   "gridUnits": "m",
   "primaryTokenAttribute": "resources.hp",
   "secondaryTokenAttribute": "resources.hero"
-}
+}

template.json

@@ -2,7 +2,8 @@
   "Actor": {
     "types": [
       "character",
-      "encounter"
+      "encounter",
+      "vehicle"
     ],
     "templates": {
       "base": {
@@ -161,6 +162,46 @@
       "villainy": false,
       "size": "",
       "environment": ""
+    },
+    "vehicle": {
+      "vehicletype": "boat",
+      "attributes": {
+        "hull": {
+          "key": "hull",
+          "label": "BOL.attributes.hull",
+          "value": 0,
+          "min": 0,
+          "max": 5
+        },
+        "crew": {
+          "key": "crew",
+          "label": "BOL.attributes.crew",
+          "value": 0,
+          "min": 0,
+          "max": 5
+        },
+        "resources": {
+          "key": "resources",
+          "label": "BOL.attributes.resources",
+          "value": 0,
+          "min": 0,
+          "max": 5
+        }
+      },
+      "row": {
+        "key": "row",
+        "label": "BOL.attributes.row",
+        "value": 0,
+        "min": 0,
+        "max": 5
+      },
+      "spur": {
+        "value": ""
+      },
+      "status": {
+
+      },
+      "description": ""
     }
   },
   "Item": {

templates/actor/actor-sheet.hbs

@@ -1,8 +1,10 @@
-<form class="{{cssClass}} flexcol" autocomplete="off">
+<form class="{{cssClass}} flexcol bol-actor-form" autocomplete="off">
+    <!--<img class="system-img" src="/systems/bol/ui/logo.webp" height="115" width="190"/> -->
+    
   <div class="wrap flexrow">
 
     {{!-- Sidebar --}}
-    <div class="sidebar flex0">
+    <div class="sidebar flex0 bol-actor-sidebar">
       <img class="profile-img" src="{{actor.img}}" data-edit="img" title="{{actor.name}}" height="100" width="100"
         style="border:1px outset lightgray; box-shadow: 5px 5px 5px gray" />
     </div>
@@ -14,8 +16,8 @@
       {{!-- 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="actions">{{localize "BOL.ui.tab.actions"}}</a>  
-        {{#if (ne data.type "creature")}}      
+        {{#if (ne charType "creature")}}      
+          <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>
           {{#if (or isSorcerer isAlchemist)}}
@@ -28,22 +30,21 @@
       {{!-- Sheet Body --}}
       <section class="sheet-body">
         <div class="tab stats" data-group="primary" data-tab="stats">
-          {{#if (eq data.type "creature")}}
+          {{#if (eq charType "creature")}}
             {{>"systems/bol/templates/actor/parts/tabs/creature-stats.hbs"}}
+            {{> "systems/bol/templates/actor/parts/tabs/creature-actions.hbs"}}
           {{else}}
             {{>"systems/bol/templates/actor/parts/tabs/actor-stats.hbs"}}
           {{/if}}
         </div>
         
+        {{#if (ne charType "creature")}}
         <div class="tab actions" data-group="primary" data-tab="actions">
-          {{#if (eq data.type "creature")}}
-            {{> "systems/bol/templates/actor/parts/tabs/creature-actions.hbs"}}
-          {{else}}
             {{> "systems/bol/templates/actor/parts/tabs/actor-actions.hbs"}}
-          {{/if}}
         </div>
+        {{/if}}
 
-        {{#if (ne data.type "creature")}}      
+        {{#if (ne charType "creature")}}      
           <div class="tab features" data-group="primary" data-tab="features">
             {{> "systems/bol/templates/actor/parts/tabs/actor-features.hbs"}}
           </div>

templates/actor/parts/actor-header.hbs

@@ -6,23 +6,23 @@
             <input class="charname  flex6" name="name" type="text" value="{{actor.name}}" placeholder="Name"/>
         </div>
         
-        {{#if (eq data.type "player")}}
+        {{#if (eq charType "player")}}
         <div class="header-field-group flexrow">
             <label class="header-field-label flex2">{{localize "BOL.ui.xp"}}</label><br/>
             <div class="header-field-group flex3">
                 <label class="header-field-label flex1" style="font-size: 1.5em; color:#606060;">{{localize "BOL.ui.xpspent"}}</label><br/>
-                <input class="header-field-value flex1" type="text" name="data.xp.spent" value="{{numberFormat data.xp.spent decimals=0 sign=false}}" data-dtype="Number"/><br/>
+                <input class="header-field-value flex1" type="text" name="system.xp.spent" value="{{numberFormat xp.spent decimals=0 sign=false}}" data-dtype="Number"/><br/>
             </div>
             <div class="header-field-group flex3">
                 <label class="header-field-label flex1" style="font-size: 1.5em; color:#606060;">&nbsp;{{localize "BOL.ui.xptotal"}}</label><br/>
-                <input class="header-field-value flex1" type="text" name="data.xp.total" value="{{numberFormat data.xp.total decimals=0 sign=false}}" data-dtype="Number"/><br/>
+                <input class="header-field-value flex1" type="text" name="system.xp.total" value="{{numberFormat xp.total decimals=0 sign=false}}" data-dtype="Number"/><br/>
             </div>
         </div>
         {{else}}
         <div class="header-field-group flexrow">
           <label class="header-field-label flex2">Type : </label><br/>
-            <select class="field-value" name="data.type" data-dtype="String">
-            {{#select data.type}}
+            <select class="field-value" name="system.chartype" data-dtype="String">
+            {{#select charType}}
             <option value="creature">Créature</option>
             <option value="base">Piétaille</option>
             <option value="tough">Coriace</option>

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

@@ -1,5 +1,5 @@
 <ol class="items-list">
-  {{#if (ne actor.type "creature")}}      
+  {{#if (ne charType "creature")}}
     <li class="item flexrow item-header">
       <div class="item-name left">{{localize "BOL.ui.biosize"}}</div>
       <div class="item-field flex2 left"><input type="text" name="system.details.height" value="{{details.height}}"></div>
@@ -40,7 +40,7 @@
   </li>
 </ol>
 
-{{editor details.biography target="system.details.biography" button=true owner=owner
+{{editor biography target="system.details.biography" button=true owner=owner
 editable=editable}}
 
 <ol class="items-list">
@@ -49,4 +49,4 @@ editable=editable}}
     <div class="item-field flex1 right"></div>
   </li>
 </ol>
-{{editor details.notes target="system.details.notes" button=true owner=owner editable=editable}}
+{{editor notes target="system.details.notes" button=true owner=owner editable=editable}}

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

@@ -1,5 +1,7 @@
-{{#each combatCreature as |combatType id|}}
+{{#each combat as |combatType id|}}
         <ol class="items-list">
+            {{#if (isEmpty combatType.items)}}
+            {{else}}
             <li class="item flexrow item-header">
                 <div class="item-name flex2">{{localize combatType.label}}</div>
                 {{#if protection}}<div class="item-field">{{localize "BOL.ui.protection"}}</div>{{/if}}
@@ -8,6 +10,7 @@
                 {{#if ranged}}<div class="item-field">{{localize "BOL.ui.range"}}</div>{{else}}<div class="item-field"></div>{{/if}}
                 {{#if options}}<div class="item-field">{{localize "BOL.ui.status"}}</div>{{else}}<div class="item-field"></div>{{/if}}
             </li>
+            {{/if}}
             {{#each combatType.items as |item id|}}
                 <li class="item flexrow" data-item-id="{{item._id}}">
                     <div class="item-image" ><img src="{{item.img}}" title="{{item.name}}"/></div>

templates/actor/parts/tabs/creature-stats.hbs

@@ -21,12 +21,10 @@
       </span>
     </div>
   </div>
-</div>
-<hr/>
-<div class="resources flexrow">
     <div class="resource stat flex1 flex-group-center">
       <label class="stat-label">{{localize "BOL.resources.hp"}}</label><br/>
       <input class="stat-value" type="text" name="system.resources.hp.value" value="{{numberFormat resources.hp.value decimals=0 sign=false}}" data-dtype="Number"/>
       <input class="stat-max" type="text" name="system.resources.hp.max" value="{{numberFormat resources.hp.max decimals=0 sign=false}}" data-dtype="Number"/>
     </div>
 </div>
+<hr/>

templates/actor/parts/tabs/vehicle-description.hbs

@@ -0,0 +1,10 @@
+<ol class="items-list">
+  <li class="item flexrow item-header">
+    <div class="item-name flex4 left">{{localize "BOL.ui.biodescription"}}</div>
+    <div class="item-field flex1 right"></div>
+  </li>
+</ol>
+
+{{editor description target="system.description" button=true owner=owner
+editable=editable}}
+

templates/actor/parts/tabs/vehicle-stats.hbs

@@ -0,0 +1,24 @@
+<hr />
+
+<div class="resources flexrow">
+  {{#each system.attributes as |attr key|}}
+  <div class="resource stat flex1 flex-group-center">
+    <label class="stat-label">{{localize attr.label}}</label><br />
+    <input class="stat-value resources-value" type="text" name="system.attributes.{{key}}.value"
+      value="{{numberFormat attr.value decimals=0 sign=false}}" data-dtype="Number" />
+    <input class="resources-value" type="text" name="system.attributes.{{key}}.max"
+      value="{{numberFormat attr.max decimals=0 sign=false}}" data-dtype="Number" />
+  </div>
+  {{/each}}
+
+  {{#if (eq system.vehicletype "boat")}}
+  <div class="resource stat flex1 flex-group-center">
+    <label class="stat-label">{{localize system.row.label}}</label><br />
+    <input class="stat-value resources-value" type="text" name="system.row.value"
+      value="{{numberFormat system.row.value decimals=0 sign=false}}" data-dtype="Number" />
+    <input class="resources-value" type="text" name="system.row.max"
+      value="{{numberFormat system.row.max decimals=0 sign=false}}" data-dtype="Number" />
+  </div>
+  {{/if}}
+
+</div>

templates/actor/parts/tabs/vehicle-weapons.hbs

@@ -0,0 +1,30 @@
+<div class="item-name flex4 left">{{localize "BOL.ui.vehicleWeapons"}}</div>
+<ol class="items-list">
+  <li class="item flexrow item-header">
+    <div class="item-name flex4 left">{{localize "BOL.ui.weapons"}}</div>
+    <div class="item-field flex2 center">{{localize "BOL.ui.hullDamage"}}</div>
+    <div class="item-field flex1 center">{{localize "BOL.ui.crewDamage"}}</div>
+    <div class="item-field flex1 center">{{localize "BOL.ui.fireDamage"}}</div>
+    <div class="item-field flex1 right"></div>
+  </li>
+  {{#each weapons 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 flex1 center">
+      <span class="item-field">{{item.system.properties.hulldamage}}</span>
+    </div>
+    <div class="item-field flex1 center">
+      <span class="item-field">{{item.system.properties.crewdamage}}</span>
+    </div>
+    <div class="item-field flex1 center">
+      <span class="item-field">{{#if item.system.properties.isfiredamage}}X{{else}}-{{/if}}</span>
+    </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>

templates/actor/vehicle-sheet.hbs

@@ -0,0 +1,66 @@
+<form class="{{cssClass}} flexcol bol-actor-form" autocomplete="off">
+    <!--<img class="system-img" src="/systems/bol/ui/logo.webp" height="115" width="190"/> -->
+    
+  <div class="wrap flexrow">
+
+    {{!-- Sidebar --}}
+    <div class="sidebar flex0 bol-actor-sidebar">
+      <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" height="100" width="100"
+        style="border:1px outset lightgray; box-shadow: 5px 5px 5px gray" />
+    </div>
+
+    <div class="main flex1">
+
+  {{!-- Sheet Header --}}
+  <header class="sheet-header">
+      <div class="header-field flex1">
+        <div class="header-field-group flexrow">
+            <label class="header-field-label flex2">{{localize "BOL.ui.name"}}</label><br/>
+            <input class="charname  flex6" name="name" type="text" value="{{name}}" placeholder="Name"/>
+        </div>
+        <div class="header-field-group flexrow">
+          <label class="header-field-label flex2">Type : </label><br/>
+            <select class="field-value" name="system.vehicletype" data-dtype="String">
+              {{#select system.vehicletype}}
+              <option value="boat">Navire</option>
+              <option value="flyingboat">Nef Volante</option>
+              <option value="chariot">Chariot/Carriole</option>
+              <option value="other">Autre</option>
+              {{/select}}
+            </select>
+        </div>
+
+    </div>
+  </header>
+
+      {{!-- 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="description">{{localize "BOL.ui.tab.description"}}</a>
+      </nav>
+
+      {{!-- Sheet Body --}}
+      <section class="sheet-body">
+        <div class="tab stats" data-group="primary" data-tab="stats">
+          {{>"systems/bol/templates/actor/parts/tabs/vehicle-stats.hbs"}}
+          {{>"systems/bol/templates/actor/parts/tabs/vehicle-weapons.hbs"}}
+
+        </div>        
+
+        <div class="tab description" data-group="primary" data-tab="description">
+          {{> "systems/bol/templates/actor/parts/tabs/vehicle-description.hbs"}}
+        </div>
+
+      </section>
+    </div>
+  </div>
+  <div class="bol-footer flexrow">
+    <div class="footer-left flex1">
+      <img src="/systems/bol/ui/banner.webp" />
+    </div>
+    <div class="footer-center flex1"></div>
+    <div class="footer-right flex1">
+      <img src="/systems/bol/ui/banner.webp" />
+    </div>
+  </div>
+</form>

templates/chat/chat-info-range.hbs

@@ -0,0 +1,19 @@
+<div>
+  <img class="chat-icon" src="{{weapon.img}}" alt="{{weapon.name}}"/>
+  <h2 class="bad"><strong>{{localize "BOL.chat.rangetitle"}}</strong></h2> 
+</div>
+
+<div class="flexrow">
+
+  {{localize "BOL.chat.rangeinfo" attackerName=attackerName defenderName=defenderName}}
+  {{#if visible}}
+    <br>{{localize "BOL.chat.rangevisible"}}
+  {{else}}
+    <br>{{localize "BOL.chat.rangenotvisible"}}
+  {{/if}}
+  <br>{{localize "BOL.chat.rangeweaponinfo" weaponName=weapon.name weaponRange=weaponRange}} m.
+  <br>{{localize "BOL.chat.rangeprefix"}} {{distance}} m.
+  <br>{{localize rangeMsg}}
+
+</div>
+

templates/chat/rolls/attack-damage-card.hbs

@@ -1,7 +1,7 @@
 
-  <button class="chat-damage-roll" data-damage-mode="normal-damage" data-attack-id="{{id}}">{{localize "BOL.chat.rolldamage"}}</button>
+  <button class="chat-damage-roll bol-margin-tb-2" data-damage-mode="normal-damage" data-attack-id="{{id}}">{{localize "BOL.chat.rolldamage"}}</button>
   
   {{#if isCritical}}
-    <button class="chat-damage-roll" data-damage-mode="damage-plus-6" data-attack-id="{{id}}">{{localize "BOL.chat.rolldamage6"}}</button>
-    <button class="chat-damage-roll" data-damage-mode="damage-plus-12" data-attack-id="{{id}}">{{localize "BOL.chat.rolldamage12"}}</button>
+    <button class="chat-damage-roll bol-margin-tb-2 " data-damage-mode="damage-plus-6" data-attack-id="{{id}}">{{localize "BOL.chat.rolldamage6"}}</button>
+    <button class="chat-damage-roll bol-margin-tb-2" data-damage-mode="damage-plus-12" data-attack-id="{{id}}">{{localize "BOL.chat.rolldamage12"}}</button>
   {{/if}}

templates/chat/rolls/default-roll-card.hbs

@@ -24,6 +24,10 @@
 <h3><strong>{{description}}</strong></h3> 
 
 <div class="actions-section">
+  {{#if isFumble}}
+    {{localize "BOL.chat.fumblemessage"}}
+  {{/if}}
+
   {{#if fightOption}}
   <div>
     {{localize "BOL.chat.fightoption"}} : {{fightOption.name}}
@@ -31,6 +35,13 @@
   {{/if}}
 
   <div id="{{optionsId}}">
+
+    {{#if isRealCritical}}
+      <div class="bol-margin-tb-2">
+        <a class="content-link" draggable="true" data-uuid="Compendium.bol.aides-de-jeu.Yl1RKQb0BjVUtilk" data-id="Yl1RKQb0BjVUtilk" data-type="JournalEntry" data-pack="bol.aides-de-jeu" data-tooltip="un journal"><i class="fas fa-book-open"></i>Succès Héroïque</a>
+      </div>
+    {{/if}}
+
     {{#if (and isSuccess weapon)}}
     {{> "systems/bol/templates/chat/rolls/attack-damage-card.hbs"}}
     {{/if}}
@@ -42,16 +53,18 @@
     {{/if}}
     
     {{#if reroll}}
-      <button class="chat-button button hero-reroll" data-roll-id=="{{rollId}}" data-actor-id="{{actor.id}}">{{localize "BOL.chat.reroll"}}</button>
+      <button class="chat-button button hero-reroll bol-margin-tb-2" data-roll-id=="{{rollId}}" data-actor-id="{{actor.id}}">{{localize "BOL.chat.reroll"}}</button>
     {{/if}}
     {{#if (and isSuccess (not isCritical))}}
-      <button class="chat-button button transform-heroic-roll" data-roll-id=="{{rollId}}" data-actor-id="{{actor.id}}">{{localize "BOL.chat.toheroic"}}</button>
+      <button class="chat-button button transform-heroic-roll bol-margin-tb-2" data-roll-id=="{{rollId}}" data-actor-id="{{actor.id}}">{{localize "BOL.chat.toheroic"}}</button>
     {{/if}}
 
     {{#if isRealCritical}}
-      <button class="chat-button button transform-legendary-roll" data-roll-id=="{{rollId}}" data-actor-id="{{actor.id}}">{{localize "BOL.chat.tolegend"}}</button>
+      <button class="chat-button button transform-legendary-roll bol-margin-tb-2" data-roll-id=="{{rollId}}" data-actor-id="{{actor.id}}">{{localize "BOL.chat.tolegend"}}</button>
     {{/if}}
+
     <br>
   </div>
 </div>
 
+

templates/dialogs/attribute-roll-part.hbs

@@ -1,5 +1,5 @@
     <div class="flexrow box-roll">
-        <div class="flex1 center bg-darkred">
+        <div class="flex1 center bg-darkred" >
             <label for="attr">{{localize 'BOL.ui.attribute'}}</label>
         </div>
         <div class="flex1 center cell">

templates/dialogs/boons-roll-part.hbs

@@ -1,6 +1,6 @@
     {{#if (count boons)}}
     <div class="flexrow roll-box" >
-        <div class="flex1 center bg-darkred">
+        <div class="flex1 center bg-darkred" data-tooltip-direction="LEFT" data-tooltip="Click-gauche pour sélectionner, CTRL+Click gauche pour déselectionner">
             <label for="mod">{{localize 'BOL.ui.boons'}}</label>
         </div>
         <div class="flex1 center cell">

templates/dialogs/career-roll-part.hbs

@@ -1,6 +1,6 @@
     {{#if careers}}
     <div class="flexrow roll-box">
-        <div class="flex1 center bg-darkred">
+        <div class="flex1 center bg-darkred" data-tooltip-direction="LEFT" data-tooltip="Click-gauche pour selectionner, CTRL+Click gauche pour déselectionner">
             <label for="mod">{{localize 'BOL.ui.careers'}}</label>
         </div>
         <div class="flex1 center cell">

templates/dialogs/flaws-roll-part.hbs

@@ -1,6 +1,6 @@
     {{#if (count flaws)}}
     <div class="flexrow roll-box">
-        <div class="flex1 center bg-darkred">
+        <div class="flex1 center bg-darkred" data-tooltip-direction="LEFT" data-tooltip="Click-gauche pour selectionner, CTRL+Click gauche pour déselectionner">
             <label for="mod">{{localize 'BOL.ui.flaws'}}</label>
         </div>
         <div class="flex1 center cell">

templates/dialogs/weapon-roll-dialog.hbs

@@ -8,7 +8,7 @@
         </div>
     </header>
 
-    {{#if weapon.data.data.properties.onlymodifier}}
+    {{#if weapon.system.properties.onlymodifier}}
     {{else}}
       {{> "systems/bol/templates/dialogs/attribute-roll-part.hbs"}}
       {{> "systems/bol/templates/dialogs/aptitude-roll-part.hbs"}}  

templates/item/item-sheet.hbs

@@ -20,7 +20,7 @@
                         </div>
                     {{/if}}
 
-                    {{editor item.system.description target="system.description" button=true owner=owner editable=editable}}
+                    {{editor description target="system.description" button=true owner=owner editable=editable}}
                 </div>
                 <div class="tab properties" data-group="primary" data-tab="properties">
                 {{#if (eq item.type "item")}}

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

@@ -26,3 +26,6 @@
 {{#if (eq item.system.category "alchemy")}}
     {{> "systems/bol/templates/item/parts/properties/item/alchemy-properties.hbs"}}
 {{/if}}
+{{#if (eq item.system.category "vehicleweapon")}}
+    {{> "systems/bol/templates/item/parts/properties/item/weapon-vehicle-properties.hbs"}}
+{{/if}}

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

@@ -88,7 +88,6 @@
     </div>
 </div>
 
-
 {{#if item.system.properties.weapon}}
     {{> "systems/bol/templates/item/parts/properties/item/weapon-properties.hbs"}}
 {{/if}}

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

@@ -0,0 +1,93 @@
+<h3 class="form-header">{{localize "BOL.ui.weaponProperties"}}</h3>
+
+<hr/>
+<div class="form-group">
+  <label class="property-label">{{localize "BOL.itemProperty.vehicleDamageType"}}</label>
+  <div class="form-fields">
+      <label class="checkbox">
+        <input class="field-value" type="checkbox" name="system.properties.isfiredamage" {{checked item.system.properties.isfiredamage}}> {{localize "BOL.itemProperty.isfiredamage"}}
+      </label>
+  </div>
+  <div class="form-fields">
+      <label class="checkbox">
+        <input class="field-value" type="checkbox" name="system.properties.ishulldamage" {{checked item.system.properties.ishulldamage}}> {{localize "BOL.itemProperty.ishulldamage"}}
+      </label>
+  </div>
+  <div class="form-fields">
+      <label class="checkbox">
+        <input class="field-value" type="checkbox" name="system.properties.iscrewdamage" {{checked item.system.properties.iscrewdamage}}> {{localize "BOL.itemProperty.iscrewdamage"}}
+      </label>
+  </div>
+  <div class="form-fields">
+      <label class="checkbox">
+        <input class="field-value" type="checkbox" name="system.properties.isboarding" {{checked item.system.properties.isboarding}}> {{localize "BOL.itemProperty.isboarding"}}
+      </label>
+  </div>
+  <div class="form-fields">
+      <label class="checkbox">
+        <input class="field-value" type="checkbox" name="system.properties.isspur" {{checked item.system.properties.isspur}}> {{localize "BOL.itemProperty.isspur"}}
+      </label>
+  </div>
+  <div class="form-fields">
+      <label class="checkbox">
+        <input class="field-value" type="checkbox" name="system.properties.isbreakrow" {{checked item.system.properties.isbreakrow}}> {{localize "BOL.itemProperty.isbreakrow"}}
+      </label>
+  </div>
+</div>
+
+{{#if item.system.properties.ishulldamage}}
+<hr/>
+<h3 class="form-header">{{localize "BOL.itemProperty.hulldamage"}}</h3>
+<div class="form-group">
+    <label class="property-label">{{localize "BOL.itemProperty.hulldamage"}}</label>
+    <div class="form-fields">
+        <select class="field-value" name="system.properties.hulldamage" data-dtype="String">
+            {{#select item.system.properties.hulldamage}}
+                {{#each config.damageValues as |value id|}}
+                    <option value="{{id}}">{{value}}</option>
+                {{/each}}
+            {{/select}}
+        </select>
+    </div>
+</div>
+<div class="form-group">
+    <label class="property-label">{{localize "BOL.itemProperty.hullDamageMultiplier"}}</label>
+    <div class="form-fields center">
+        <select class="field-value" name="system.properties.hullDamageMultiplier" data-dtype="String">
+            {{#select item.system.properties.hullDamageMultiplier}}
+                {{#each config.damageMultiplier as |value id|}}
+                    <option value="{{id}}">{{value}}</option>
+                {{/each}}
+            {{/select}}
+        </select>
+    </div>
+</div>
+{{/if}}
+{{#if item.system.properties.iscrewdamage}}
+<hr/>
+<h3 class="form-header">{{localize "BOL.itemProperty.crewdamage"}}</h3>
+<div class="form-group">
+    <label class="property-label">{{localize "BOL.itemProperty.crewdamage"}}</label>
+    <div class="form-fields">
+        <select class="field-value" name="system.properties.crewdamage" data-dtype="String">
+            {{#select item.system.properties.crewdamage}}
+                {{#each config.damageValues as |value id|}}
+                    <option value="{{id}}">{{value}}</option>
+                {{/each}}
+            {{/select}}
+        </select>
+    </div>
+</div>
+<div class="form-group">
+    <label class="property-label">{{localize "BOL.itemProperty.crewDamageMultiplier"}}</label>
+    <div class="form-fields center">
+        <select class="field-value" name="system.properties.crewDamageMultiplier" data-dtype="String">
+            {{#select item.system.properties.crewDamageMultiplier}}
+                {{#each config.damageMultiplier as |value id|}}
+                    <option value="{{id}}">{{value}}</option>
+                {{/each}}
+            {{/select}}
+        </select>
+    </div>
+</div>
+{{/if}}