Roll pour carrière

css/bol.css

@@ -255,22 +255,10 @@
   font-display: swap;
   src: url(https://fonts.gstatic.com/s/contrailone/v10/eLGbP-j_JA-kG0_Zo51noafdZQ.ttf) format('truetype');
 }
-@font-face {
-  font-family: "ImaginaryForces";
-  src: url('../fonts/iforces.ttf');
-}
-@font-face {
-  font-family: "OPTIFantastiK";
-  src: url('../fonts/OPTIFantastiK.otf');
-}
 @font-face {
   font-family: "CCMeanwhile";
   src: url('../fonts/ccmeanwhile-regular.ttf');
 }
-@font-face {
-  font-family: "Papyrus";
-  src: url('../fonts/PAPYRUS.TTF');
-}
 @font-face {
   font-family: "Wolfsbane2";
   src: url('../fonts/wolfsbane2.ttf');
@@ -283,6 +271,9 @@
   font-family: "Wolfsbane2Expanded";
   src: url('../fonts/wolfsbane2expand.ttf');
 }
+/* ----------------------------------------- */
+/*  TEXT STYLES                             */
+/* ----------------------------------------- */
 .bol.sheet.actor {
   min-width: 760px;
   min-height: 700px;
@@ -549,3 +540,10 @@
 .bonus {
   color: darkgreen;
 }
+.chat-message .chat-icon {
+  border: 0;
+  padding: 2px 6px 2px 2px;
+  float: left;
+  width: 64px;
+  height: 64px;
+}

lang/en.json

@@ -13,5 +13,9 @@
   "BOL.resources.faith": "Faith points",
   "BOL.resources.creation": "Creation points",
   "BOL.resources.power": "Power points",
-  "BOL.traits.xp": "Experience"
+  "BOL.traits.xp": "Experience",
+
+  "attribut": "Attribut",
+  "rank": "Level",
+  "subtype": "Type"
 }

lang/fr.json

@@ -13,5 +13,42 @@
   "BOL.resources.faith": "Foi",
   "BOL.resources.creation": "Création",
   "BOL.resources.power": "Pouvoir",
-  "BOL.traits.xp": "Expérience"
+  "BOL.traits.xp": "Expérience",
+
+  "Careers": "Carrières",
+  "Name": "Nom",
+  "Boons": "Avantages",
+  "Flaws": "Désavantages",
+  "Inventory": "Inventaire",
+
+  "Career": "Carrière",
+  "Boon": "Avantage",
+  "Flaw": "Désavantage",
+
+  "d6B": "d6 Bonus",
+  "d6M": "d6 Malus",
+  "ranged": "A Distance",
+  "melee": "Melée",
+  "spell" : "Sort",
+  "protection" : "Protectin",
+  "weapon" : "Arme",
+  "armor" : "Armure",
+  "helm" : "Casque",
+  "shield" : "Bouclier",
+
+  "equipable": "Equipable",
+  "stackable": "Empilable",
+  "consumable" : "Consommable",
+  "magical" : "Magique",
+
+  "2H" : "A Deux Mains",
+  "reloadable" : "A Recharger",
+  "bow" : "Arc",
+  "crossbow" : "Arbalète",
+  "throwing" : "Lancer", 
+
+  "rank": "Niveau",
+  "attribut": "Attribut",
+  "subtype": "Type",
+  "Language": "Langue"
 }

module/actor/actor-sheet.js

@@ -59,6 +59,11 @@ export class BoLActorSheet extends ActorSheet {
       item.sheet.render(true);
     });
 
+    html.find('.roll-career').click(ev => {
+      const li = $(ev.currentTarget).parents(".item");
+      this.actor.rollCareer( li.data("itemId") );
+    });
+
     // Delete Inventory Item
     html.find('.item-delete').click(ev => {
       const li = $(ev.currentTarget).parents(".item");

module/actor/actor.js

@@ -1,3 +1,6 @@
+import { BoLRollDialog } from "../system/roll-dialog.js";
+import { BoLUtility } from "../system/bol-utility.js";
+
 /**
  * Extend the base Actor entity by defining a custom roll data structure which is ideal for the Simple system.
  * @extends {Actor}
@@ -26,12 +29,52 @@ export class BoLActor extends Actor {
   //   const data = actorData.data;
   //
   //   // Make modifications to data here. For example:
-  //
+  ////   // Loop through ability scores, and add their modifiers to our sheet output.
-  //   // Loop through ability scores, and add their modifiers to our sheet output.
   //   for (let [key, ability] of Object.entries(data.abilities)) {
   //     // Calculate the modifier using d20 rules.
   //     ability.mod = Math.floor((ability.value - 10) / 2);
   //   }
   // }
-
+  /* -------------------------------------------- */
+  getBoons() {
+    return this.data.items.filter(i => i.type === "feature" && i.data.subtype === "boon");   
+  }
+  /* -------------------------------------------- */
+  getFlaws() {
+    return this.data.items.filter(i => i.type === "feature" && i.data.subtype === "flaw");    
+  }
+  /* -------------------------------------------- */
+  getCareers() {
+    return this.data.items.filter(i => i.type === "feature" && i.data.subtype === "career");    
+  }
+  /* -------------------------------------------- */
+  saveRollData( rollData) {
+    this.currentRollData = rollData;
+  }
+
+  async rollCareer( careerId ) {
+    let career = BoLUtility.data(this.data.items.find( item => item.type == 'feature' && item.id == careerId));
+    if (career) {
+      let rollData = {
+        mode : "career",
+        actorId: this.id,
+        actorImg: this.img,
+        career :  career,
+        rollAttribute: 'mind',
+        attributes :  duplicate(this.data.data.attributes),
+        boons :  this.getBoons(),
+        flaws :  this.getFlaws(),
+        d6Bonus: 0,
+        d6Malus: 0,
+        rollMode: game.settings.get("core", "rollMode"),
+        title: `${career.name} : ${career.data.rank}`,
+        optionsBonusMalus: BoLUtility.buildListOptions(-8, +2),
+        bonusMalus: 0
+      }
+      let rollDialog = await BoLRollDialog.create( this, rollData);
+      rollDialog.render( true );
+    } else {
+      ui.notifications.warn("Unable to find career for actor " + this.name + " - Career ID  " + careerId);
+    }
+  }
 }

module/bol.js

@@ -22,8 +22,8 @@ Hooks.once('init', async function () {
      * @type {String}
      */
     CONFIG.Combat.initiative = {
-        formula: "1d20",
+        formula: "2d6+@attributes.mind.value+@aptitudes.init.value",
-        decimals: 2
+        decimals: 0
     };
 
     // Define custom Entity classes

module/item/item-sheet.js

@@ -1,3 +1,5 @@
+import { BoLUtility } from "../system/bol-utility.js";
+
 /**
  * Extend the basic ItemSheet with some very simple modifications
  * @extends {ItemSheet}
@@ -29,12 +31,26 @@ export class BoLItemSheet extends ItemSheet {
 
   /** @override */
   getData() {
-    const item = super.getData();
+    const objectData = BoLUtility.data(this.object);
-    console.debug("Item getData");
+    
-    item.data.description = item.data.data.description;
+    let itemData = foundry.utils.deepClone(BoLUtility.templateData(this.object));
-    item.data.properties = item.data.data.properties;
+    let formData = {
-    console.log(item.data);
+      title: this.title,
-    return item;
+      id: this.id,
+      type: objectData.type,
+      img: objectData.img,
+      name: objectData.name,
+      editable: this.isEditable,
+      cssClass: this.isEditable ? "editable" : "locked",
+      data: itemData, 
+      limited: this.object.limited,
+      options: this.options,
+      owner: this.document.isOwner,
+      isGM: game.user.isGM      
+    }
+    console.log("ITEMDATA", formData);
+    this.options.editable = !(this.object.data.origin == "embeddedItem");
+    return formData;
   }
 
   /* -------------------------------------------- */

module/system/bol-utility.js

@@ -0,0 +1,186 @@
+export class BoLUtility  {
+  
+
+  /* -------------------------------------------- */
+  static async init() {
+  }
+  
+  /* -------------------------------------------- */
+  static async ready() {
+  }
+  
+  /* -------------------------------------------- */
+  static templateData(it) {
+    return BoLUtility.data(it)?.data ?? {}
+  }
+
+  /* -------------------------------------------- */
+  static data(it) {
+    if (it instanceof Actor || it instanceof Item || it instanceof Combatant) {
+      return it.data;
+    }
+    return it;
+  }
+  
+  /* -------------------------------------------- */
+  static createDirectOptionList( min, max) {
+    let options = {};
+    for(let i=min; i<=max; i++) {
+      options[`${i}`] = `${i}`;
+    }
+    return options;
+  }
+
+  /* -------------------------------------------- */
+  static buildListOptions(min, max) {
+    let options = ""
+    for (let i = min; i <= max; i++) {
+      options += `<option value="${i}">${i}</option>`
+    }
+    return options;
+  }
+  /* -------------------------------------------- */
+  static async showDiceSoNice(roll, rollMode) {
+    if (game.modules.get("dice-so-nice")?.active) {
+      if (game.dice3d) {
+        let whisper = null;
+        let blind = false;
+        rollMode = rollMode ?? game.settings.get("core", "rollMode");
+        switch (rollMode) {
+          case "blindroll": //GM only
+            blind = true;
+          case "gmroll": //GM + rolling player
+            whisper = this.getUsers(user => user.isGM);
+            break;
+          case "roll": //everybody
+            whisper = this.getUsers(user => user.active);
+            break;
+          case "selfroll":
+            whisper = [game.user.id];
+            break;
+        }
+        await game.dice3d.showForRoll(roll, game.user, true, whisper, blind);
+      }
+    }
+  }
+    /* -------------------------------------------- */
+    static getUsers(filter) {
+      return game.users.filter(filter).map(user => user.data._id);
+    }
+    /* -------------------------------------------- */
+    static getWhisperRecipients(rollMode, name) {
+      switch (rollMode) {
+        case "blindroll": return this.getUsers(user => user.isGM);
+        case "gmroll": return this.getWhisperRecipientsAndGMs(name);
+        case "selfroll": return [game.user.id];
+      }
+      return undefined;
+    }
+    /* -------------------------------------------- */
+    static getWhisperRecipientsAndGMs(name) {
+      let recep1 = ChatMessage.getWhisperRecipients(name) || [];
+      return recep1.concat(ChatMessage.getWhisperRecipients('GM'));
+    }
+  
+    /* -------------------------------------------- */
+    static blindMessageToGM(chatOptions) {
+      let chatGM = duplicate(chatOptions);
+      chatGM.whisper = this.getUsers(user => user.isGM);
+      chatGM.content = "Blinde message of " + game.user.name + "<br>" + chatOptions.content;
+      console.log("blindMessageToGM", chatGM);
+      game.socket.emit("system.fvtt-fragged-kingdom", { msg: "msg_gm_chat_message", data: chatGM });
+    }
+    /* -------------------------------------------- */
+    static createChatMessage(name, rollMode, chatOptions) {
+      switch (rollMode) {
+        case "blindroll": // GM only
+          if (!game.user.isGM) {
+            this.blindMessageToGM(chatOptions);
+  
+            chatOptions.whisper = [game.user.id];
+            chatOptions.content = "Message only to the GM";
+          }
+          else {
+            chatOptions.whisper = this.getUsers(user => user.isGM);
+          }
+          break;
+        default:
+          chatOptions.whisper = this.getWhisperRecipients(rollMode, name);
+          break;
+      }
+      chatOptions.alias = chatOptions.alias || name;
+      ChatMessage.create(chatOptions);
+    }
+  
+    /* -------------------------------------------- */
+    static createChatWithRollMode(name, chatOptions) {
+      this.createChatMessage(name, game.settings.get("core", "rollMode"), chatOptions);
+    }
+  
+  
+  /* -------------------------------------------- */
+  static async rollBoL( rollData ) {
+
+    // Dice bonus/malus selection
+    let nbDice = 2;
+    let d6BM = 0;
+    let mode = "";
+    if ( rollData.d6Malus > rollData.d6Bonus){
+      d6BM = rollData.d6Malus - rollData.d6Bonus;
+      mode = "kl2";
+    }
+    if ( rollData.d6Bonus > rollData.d6Malus){
+      d6BM = rollData.d6Bonus - rollData.d6Malus;
+      mode = "kh2";
+    }
+    nbDice +=  d6BM;
+
+    // Final modifier 
+    let modifier = Number(rollData.attributes[rollData.rollAttribute].value) + Number(rollData.career.data.rank) + Number(rollData.bonusMalus);
+    let formula = nbDice+"d6"+mode+"+"+modifier;
+    console.log("Goigin to roll ", formula, rollData.attributes, rollData.rollAttribute);
+    let myRoll = new Roll(formula).roll( { async: false});
+    await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode") );
+    rollData.roll = myRoll;
+    rollData.formula = formula;
+    rollData.modifier = modifier; 
+    rollData.finalScore = myRoll.total;
+
+    let actor = game.actors.get(rollData.actorId);
+    actor.saveRollData( rollData );
+  
+    this.createChatWithRollMode( rollData.alias, {
+      content: await renderTemplate(`systems/bol/templates/roll/chat-generic-result.hbs`, rollData)
+    });
+      // TODO
+  }  
+
+  /* -------------------------------------------- */
+  static async confirmDelete(actorSheet, li) {
+    let itemId = li.data("item-id");
+    let msgTxt = "<p>Are you sure to remove this Item ?";
+    let buttons = {
+      delete: {
+          icon: '<i class="fas fa-check"></i>',
+          label: "Yes, remove it",
+          callback: () => {
+            actorSheet.actor.deleteEmbeddedDocuments( "Item", [itemId] );
+            li.slideUp(200, () => actorSheet.render(false));
+          }
+        },
+        cancel: {
+          icon: '<i class="fas fa-times"></i>',
+          label: "Cancel"
+        }
+      }
+      msgTxt += "</p>";
+      let d = new Dialog({
+        title: "Confirm removal",
+        content: msgTxt,
+        buttons: buttons,
+        default: "cancel"
+      });
+      d.render(true);
+  }
+
+}

module/system/roll-dialog.js

@@ -0,0 +1,64 @@
+import { BoLUtility } from "../system/bol-utility.js";
+
+export class BoLRollDialog extends Dialog {
+
+  /* -------------------------------------------- */
+  static async create(actor, rollData ) {
+
+    let options = { classes: ["BoL"], width: 600, height: 320, 'z-index': 99999 };
+    let html = await renderTemplate(`systems/bol/templates/roll/roll-dialog-${rollData.mode}.hbs`, rollData);
+    return new BoLRollDialog(actor, rollData, html, options );
+  }
+
+  /* -------------------------------------------- */
+  constructor(actor, rollData, html, options, close = undefined) {
+    let conf = {
+      title: rollData.title,
+      content: html,
+      buttons: { 
+        roll: {
+            icon: '<i class="fas fa-check"></i>',
+            label: "Roll !",
+            callback: () => { this.roll() } 
+          },
+          cancel: {
+            icon: '<i class="fas fa-times"></i>',
+            label: "Cancel",
+            callback: () => { this.close() }
+        } },
+      default: "roll",
+      close: close
+    }
+
+    super(conf, options);
+
+    console.log("ROLLDATA ", rollData);
+    this.actor = actor;
+    this.rollData = rollData;
+  }
+
+  /* -------------------------------------------- */
+  roll () {
+    BoLUtility.rollBoL( this.rollData )
+  }
+
+  /* -------------------------------------------- */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    var dialog = this;
+    function onLoad() {
+    }
+    $(function () { onLoad(); });
+
+    html.find('#bonusMalus').change((event) => {
+      this.rollData.bonusMalus = Number(event.currentTarget.value);
+    });
+    html.find('#d6Bonus').change((event) => {
+      this.rollData.d6Bonus = Number(event.currentTarget.value);
+    });
+    html.find('#d6Malus').change((event) => {
+      this.rollData.d6Malus = Number(event.currentTarget.value);
+    });
+  }
+}

module/system/templates.js

@@ -7,55 +7,6 @@ export const preloadHandlebarsTemplates = async function () {
 
     // Define template paths to load
     const templatePaths = [
-        // ACTOR
-        "systems/cof/templates/actors/actor-sheet.hbs",
-        "systems/cof/templates/actors/loot-sheet.hbs",
-        "systems/cof/templates/actors/parts/actor-details.hbs",
-        "systems/cof/templates/actors/parts/actor-tabs.hbs",
-        "systems/cof/templates/actors/parts/actor-description.hbs",
-        "systems/cof/templates/actors/parts/capacities/actor-capacities.hbs",
-        "systems/cof/templates/actors/parts/capacities/actor-paths.hbs",
-        "systems/cof/templates/actors/parts/combat/actor-combat.hbs",
-        "systems/cof/templates/actors/parts/combat/actor-combat-item.hbs",
-        "systems/cof/templates/actors/parts/combat/encounter-combat.hbs",
-        "systems/cof/templates/actors/parts/details/actor-details.hbs",
-        "systems/cof/templates/actors/parts/details/encounter-details.hbs",
-        "systems/cof/templates/actors/parts/inventory/actor-inventory.hbs",
-        "systems/cof/templates/actors/parts/inventory/actor-inventory-item.hbs",
-        "systems/cof/templates/actors/parts/stats/actor-stats.hbs",
-        "systems/cof/templates/actors/parts/stats/encounter-stats.hbs",
-
-        "systems/cof/templates/actors/parts/stats/actor-attacks.hbs",
-        "systems/cof/templates/actors/parts/stats/actor-attributes.hbs",
-        "systems/cof/templates/actors/parts/stats/actor-recovery.hbs",
-        "systems/cof/templates/actors/parts/stats/actor-resources.hbs",
-        "systems/cof/templates/actors/parts/stats/actor-vitality.hbs",
-        "systems/cof/templates/actors/parts/stats/actor-defence.hbs",
-        "systems/cof/templates/actors/parts/stats/actor-init.hbs",
-        
-        // EFFECTS
-        "systems/cof/templates/effects/effects.hbs",
-        "systems/cof/templates/effects/effects-item.hbs",
-
-        // DIALOGS
-        "systems/cof/templates/dialogs/parts/roll-dmg-fields.hbs",
-
-        // ITEMS PROPERTIES
-        "systems/cof/templates/items/parts/properties/item-properties.hbs",
-
-        // ITEMS DETAILS
-        "systems/cof/templates/items/parts/details/item-details.hbs",
-        "systems/cof/templates/items/parts/details/capacity-details.hbs",
-        "systems/cof/templates/items/parts/details/path-details.hbs",
-        "systems/cof/templates/items/parts/details/profile-details.hbs",
-        "systems/cof/templates/items/parts/details/ranged-details.hbs",
-        "systems/cof/templates/items/parts/details/species-details.hbs",
-        "systems/cof/templates/items/parts/details/equipment-details.hbs",
-        "systems/cof/templates/items/parts/details/protection-details.hbs",
-        "systems/cof/templates/items/parts/details/spell-details.hbs",
-        "systems/cof/templates/items/parts/details/weapon-details.hbs",
-        "systems/cof/templates/items/parts/details/usage-details.hbs",
-        "systems/cof/templates/items/parts/details/effects-details.hbs",
     ];
 
     // Load the template parts

styles/bol.less

@@ -374,4 +374,12 @@
   color: darkgreen;
 }
 
+.chat-message .chat-icon {
+  border: 0;
+  padding: 2px 6px 2px 2px;
+  float: left;
+  width: 64px;
+  height: 64px;
+}
+
 

system.json

@@ -2,10 +2,10 @@
   "name": "bol",
   "title": "Barbarians of Lemuria",
   "description": "The Barbarians of Lemuria system for FoundryVTT!",
-  "version": "0.8.8.1",
+  "version": "0.8.8.3",
   "minimumCoreVersion": "0.8.6",
   "compatibleCoreVersion": "0.8.8",
-  "templateVersion": 2,
+  "templateVersion": 4,
   "author": "Zigmund",
   "esmodules": ["module/bol.js"],
   "styles": ["css/bol.css"],

template.json

@@ -133,7 +133,10 @@
       "base": {
         "subtype" : "default",
         "description": "",
-        "properties" : {}
+        "properties" : {
+          "d6B": false,
+          "d6M": false
+        }
       },
       "equipment" : {
         "quantity": 1,
@@ -149,20 +152,14 @@
           "shield" : false,
 
           "equipable": false,
-          "stackable": false,
-          "activable" : false,
           "consumable" : false,
           "magical" : false,
-          "concealable" : false,
-          "ignoreshield" : false,
 
           "2H" : false,
           "reloadable" : false,
           "bow" : false,
           "crossbow" : false,
-          "powder" : false,
+          "throwing" : false
-          "throwing" : false,
-          "bashing" : false
         }
       }
     },
@@ -172,6 +169,7 @@
       "weight": 0
     },
     "feature": {
+      "rank": 0,
       "templates": ["base"]
     }
   }

templates/actor/actor-sheet.hbs

@@ -24,7 +24,7 @@
 
             {{!-- Sheet Tab Navigation --}}
             <nav class="sheet-tabs tabs" data-group="primary">
-                <a class="item" data-tab="stats">Stats</a>
+                <a class="item" data-tab="stats">Attributs</a>
                 <a class="item" data-tab="features">Traits</a>
                 <a class="item" data-tab="equipment">Equipement</a>
                 <a class="item" data-tab="description">Description</a>
@@ -69,8 +69,8 @@
                 <div class="tab features" data-group="primary" data-tab="features">
                     <ol class="items-list">
                         <li class="item flexrow item-header">
-                            <div class="item-image">Careers</div>
+                            <div class="item-image">{{localize "Careers"}}</div>
-                            <div class="item-name">Name</div>
+                            <div class="item-name">{{localize "Name"}}</div>
 <!--                            <div class="item-controls">-->
 <!--                                <a class="item-control item-create" title="Create item" data-type="item"><i class="fas fa-plus"></i> Add item</a>-->
 <!--                            </div>-->
@@ -78,7 +78,8 @@
                         {{#each data.features.careers as |item id|}}
                             <li class="item flexrow" data-item-id="{{item._id}}">
                                 <div class="item-image"><img src="{{item.img}}" title="{{item.name}}" width="24" height="24"/></div>
-                                <h4 class="item-name">{{item.name}}</h4>
+                                <h4 class="item-name"><a class="roll-career">{{item.name}}</a></h4>
+                                <span class="item-name">{{item.data.data.rank}}</span>
                                 <div class="item-controls">
                                     <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                                     <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@@ -88,8 +89,8 @@
                     </ol>
                     <ol class="items-list">
                         <li class="item flexrow item-header">
-                            <div class="item-image">Boons</div>
+                            <div class="item-image">{{localize "Boons"}}</div>
-                            <div class="item-name">Name</div>
+                            <div class="item-name">{{localize "Name"}}</div>
 <!--                            <div class="item-controls">-->
 <!--                                <a class="item-control item-create" title="Create item" data-type="item"><i class="fas fa-plus"></i> Add item</a>-->
 <!--                            </div>-->
@@ -107,8 +108,8 @@
                     </ol>
                     <ol class="items-list">
                         <li class="item flexrow item-header">
-                            <div class="item-image">Flaws</div>
+                            <div class="item-image">{{localize "Flaws"}}</div>
-                            <div class="item-name">Name</div>
+                            <div class="item-name">{{localize  "Name"}}</div>
 <!--                            <div class="item-controls">-->
 <!--                                <a class="item-control item-create" title="Create item" data-type="item"><i class="fas fa-plus"></i> Add item</a>-->
 <!--                            </div>-->
@@ -128,8 +129,8 @@
                 <div class="tab equipment" data-group="primary" data-tab="equipment">
                     <ol class="items-list">
                         <li class="item flexrow item-header">
-                            <div class="item-image">Inventory</div>
+                            <div class="item-image">{{localize "Inventory"}}</div>
-                            <div class="item-name">Name</div>
+                            <div class="item-name">{{localize "Name"}}</div>
 <!--                            <div class="item-controls">-->
 <!--                                <a class="item-control item-create" title="Create item" data-type="item"><i class="fas fa-plus"></i> Add item</a>-->
 <!--                            </div>-->

templates/item/item-sheet.hbs

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

templates/roll/chat-generic-result.hbs

@@ -0,0 +1,28 @@
+  <div class="chat-message-header">
+    <img class="chat-icon" src="{{actorImg}}" alt="{{alias}}" />
+    <h4 class=chat-actor-name>{{alias}}</h4>
+  </div>
+
+  <hr>
+
+  <div>
+  <img class="chat-icon" src="{{img}}" alt="{{name}}" />
+    <h4>
+    {{#if (eq mode "career")}}  
+    {{localize "Career"}} : {{career.name}}
+    {{else}}
+      {{#if (eq mode "weapon")}}
+      Weapon attack : {{weapon.name}}   
+      {{/if}}
+    {{/if}}
+    </h4>
+
+    <div>
+    <ul>
+      <li>Formula : {{formula}}</li>
+      <li>Modifier : {{modifier}} </li>    
+      <li><strong>Total Roll : {{finalScore}}</strong>
+    </ul>  
+    </div>
+
+  </div>

templates/roll/roll-dialog-attribute.hbs

@@ -0,0 +1,8 @@
+<form class="skill-roll-dialog">
+  <h2 class="dialog-roll-title">{{title}}</h2>
+
+  <div class="flexrow">
+
+  </div>
+  
+</form>

templates/roll/roll-dialog-career.hbs

@@ -0,0 +1,56 @@
+<form class="skill-roll-dialog">
+  <h2 class="dialog-roll-title">{{title}}</h2>
+
+  <div class="property flexrow">
+    <label class="property-label">{{localize "rank"}}</label>
+    <label class="property-label">{{career.data.rank}}</label>
+  </div>
+
+  <div class="property flexrow">
+    <label class="property-label">{{localize "attribut"}}</label>
+    <select id="rollAttribute" value="rollAttribute">
+      {{#select rollAttribute}}
+      <option value="vigor">{{localize "BOL.attributes.vigor"}}</option>
+      <option value="agility">{{localize "BOL.attributes.agility"}}</option>
+      <option value="mind">{{localize "BOL.attributes.mind"}}</option>
+      <option value="appeal">{{localize "BOL.attributes.appeal"}}</option>
+      {{/select}}
+    </select>
+  </div>
+
+  <div class="property flexrow">
+    <label class="property-label">{{localize "d6M"}}</label>
+    <select id="d6Malus" value="d6Malus">
+      {{#select d6Malus}}
+      <option value="0">0</option>
+      <option value="1">1</option>
+      <option value="2">2</option>
+      <option value="3">3</option>
+      <option value="4">4</option>
+      {{/select}}
+    </select>
+  </div>
+
+  <div class="property flexrow">
+    <label class="property-label">{{localize "d6B"}}</label>
+    <select id="d6Bonus" value="d6Bonus">
+      {{#select d6Bonus}}
+      <option value="0">0</option>
+      <option value="1">1</option>
+      <option value="2">2</option>
+      <option value="3">3</option>
+      <option value="4">4</option>
+      {{/select}}
+    </select>
+  </div>
+
+  <div class="property flexrow">
+    <label class="property-label">{{localize "Modifier"}}</label>
+    <select id="bonusMalus" value="bonusMalus">
+      {{#select bonusMalus}}
+      {{{optionsBonusMalus}}}
+      {{/select}}
+    </select>
+  </div>
+
+</form>

templates/roll/roll-dialog-spell.hbs

@@ -0,0 +1,8 @@
+<form class="skill-roll-dialog">
+  <h2 class="dialog-roll-title">{{title}}</h2>
+
+  <div class="flexrow">
+
+  </div>
+  
+</form>

templates/roll/roll-dialog-weapon.hbs

@@ -0,0 +1,8 @@
+<form class="skill-roll-dialog">
+  <h2 class="dialog-roll-title">{{title}}</h2>
+
+  <div class="flexrow">
+
+  </div>
+  
+</form>