Various fixes

modules/vadentis-actor-sheet.js

@@ -25,14 +25,25 @@ export class VadentisActorSheet extends ActorSheet {
   getData() {
     let data = super.getData();
     
-    data.stats  = this.actor.stats;
-    data.combat = this.actor.combat;
-    data.magie  = this.actor.magie;
     data.editScore   = this.options.editScore;
     data.donnees     = this.actor.getDonnees();
+    data.eglises     = this.actor.getEglises();
     data.competences = this.actor.getCompetences();
     data.sorts       = this.actor.getSorts();
     data.devotions   = this.actor.getDevotions();
+    data.attributs   = this.actor.getAttributs();
+    data.techniques  = this.actor.getTechniques();
+    data.armes       = this.actor.getArmes();
+    data.armures     = this.actor.getArmures();
+    data.equipements = this.actor.getEquipements();
+
+    data.optionsBase  = VadentisUtility.createDirectOptionList(0, 50);
+    data.optionsMalus = VadentisUtility.createDirectOptionList(-50, 0);
+    data.optionsBonus = VadentisUtility.createDirectOptionList(0, 50);
+    data.optionsPV    = VadentisUtility.createOptionList(-50, 200);
+    data.optionsPE    = VadentisUtility.createOptionList(-50, 200);
+    data.optionsPA    = VadentisUtility.createOptionList(0, 20);
+
     data.isGM = game.user.isGM; 
 
     return data;
@@ -67,11 +78,21 @@ export class VadentisActorSheet extends ActorSheet {
       const competenceId = li.data("item-id");
       this.actor.rollCompetence(competenceId);
     });
+    html.find('.technique-label a').click((event) => {
+      const li = $(event.currentTarget).parents(".item");
+      const techniqueId = li.data("item-id");
+      this.actor.rollTechnique(techniqueId);
+    });
     html.find('.sort-label a').click((event) => {
       const li = $(event.currentTarget).parents(".item");
       const sortId = li.data("item-id");
       this.actor.rollSort(sortId);
     });    
+    html.find('.arme-label a').click((event) => {
+      const li = $(event.currentTarget).parents(".item");
+      const armeId = li.data("item-id");
+      this.actor.rollArme(armeId);
+    });    
     html.find('.devotion-label a').click((event) => {
       const li = $(event.currentTarget).parents(".item");
       const devotionId = li.data("item-id");
@@ -103,6 +124,11 @@ export class VadentisActorSheet extends ActorSheet {
       const item = this.actor.getOwnedItem(itemId);
       item.sheet.render(true);
     });    
+    html.find('.item-equip').click(ev => {
+      const li = $(ev.currentTarget).parents(".item");
+      this.actor.equiperObject( li.data("item-id") );
+      this.render(true);
+    });
 
   }
 

modules/vadentis-actor.js

@@ -32,13 +32,6 @@ export class VadentisActor extends Actor {
       return actor;
     }
 
-    /*data.items = [];
-    let compendiumName = "foundryvtt-vadentis.competences";
-    if ( compendiumName ) {
-      let skills = await SoSUtility.loadCompendium(compendiumName);
-      data.items = data.items.concat( skills );
-    }*/
-
     return super.create(data, options);
   }
 
@@ -56,16 +49,38 @@ export class VadentisActor extends Actor {
   getDonnees()   {
     return this.data.items.filter( item => item.type == 'donnee');
   }
-
+  /* -------------------------------------------- */
+  getEglises()   {
+    return this.data.items.filter( item => item.type == 'eglise');
+  }
   /* -------------------------------------------- */
   getSorts() {
     return this.data.items.filter( item => item.type == 'sort');
   }
-
+  /* -------------------------------------------- */
+  getAttributs() {
+    return this.data.items.filter( item => item.type == 'attribut');
+  }
+  /* -------------------------------------------- */
+  getTechniques() {
+    return this.data.items.filter( item => item.type == 'technique');
+  }
   /* -------------------------------------------- */
   getDevotions() {
     return this.data.items.filter( item => item.type == 'devotion');
   }
+  /* -------------------------------------------- */
+  getEquipements() {
+    return this.data.items.filter( item => item.type == 'equipement'  );
+  }
+  /* -------------------------------------------- */
+  getArmes() {
+    return this.data.items.filter( item => item.type == 'armecc' || item.type == 'tir' );
+  }
+  /* -------------------------------------------- */
+  getArmures() {
+    return this.data.items.filter( item => item.type == 'armurebouclier' );
+  }
   
   /* -------------------------------------------- */
   async updateCompetence( name, field, value) {
@@ -77,75 +92,90 @@ export class VadentisActor extends Actor {
   }
   
   /* -------------------------------------------- */
-  rollSort( sortId ) {
+  async equiperObject( equipementId ) {    
-    let sort = this.data.items.find( item => item.type == 'sort' && item._id == sortId );
+    let item = this.getOwnedItem(equipementId);
-    if ( sort ) {
+    if (item && item.data.data) {
-
+      let update = { _id: item._id, "data.equipee": !item.data.data.equipee };
-      if ( sort.data.pe > this.data.data.stats.pointsenergie.value) { // Vérification du ~ de points d'énergie
+      await this.updateEmbeddedEntity("OwnedItem", update);
-        ChatMessage.create({ content: `Vous n'avez pas assez de Points d'Energie pour lancer votre sort ${sort.name}` } );        
-        return;
-      }
-
-      let magieElementaire = this.data.data.magie['matriseelementaire'];
-      let statValue = magieElementaire.base + magieElementaire.malus + magieElementaire.bonus;
-      let formulaFull = `1d20+${magieElementaire.base}+${magieElementaire.malus}+${magieElementaire.bonus}`;
-      let myRoll = new Roll("1d20+"+statValue);
-      myRoll.evaluate();
-      myRoll.toMessage( { flavor: `Lancer de Sort : ${sort.name} (${formulaFull})` } );
-      
-      if (myRoll.total >= sort.data.difficulty) {
-        let content =  `Votre sort ${sort.name} a réussi ! Vous perdez ${sort.data.pe} Points d'Energie et votre sort produit l'effet : <br>${sort.data.effect}`;
-        let newEnergie = this.data.data.stats.pointsenergie - sort.data.pe;
-        await this.update( {'data.stats.pointsenergie': newEnergie });
-
-        if ( sort.data.damage != "") {
-          if (myRoll.results[0] == 20 ) { // Critique ?
-            content += `<br>Et provoque les dégats critiques suivants : ${sort.data.damagecritical}`;
-          } else {
-            content += `<br>Et provoque les dégats suivants : ${sort.data.damage}`;
-          }
-        }
-        ChatMessage.create({ content:content} );        
-      } else {
-        ChatMessage.create({ content: `Votre sort ${sort.name} a échoué !`});
-      }
     }
   }
 
   /* -------------------------------------------- */
-  rollDevotion( devotionId ) {
+  async processSortDevotion( name, devotionSort ) {
-    let devotion = this.data.items.find( item => item.type == 'devotion' && item._id == devotionId );
+    if ( this.data.data.stats.pointsenergie.value > 0) { // Vérification du ~ de points d'énergie
-    if ( devotion ) {
+      ChatMessage.create({ content: `${this.name} n'a pas assez de Points d'Energie pour lancer ${name} ${devotionSort.name}` } );        
-
-      if ( devotion.data.pe > this.data.data.stats.pointsenergie.value) { // Vérification du ~ de points d'énergie
-        ChatMessage.create({ content: `Vous n'avez pas assez de Points d'Energie pour lancer votre dévotion ${devotion.name}` } );        
       return;
     }
     
-      let devotionComp = this.data.data.magie['devotion'];
+    let scores = this.data.data.magie[(name =="devotion") ? 'devotion': 'matriseelementaire'];
-      let statValue = devotionComp.base + devotionComp.malus + devotionComp.bonus;
+    let statValue = scores.base + scores.malus + scores.bonus;
-      let formulaFull = `1d20+${devotionComp.base}+${devotionComp.malus}+${devotionComp.bonus}`;
+    let formulaFull = `1d20+${scores.base}+${scores.malus}+${scores.bonus}`;
     let myRoll = new Roll("1d20+"+statValue);
     myRoll.evaluate();
-      myRoll.toMessage( { flavor: `Lancer de Dévotion : ${devotion.name} (${formulaFull})` } );
+    myRoll.toMessage( { flavor: `Lancer de ${name} : ${devotionSort.name} (${formulaFull})` } );
     
-      if (myRoll.total >= devotion.data.difficulty) {
+    if (myRoll.total >= devotionSort.data.difficulty) {
-        let content =  `Votre dévotion ${devotion.name} a réussie ! Vous perdez ${devotion.data.pe} Points d'Energie et votre dévotion produit l'effet : <br>${devotion.data.effect}`;
+      let content =  `${this.name} a réussi son ${name} et perd ${devotionSort.data.pe} Points d'Energie. L'effet suivant se produit: <br>${devotionSort.data.effect}`;
-        let newEnergie = this.data.data.stats.pointsenergie - devotion.data.pe;
+      let newEnergie = this.data.data.stats.pointsenergie.value - devotionSort.data.pe;
-        await this.update( {'data.stats.pointsenergie': newEnergie });
+      await this.update( {'data.stats.pointsenergie.value': newEnergie });
 
-        if ( devotion.data.damage != "") {
+      if ( devotionSort.data.damage != "") {
         if (myRoll.results[0] == 20 ) { // Critique ?
-            content += `<br>Et provoque les dégats critiques suivants : ${devotion.data.damagecritical}`;
+          content += `<br>Et provoque les dégats critiques suivants : ${devotionSort.data.damagecritical}`;
         } else {
-            content += `<br>Et provoque les dégats suivants : ${devotion.data.damage}`;
+          content += `<br>Et provoque les dégats suivants : ${devotionSort.data.damage}`;
         }
       }
-        ChatMessage.create({ content:content} );        
+      if ( newEnergie < 0) {
+        content += `<br>Les Points d'Energie de ${this.name} sont négatifs ! Il convient d'éditer ses Points de Vie en conséquence.`;
+      }
+      ChatMessage.create( { content: content} );      
     } else {
-        ChatMessage.create({ content: `Votre dévotion ${devotion.name} a échoué !`});
+      ChatMessage.create( { content: `${this.name} a échoué son lancer de ${name}` } );
     }
   }
+
+  /* -------------------------------------------- */
+  getDefenseScore(  ) {
+    let defenseData = this.data.data.combat.defense;
+    return defenseData.base + defenseData.malus + defenseData.bonus;
+  }
+  /* -------------------------------------------- */
+  getAttaqueScore(  ) {
+    let attaqueData = this.data.data.combat.attaque;
+    return attaqueData.base + attaqueData.malus + attaqueData.bonus;
+  }
+
+  /* -------------------------------------------- */
+  async rollSort( sortId ) {
+    let sort = this.data.items.find( item => item.type == 'sort' && item._id == sortId );
+    if ( sort ) {
+      this.processSortDevotion( "sort", sort);
+    }
+  }
+
+  /* -------------------------------------------- */
+  async rollDevotion( devotionId ) {
+    let devotion = this.data.items.find( item => item.type == 'devotion' && item._id == devotionId );
+    if ( devotion ) {
+      this.processSortDevotion( "devotion", devotion);
+    }
+  }
+
+  /* -------------------------------------------- */
+  async rollTechnique( techniqueId ) {
+    let technique = this.data.items.find( item => item.type == 'technique' && item._id == techniqueId );
+    if (technique) {
+      if ( this.data.data.stats.pointsadrenaline.value < technique.data.pacost) { // Vérification du ~ de points d'adrénaline
+        ChatMessage.create({ content: `${this.name} n'a pas assez de Points d'Adrénaline pour éxecuter sa technique ${technique.name}` } );                
+        return;
+      }
+      let newAdrenaline = this.data.data.stats.pointsadrenaline.value - technique.data.pacost;
+      await this.update( {'data.stats.pointsadrenaline.value': newAdrenaline });
+
+      ChatMessage.create( { content: `${this.name} execute sa technique ${technique.name}, pour un côut de ${technique.data.pacost} Points d'Adrénaline<br>
+            Les effets sont : ${technique.data.effect}`} );
+    }
   }
 
   /* -------------------------------------------- */
@@ -167,8 +197,30 @@ export class VadentisActor extends Actor {
     let formulaFull = `1d20+${stat.base}+${stat.malus}+${stat.bonus}`;
     let myRoll = new Roll("1d20+"+statValue);
     myRoll.evaluate();
-    myRoll.toMessage( { flavor: `Jet de ${stat.label} (${formulaFull})` } );  
+    myRoll.toMessage( { title: "Test !",flavor: `Jet de ${stat.label} (${formulaFull})` } );  
   }
   
+  /* -------------------------------------------- */
+  rollArme(armeId) {
+    let target = VadentisUtility.getTarget();
+
+    if ( target ) {
+      let arme = this.data.items.find( item => (item.type == 'armecc' || item.type == 'tir') && item._id == armeId);
+      if (arme) {
+        let combatData = { 
+          attackerActorId: this._id,
+          targetActorId: target.actor._id,
+          arme: duplicate(arme) 
+        }
+        if (game.user.isGM) {
+          VadentisUtility.performAttack( combatData);
+        } else {
+          game.socket.emit("system.foundryvtt-vadentis", { name: "msg_attack", data: { combatData } } );
+        }
+      }
+    } else {
+      ui.notifications.warn("Vous devez désigner une cible pour attaquer avec une arme.")
+    }
+  }
   
 }

modules/vadentis-combat.js

@@ -3,187 +3,5 @@ import { VadentisUtility } from "./vadentis-utility.js";
 /* -------------------------------------------- */
 export class VadentisCombat extends Combat {
   
-  /* -------------------------------------------- */
-  requestActions() {
-    if ( game.user.isGM && !this.actionsRequested) {
-      console.log("REQUEST ACTIONS !!!");
-      this.actionsRequested = true;
-      this.phaseSetup = {}; // Reset each new round/update
-      for( let combatant of this.combatants) {
-        this.setInitiative(combatant._id, -1 ); // Reset init
-        let uniq = randomID(16);
-        const name = combatant.actor ? combatant.actor.data.name : combatant.name;
-        if ( combatant.players[0]) {
-          // A player controls this combatant -> message !
-          ChatMessage.create( { content: `New round ! Click on the button below to declare the actions of ${name} for round ${this.round} !<br>
-          <a class='chat-card-button' id='button-declare-actions' data-uniq-id='${uniq}' data-combatant-id='${combatant._id}' data-combat-id='${this._id}' data-round='${this.round}'>Declare actions</a>`, 
-                          whisper: [ combatant.players[0].data._id] } );
-        } else {
-          ChatMessage.create( { content: `New round ! Click on the button below to declare the actions of ${name} for round ${this.round} !<br>
-          <a class='chat-card-button' id='button-declare-actions' data-uniq-id='${uniq}' data-combatant-id='${combatant._id}' data-combat-id='${this._id}' data-round='${this.round}'>Declare actions</a>`, 
-                          whisper: [ ChatMessage.getWhisperRecipients("GM") ] } );
-        }
-      }
-    }
-  }
-
-  /* -------------------------------------------- */
-  async nextRound() {
-    this.actionsRequested = false;
-    super.nextRound();
-  }
-
-  /* -------------------------------------------- */
-  gotoNextTurn() {
-    this.phaseNumber -= 1;
-    if ( this.phaseNumber <= 0) {
-      this.applyConsequences();
-      this.nextRound(); // Auto-switch to next round
-    } else { 
-      this.nextTurn();
-    }
-  }
-
-  /* -------------------------------------------- */
-  async nextTurn() {
-    console.log("Going to phase !", this.phaseNumber );
-    // Get all actions for this phase
-    let phaseIndex = this.phaseNumber - 1;
-    let actionList = [];
-    let actionMsg = `<h4>Actions for phase ${this.phaseNumber}</h4>`;
-    for (let combatantId in this.phaseSetup ) {
-      let actionData = this.phaseSetup[combatantId];
-      if ( actionData.phaseArray[phaseIndex].name != 'No Action' ) {
-        let combatant = this.combatants.find( comb => comb._id == actionData.combatantId);
-        const name = combatant.actor ? combatant.actor.data.name : combatant.name;
-        actionList.push( {  combatant: combatant, 
-                            action: actionData.phaseArray[phaseIndex], 
-                            isDone: false
-                         });
-        actionMsg += `<br>${name} is going to : ${actionData.phaseArray[phaseIndex].name}`;
-      }
-    }
-    if ( actionList.length == 0) {
-      actionMsg += "<br>No actions for the phase !";
-      this.gotoNextTurn();
-    }
-    // Display a nice message
-    ChatMessage.create( { content: actionMsg });
-
-    // Now push specific messages
-    for ( let action of actionList) {
-      let uniq = randomID(16);
-      action.uniqId = uniq; // Easy tracking with chat messages
-      const name = action.combatant.actor ? action.combatant.actor.data.name : action.combatant.name;
-      if ( action.combatant.players[0]) {
-        // A player controls this combatant -> message !
-        ChatMessage.create( { content: `Phase ${this.phaseNumber} ! ${name} must perform a <strong>${action.action.name}</strong> action.
-              When done, click on the button below to close the action.
-              <a class='chat-card-button' id='button-end-action' data-uniq-id='${uniq}' data-combatant-id='${action.combatant._id}' data-combat-id='${this._id}' data-round='${this.round}'>Action is done !</a>`, 
-                        whisper: [ action.combatant.players[0].data._id] } );
-      } else {
-        ChatMessage.create( { content: `Phase ${this.phaseNumber} ! ${name} must perform a <strong>${action.action.name}</strong> action.<br>
-              When done, click on the button below to close the action.
-              <a class='chat-card-button' id='button-end-action' data-uniq-id='${uniq}' data-combatant-id='${action.combatant._id}' data-combat-id='${this._id}' data-round='${this.round}'>Action is done !</a>`, 
-                    whisper: [ ChatMessage.getWhisperRecipients("GM") ] } );
-      }
-    }
-    // Save for easy access
-    this.currentActions = actionList;
-  }
-
-  /* -------------------------------------------- */
-  applyConsequences( ) { 
-    if (game.user.isGM ) {
-      for( let combatant of this.combatants) {
-        if (!combatant.actor) continue; // Can't check tokens without assigned actors, Maybe print chat message about bleeding happening so that the GM can manually track this?
-        let bleeding = combatant.actor.data.items.find( item => item.type == 'consequence' && item.name == 'Bleeding');
-        combatant.actor.applyConsequenceWound( bleeding.data.severity, "bleeding" );
-      }
-    }
-  }
-
-  /* -------------------------------------------- */
-  closeAction( uniqId) {
-    // Delete message !    
-    const toDelete = game.messages.filter(it => it.data.content.includes( uniqId ));
-    toDelete.forEach(it => it.delete());
-
-    let action = this.currentActions.find( _action => _action.uniqId == uniqId );
-    if (action) {
-      action.isDone = true;
-
-      let filtered = this.currentActions.filter( _action => action.isDone );
-      if ( filtered.length == this.currentActions.length) {  // All actions closed !
-        console.log("Going next turn !!!");
-        this.gotoNextTurn();
-      }
-    }
-  }
-
-  /* -------------------------------------------- */
-  getPhaseRank( actionConf) {
-    for (let i=2; i>=0; i--) {
-      let action = actionConf.phaseArray[i];
-      if (action.name != "No Action") {
-        return i+1;
-      }
-    }
-    return 0;
-  }
-
-  /* -------------------------------------------- */
-  getAPFromActor( actorId ) {
-    for( let combatant of this.combatants) {
-      //console.log(combatant);
-      if ( combatant.actor.data._id == actorId ) {
-        let phase = this.phaseSetup[combatant._id]; 
-        return phase.remainingAP;
-      }
-    }
-    return 0;
-  }
-
-  /* -------------------------------------------- */
-  decreaseAPFromActor( actorId ) {
-    for( let combatant of this.combatants) {
-      //console.log(combatant);
-      if ( combatant.actor.data._id == actorId ) {
-        let phase = this.phaseSetup[combatant._id]; 
-        phase.remainingAP -= 1;
-        if ( phase.remainingAP < 0 ) phase.remainingAP = 0;
-      }
-    }
-  }
-  
-  /* -------------------------------------------- */
-  async setupActorActions(actionConf) {
-    console.log("Setting combat for phase : ", actionConf, actionConf.uniqId);
-
-    // Delete message !
-    const toDelete = game.messages.filter(it => it.data.content.includes( actionConf.uniqId ));
-    console.log("MESSAGE : ", toDelete);
-    toDelete.forEach(it => it.delete());
-
-    if ( !this.phaseSetup) this.phaseSetup = {}; // Opportunistic init    
-    
-    // Keep track
-    this.phaseSetup[actionConf.combatantId] = actionConf;
-    console.log( this.combatants );
-    //let combatant = this.combatants.find( comb => comb._id == actionConf.combatantId);
-    await this.setInitiative( actionConf.combatantId, this.getPhaseRank( actionConf ) );
-
-    let actionsDone = true
-    for( let combatant of this.combatants) {
-      if ( combatant.initiative == -1 ) actionsDone = false;
-    }
-    if ( actionsDone ) {
-      this.actionsRequested = false;
-      ChatMessage.create( { content: `Action declaration has been completed ! Now proceeding with actions.`, 
-                            whisper: [ ChatMessage.getWhisperRecipients("GM") ] } );  
-      this.phaseNumber = 3;
-      this.nextTurn();
-    }
-  }
 
 }

modules/vadentis-utility.js

@@ -18,6 +18,57 @@ export class VadentisUtility extends Entity {
     return loadTemplates(templatePaths);    
   }
 
+  /* -------------------------------------------- */
+  static createOptionList( min, max) {
+    let options = ""
+    for(let i=min; i<=max; i++) {
+      options+= `<option value="${i}">${i}</option>\n`;
+    }
+    return options;
+  }
+
+  /* -------------------------------------------- */
+  static createDirectOptionList( min, max) {
+    let options = []
+    for(let i=min; i<=max; i++) {
+      options.push( i ) ;
+    }
+    return options;
+    }
+  
+  /* -------------------------------------------- */
+  static getTarget() {
+    if (game.user.targets && game.user.targets.size == 1) {
+    for (let target of game.user.targets) {
+      return target;
+      }
+    }
+    return undefined;
+  }
+  
+  /* -------------------------------------------- */
+  static async performAttack( combatData) {
+    let attacker = game.actors.get(combatData.attackerActorId);
+    let defender = game.actors.get(combatData.targetActorId);
+    if( attacker && defender) {
+      let defense = defender.getDefenseScore();
+      let attaque = attacker.getAttaqueScore();
+      console.log("Attaque : ", attaque);
+      let myRoll = new Roll("1d20"+attaque);
+      myRoll.evaluate()
+      if (game.modules.get("dice-so-nice") && game.modules.get("dice-so-nice").active) {
+        await game.dice3d.showForRoll(myRoll, game.user, true);
+      }
+      if (myRoll.total >= defense) { // Success !
+        ChatMessage.create( { content: `${attacker.name} a réussi son attaque sur ${defender.name} (${myRoll.total} / ${defense}) !<br> Les dégâts sont de : ${combatData.arme.data.damage}`});
+      } else { //Echec
+        ChatMessage.create( { content: `${attacker.name} a raté son attaque sur ${defender.name} (${myRoll.total} / ${defense}) !` });
+      }
+    } else {
+      ui.notifications.warn("Impossible de trouver l'attaquant et le défenseur.")
+    }
+  }
+
   /* -------------------------------------------- */
   static registerChatCallbacks( ) {
 
@@ -32,7 +83,8 @@ export class VadentisUtility extends Entity {
   static onSocketMesssage( msg ) {
     if( !game.user.isGM ) return; // Only GM
 
-    if (msg.name == 'msg_declare_actions' ) {
+    if (msg.name == 'msg_attack' ) {
+      this.performAttack( msg.data );
     }
   }
 

styles/simple.css

@@ -674,6 +674,11 @@ ul, li {
 .competence-label,
 .devotion-label,
 .sort-label,
+.technique-label,
+.stat-label,
+.arme-label,
+.armure-label,
+.equipement-label,
 .description-label {
   flex-grow: 2;
 }

system.json

@@ -2,11 +2,11 @@
   "name": "foundryvtt-vadentis",
   "title": "Vadentis",
   "description": "Système Vadentis pour FoundryVTT",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "manifestPlusVersion": "1.0.0",
   "minimumCoreVersion": "0.7.5",
   "compatibleCoreVersion": "0.7.9",
-  "templateVersion": 7,
+  "templateVersion": 8,
   "author": "Uberwald",
   "esmodules": [ "modules/vadentis-main.js" ],
   "styles": ["styles/simple.css"],

template.json

@@ -99,6 +99,7 @@
       "damagecritical": ""
     },
     "equipcommun": {
+      "equipee": false,
       "description": "",
       "enc": 0,
       "cost": 0  

templates/actor-sheet.html

@@ -14,8 +14,9 @@
     <nav class="sheet-tabs tabs" data-group="primary">
         <a class="item" data-tab="principal">Principal</a>
         <a class="item" data-tab="competences">Compétences</a>
+        <a class="item" data-tab="combat">Combat</a>
         <a class="item" data-tab="sorts">Sorts</a>
-        <a class="item" data-tab="equpement">Equipement</a>
+        <a class="item" data-tab="equipement">Equipement</a>
         <a class="item" data-tab="description">Description</a>
     </nav>
 
@@ -24,79 +25,114 @@
 
         {{!-- Carac Tab --}}
         <div class="tab items" data-group="primary" data-tab="principal">
-          <div class="grid grid-2col">
-            <div class="flex-group-left flexcol">
-
-              <span class="generic-label">Données</span>
-              <ul>
-                {{#each donnees as |donnee key|}}
-                <li class="stat flexrow list-item" data-attribute="{{key}}">
-                  <span class="stat-label flexrow tooltip tooltip-nobottom" name="donnee.name">{{donnee.name}}</span>
-                </li>
-                {{/each}}
-              </ul>  
-
-              <span class="generic-label">Eglise</span>
-              <ul>
-                {{#each donnees as |donnee key|}}
-                <li class="stat flexrow list-item" data-attribute="{{key}}">
-                  <span class="stat-label flexrow tooltip tooltip-nobottom" name="donnee.name">{{donnee.name}}</span>
-                </li>
-                {{/each}}
-              </ul>  
-                    
           <span><a class="lock-unlock-sheet"><img class="small-button-container" 
-                src="systems/foundryvtt-vadentis/images/icons/{{#if editScore}}unlocked.svg{{else}}locked.svg{{/if}}" alt="Editable/Vérouillé"
+            src="systems/foundryvtt-vadentis/images/icons/{{#if editScore}}unlocked.svg{{else}}locked.svg{{/if}}" alt="Editable/Vérouillé">
-                >{{#if editScore}}Editable{{else}}Vérouillé{{/if}}</a></span>
+            {{#if editScore}}Editable{{else}}Vérouillé{{/if}}</a>
+          </span>
+          <div class="grid grid-2col">
+            <div class="">
+
+              <span class="generic-label"><h3>Données</h3></span>
+              <ul>
+                {{#each donnees as |donnee key|}}
+                <li class="item flexrow list-item" data-item-id="{{donnee._id}}">
+                  <span class="stat-label flexrow tooltip tooltip-nobottom" name="donnee.name">{{donnee.name}}</span>
+                  <div class="item-controls">
+                    <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                  </div>
+                </li>
+                {{/each}}
+              </ul>  
+
+              <hr><span class="generic-label"><h3>Eglise</h3></span>
+              <ul>
+                {{#each eglises as |eglise key|}}
+                <li class="item flexrow list-item" data-item-id="{{eglise._id}}">
+                  <span class="stat-label flexrow tooltip tooltip-nobottom" name="eglise.name">{{eglise.name}}</span>
+                  <div class="item-controls">
+                    <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                    <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                  </div>
+                </li>
+                {{/each}}
+              </ul>  
+                    
+              <hr><span class="generic-label"><h3>Scores</h3></span>
               <ul class="stat-list alternate-list">
                   <li class="stat flexrow" >
-                  <li class="stat flexrow" >
+                    <span class="generic-label flexrow tooltip tooltip-nobottom" name="statlabel1">Désignation</span>
-                    <span class="generic-label flexrow tooltip tooltip-nobottom" name="statlabel">Désignation</span>
+                    <span class="flexrow tooltip tooltip-nobottom" name="statlabel2">Valeur</span>
-                    <span class="generic-label flexrow tooltip tooltip-nobottom" name="statlabel">Valeur</span>
+                    <span class="flexrow tooltip tooltip-nobottom" name="statlabel3">Max</span>
-                    <span class="generic-label flexrow tooltip tooltip-nobottom" name="statlabel">Max</span>
                   </li>
-                  {{#each data.stats as |stat key|}}
+                  <li class="stat flexrow list-item" data-attribute="pointsvie">
-                    <li class="stat flexrow list-item" data-attribute="{{key}}">
+                    <span class="stat-label flexrow tooltip tooltip-nobottom">Points de Vie</span>
-                      <span class="stat-label flexrow tooltip tooltip-nobottom" name="data.stats.{{key}}.label">{{stat.label}}</span>
+                    <select class="stat-value flexrow" type="text" name="data.stats.pointsvie.value" value="{{data.stats.pointsvie.value}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
-                      <select class="stat-value flexrow" type="text" name="data.stats.{{key}}.value" value="{{stat.value}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+                      {{#select data.stats.pointsvie.value}}
-                        {{#select stat.value}}
+                      {{{@root.optionsPV}}}
-                        {{>"systems/foundryvtt-vadentis/templates/score-option-list.html"}}
                       {{/select}}
                     </select> 
-                      <select class="stat-value flexrow" type="text" name="data.stats.{{key}}.max" value="{{stat.max}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+                    <select class="stat-value flexrow" type="text" name="data.stats.pointsvie.max" value="{{data.stats.pointsvie.max}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
-                        {{#select stat.max}}
+                      {{#select data.stats.pointsvie.max}}
-                        {{>"systems/foundryvtt-vadentis/templates/score-option-list.html"}}
+                      {{{@root.optionsPV}}}
+                      {{/select}}
+                    </select> 
+                  </li>
+                  <li class="stat flexrow list-item" data-attribute="pointsenergie">
+                    <span class="stat-label flexrow tooltip tooltip-nobottom">Points d'Energie</span>
+                    <select class="stat-value flexrow" type="text" name="data.stats.pointsenergie.value" value="{{stats.pointsenergie.value}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+                      {{#select data.stats.pointsenergie.value}}
+                      {{{@root.optionsPE}}}
+                      {{/select}}
+                    </select> 
+                    <select class="stat-value flexrow" type="text" name="data.stats.pointsenergie.max" value="{{data.stats.pointsenergie.max}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+                      {{#select data.stats.pointsenergie.max}}
+                      {{{@root.optionsPE}}}
+                      {{/select}}
+                    </select> 
+                  </li>
+                  <li class="stat flexrow list-item" data-attribute="pointsadrenaline">
+                    <span class="stat-label flexrow tooltip tooltip-nobottom">Points d'Adrénaline</span>
+                    <select class="stat-value flexrow" type="text" name="data.stats.pointsadrenaline.value" value="{{data.stats.pointsadrenaline.value}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+                      {{#select data.stats.pointsadrenaline.value}}
+                      {{{@root.optionsPA}}}
+                      {{/select}}
+                    </select> 
+                    <select class="stat-value flexrow" type="text" name="data.stats.pointsadrenaline.max" value="{{data.stats.pointsadrenaline.max}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+                      {{#select data.stats.pointsadrenaline.max}}
+                      {{{@root.optionsPA}}}
                       {{/select}}
                     </select> 
                   </li>
-                {{/each}}
               </ul>          
             </div>
-            <div class="flex-group-left flexcol">
+            <div class="">
+              <hr><span class="generic-label"><h3>Expérience</h3></span>
+              <ul class="stat-list alternate-list">
+                <li class="stat flexrow list-item" data-attribute="experience">
+                  <span class="stat-label flexrow tooltip tooltip-nobottom">Expérience</span>
+                  <input type="text" name="data.experience.experience.total" value="{{data.experience.experience.total}}" data-dtype="Number"/>                  
+                </li>
+              </ul>
+              <hr><span class="generic-label"><h3>Combat</h3></span>
               <ul class="stat-list alternate-list">
                 <li class="stat flexrow" >
                   <span class="generic-label flexrow tooltip tooltip-nobottom" name="statlabel">Désignation</span>
-                  <span class="generic-label flexrow tooltip tooltip-nobottom" name="statlabel">Valeur</span>
+                  <span class="flexrow tooltip tooltip-nobottom" name="statlabel">Valeur</span>
-                  <span class="generic-label flexrow tooltip tooltip-nobottom" name="statlabel">Bonus</span>
+                  <span class="flexrow tooltip tooltip-nobottom" name="statlabel">Bonus</span>
-                  <span class="generic-label flexrow tooltip tooltip-nobottom" name="statlabel">Malus</span>
+                  <span class="flexrow tooltip tooltip-nobottom" name="statlabel">Malus</span>
                 </li>
-                {{#each data.combat as |combat key|}}
+                {{#each data.combat as |mycombat key|}}
                   <li class="stat flexrow list-item" data-attribute="{{key}}">
-                    <span class="stat-label combat-label flexrow tooltip tooltip-nobottom" name="data.combat.{{key}}.label"><a name="{{key}}">{{combat.label}}</a></span>
+                    <span class="stat-label combat-label flexrow tooltip tooltip-nobottom" name="data.combat.{{key}}.label"><a name="{{key}}">{{mycombat.label}}</a></span>
-                    <select class="stat-value flexrow" type="text" name="data.combat.{{key}}.base" value="{{combat.base}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+                    <select class="stat-value flexrow" type="text" name="data.combat.{{key}}.base" value="{{mycombat.base}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
-                      {{#select combat.base}}
+                      {{selectOptions @root.optionsBase selected=mycombat.base localize=false}}
-                      {{>"systems/foundryvtt-vadentis/templates/score-option-list.html"}}
-                      {{/select}}
                     </select> 
-                    <select class="stat-value flexrow" type="text" name="data.combat.{{key}}.malus" value="{{combat.malus}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+                    <select class="stat-value flexrow" type="text" name="data.combat.{{key}}.malus" value="{{mycombat.malus}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
-                      {{#select combat.malus}}
+                      {{selectOptions @root.optionsMalus selected=mycombat.malus localize=false}}
-                      {{>"systems/foundryvtt-vadentis/templates/malus-option-list.html"}}
-                      {{/select}}
                     </select> 
-                    <select class="stat-value flexrow" type="text" name="data.combat.{{key}}.bonus" value="{{combat.bonus}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+                    <select class="stat-value flexrow" type="text" name="data.combat.{{key}}.bonus" value="{{mycombat.bonus}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
-                      {{#select combat.bonus}}
+                      {{selectOptions @root.optionsBonus selected=mycombat.bonus localize=false}}
-                      {{>"systems/foundryvtt-vadentis/templates/bonus-option-list.html"}}
-                      {{/select}}
                     </select> 
                   </li>
                 {{/each}}
@@ -110,12 +146,13 @@
         <div class="tab competences" data-group="primary" data-tab="competences">
           <div class="flexrow">
             <span><a class="lock-unlock-sheet"><img class="small-button-container" 
-              src="systems/foundryvtt-shadows-over-sol/img/icons/{{#if data.editStatSkill}}unlocked.svg{{else}}locked.svg{{/if}}" alt="lock/unlock"
+              src="systems/foundryvtt-shadows-over-sol/img/icons/{{#if editScore}}unlocked.svg{{else}}locked.svg{{/if}}" alt="Vérouillé/Editable"
-              >{{#if data.editStatSkill}}Lock{{else}}Unlock{{/if}}</a></span>
+              >{{#if editScore}}Editable{{else}}Vérouillé{{/if}}</a></span>
           </div>
           
-          <span class="generic-label">Compétences</span>
           <div class="grid grid-2col">
+            <div>
+              <span class="generic-label">Compétences</span>
 
               <ul class="item-list alterne-list">
                 {{#each competences as |competence key|}}
@@ -123,12 +160,14 @@
                     <img class="sheet-competence-img" src="{{competence.img}}"/>
                     <span class="competence-label"><a>{{competence.name}}</a></span>
                     <select class="competence-base flexrow" type="text" skillname="{{competence.name}}" value="{{competence.data.base}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
-                    {{#select competence.data.base}}
+                      {{selectOptions @root.optionsBase selected=competence.data.base localize=false}}
-                    {{>"systems/foundryvtt-vadentis/templates/score-option-list.html"}}
+                    </select> 
-                    {{/select}}
+                    <select class="competence-malus flexrow" type="text" skillname="{{competence.name}}" value="{{competence.data.malus}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+                      {{selectOptions @root.optionsMalus selected=competence.data.malus localize=false}}
+                    </select> 
+                    <select class="competence-bonus flexrow" type="text" skillname="{{competence.name}}" value="{{competence.data.bonus}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+                      {{selectOptions @root.optionsBonus selected=competence.data.bonus localize=false}}
                     </select> 
-                  <input class="competence-malus" type="text" skillname="{{competence.name}}" value="{{competence.data.malus}}" data-dtype="number" {{#unless @root.data.editStatSkill}}disabled{{/unless}}/>
-                  <input class="competence-bonus" type="text" skillname="{{competence.name}}" value="{{competence.data.bonus}}" data-dtype="number" {{#unless @root.data.editStatSkill}}disabled{{/unless}}/>
                     <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>
@@ -136,7 +175,82 @@
                   </li>                  
                 {{/each}}
               </ul>
+            </div>
+            <div>
+              <span class="generic-label">Attributs</span>
+              <ul class="item-list alterne-list">
+                {{#each attributs as |attribut key|}}
+                  <li class="item flexrow list-item" data-item-id="{{attribut._id}}">
+                    <img class="sheet-competence-img" src="{{attribut.img}}"/>
+                    <span class="competence-label">{{attribut.name}}</span>
+                    <div class="item-controls">
+                      <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                      <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                    </div>
+                  </li>                  
+                {{/each}}
+              </ul>
+              <span class="generic-label">Techniques</span>
+              <ul class="item-list alterne-list">
+                {{#each techniques as |technique key|}}
+                  <li class="item flexrow list-item" data-item-id="{{technique._id}}">
+                    <img class="sheet-competence-img" src="{{technique.img}}"/>
+                    <span class="technique-label"><a>{{technique.name}}</a></span>
+                    <div class="item-controls">
+                      <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                      <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                    </div>
+                  </li>                  
+                {{/each}}
+              </ul>
+            </div>
+        </div>
+      </div>
 
+      {{!-- Combat Tab --}}
+      <div class="tab combat" data-group="primary" data-tab="combat">
+        <div class="flexcol">
+          <hr><span class="generic-label"><h3>Combat</h3></span>
+          <ul class="stat-list alternate-list">
+            <li class="stat flexrow" >
+              <span class="generic-label flexrow tooltip tooltip-nobottom" name="statlabel">Désignation</span>
+              <span class="flexrow tooltip tooltip-nobottom" name="statlabel">Valeur</span>
+              <span class="flexrow tooltip tooltip-nobottom" name="statlabel">Bonus</span>
+              <span class="flexrow tooltip tooltip-nobottom" name="statlabel">Malus</span>
+            </li>
+            {{#each data.combat as |combat key|}}
+              <li class="stat flexrow list-item" data-attribute="{{key}}">
+                <span class="stat-label combat-label flexrow tooltip tooltip-nobottom" name="data.combat.{{key}}.label"><a name="{{key}}">{{combat.label}}</a></span>
+                <select class="stat-value flexrow" type="text" name="data.combat.{{key}}.base" value="{{combat.base}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+                  {{#select data.combat.base}}
+                  {{{@root.optionsBase}}}
+                  {{/select}}
+                </select> 
+                <select class="stat-value flexrow" type="text" name="data.combat.{{key}}.malus" value="{{combat.malus}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+                  {{#select data.combat.malus}}
+                  {{{@root.optionsMalus}}}
+                  {{/select}}
+                </select> 
+                <select class="stat-value flexrow" type="text" name="data.combat.{{key}}.bonus" value="{{combat.bonus}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+                  {{#select data.combat.bonus}}
+                  {{{@root.optionsBonus}}}
+                  {{/select}}
+                </select> 
+              </li>
+            {{/each}}
+          </ul>          
+          <div><h4>Armes</h4></div>
+          <ul class="item-list alternate-list">
+            {{#each armes as |arme key|}}
+            {{#if arme.data.equipee}}
+            <li class="item flexrow list-item" data-item-id="{{arme._id}}">
+              <img class="sheet-competence-img" src="{{arme.img}}"/>
+              <span class="arme-label"><a>{{arme.name}}</a></span>
+              <span class="generic-label">{{arme.data.damage}} / {{arme.data.criticaldamage}}</a></span>
+            </li>                  
+            {{/if}}
+            {{/each}}
+          </ul>
         </div>
       </div>
 
@@ -177,16 +291,16 @@
 
         </div>
 
-        {{!-- Equipeme,t Tab --}}
+        {{!-- Equipement Tab --}}
         <div class="tab equipement" data-group="primary" data-tab="equipement">
           <div><h4>Armes</h4></div>
           <ul class="item-list alternate-list">
-            {{#each data.weapons as |weapon key|}}
+            {{#each armes as |arme key|}}
-            <li class="item flexrow list-item" data-item-id="{{weapon._id}}">
+            <li class="item flexrow list-item" data-item-id="{{arme._id}}">
-              <img class="sheet-skill-img" src="{{weapon.img}}"/>
+              <img class="sheet-competence-img" src="{{arme.img}}"/>
-              <span class="weapon-label"><a>{{weapon.name}}</a></span>
+              <span class="arme-label">{{arme.name}}</span>
               <div class="item-controls">
-                <a class="item-control item-equip" title="Equipped">{{#if weapon.data.equiped}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                <a class="item-control item-equip" title="Equipé">{{#if arme.data.equipee}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
                 <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
@@ -195,12 +309,12 @@
           </ul>
           <div><h4>Armures</h4></div>
           <ul class="item-list alternate-list">
-            {{#each data.armors as |armor key|}}
+            {{#each armures as |armure key|}}
-            <li class="item flexrow list-item" data-item-id="{{armor._id}}">
+            <li class="item flexrow list-item" data-item-id="{{armure._id}}">
-              <img class="sheet-skill-img" src="{{armor.img}}"/>
+              <img class="sheet-competence-img" src="{{armure.img}}"/>
-              <span class="armor-label">{{armor.name}}</span>
+              <span class="armure-label">{{armure.name}}</span>
               <div class="item-controls">
-                <a class="item-control item-worn" title="Worn">{{#if armor.data.worn}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                <a class="item-control item-equip" title="Equipé">{{#if armure.data.equipee}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
                 <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
@@ -209,12 +323,12 @@
           </ul>
           <div><h4>Equipement</h4></div>
           <ul class="item-list alternate-list">
-            {{#each data.gearsRoot as |gear key|}}
+            {{#each equipements as |equipement key|}}
-            <li class="item flexrow list-item" data-item-id="{{gear._id}}">
+            <li class="item flexrow list-item" data-item-id="{{equipement._id}}">
-              <img class="sheet-skill-img" src="{{gear.img}}"/>
+              <img class="sheet-competence-img" src="{{equipement.img}}"/>
-              <span class="conseq-label">{{gear.name}}</span>
+              <span class="equipement-label">{{equipement.name}}</span>
               <div class="item-controls">
-                <a class="item-control item-equip" title="Worn">{{#if armor.data.worn}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                <a class="item-control item-equip" title="Worn">{{#if equipement.data.equipee}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
                 <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>

templates/item-equipement-sheet.html

@@ -11,9 +11,6 @@
 
         <div class="tab" data-group="primary">
           <ul>
-            <li class="flexrow"><label class="generic-label">Type</label><input type="text" name="data.type" value="{{data.type}}" data-dtype="String"/></li>
-            <li class="flexrow"><label class="generic-label">Bonus</label><input type="text" name="data.bonus" value="{{data.bonus}}" data-dtype="String"/></li>
-            <li class="flexrow"><label class="generic-label">Malus</label><input type="text" name="data.malus" value="{{data.malus}}" data-dtype="String"/></li>
             <li class="flexrow"><label class="generic-label">Encombrement</label><input type="text" name="data.enc" value="{{data.enc}}" data-dtype="Number"/></li>
             <li class="flexrow"><label class="generic-label">Coût</label><input type="text" name="data.cost" value="{{data.cost}}" data-dtype="Number"/></li>
           </ul>