Fix calcul defense

Enhance stats
Automatisations de combats, WIP
2024-02-15 11:47:15 +01:00 · 2024-02-08 12:51:41 +01:00 · 2023-12-28 18:40:46 +01:00 · 2023-12-21 21:02:11 +01:00 · 2023-12-19 21:52:59 +01:00 · 2023-11-26 14:07:55 +01:00
16 changed files with 246 additions and 153 deletions
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -1,25 +1,25 @@
 {
-  "ACTOR": {
-    "TypePersonnage": "Personnage",
-    "TypeCellule": "Cellule",
-    "TypeCreature": "Créature"
+  "TYPES": {
+    "Actor": {
+      "personnage": "Personnage",
+      "cellule": "Cellule",
+      "creature": "Créature"
+    },
+    "Item": {
+      "artefact": "Artefact",
+      "arme": "Arme",
+      "talent": "Talent",
+      "historique": "Historique",
+      "profil": "Profil",
+      "competence": "Compétence",
+      "protection": "Protection",
+      "monnaie": "Monnaie",
+      "equipement": "Equipement",
+      "ressource": "Ressource",
+      "contact": "Contact"
+    
+    }
  },
-
-  "ITEM": {
-    "TypeArtefact": "Artefact",
-    "TypeArme": "Arme",
-    "TypeTalent": "Talent",
-    "TypeHistorique": "Historique",
-    "TypeProfil": "Profil",
-    "TypeCompetence": "Compétence",
-    "TypeProtection": "Protection",
-    "TypeMonnaie": "Monnaie",
-    "TypeEquipement": "Equipement",
-    "TypeRessource": "Ressource", 
-    "TypeContact": "Contact"
-
-  },
-
  "HAWKMOON": {
    "ui": {
      "editContact": "Modifier le contact",
--- a/modules/hawkmoon-actor-sheet.js
+++ b/modules/hawkmoon-actor-sheet.js
@@ -49,9 +49,11 @@ export class HawkmoonActorSheet extends ActorSheet {
      combat: this.actor.getCombatValues(),      
      equipements: duplicate(this.actor.getEquipments()),
      artefacts: duplicate(this.actor.getArtefacts()),
-      monnaies: duplicate(this.actor.getMonnaies()),
      richesse: this.actor.computeRichesse(),
+      coupDevastateur: this.actor.items.find(it => it.type =="talent" && it.name.toLowerCase() == "coup devastateur" && !it.system.used),
      valeurEquipement: this.actor.computeValeurEquipement(),
+      nbCombativite: this.actor.system.sante.nbcombativite,
+      combativiteList: HawkmoonUtility.getCombativiteList(this.actor.system.sante.nbcombativite),
      initiative: this.actor.getFlag("world", "last-initiative") || -1,
      description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}),
      habitat: await TextEditor.enrichHTML(this.object.system.biodata.habitat, {async: true}),
--- a/modules/hawkmoon-actor.js
+++ b/modules/hawkmoon-actor.js
@@ -76,6 +76,7 @@ export class HawkmoonActor extends Actor {
      arme.system.totalDegats = arme.system.degats + "+" + combat.bonusDegatsTotal
      arme.system.totalOffensif = this.system.attributs.pui.value + arme.system.competence.system.niveau + arme.system.bonusmaniementoff
      arme.system.totalDefensif = combat.defenseTotal + arme.system.competence.system.niveau + arme.system.seuildefense + bonusDefense
+      console.log("Arme", arme.system.totalDefensif, combat, arme.system.competence.system.niveau, arme.system.seuildefense, bonusDefense)
      arme.system.isdefense = true
      arme.system.isMelee = true
      arme.system.isDistance = false
@@ -118,7 +119,7 @@ export class HawkmoonActor extends Actor {
  }
  getArtefacts() {
    return this.getItemSorted(["artefact"])
- }
+  }
  getArmors() {
    return this.getItemSorted(["protection"])
  }
@@ -175,7 +176,7 @@ export class HawkmoonActor extends Actor {

  /* -------------------------------------------- */
  getDefenseBase() {
-    return Math.max(this.system.attributs.tre.value, this.system.attributs.pui.value)
+    return Math.max(this.system.attributs.tre.value, this.system.attributs.adr.value)
  }

  /* -------------------------------------------- */
@@ -185,7 +186,7 @@ export class HawkmoonActor extends Actor {
  /* -------------------------------------------- */
  getProtection() {
    let equipProtection = 0
-    for (let armor in this.items) {
+    for (let armor of this.items) {
      if (armor.type == "protection" && armor.system.equipped) {
        equipProtection += Number(armor.system.protection)
      }
@@ -382,10 +383,33 @@ export class HawkmoonActor extends Actor {
    return 0;
  }

+  /* -------------------------------------------- */
+  changeEtatCombativite(value) {
+    let sante = duplicate(this.system.sante)
+    sante.etat += Number(value)
+    sante.etat = Math.max(sante.etat, 0)
+    sante.etat = Math.min(sante.etat, 5)
+    this.update({ 'system.sante': sante })
+    if (sante.etat == this.system.sante.nbcombativite) {
+      ChatMessage.create({ content: `<strong>${this.name} est vaincu !</strong>` })
+    }
+    // Gestion des états affaibli et très affaibli
+    if (sante.etat == this.system.sante.nbcombativite-2 || sante.etat == this.system.sante.nbcombativite-1) {
+      if (sante.etat == this.system.sante.nbcombativite-2 && this.items.find(item => item.type == "talent" && item.name.toLowerCase() == "encaissement")) {
+        ChatMessage.create({ content: `<strong>${this.name} ne subit pas les 2 adversités rouge grâce à Encaissement. Pensez à les ajouter à la fin de la scène !</strong>` })
+      } else if (sante.etat == this.system.sante.nbcombativite-1 && this.items.find(item => item.type == "talent" && item.name.toLowerCase().includes("vaillant"))) {
+        ChatMessage.create({ content: `<strong>${this.name} ne subit pas les 2 adversités rouge grâce à Vaillant. Pensez à les ajouter à la fin de la scène !</strong>` })
+      } else {
+        ChatMessage.create({ content: `<strong>${this.name} subit 2 adversités rouge !</strong>` })
+        this.incDecAdversite("rouge", 2)
+      }
+    }
+  }
+
  /* -------------------------------------------- */
  async equipGear(equipmentId) {
    let item = this.items.find(item => item.id == equipmentId);
-    if (item && item.system.data) {
+    if (item?.system?.data) {
      let update = { _id: item.id, "system.equipped": !item.system.equipped };
      await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
    }
@@ -434,7 +458,7 @@ export class HawkmoonActor extends Actor {
    if (objetQ) {
      let newQ = objetQ.system.quantite + incDec
      newQ = Math.max(newQ, 0)
-      const updated = await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.quantite': newQ }]); // pdates one EmbeddedEntity
+      await this.updateEmbeddedDocuments('Item', [{ _id: objetQ.id, 'system.quantite': newQ }]); // pdates one EmbeddedEntity
    }
  }

@@ -538,6 +562,8 @@ export class HawkmoonActor extends Actor {
    rollData.nbBA = this.system.bonneaventure.actuelle
    rollData.nbAdversites = this.getTotalAdversite()
    rollData.talents = []
+    rollData.attrKey2 = "none"
+    rollData.coupDevastateur = this.items.find(it => it.type =="talent" && it.name.toLowerCase() == "coup dévastateur" && !it.system.used)

    if (attrKey) {
      rollData.attrKey = attrKey
@@ -597,31 +623,42 @@ export class HawkmoonActor extends Actor {
    if (arme.type == "arme") {
      arme = this.prepareArme(arme)
    }
-    console.log("DEGATS", arme)
+    console.log("DEGATS", arme, targetVigueur, rollDataInput)
    let roll
    let bonus = 0
+    let bonus2 = 0
+
+    if (rollDataInput?.applyCoupDevastateur) {
+      bonus2 = Math.floor(this.system.attributs.pui.value / 2)
+      let talent = this.items.find(item => item.type == "talent" && item.name.toLowerCase() == "coup dévastateur")
+      this.updateEmbeddedDocuments('Item', [{ _id: talent.id, 'system.used': true }]) 
+    }
+
    if (rollDataInput?.isHeroique) {
      if (rollDataInput?.attaqueCharge) {
        bonus = 5
      }
-      roll = new Roll("2d10rr10+" + arme.system.totalDegats + "+" + bonus).roll({ async: false })
+      roll = new Roll("2d10rr10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll({ async: false })
    } else {
      if (rollDataInput?.attaqueCharge) {
        bonus = 3
      }
-      roll = new Roll("1d10+" + arme.system.totalDegats + "+" + bonus).roll({ async: false })
+      roll = new Roll("1d10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll({ async: false })
    }
    await HawkmoonUtility.showDiceSoNice(roll, game.settings.get("core", "rollMode"));
    let nbEtatPerdus = 0
    if (targetVigueur) {
      nbEtatPerdus = Math.floor(roll.total / targetVigueur)
    }
+    console.log(roll)
    let rollData = {
      arme: arme,
      finalResult: roll.total,
+      formula: roll.formula,
      alias: this.name,
      actorImg: this.img,
      actorId: this.id,
+      defenderTokenId: rollDataInput?.defenderTokenId,
      actionImg: arme.img,
      targetVigueur: targetVigueur,
      nbEtatPerdus: nbEtatPerdus
@@ -630,5 +667,9 @@ export class HawkmoonActor extends Actor {
      content: await renderTemplate(`systems/fvtt-hawkmoon-cyd/templates/chat-degats-result.html`, rollData)
    })

+    if (rollDataInput?.defenderTokenId && nbEtatPerdus) {
+      HawkmoonUtility.applyCombativite(rollDataInput, nbEtatPerdus)
+    }
+
  }
 }
--- a/modules/hawkmoon-main.js
+++ b/modules/hawkmoon-main.js
@@ -18,6 +18,7 @@ import { HawkmoonCombat } from "./hawkmoon-combat.js";
 import { HawkmoonItem } from "./hawkmoon-item.js";
 import { HawkmoonAutomation } from "./hawkmoon-automation.js";
 import { HawkmoonTokenHud } from "./hawkmoon-hud.js";
+import { ClassCounter} from "https://www.uberwald.me/fvtt_appcount/count-class-ready.js"

 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
@@ -82,32 +83,6 @@ function welcomeMessage() {
    ` });
 }

-/* -------------------------------------------- */
-// Register world usage statistics
-function registerUsageCount(registerKey) {
-  if (game.user.isGM) {
-    game.settings.register(registerKey, "world-key", {
-      name: "Unique world key",
-      scope: "world",
-      config: false,
-      default: "",
-      type: String
-    });
-
-    let worldKey = game.settings.get(registerKey, "world-key")
-    if (worldKey == undefined || worldKey == "") {
-      worldKey = randomID(32)
-      game.settings.set(registerKey, "world-key", worldKey)
-    }
-    // Simple API counter
-    let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.version}"`
-    //$.ajaxSetup({
-    //headers: { 'Access-Control-Allow-Origin': '*' }
-    //})
-    $.ajax(regURL)
-  }
-}
-
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
 /* -------------------------------------------- */
@@ -124,14 +99,9 @@ Hooks.once("ready", function () {
    });
  }

-  registerUsageCount('fvtt-hawkmoon-cyd')
+  ClassCounter.registerUsageCount();
  welcomeMessage()

-  // CSS patch for v9
-  if (game.version) {
-    let sidebar = document.getElementById("sidebar");
-    sidebar.style.width = "min-content";
-  }
 });

 /* -------------------------------------------- */
--- a/modules/hawkmoon-roll-dialog.js
+++ b/modules/hawkmoon-roll-dialog.js
@@ -66,6 +66,9 @@ export class HawkmoonRollDialog extends Dialog {
    html.find('#attrKey').change(async (event) =>  {
      this.rollData.attrKey = String(event.currentTarget.value)
    })    
+    html.find('#attrKey2').change(async (event) =>  {
+      this.rollData.attrKey2 = String(event.currentTarget.value)
+    })    
    html.find('#select-maitrise').change(async (event) =>  {
      this.rollData.maitriseId = String(event.currentTarget.value)
    })
--- a/modules/hawkmoon-utility.js
+++ b/modules/hawkmoon-utility.js
@@ -153,6 +153,15 @@ export class HawkmoonUtility {
      let actor = this.getActorFromRollData(rollData)
      actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur, rollData)
    })
+    html.on("click", '.roll-chat-degat-devastateur', async event => {
+      let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget)
+      let message = game.messages.get(messageId)
+      let rollData = message.getFlag("world", "hawkmoon-roll")
+      let actor = this.getActorFromRollData(rollData)
+      rollData.applyCoupDevastateur = true
+      actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur, rollData)
+    })
+    
  }

  /* -------------------------------------------- */
@@ -250,27 +259,12 @@ export class HawkmoonUtility {
    let newRollData = mergeObject(oldRollData, rollData);
    this.rollDataStore[id] = newRollData;
  }
-  /* -------------------------------------------- */
-  static saveRollData(rollData) {
-    game.socket.emit("system.fvtt-hawkmoon-cyd", {
-      name: "msg_update_roll", data: rollData
-    }); // Notify all other clients of the roll    
-    this.updateRollData(rollData);
-  }
-
-  /* -------------------------------------------- */
-  static getRollData(id) {
-    return this.rollDataStore[id];
-  }

  /* -------------------------------------------- */
  static onSocketMesssage(msg) {
-    //console.log("SOCKET MESSAGE", msg.name, game.user.character.id, msg.data.defenderId);
-    if (msg.name == "msg_update_defense_state") {
-      this.updateDefenseState(msg.data.defenderId, msg.data.rollId);
-    }
-    if (msg.name == "msg_update_roll") {
-      this.updateRollData(msg.data);
+    if (msg.name == "msg_apply_combativite") {
+      let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
+      defender.changeEtatCombativite(msg.data.value)
    }
  }

@@ -352,7 +346,15 @@ export class HawkmoonUtility {
    }

  }
-
+  /* -------------------------------------------- */
+  static applyCombativite(rollData, value) {
+    if (game.user.isGM) {     
+      let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor
+      defender.changeEtatCombativite(value)
+    } else {
+      game.socket.emit("system.fvtt-hawkmoon-cyd", { msg: "msg_apply_combativite", data: { defenderTokenId: rollData.defenderTokenId, value } });
+    }
+  }
  /* -------------------------------------------- */
  static async rollHawkmoon(rollData) {

@@ -364,6 +366,9 @@ export class HawkmoonUtility {
      rollData.actionImg = "systems/fvtt-hawkmoon-cyd/assets/icons/" + actor.system.attributs[rollData.attrKey].labelnorm + ".webp"
      rollData.attr = duplicate(actor.system.attributs[rollData.attrKey])
    }
+    if (rollData.attrKey2 != "none") {
+      rollData.attr2 = duplicate(actor.system.attributs[rollData.attrKey2])
+    }

    if (rollData.maitriseId != "none") {
      rollData.selectedMaitrise = rollData.maitrises.find(p => p.id == rollData.maitriseId)
@@ -374,10 +379,10 @@ export class HawkmoonUtility {

    //console.log("BEFORE COMP", rollData)
    if (rollData.competence) {
-      rollData.predilections = duplicate(rollData.competence.system.predilections.filter(pred => pred.acquise && !pred.maitrise && !pred.used) || [])
+      rollData.predilections = duplicate(rollData.competence.system.predilections || [])
      let compmod = (rollData.competence.system.niveau == 0) ? -3 : 0
      rollData.diceFormula += `+${rollData.attr.value}+${rollData.competence.system.niveau}+${rollData.modificateur}+${compmod}`
-
+      
      if (rollData.selectedTalents && rollData.selectedTalents.length > 0) {
        for (let id of rollData.selectedTalents) {
          let talent = rollData.talents.find(t => t._id == id)
@@ -396,9 +401,12 @@ export class HawkmoonUtility {
        }
      }
      rollData.diceFormula += `+${rollData.bonusMalusContext}`
+    } else if (rollData.attr2) {
+      rollData.diceFormula += `+${rollData.attr.value}+${rollData.attr2.value}+${rollData.modificateur}+${rollData.bonusMalusContext}`
    } else {
      rollData.diceFormula += `+${rollData.attr.value}*${rollData.multiplier}+${rollData.modificateur}+${rollData.bonusMalusContext}`
    }
+    
    // Bonus arme naturelle en défense
    if (rollData.bonusArmeNaturelle) {
      rollData.diceFormula += `+${rollData.bonusArmeNaturelle}`
@@ -453,8 +461,24 @@ export class HawkmoonUtility {
      content: await renderTemplate(`systems/fvtt-hawkmoon-cyd/templates/chat-generic-result.html`, rollData)
    }, rollData)

+    if (rollData.arme && rollData.isSuccess && rollData.defenderTokenId) {
+      this.applyCombativite(rollData, 1)
+    }
+
  }

+  /* -------------------------------------------- */
+  static getCombativiteList(nbActivite) {
+    let list = [ { value: 0, label: "Combatif"}]
+    for (let i = 1; i < nbActivite-2; i++) {
+      list.push({ value: i, label:"Eprouvé " + i} )
+    }
+    list[nbActivite-2] = { value: nbActivite-2, label:"Affaibli"}
+    list[nbActivite-1] = { value: nbActivite-1, label:"Très Affaibli"}
+    list[nbActivite] = { value: nbActivite, label:"Vaincu"}
+    return list
+
+  }
  /* -------------------------------------------- */
  static async bonusRollHawkmoon(rollData) {
    rollData.bonusFormula = rollData.addedBonus
@@ -692,11 +716,11 @@ export class HawkmoonUtility {
  /* -------------------------------------------- */
  static async confirmDelete(actorSheet, li) {
    let itemId = li.data("item-id");
-    let msgTxt = "<p>Are you sure to remove this Item ?";
+    let msgTxt = "<p>Etes vous certain de vouloir supprimer cet item ?";
    let buttons = {
      delete: {
        icon: '<i class="fas fa-check"></i>',
-        label: "Yes, remove it",
+        label: "Oui !",
        callback: () => {
          actorSheet.actor.deleteEmbeddedDocuments("Item", [itemId]);
          li.slideUp(200, () => actorSheet.render(false));
@@ -704,12 +728,12 @@ export class HawkmoonUtility {
      },
      cancel: {
        icon: '<i class="fas fa-times"></i>',
-        label: "Cancel"
+        label: "Non"
      }
    }
    msgTxt += "</p>";
    let d = new Dialog({
-      title: "Confirm removal",
+      title: "Confirmer la suppression",
      content: msgTxt,
      buttons: buttons,
      default: "cancel"
@@ -728,7 +752,6 @@ export class HawkmoonUtility {
      console.log(entryData)
      htmlTab += `<tr><td>@UUID[Compendium.${compName}.${entryData._id}]{${entryData.name}}</td>`
      htmlTab += `<td>${entryData.system.description}</td>`;
-      //htmlTab += `<td>${entryData.system.resumebonus}</td>`;
      htmlTab += "</tr>\n";
    }
    htmlTab += "</table>";
--- a/packs/aides-de-jeu.SAVED
+++ b/packs/aides-de-jeu.SAVED
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -40,7 +40,6 @@
    --debug-box-shadow-blue: inset 0 0 2px blue;
    --debug-box-shadow-green: inset 0 0 2px green;
  }
-
 /*@import url("https://fonts.googleapis.com/css2?family=Martel:wght@400;800&family=Roboto:wght@300;400;500&display=swap");*/
 /* Global styles & Font */
 .window-app {
@@ -527,7 +526,6 @@ section.sheet-body:after {
 h1, h2, h3, h4 {
  font-weight: bold;
 }
-
 ul, ol {
    margin: 0;
    padding: 0;
@@ -828,7 +826,6 @@ ul, li {
 #sidebar {
  font-size: 1rem;
  background-position: 100%;
-  color: rgba(220,220,220,0.75);
 }

 /*  background: rgb(105,85,65) url("../images/ui/texture_feuille_perso_onglets.webp") no-repeat right bottom;*/
@@ -946,22 +943,11 @@ ul, li {
  height: 15%;
  font-size: 15px;
  padding: 10px;
-  padding-bottom: 20px;
+  /*padding-bottom: 20px;*/
  padding-top: .2rem;
  padding-bottom: .2rem;
 }

-.div-river-full {
-  height: 5rem;
-  align-items: flex-start;
-}
-
-.div-river {
-  align-content: center;
-  margin-left: 8px;
-  align-content:space-around;
-  justify-content: space-around;
-}

 .div-center {
  align-self: center;
@@ -999,13 +985,10 @@ ul, li {
 }

 #sidebar #sidebar-tabs i{
-  width: 25px;
-  height: 25px;
  display: inline-block;
  background-position:center;
  background-size:cover;
  text-shadow: 1px 1px 0 rgba(0,0,0,0.75);
-
 }

 /*#sidebar #sidebar-tabs i.fa-comments:before, #sidebar #sidebar-tabs i.fa-fist-raised:before, #sidebar #sidebar-tabs i.fa-users:before, #sidebar #sidebar-tabs i.fa-map:before, #sidebar #sidebar-tabs i.fa-suitcase:before, #sidebar #sidebar-tabs i.fa-book-open:before, #sidebar #sidebar-tabs i.fa-th-list:before, #sidebar #sidebar-tabs i.fa-music:before, #sidebar #sidebar-tabs i.fa-atlas:before, #sidebar #sidebar-tabs i.fa-cogs:before {content: "";}
@@ -1277,24 +1260,6 @@ ul, li {
  padding-left: 2rem;
 }

-.drop-equipment-effect,
-.drop-power-effect,
-.drop-perk-effect,
-.drop-ability-effect,
-.drop-effect-specaffected,
-.drop-effect-spec,
-.drop-ability-weapon,
-.drop-ability-armor,
-.drop-race-perk,
-.drop-spec-perk,
-.drop-ability-power,
-.drop-ability-spec,
-.drop-spec-power,
-.drop-abilities, 
-.drop-optionnal-abilities,
-.drop-specialperk1,
-.drop-perk2,
-.drop-spec1 ,
 .drop-spec2 {
  background: linear-gradient(to bottom, #6c95b9fc 5%, #105177ab 100%);
  background-color: #7d5d3b00;
@@ -1409,6 +1374,12 @@ ul, li {
  max-width: 8rem;
  min-width: 8rem;
 }
+.item-field-label-long1 {
+  padding-top: 6px;
+  flex-grow:1;
+  max-width: 12rem;
+  min-width: 12rem;
+}
 .item-field-label-long2 {
  padding-top: 6px;
  flex-grow:1;
@@ -1450,10 +1421,23 @@ ul, li {
 .argent-total-text {
  margin-left: 4px;
 }
-h4.entry-name.document-name {
-  color: black;  
+
+.compendium h4.entry-name.document-name {
+  color: black;
+}
+.page-title {
+  color: black;
+}
+textarea {
+  font-family: "Charlemagne";
+  font-size: 0.8rem;
 }
 .fxmaster {
  background: #443e37E0;
  background-color: #443e37E0;
 }
+.predilection-text {
+  padding-left: 8px;
+  font-style: italic;
+  font-size: 0.6rem;
+}
--- a/system.json
+++ b/system.json
@@ -1,7 +1,7 @@
 {
  "id": "fvtt-hawkmoon-cyd",
  "description": "Hawkmoon RPG for FoundryVTT (CYD system - French)",
-  "version": "11.0.6",
+  "version": "11.1.1",
  "authors": [
    {
      "name": "Uberwald/LeRatierBretonnien",
@@ -35,7 +35,7 @@
  "gridUnits": "m",
  "license": "LICENSE.txt",
  "manifest": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/raw/branch/master/system.json",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/archive/fvtt-hawkmoon-cyd-11.0.6.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/archive/fvtt-hawkmoon-cyd-11.1.1.zip",
  "languages": [
    {
      "lang": "fr",
--- a/template.json
+++ b/template.json
@@ -70,7 +70,8 @@
        "sante": {
          "vigueur": 0,
          "etat": 0,
-          "vigueurmodifier": 0
+          "vigueurmodifier": 0,
+          "nbcombativite": 5
        },
        "adversite":  {
          "bleue": 0,
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -38,7 +38,9 @@
                  <select class="status-small-label color-class-common item-field-label-medium" type="text" name="system.sante.etat"
                    value="{{system.sante.etat}}" data-dtype="Number">
                    {{#select system.sante.etat}}
-                    {{> systems/fvtt-hawkmoon-cyd/templates/partial-sante-etat.html}}
+                      {{#each combativiteList as |combativite idx|}}*
+                        <option value="{{idx}}">{{combativite.label}}</option>
+                      {{/each}}
                    {{/select}}
                  </select>
                </li>
@@ -132,6 +134,10 @@
                <label class="short-label">Résumé</label>
              </span>
              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="talent" title="Ajouter un Talent"><i
+                    class="fas fa-plus"></i></a>
+              </div>
            </li>
            {{#each talents as |talent key|}}
            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="competence">
@@ -160,7 +166,11 @@
                  <label class="short-label">Résumé</label>
                </span>
                <div class="item-filler">&nbsp;</div>
-              </li>
+                <div class="item-controls item-controls-fixed">
+                  <a class="item-control item-add" data-type="talent" title="Ajouter un Talent"><i
+                      class="fas fa-plus"></i></a>
+                </div>
+                </li>
              {{#each talentsCell as |talent key|}}
              <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="competence">
                <img class="item-name-img" src="{{talent.img}}" />
@@ -199,8 +209,20 @@
            {{#each skills as |skill key|}}
            <li class="item flexrow " data-item-id="{{skill._id}}" data-item-type="competence">
              <img class="item-name-img" src="{{skill.img}}" />
-              <span class="item-name-label competence-name"><a class="roll-competence item-field-label-short"
+              <div class="flexcol item-name-label">
+
+                <span class="item-name-label competence-name"><a class="roll-competence item-field-label-short"
                  data-attr-key="tochoose">{{skill.name}}</a></span>
+
+                    <span class="predilection-text">
+                    {{#each skill.system.predilections as |pred key|}}
+                      {{#if (and pred.acquise (not pred.used))}}
+                        {{pred.name}},
+                      {{/if}} 
+                    {{/each}}
+                  </span>
+              </div>
+
              <select class="status-small-label color-class-common edit-item-data competence-niveau" type="text"
                data-item-field="niveau" value="{{skill.system.niveau}}" data-dtype="Number">
                {{#select skill.system.niveau}}
@@ -332,6 +354,8 @@
              </span>
              <div class="item-filler">&nbsp;</div>
              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-equip" title="Worn">{{#if protection.system.equipped}}<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>
--- a/templates/cellule-sheet.html
+++ b/templates/cellule-sheet.html
@@ -81,6 +81,10 @@
                <label class="short-label">Résumé</label>
              </span>
              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="talent" title="Ajouter un Talent"><i
+                    class="fas fa-plus"></i></a>
+              </div>
            </li>
            {{#each talents as |talent key|}}
            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="talent">
--- a/templates/chat-degats-result.html
+++ b/templates/chat-degats-result.html
@@ -19,10 +19,11 @@
 <div>
  <ul>
    <li>Arme : {{arme.name}} (+{{arme.system.totalDegats}})</li>
+    <li>Formule : {{formula}}</li>
    <li>Dégats : {{finalResult}}</li>    
    {{#if targetVigueur}}
      <li>Vigueur de la cible : {{targetVigueur}}</li>    
-      <li>Etats Combativité supplémentaires perdus (manuel): {{nbEtatPerdus}} </li>
+      <li>Etats de Combativité supplémentaires perdus (auto): {{nbEtatPerdus}} </li>
    {{/if}}
  </ul>
 </div>
--- a/templates/chat-generic-result.html
+++ b/templates/chat-generic-result.html
@@ -19,6 +19,9 @@
 <div>
  <ul>
    <li class="hawkmoon-roll">Attribut : {{attr.label}} ({{attr.value}})</li>
+    {{#if attr2}}
+      <li>Attribut : {{attr2.label}} ({{attr2.value}})</li>
+    {{/if}}

    {{#if competence}}
    <li>Compétence : {{competence.name}} ({{competence.system.niveau}})</li>
@@ -76,9 +79,12 @@

    {{#if isSuccess}}
      {{#if arme}}
-        <li>Votre adversaire perd 1 Etat de Combativité (manuel) </li>
+        <li>Votre adversaire a perdu 1 Etat de Combativité (auto)</li>
        {{#if (not arme.system.onlevelonly)}}
          <button class="chat-card-button roll-chat-degat">Dégats de l'arme</button>
+          {{#if coupDevastateur}}
+          <button class="chat-card-button roll-chat-degat-devastateur">Dégats de l'arme avec Coup Dévastateur</button>
+          {{/if}}
        {{/if}}
      {{/if}}
    {{/if}}
@@ -86,8 +92,11 @@

    {{#each predilections as |pred key|}}
    <li>
-      <button class="chat-card-button predilection-reroll" data-predilection-index="{{key}}">Predilection :
-        {{pred.name}}</button>
+        {{#if (and (and pred.acquise (not pred.maitrise)) (not pred.used))}}
+        <button class="chat-card-button predilection-reroll" data-predilection-index="{{key}}">Predilection :
+          {{pred.name}}
+        </button>
+        {{/if}}
    </li>
    {{/each}}

--- a/templates/creature-sheet.html
+++ b/templates/creature-sheet.html
@@ -58,20 +58,24 @@
              <img class="item-name-img" src="systems/fvtt-hawkmoon-cyd/assets/icons/vitesse.webp">
              <span class="item-name-label competence-name item-field-label-medium">Vitesse</span>
              <input type="text" class="padd-right numeric-input item-field-label-short" name="system.vitesse.value"
-                    value="{{system.vitesse.value}}" data-dtype="Number" />
+                value="{{system.vitesse.value}}" data-dtype="Number" />
            </li>
          </ul>
          <h4 class="item-name-label competence-name">Santé</h4>
          <ul class="item-list alternate-list">
            <li class="item flexrow">
-              <label class="label-name item-field-label-short">Vigueur</label>
-              <input type="text" class="padd-right numeric-input item-field-label-short" data-dtype="Number" name="system.sante.vigueur" value="{{system.sante.vigueur}}" >
+              <label class="label-name item-field-label-medium">Vigueur</label>
+              <input type="text" class="padd-right numeric-input item-field-label-short" data-dtype="Number"
+                name="system.sante.vigueur" value="{{system.sante.vigueur}}">
            </li>
            <li class="item  flexrow">
-              <label class="label-name item-field-label-short">Etat</label>
-              <select class="label-name item-field-label-medium" type="text" name="system.sante.etat" value="{{system.sante.etat}}" data-dtype="Number">
+              <label class="label-name item-field-label-medium">Etat</label>
+              <select class="label-name item-field-label-medium" type="text" name="system.sante.etat"
+                value="{{system.sante.etat}}" data-dtype="Number">
                {{#select system.sante.etat}}
-                {{> systems/fvtt-hawkmoon-cyd/templates/partial-sante-etat.html}}
+                {{#each combativiteList as |combativite idx|}}
+                <option value="{{idx}}">{{combativite.label}}</option>
+                {{/each}}
                {{/select}}
              </select>
            </li>
@@ -103,6 +107,13 @@
            </li>
            {{/each}}
          </ul>
+          <ul class="item-list alternate-list">
+            <li class="item  flexrow">
+              <label class="label-name item-field-label-long1">Niveaux de combativité</label>
+              <input type="text" class="padd-right numeric-input item-field-label-short" data-dtype="Number"
+                name="system.sante.nbcombativite" value="{{system.sante.nbcombativite}}">
+            </li>
+          </ul>


        </div>
@@ -135,21 +146,21 @@
              <select class="status-small-label color-class-common edit-item-data competence-niveau" type="text"
                data-item-field="niveau" value="{{skill.system.niveau}}" data-dtype="Number">
                {{#select skill.system.niveau}}
-                  {{> systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau.html}}
+                {{> systems/fvtt-hawkmoon-cyd/templates/partial-list-niveau.html}}
                {{/select}}
              </select>

              {{#if (ne skill.system.attribut1 "none")}}
-                <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut1}}">{{upper
-                  skill.system.attribut1}} : {{skill.system.attribut1total}}</button>
+              <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut1}}">{{upper
+                skill.system.attribut1}} : {{skill.system.attribut1total}}</button>
              {{/if}}
              {{#if (ne skill.system.attribut2 "none")}}
-                <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut2}}">{{upper
-                  skill.system.attribut2}} : {{skill.system.attribut2total}}</button>
+              <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut2}}">{{upper
+                skill.system.attribut2}} : {{skill.system.attribut2total}}</button>
              {{/if}}
              {{#if (ne skill.system.attribut3 "none")}}
-                <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut3}}">{{upper
-                  skill.system.attribut3}} : {{skill.system.attribut3total}}</button>
+              <button class="roll-competence button-sheet-roll" data-attr-key="{{skill.system.attribut3}}">{{upper
+                skill.system.attribut3}} : {{skill.system.attribut3total}}</button>
              {{/if}}

              <div class="item-filler">&nbsp;</div>
@@ -181,13 +192,17 @@
                <label class="short-label">Résumé</label>
              </span>
              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="talent" title="Ajouter un Talent"><i
+                    class="fas fa-plus"></i></a>
+              </div>
            </li>
            {{#each talents as |talent key|}}
-            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="competence">
+            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="talent">
              <img class="item-name-img" src="{{talent.img}}" />
              <span class="item-name-label competence-name">{{talent.name}}</span>
              <span class="item-name-label item-field-label-long2">{{talent.system.resumebonus}}</span>
-  
+
              <div class="item-filler">&nbsp;</div>
              <div class="item-controls item-controls-fixed">
                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
@@ -210,9 +225,13 @@
                <label class="short-label">Résumé</label>
              </span>
              <div class="item-filler">&nbsp;</div>
+              <div class="item-controls item-controls-fixed">
+                <a class="item-control item-add" data-type="talent" title="Ajouter un Talent"><i
+                    class="fas fa-plus"></i></a>
+              </div>
            </li>
            {{#each talentsCell as |talent key|}}
-            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="competence">
+            <li class="item flexrow " data-item-id="{{talent._id}}" data-item-type="talent">
              <img class="item-name-img" src="{{talent.img}}" />
              <span class="item-name-label competence-name">{{talent.name}}</span>
              <span class="item-name-label item-field-label-long2">{{talent.system.resumebonus}}</span>
@@ -269,10 +288,10 @@
              </span>

              {{#if arme.system.isdefense}}
-                <span class="item-field-label-short arme-defensif item-field-label-short"><label
+              <span class="item-field-label-short arme-defensif item-field-label-short"><label
                  class="arme-defensif item-field-label-short defense-sheet">{{arme.system.totalDefensif}}</label></span>
              {{else}}
-                <span class="item-field-label-short arme-defensif item-field-label-short"><label
+              <span class="item-field-label-short arme-defensif item-field-label-short"><label
                  class="arme-defensif item-field-label-short defense-sheet">N/A</label></span>
              {{/if}}

--- a/templates/roll-dialog-generic.html
+++ b/templates/roll-dialog-generic.html
@@ -49,6 +49,18 @@
        </select>      
      </div>
      {{/if}}
+    {{else}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">Second Attribut</span>
+        <select class="status-small-label color-class-common" id ="attrKey2" type="text" name="attrKey2" value="attrKey2" data-dtype="string" >
+          {{#select attrKey2}}
+          <option value="none">Aucun</option>
+          {{#each attributs as |attrLabel attrKey|}}
+            <option value="{{attrKey}}">{{attrLabel}}</option>
+          {{/each}}
+          {{/select}}
+        </select>      
+      </div>
    {{/if}}

    {{#if (count talents)}}
Author	SHA1	Message	Date
LeRatierBretonnien	9e023d3f01	Fix calcul defense	2024-02-15 11:47:15 +01:00
LeRatierBretonnien	2c12ec38fb	Enhance stats	2024-02-08 12:51:41 +01:00
LeRatierBretonnien	38059232cb	Automatisations de combats, WIP	2023-12-28 18:40:46 +01:00
LeRatierBretonnien	c331604393	Predilections et warning	2023-12-21 21:02:11 +01:00
LeRatierBretonnien	71c1e1cd29	Affichage des specialisations	2023-12-19 21:52:59 +01:00
LeRatierBretonnien	4a2ca5fab5	CSS fixes	2023-11-26 14:07:55 +01:00