Ajout maneuver

lang/en.json

@@ -4,9 +4,11 @@
       "Personnage": "PC"
     },
     "Item": {
-      "Trait": "Trait",
-      "Weapon": "Weapon",
-      "Equipment": "Equipment"
+      "trait": "Trait",
+      "weapon": "Weapon",
+      "equipment": "Equipment",
+      "maneuver": "Maneuver",
+      "specialization": "Specialization"
     }
   },
   "ECRY": {
@@ -30,6 +32,18 @@
       "bonusmalustraits": "Traits Bonus/Malus",
       "spectranscend": "Self-Transcend : "
     },
+    "rule": {
+      "cephaly-success-2": "Duration : 1 scene - Impact : Superficial - Bonus : 1 - Elegy : 1",
+      "cephaly-success-4": "Duration : 1 week - Impact : Light - Bonus : 2 - Elegy : 2",
+      "cephaly-success-6": "Duration : 1 month - Impact : Serious - Bonus : 3 - Elegy : 3",
+      "cephaly-success-8": "Duration : 1 year - Impact : Major - Bonus : 4 - Elegy : 4",
+      "cephaly-success-10": "Duration : Permanent - Impact : Dead - Bonus : 5 - Elegy : 5",
+      "cephaly-failure-2": "Duration : 1 scene - Impact : Superficial - Malus : 1",
+      "cephaly-failure-4": "Duration : 1 week - Impact : Light - Malus : 2",
+      "cephaly-failure-6": "Duration : 1 month - Impact : Serious - Malus : 3",
+      "cephaly-failure-8": "Duration : 1 year - Impact : Major - Malus : 4",
+      "cephaly-failure-10": "Duration : Permanent - Impact : Death/Madness - Malus : 5"
+    },
     "warn": {
       "notenoughdice": "Execution and Preservation must have 2 dices allocated"
     },
@@ -45,7 +59,7 @@
       "goldcoin": "Gold coin",
       "lige": "Lige",
       "hurle": "Howl",
-      "coin": "Coin",
+      "coin": "Penny",
       "notes": "Notes",
       "bio": "Bio",
       "bionotes": "Bio&Notes",
@@ -123,7 +137,14 @@
       "type": "Type",
       "applyimpact": "Apply impact",
       "applybonus": "Apply bonus",
-      "bonuspool": "Available bonuses"
+      "bonuspool": "Available bonuses",
+      "cephaly": "Cephaly",
+      "elegy": "Elegy",
+      "entelechy": "Entelechy",
+      "mekany": "Mekany",
+      "psyche": "Psyche",
+      "scoria": "Scoria",
+      "cephalydifficulty": "Set Cephaly difficulty"
     }
   }
 }

lang/fr.json

@@ -4,9 +4,11 @@
       "Personnage": "PJ"
     },
     "Item": {
-      "Trait": "Trait",
-      "Weapon": "Arme",
-      "Equipment": "Equipement"
+      "trait": "Trait",
+      "weapon": "Arme",
+      "equipment": "Equipement",
+      "maneuver": "Manoeuvre",
+      "specialization": "Spécialisation"
     }
   },
   "ECRY": {
@@ -30,6 +32,19 @@
       "bonusmalustraits": "Bonus/Malus des Traits",
       "spectranscend": "Dépassement de soi : "
     },
+    "rule": {
+      "cephaly-success-12": "Durée : 1 scène - Impact : Superficiel - Bonus : 1 - Elegie : 1",
+      "cephaly-success-34": "Durée : 1 semaine - Impact : Léger - Bonus : 2 - Elegie : 2",
+      "cephaly-success-56": "Durée : 1 mois - Impact : Grave - Bonus : 3 - Elegie : 3",
+      "cephaly-success-78": "Durée : 1 année - Impact : Majeur - Bonus : 4 - Elegie : 4",
+      "cephaly-success-910": "Durée : Permanent - Impact : Mort - Bonus : 5 - Elegie : 5",
+      "cephaly-failure-2": "Durée : 1 scène - Impact : Superficiel - Malus : 1 - Symptôme non visible et sans gravité - Altération bégigne difficilement repérable",
+      "cephaly-failure-4": "Durée : 1 semaine - Impact : Léger - Malus : 2 - Symptôme visible non incapacitant - Altération repérable",
+      "cephaly-failure-6": "Durée : 1 mois - Impact : Grave - Malus : 3 - Symptôme incapacitant - Altération repérable et fâcheuse",
+      "cephaly-failure-8": "Durée : 1 année - Impact : Majeur - Malus : 4 - Symptôme très incapacitant - Altération dangereuse",
+      "cephaly-failure-10": "Durée : Permanent - Impact : Mort/Folie - Malus : 5 - Symptôme spectaculaire et repoussant - Altération dangereuse globalement"
+
+    },
     "warn": {
       "notenoughdice": "L'Accomplissement et la Préservation doivent avoir 2 dés chacun"
     },
@@ -123,7 +138,14 @@
       "type": "Type",
       "applyimpact": "Appliquer l'impact",
       "applybonus": "Appliquer le bonus",
-      "bonuspool": "Bonus disponibles"
+      "bonuspool": "Bonus disponibles",
+      "cephaly": "Cephalie",
+      "elegy": "Elégie",
+      "entelechy": "Entéléchie",
+      "mekany": "Mekanë",
+      "psyche": "Psyché",
+      "scoria": "Scorie",
+      "cephalydifficulty": "Difficulté de la Céphalie"
     }
   }
 }

modules/actors/ecryme-actor-sheet.js

@@ -46,6 +46,8 @@ export class EcrymeActorSheet extends ActorSheet {
       impactsMalus: this.actor.getImpactsMalus(),
       archetype: duplicate(this.actor.getArchetype()),
       equipements: this.actor.getEquipments(),
+      hasCephaly: EcrymeUtility.hasCephaly(),
+      cephalySkills: this.actor.getCephalySkills(),
       subActors: duplicate(this.actor.getSubActors()),
       description: await TextEditor.enrichHTML(this.object.system.description, { async: true }),
       notes: await TextEditor.enrichHTML(this.object.system.notes, { async: true }),
@@ -122,6 +124,10 @@ export class EcrymeActorSheet extends ActorSheet {
       let skillKey = $(event.currentTarget).data("skill-key")
       this.actor.rollSkillConfront(categKey, skillKey)
     });
+    html.find('.roll-cephaly').click((event) => {
+      let skillKey = $(event.currentTarget).data("skill-key")
+      this.actor.rollCephalySkillConfront(skillKey)
+    });
     html.find('.roll-weapon-confront').click((event) => {
       const li = $(event.currentTarget).parents(".item")
       let weaponId = li.data("item-id");

modules/actors/ecryme-actor.js

@@ -109,6 +109,11 @@ export class EcrymeActor extends Actor {
     return skills
   }
   /* -------------------------------------------- */
+  getCephalySkills() {
+    let skills = duplicate(this.system.cephaly.skilllist)
+    return skills
+  }
+  /* -------------------------------------------- */
   getImpacts() {
     let comp = duplicate(this.items.filter(item => item.type == 'impact') || [])
     return comp;
@@ -323,7 +328,7 @@ export class EcrymeActor extends Actor {
 
   /* -------------------------------------------- */
   getCommonRollData() {
-    this.system.internals.confrontbonus = 5 // TO BE REMOVED!!!!
+    //this.system.internals.confrontbonus = 5 // TO BE REMOVED!!!!
     let rollData = EcrymeUtility.getBasicRollData()
     rollData.alias = this.name
     rollData.actorImg = this.img
@@ -371,6 +376,26 @@ export class EcrymeActor extends Actor {
     rollData.executionTotal    = rollData.skill.value
     rollData.preservationTotal = rollData.skill.value
     rollData.applyTranscendence = "execution"
+    rollData.traitsBonus = duplicate(rollData.traits)
+    rollData.traitsMalus = duplicate(rollData.traits)
+    let confrontStartDialog = await EcrymeConfrontStartDialog.create(this, rollData)
+    confrontStartDialog.render(true)
+  }
+  /* -------------------------------------------- */
+  async rollCephalySkillConfront(skillKey) {
+    let rollData = this.getCommonRollData()
+    rollData.mode = "cephaly"
+    rollData.skill = duplicate(this.system.cephaly.skilllist[skillKey])
+    rollData.img = rollData.skill.img
+    rollData.skill.categKey = "cephaly"
+    rollData.skill.skillKey = skillKey
+    //rollData.impactMalus = this.getImpactMalus(categKey)
+    rollData.title = game.i18n.localize("ECRY.ui.cephaly") + " : " + game.i18n.localize(rollData.skill.name)
+    rollData.executionTotal    = rollData.skill.value
+    rollData.preservationTotal = rollData.skill.value
+    rollData.traitsBonus = duplicate(rollData.traits)
+    rollData.traitsMalus = duplicate(rollData.traits)
+    rollData.applyTranscendence = "execution"
     let confrontStartDialog = await EcrymeConfrontStartDialog.create(this, rollData)
     confrontStartDialog.render(true)
   }

modules/common/ecryme-utility.js

@@ -4,7 +4,32 @@ import { EcrymeCommands } from "../app/ecryme-commands.js";
 /* -------------------------------------------- */
 const __maxImpacts = { superficial: 4, light: 3, serious: 2, major: 1 }
 const __nextImpacts = { superficial: "light", light: "serious", serious: "major", major: "major" }
-const __effect2Impact= [ "none", "superficial", "superficial", "light", "light", "serious", "serious", "major", "major" ]
+const __effect2Impact = ["none", "superficial", "superficial", "light", "light", "serious", "serious", "major", "major"]
+const __cephalySuccess = {
+  1: "cephaly-success-2",
+  2: "cephaly-success-2",
+  3: "cephaly-success-4",
+  4: "cephaly-success-4",
+  5: "cephaly-success-6",
+  6: "cephaly-success-6",
+  7: "cephaly-success-8",
+  8: "cephaly-success-8",
+  9: "cephaly-success-9",
+  10: "cephaly-success-10"
+}
+const __cephalyFailure = {
+  1: "cephaly-failure-2",
+  2: "cephaly-failure-2",
+  3: "cephaly-failure-4",
+  4: "cephaly-failure-4",
+  5: "cephaly-failure-6",
+  6: "cephaly-failure-6",
+  7: "cephaly-failure-8",
+  8: "cephaly-failure-8",
+  9: "cephaly-failure-9",
+  10: "cephaly-failure-10"
+}
+
 /* -------------------------------------------- */
 export class EcrymeUtility {
 
@@ -56,6 +81,9 @@ export class EcrymeUtility {
         accum += block.fn(i);
       return accum;
     })
+    Handlebars.registerHelper('isGM', function () {
+      return game.user.isGM
+    })
 
     game.settings.register("fvtt-ecryme", "ecryme-game-level", {
       name: game.i18n.localize("ECRY.settings.gamelevel"),
@@ -76,6 +104,12 @@ export class EcrymeUtility {
 
   }
 
+  /*-------------------------------------------- */
+  static hasCephaly() {
+    let level = game.settings.get("fvtt-ecryme", "ecryme-game-level")
+    return level != "level_e"
+  }
+
   /*-------------------------------------------- */
   static buildSkillConfig() {
     game.system.ecryme.config.skills = {}
@@ -138,7 +172,7 @@ export class EcrymeUtility {
     console.log(confront.marginExecution, confront.marginPreservation)
     // Filter margin
     let maxMargin // Dummy max
-    if ( confront.marginExecution > 0) { // Successful hit
+    if (confront.marginExecution > 0) { // Successful hit
       // Limit with skill+spec
       maxMargin = confront.rollData1.skill.value + ((confront.rollData1.spec) ? 2 : 0)
       confront.marginExecution = Math.min(confront.marginExecution, maxMargin)
@@ -147,7 +181,7 @@ export class EcrymeUtility {
       confront.marginExecution = -Math.min(Math.abs(confront.marginExecution), maxMargin)
     }
 
-    if ( confront.marginPreservation > 0) { // Successful defense
+    if (confront.marginPreservation > 0) { // Successful defense
       // Limit with skill+spec
       maxMargin = confront.rollData1.skill.value + ((confront.rollData1.spec) ? 2 : 0)
       confront.marginPreservation = Math.min(confront.marginPreservation, maxMargin)
@@ -162,7 +196,7 @@ export class EcrymeUtility {
       confront.effectExecution += confront.rollData1.weapon.system.effect
       confront.impactExecution = this.getImpactFromEffect(confront.effectExecution)
     }
-    if ( confront.marginExecution < 0) {
+    if (confront.marginExecution < 0) {
       confront.bonus2 = -confront.marginExecution
     }
     confront.effectPreservation = confront.marginPreservation
@@ -170,7 +204,7 @@ export class EcrymeUtility {
       confront.effectPreservation = - (Math.abs(confront.marginPreservation) + confront.rollData2.weapon.system.effect)
       confront.impactPreservation = this.getImpactFromEffect(Math.abs(confront.effectPreservation))
     }
-    if ( confront.marginPreservation > 0) {
+    if (confront.marginPreservation > 0) {
       confront.bonus1 = -confront.marginPreservation
     }
 
@@ -182,6 +216,27 @@ export class EcrymeUtility {
 
     this.lastConfront = confront
   }
+  /* -------------------------------------------- */
+  static async manageCephalyDifficulty(rollData, difficulty) {
+    rollData.difficulty = Number(difficulty)
+    if (rollData.executionTotal > difficulty) {
+      rollData.marginExecution = rollData.executionTotal - difficulty
+      rollData.cephalySuccess = "ECRY.rule." + __cephalySuccess[(rollData.marginExecution > 10) ? 10 : rollData.marginExecution]
+    } else {
+      rollData.marginExecution = -1
+    }
+    if (rollData.preservationTotal < difficulty) {
+      rollData.marginPreservation = difficulty - rollData.preservationTotal
+      rollData.cephalyFailure = "ECRY.rule." + __cephalyFailure[(rollData.marginPreservation > 10) ? 10 : rollData.marginPreservation]
+    } else {
+      rollData.marginPreservation = -1
+    }
+    let msg = await this.createChatWithRollMode(rollData.alias, {
+      content: await renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-cephaly-result.hbs`, rollData)
+    })
+    msg.setFlag("world", "ecryme-rolldata", rollData)
+    console.log("Cephaly result", rollData)
+  }
 
   /* -------------------------------------------- */
   static manageConfrontation(rollData) {
@@ -237,6 +292,13 @@ export class EcrymeUtility {
       let rollData = message.getFlag("world", "ecryme-rolldata")
       EcrymeUtility.manageConfrontation(rollData)
     })
+    html.on("click", '.button-apply-cephaly-difficulty', event => {
+      let messageId = EcrymeUtility.findChatMessageId(event.currentTarget)
+      let message = game.messages.get(messageId)
+      let rollData = message.getFlag("world", "ecryme-rolldata")
+      let difficulty = $("#" + rollData.rollId + "-cephaly-difficulty").val()
+      EcrymeUtility.manageCephalyDifficulty(rollData, difficulty)
+    })
     html.on("click", '.button-apply-impact', event => {
       let messageId = EcrymeUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
@@ -247,11 +309,7 @@ export class EcrymeUtility {
       let messageId = EcrymeUtility.findChatMessageId(event.currentTarget)
       let message = game.messages.get(messageId)
       let actor = game.actors.get($(event.currentTarget).data("actor-id"))
-      actor.modifyConfrontBonus( $(event.currentTarget).data("bonus") )
-    })      
-    html.on("click", '.draw-tarot-card', event => {
-      let messageId = EcrymeUtility.findChatMessageId(event.currentTarget)
-      this.drawDeckCard(messageId)
+      actor.modifyConfrontBonus($(event.currentTarget).data("bonus"))
     })
 
   }

modules/dialogs/ecryme-confront-dialog.js

@@ -54,6 +54,25 @@ export class EcrymeConfrontDialog extends Dialog {
     msg.setFlag("world", "ecryme-rolldata", this.rollData)
   }
 
+  /* -------------------------------------------- */
+  async refreshDice() {
+    this.rollData.filter = "execution"
+    let content = await renderTemplate("systems/fvtt-ecryme/templates/dialogs/partial-confront-dice-area.hbs", this.rollData )
+    content += await renderTemplate("systems/fvtt-ecryme/templates/dialogs/partial-confront-bonus-area.hbs", this.rollData )
+    $("#confront-execution").html(content)
+
+    this.rollData.filter = "preservation"
+    content = await renderTemplate("systems/fvtt-ecryme/templates/dialogs/partial-confront-dice-area.hbs", this.rollData )
+    content += await renderTemplate("systems/fvtt-ecryme/templates/dialogs/partial-confront-bonus-area.hbs", this.rollData )
+    $("#confront-preservation").html(content)
+
+    this.rollData.filter = "mainpool"
+    content = await renderTemplate("systems/fvtt-ecryme/templates/dialogs/partial-confront-dice-area.hbs", this.rollData )
+    $("#confront-dice-pool").html(content)
+    content = await renderTemplate("systems/fvtt-ecryme/templates/dialogs/partial-confront-bonus-area.hbs", this.rollData )
+    $("#confront-bonus-pool").html(content)
+    
+  }
   /* -------------------------------------------- */
   async refreshDialog() {
     const content = await renderTemplate("systems/fvtt-ecryme/templates/dialogs/confront-dialog.hbs", this.rollData)
@@ -69,7 +88,7 @@ export class EcrymeConfrontDialog extends Dialog {
     super._onDragStart(event)
     let dragType = $(event.srcElement).data("drag-type")
     let diceData = {}
-    console.log("DRAGTYPE", dragType)
+    //console.log("DRAGTYPE", dragType)
     if (dragType == "dice") {
       diceData = {
         dragType: "dice",
@@ -157,43 +176,45 @@ export class EcrymeConfrontDialog extends Dialog {
     rollData.preservationTotal = rollData.confrontBonus.filter(d => d.location == "preservation").reduce((previous, current) => {
       return previous + 1
     }, rollData.preservationTotal)
+
     this.processTranscendence()
 
     if (rollData.selectedSpecs && rollData.selectedSpecs.length > 0) {
       rollData.spec = duplicate(actor.getSpecialization(rollData.selectedSpecs[0]))    
-      this.rollData.executionTotal += "+2"
-      this.rollData.preservationTotal += "+2"
+      rollData.specApplied = true
+      rollData.executionTotal += 2
+      rollData.preservationTotal += 2
+    }
+    if ( rollData.specApplied && rollData.selectedSpecs.length == 0) {
+      rollData.spec = undefined
+      rollData.specApplied = false
     }
     rollData.bonusMalusTraits = 0
-    for (let t of rollData.traits) {
-      t.isBonus = false
-      t.isMalus = false
+    for (let t of rollData.traitsBonus) {
+      t.activated = false
     }
-    if (rollData.traitsBonus && rollData.traitsBonus.length > 0) {
-      rollData.traitsBonusList = []
-      for (let id of rollData.traitsBonus) {
-        let trait = rollData.traits.find(t => t._id == id)
-        trait.isBonus = true
-        rollData.traitsBonusList.push(trait)
+    for (let t of rollData.traitsMalus) {
+      t.activated = false
+    }
+    if (rollData.traitsBonusSelected && rollData.traitsBonusSelected.length > 0) {
+      for (let id of rollData.traitsBonusSelected) {
+        let trait = rollData.traitsBonus.find(t => t._id == id)
+        trait.activated = true
         rollData.bonusMalusTraits += trait.system.level
       }
     }
-    if (rollData.traitsMalus && rollData.traitsMalus.length > 0) {
-      rollData.traitsMalusList = []
-      for (let id of rollData.traitsMalus) {
-        let trait = rollData.traits.find(t => t._id == id)
-        trait.isMalus = true
-        rollData.traitsMalusList.push(trait)
+    if (rollData.traitsMalusSelected && rollData.traitsMalusSelected.length > 0) {
+      for (let id of rollData.traitsMalusSelected) {
+        let trait = rollData.traitsMalus.find(t => t._id == id)
+        trait.activated = true
         rollData.bonusMalusTraits -= trait.system.level
       }
     }
-    rollData.executionTotal += rollData.bonusMalusTraits
-    rollData.executionTotal += rollData.bonusMalusPerso
 
-    rollData.preservationTotal += rollData.bonusMalusTraits
-    rollData.preservationTotal += rollData.bonusMalusPerso
+    rollData.executionTotal += rollData.bonusMalusTraits + rollData.bonusMalusPerso
+    rollData.preservationTotal += rollData.bonusMalusTraits + rollData.bonusMalusPerso
 
-    this.refreshDialog().catch("Error on refresh confrontation dialog")
+    this.refreshDialog()
   }
 
   /* -------------------------------------------- */
@@ -209,11 +230,11 @@ export class EcrymeConfrontDialog extends Dialog {
       this.computeTotals()
     })
     html.find('#roll-trait-bonus').change((event) => {
-      this.rollData.traitsBonus = $('#roll-trait-bonus').val()
+      this.rollData.traitsBonusSelected = $('#roll-trait-bonus').val()
       this.computeTotals()
     })
     html.find('#roll-trait-malus').change((event) => {
-      this.rollData.traitsMalus = $('#roll-trait-malus').val()
+      this.rollData.traitsMalusSelected = $('#roll-trait-malus').val()
       this.computeTotals()
     })
     html.find('#roll-select-transcendence').change((event) => {

system.json

@@ -31,8 +31,7 @@
   "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-ecryme/raw/branch/master/system.json",
   "compatibility": {
     "minimum": "10",
-    "verified": "11",
-    "maximum": "11"
+    "verified": "11"
   },
   "id": "fvtt-ecryme",
   "primaryTokenAttribute": "secondary.health",
@@ -43,7 +42,7 @@
   ],
   "title": "Ecryme, le Jeu de Rôles",
   "url": "https://www.uberwald.me/gitea/uberwald/fvtt-ecryme",
-  "version": "11.0.3",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-ecryme/archive/fvtt-ecryme-v10.0.0.zip",
+  "version": "11.0.8",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-ecryme/archive/fvtt-ecryme-v11.0.8.zip",
   "background": "systems/fvtt-ecryme/images/assets/ecryme_extract_panel_01.webp"
 }

template.json

@@ -191,7 +191,7 @@
       "annency",
       "boheme",
       "contact",
-      "confrontation"
+      "maneuver"
     ],
     "templates": {
       "common": {
@@ -203,6 +203,11 @@
         "costunit": ""
       }
     },
+    "maneuver": {
+      "templates": [
+        "common"
+      ]
+    },
     "confrontation": {
       "templates": [
         "common"

templates/actors/actor-sheet.hbs

@@ -51,6 +51,9 @@
     <a class="item" data-tab="competences">{{localize "ECRY.ui.skills"}}</a>
     <a class="item" data-tab="traits">{{localize "ECRY.ui.traits"}}</a>
     <a class="item" data-tab="combat">{{localize "ECRY.ui.healthcombat"}}</a>
+    {{#if hasCephaly}}
+    <a class="item" data-tab="cephaly">{{localize "ECRY.ui.cephaly"}}</a>
+    {{/if}}
     <a class="item" data-tab="equipements">{{localize "ECRY.ui.equipment"}}</a>
     <a class="item" data-tab="biodata">{{localize "ECRY.ui.bionotes"}}</a>
   </nav>
@@ -119,6 +122,34 @@
 
     </div>
 
+    {{#if hasCephaly}}
+    {{!-- Cephaly Tab --}}
+    <div class="tab cephaly" data-group="primary" data-tab="cephaly">
+        
+        <div>
+          <ul class="stat-list alternate-list item-list">
+            {{#each cephalySkills as |skill skillkey|}}
+            <li class="item flexrow list-item">
+              <span class="item-name-label-long">
+                <a class="roll-cephaly" data-category-key="cephaly" data-skill-key="{{skillkey}}">
+                  <i class="fa-solid fa-dice-d6"></i>
+                  {{localize skill.name}}
+                </a></span>
+              <select class="item-field-label-short" type="text"
+                name="system.cephaly.skilllist.{{skillkey}}.value" value="{{skill.value}}"
+                data-dtype="Number">
+                {{#select skill.value}}
+                {{#each @root.config.skillLevel as |level key| }}
+                <option value="{{level}}">{{level}}</option>
+                {{/each}}
+                {{/select}}
+              </select>
+            </li>
+            {{/each}}
+          </ul>
+        </div>
+    </div>
+    {{/if}}
 
     <div class="tab traits" data-group="primary" data-tab="traits">
 

templates/chat/chat-cephaly-result.hbs

@@ -0,0 +1,30 @@
+<div class="chat-message-header">
+  {{#if actorImg}}
+  <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
+  {{/if}}
+  <h4 class="chat-actor-name">{{alias}}</h4>
+</div>
+
+<hr>
+
+{{#if img}}
+<div>
+  <img class="chat-icon" src="{{img}}" alt="{{alias}}" />
+</div>
+{{/if}}
+
+<div>
+  <ul>
+    <li>{{localize "ECRY.ui.cephaly"}} : {{localize skill.name}}</li>
+    {{#if (gt marginExecution 0)}}    
+    <li>{{localize "ECRY.ui.execution"}} {{executionTotal}} vs {{difficulty}} : {{marginExecution}}</li>
+    <li>{{localize cephalySuccess}}</li>
+    {{/if}}
+    {{#if (gt marginPreservation 0)}}    
+    <li>{{localize "ECRY.ui.preservation"}} {{preservationTotal}} vs {{difficulty}} : {{marginPreservation}}</li>
+    <li>{{localize cephalyFailure}}</li>
+    {{/if}}
+  </ul>
+</div>
+
+</div>

templates/chat/chat-confrontation-pending.hbs

@@ -15,13 +15,47 @@
 
 <div>
   <ul>
+    {{#if (eq mode "cephaly")}}
+    <li>{{localize "ECRY.ui.cephaly"}} : {{localize skill.name}} </li>
+    {{else}}
     <li>Confrontation : {{alias}} </li>
+    {{/if}}
+
     <li>{{localize skill.name}}: {{skill.value}} </li>
     {{#if spec}}
     <li>{{localize "ECRY.chat.specialization"}} {{spec.name}} (+2) </li>
     {{/if}}
+
+    {{#each traitsBonus as |trait idx|}}
+    {{#if trait.activated}}
+    <li>{{localize "ECRY.chat.traitbonus"}}: {{trait.name}} ({{trait.system.level}}) </li>
+    {{/if}}
+    {{/each}}
+    {{#each traitsMalus as |trait idx|}}
+    {{#if trait.activated}}
+    <li>{{localize "ECRY.chat.traitmalus"}}: {{trait.name}} ({{trait.system.level}}) </li>
+    {{/if}}
+    {{/each}}
+    {{#if bonusMalusTraits}}
+    <li>{{localize "ECRY.chat.bonusmalustraits"}}: {{bonusMalusTraits}} </li>
+    {{/if}}
+
   </ul>
+  {{#if (isGM)}}
+    {{#if (eq mode "cephaly")}}
+    <div>
+      <span>{{localize "ECRY.chat.difficulty"}}</span>
+      <select id="{{rollId}}-cephaly-difficulty" name="cephaly-difficulty">
+        {{#for 1 20 1}}
+        <option value="{{this}}">{{this}}</option>
+        {{/for}}
+      </select>
+    </div>
+    <button class="button-apply-cephaly-difficulty">{{localize "ECRY.ui.cephalydifficulty"}}</button>
+    {{else}}
     <button class="button-select-confront">{{localize "ECRY.ui.selectconfront"}}</button>
+    {{/if}}
+  {{/if}}
 </div>
 
 </div>

templates/dialogs/confront-dialog.hbs

@@ -14,7 +14,6 @@
         <h3>{{localize "ECRY.ui.execution"}} : <span id="execution-total">{{executionTotal}}</span> </h3>        
         <div id="confront-execution" class="flexrow confront-area confront-execution-area">
           {{> systems/fvtt-ecryme/templates/dialogs/partial-confront-dice-area.hbs filter="execution"}}
-          <br>
           {{> systems/fvtt-ecryme/templates/dialogs/partial-confront-bonus-area.hbs filter="execution"}}
         </div>
       </div>
@@ -73,20 +72,22 @@
       </select>
     </div>
 
+    {{#if skill.spec}}
     <div class="flexrow">
       <span class="roll-dialog-label">{{localize "ECRY.ui.spec"}} : </span>
       <select class="" id="roll-specialization" data-type="String" multiple>
         {{#each skill.spec as |spec idx|}}
-        <option value="{{spec.id}}">{{spec.name}}</option>
+        <option value="{{spec.id}}"  {{#if (eq spec.name @root.spec.name)}}selected{{/if}}>{{spec.name}}</option>
         {{/each}}
       </select>
     </div>
+    {{/if}}
 
     <div class="flexrow">
       <span class="roll-dialog-label">{{localize "ECRY.ui.traitbonus"}} : </span>
       <select class="" id="roll-trait-bonus" data-type="String" multiple>
-        {{#each traits as | trait idx|}}
-        <option value="{{trait._id}}" {{#if trait.isBonus}}selected{{/if}}>{{trait.name}} ({{trait.system.level}})</option>
+        {{#each traitsBonus as |trait idx|}}
+        <option value="{{trait._id}}" {{#if trait.activated}}selected{{/if}}>{{trait.name}} ({{trait.system.level}})</option>
         {{/each}}
       </select>
     </div>
@@ -94,13 +95,12 @@
     <div class="flexrow">
       <span class="roll-dialog-label">{{localize "ECRY.ui.traitmalus"}} : </span>
       <select class="" id="roll-trait-malus" data-type="String" multiple>
-        {{#each traits as | trait idx|}}
-        <option value="{{trait._id}}" {{#if trait.isMalus}}selected{{/if}}">{{trait.name}} ({{trait.system.level}})</option>
+        {{#each traitsMalus as |trait idx|}}
+        <option value="{{trait._id}}" {{#if trait.activated}}selected{{/if}}>{{trait.name}} ({{trait.system.level}})</option>
         {{/each}}
       </select>
     </div>
 
-
     <div class="flexrow">
       <span class="roll-dialog-label">Bonus/Malus : </span>
       <select id="bonusMalusPerso" name="bonusMalusPerso">

templates/items/item-equipment-sheet.hbs

@@ -0,0 +1,25 @@
+<form class="{{cssClass}}" autocomplete="off">
+  <header class="sheet-header">
+      <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+      <div class="header-fields">
+          <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
+      </div>
+  </header>
+  
+  {{> systems/fvtt-ecryme/templates/items/partial-item-nav.hbs}}
+
+
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+
+    {{> systems/fvtt-ecryme/templates/items/partial-item-description.hbs}}
+    
+    <div class="tab details" data-group="primary" data-tab="details">
+
+      {{> systems/fvtt-ecryme/templates/items/partial-item-equipment.hbs}}
+
+    </div>
+  </div>
+
+  </section>
+</form>

templates/items/partial-item-equipment.hbs

@@ -7,7 +7,7 @@
 <li class="flexrow">
   <label class="item-field-label-long">{{localize "ECRY.ui.cost"}}</label>
   <input type="text" class="item-field-label-short" name="system.cost" value="{{system.cost}}" data-dtype="Number" />
-  <select class="item-field-label-medium" type="text" name="system.costunit" value="{{system.costunit}}" data-dtype="Number">
+  <select class="item-field-label-medium" type="text" name="system.costunit" value="{{system.costunit}}" data-dtype="String">
     {{#select system.costunit}}
     {{#each config.costUnits as |unit key| }}
     <option value="{{key}}">{{localize unit.name}}</option>