diff --git a/modules/actors/tedeum-actor.js b/modules/actors/tedeum-actor.js index 7cb6669..2c5ea33 100644 --- a/modules/actors/tedeum-actor.js +++ b/modules/actors/tedeum-actor.js @@ -209,6 +209,7 @@ export class TeDeumActor extends Actor { for (let key in combatLoc) { combatLoc[key] = foundry.utils.mergeObject(combatLoc[key], game.system.tedeum.config.LOCALISATION[key]) combatLoc[key].armures = [] + combatLoc[key].blessures = [] combatLoc[key].protectionTotal = 0 let armures = this.getArmures() for (let armure of armures) { @@ -217,6 +218,12 @@ export class TeDeumActor extends Actor { combatLoc[key].protectionTotal += armure.system.protection } } + let blessures = this.getBlessures() + for (let blessure of blessures) { + if (blessure.system.localisation == key) { + combatLoc[key].blessures.push(blessure) + } + } let endurance = this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "endurance") combatLoc[key].endurance = endurance.system.score + game.system.tedeum.config.LOCALISATION[key].locMod combatLoc[key].touche = combatLoc[key].endurance + combatLoc[key].protectionTotal @@ -272,24 +279,8 @@ export class TeDeumActor extends Actor { /* -------------------------------------------- */ async equipItem(itemId) { let item = this.items.find(item => item.id == itemId) - if (item?.system) { - if (item.type == "armure") { - let armor = this.items.find(item => item.id != itemId && item.type == "armor" && item.system.equipped) - if (armor) { - ui.notifications.warn("You already have an armor equipped!") - return - } - } - if (item.type == "shield") { - let shield = this.items.find(item => item.id != itemId && item.type == "shield" && item.system.equipped) - if (shield) { - ui.notifications.warn("You already have a shield equipped!") - return - } - } - let update = { _id: item.id, "system.equipped": !item.system.equipped }; - await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity - } + let update = { _id: item.id, "system.equipe": !item.system.equipe }; + await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity } /* ------------------------------------------- */ diff --git a/modules/common/tedeum-config.js b/modules/common/tedeum-config.js index 5680991..e0ae893 100644 --- a/modules/common/tedeum-config.js +++ b/modules/common/tedeum-config.js @@ -31,7 +31,6 @@ export const TEDEUM_CONFIG = { "coupassomant": { label: "Coup assomant", id: "coupassomant", melee: true, tir: false}, "peutlancer": { label: "Peut être lancée", id: "peutlancer", melee: true, tir: false}, "pasboutportant": { label: "Inutilisable à bout portant", id: "pasboutportant", melee: false, tir: true}, - "rechargearquebusade": { label: "Retrancher l'Arquebusade au temps de recharge", id: "rechargearquebusade", melee: false, tir: true }, "mitraille": { label: "Mitraille", id: "mitraille", melee: false, tir: true }, "degatscharge": { label: "Dégâts accrus à la charge", id: "degatscharge", melee: true, tir: false }, "crochecavalier": { label: "Croche-cavalier", id: "crochecavalier", melee: true, tir: false }, @@ -117,14 +116,19 @@ export const TEDEUM_CONFIG = { archerie: { label: "Archerie", value: "archerie" }, arquebusade: { label: "Arquebusade", value: "arquebusade" } }, + competencesRecharge: { + aucune: { label: "Aucune", value: "aucune" }, + archerie: { label: "Archerie", value: "archerie" }, + arquebusade: { label: "Arquebusade", value: "arquebusade" } + }, difficulte: { - routine: { label: "Routine", value: 3 }, - facile: { label: "Facile", value: 5 }, - pardefaut: { label: "Par Défaut", value: 7 }, - malaise: { label: "Malaisé", value: 9 }, - difficile: { label: "Difficile", value: 11 }, - perilleux: { label: "Perilleux", value: 13 }, - desespere: { label: "Désespéré", value: 15 } + routine: { label: "Routine", key: "routine", value: 3 }, + facile: { label: "Facile", key: "facile",value: 5 }, + pardefaut: { label: "Par Défaut", key: "pardefaut", value: 7 }, + malaise: { label: "Malaisé", key: "malaise", value: 9 }, + difficile: { label: "Difficile", key: "difficile", value: 11 }, + perilleux: { label: "Perilleux", key: "perilleux", value: 13 }, + desespere: { label: "Désespéré", key: "desespere", value: 15 } }, monnaie: { denier: { label: "Deniers", id: "denier", value: 1 }, diff --git a/modules/common/tedeum-utility.js b/modules/common/tedeum-utility.js index 48297c1..ca866a1 100644 --- a/modules/common/tedeum-utility.js +++ b/modules/common/tedeum-utility.js @@ -392,7 +392,7 @@ export class TeDeumUtility { let actor = game.actors.get(rollData.actorId) // Fix difficulty if (!rollData.difficulty || rollData.difficulty == "-") { - rollData.difficulty = 7 + rollData.difficulty = "pardefaut" } rollData.difficulty = game.system.tedeum.config.difficulte[rollData.difficulty].value let diceFormula = this.computeRollFormula(rollData, actor) diff --git a/modules/data/tedeum-schema-arme.js b/modules/data/tedeum-schema-arme.js index b10e883..4b10210 100644 --- a/modules/data/tedeum-schema-arme.js +++ b/modules/data/tedeum-schema-arme.js @@ -34,6 +34,7 @@ export class TeDeumArmeSchema extends foundry.abstract.TypeDataModel { }); schema.tempsRecharge = new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }); + schema.competenceRecharge = new fields.StringField({ required: false, choices:["aucune", "archerie", "arquebusade"], initial: "aucune", blank: true }); schema.valeurEchecCritique = new fields.NumberField({ ...requiredInteger, initial: 1, min: 1 }); schema.initiativeBonus = new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }); diff --git a/packs/competences/000148.log b/packs/competences/000152.log similarity index 100% rename from packs/competences/000148.log rename to packs/competences/000152.log diff --git a/packs/competences/CURRENT b/packs/competences/CURRENT index ffd4a01..939d9b8 100644 --- a/packs/competences/CURRENT +++ b/packs/competences/CURRENT @@ -1 +1 @@ -MANIFEST-000146 +MANIFEST-000150 diff --git a/packs/competences/LOG b/packs/competences/LOG index bd0b990..cf6cafe 100644 --- a/packs/competences/LOG +++ b/packs/competences/LOG @@ -1,8 +1,8 @@ -2024/07/07-21:34:33.552483 7fdbf4c006c0 Recovering log #144 -2024/07/07-21:34:33.562583 7fdbf4c006c0 Delete type=3 #142 -2024/07/07-21:34:33.562681 7fdbf4c006c0 Delete type=0 #144 -2024/07/08-07:54:26.000826 7fdbefe006c0 Level-0 table #149: started -2024/07/08-07:54:26.000937 7fdbefe006c0 Level-0 table #149: 0 bytes OK -2024/07/08-07:54:26.043881 7fdbefe006c0 Delete type=0 #147 -2024/07/08-07:54:26.179609 7fdbefe006c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) -2024/07/08-07:54:26.179705 7fdbefe006c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/07/08-23:17:26.473944 7f0c0e0006c0 Recovering log #148 +2024/07/08-23:17:26.485257 7f0c0e0006c0 Delete type=3 #146 +2024/07/08-23:17:26.485363 7f0c0e0006c0 Delete type=0 #148 +2024/07/09-07:41:46.369958 7f0c07e006c0 Level-0 table #153: started +2024/07/09-07:41:46.369997 7f0c07e006c0 Level-0 table #153: 0 bytes OK +2024/07/09-07:41:46.376145 7f0c07e006c0 Delete type=0 #151 +2024/07/09-07:41:46.376375 7f0c07e006c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/07/09-07:41:46.387648 7f0c07e006c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) diff --git a/packs/competences/LOG.old b/packs/competences/LOG.old index 70ad342..bd0b990 100644 --- a/packs/competences/LOG.old +++ b/packs/competences/LOG.old @@ -1,8 +1,8 @@ -2024/07/07-13:46:28.434141 7fdbf6a006c0 Recovering log #140 -2024/07/07-13:46:28.444184 7fdbf6a006c0 Delete type=3 #138 -2024/07/07-13:46:28.444239 7fdbf6a006c0 Delete type=0 #140 -2024/07/07-16:48:21.944701 7fdbefe006c0 Level-0 table #145: started -2024/07/07-16:48:21.944735 7fdbefe006c0 Level-0 table #145: 0 bytes OK -2024/07/07-16:48:21.951284 7fdbefe006c0 Delete type=0 #143 -2024/07/07-16:48:21.964341 7fdbefe006c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) -2024/07/07-16:48:21.975753 7fdbefe006c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/07/07-21:34:33.552483 7fdbf4c006c0 Recovering log #144 +2024/07/07-21:34:33.562583 7fdbf4c006c0 Delete type=3 #142 +2024/07/07-21:34:33.562681 7fdbf4c006c0 Delete type=0 #144 +2024/07/08-07:54:26.000826 7fdbefe006c0 Level-0 table #149: started +2024/07/08-07:54:26.000937 7fdbefe006c0 Level-0 table #149: 0 bytes OK +2024/07/08-07:54:26.043881 7fdbefe006c0 Delete type=0 #147 +2024/07/08-07:54:26.179609 7fdbefe006c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) +2024/07/08-07:54:26.179705 7fdbefe006c0 Manual compaction at level-1 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!zwC0H39ar5Pl1l92' @ 0 : 0; will stop at (end) diff --git a/packs/competences/MANIFEST-000146 b/packs/competences/MANIFEST-000150 similarity index 72% rename from packs/competences/MANIFEST-000146 rename to packs/competences/MANIFEST-000150 index bb6a40f..38faabb 100644 Binary files a/packs/competences/MANIFEST-000146 and b/packs/competences/MANIFEST-000150 differ diff --git a/packs/equipment/000208.log b/packs/equipment/000212.log similarity index 100% rename from packs/equipment/000208.log rename to packs/equipment/000212.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index b04a015..af31d42 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000206 +MANIFEST-000210 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index 7bd2be0..e25ba63 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,7 +1,7 @@ -2024/07/07-21:34:33.538979 7fdbf60006c0 Recovering log #204 -2024/07/07-21:34:33.549574 7fdbf60006c0 Delete type=3 #202 -2024/07/07-21:34:33.549666 7fdbf60006c0 Delete type=0 #204 -2024/07/08-07:54:26.137628 7fdbefe006c0 Level-0 table #209: started -2024/07/08-07:54:26.137703 7fdbefe006c0 Level-0 table #209: 0 bytes OK -2024/07/08-07:54:26.179305 7fdbefe006c0 Delete type=0 #207 -2024/07/08-07:54:26.179685 7fdbefe006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/07/08-23:17:26.460912 7f0c0ea006c0 Recovering log #208 +2024/07/08-23:17:26.470623 7f0c0ea006c0 Delete type=3 #206 +2024/07/08-23:17:26.470703 7f0c0ea006c0 Delete type=0 #208 +2024/07/09-07:41:46.363059 7f0c07e006c0 Level-0 table #213: started +2024/07/09-07:41:46.363133 7f0c07e006c0 Level-0 table #213: 0 bytes OK +2024/07/09-07:41:46.369813 7f0c07e006c0 Delete type=0 #211 +2024/07/09-07:41:46.376359 7f0c07e006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/LOG.old b/packs/equipment/LOG.old index 3c0f9e0..7bd2be0 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,7 +1,7 @@ -2024/07/07-13:46:28.422245 7fdbf56006c0 Recovering log #200 -2024/07/07-13:46:28.431962 7fdbf56006c0 Delete type=3 #198 -2024/07/07-13:46:28.432013 7fdbf56006c0 Delete type=0 #200 -2024/07/07-16:48:21.951406 7fdbefe006c0 Level-0 table #205: started -2024/07/07-16:48:21.951432 7fdbefe006c0 Level-0 table #205: 0 bytes OK -2024/07/07-16:48:21.957697 7fdbefe006c0 Delete type=0 #203 -2024/07/07-16:48:21.964354 7fdbefe006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/07/07-21:34:33.538979 7fdbf60006c0 Recovering log #204 +2024/07/07-21:34:33.549574 7fdbf60006c0 Delete type=3 #202 +2024/07/07-21:34:33.549666 7fdbf60006c0 Delete type=0 #204 +2024/07/08-07:54:26.137628 7fdbefe006c0 Level-0 table #209: started +2024/07/08-07:54:26.137703 7fdbefe006c0 Level-0 table #209: 0 bytes OK +2024/07/08-07:54:26.179305 7fdbefe006c0 Delete type=0 #207 +2024/07/08-07:54:26.179685 7fdbefe006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/MANIFEST-000206 b/packs/equipment/MANIFEST-000206 deleted file mode 100644 index 1beaaea..0000000 Binary files a/packs/equipment/MANIFEST-000206 and /dev/null differ diff --git a/packs/equipment/MANIFEST-000210 b/packs/equipment/MANIFEST-000210 new file mode 100644 index 0000000..333b869 Binary files /dev/null and b/packs/equipment/MANIFEST-000210 differ diff --git a/styles/tedeum.css b/styles/tedeum.css index 827d7e5..6baef9e 100644 --- a/styles/tedeum.css +++ b/styles/tedeum.css @@ -1084,8 +1084,8 @@ ul, li { flex-shrink: 7; } .item-controls-fixed { - min-width: 2rem; - max-width: 2rem; + min-width: 2.8rem; + max-width: 2.8rem; } .item-controls-fixed-full { min-width: 3rem; diff --git a/system.json b/system.json index 6353ba9..1896bc6 100644 --- a/system.json +++ b/system.json @@ -62,8 +62,8 @@ }, "title": "Te Deum pour Un Massacre, le Jeu de Rôles", "url": "https://www.uberwald.me/gitea/public/fvtt-te-deum", - "version": "12.0.1", - "download": "https://www.uberwald.me/gitea/public/fvtt-te-deum/archive/fvtt-te-deum-v12.0.1.zip", + "version": "12.0.2", + "download": "https://www.uberwald.me/gitea/public/fvtt-te-deum/archive/fvtt-te-deum-v12.0.2.zip", "background": "", "flags": { "hotReload": { @@ -80,4 +80,4 @@ ] } } -} \ No newline at end of file +} diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index 96093f4..1dd0995 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -245,7 +245,10 @@ {{arme.system.degats}}
 
-
+
+ + +
@@ -268,7 +271,10 @@
 
-
+
+ + +
@@ -290,7 +296,10 @@ {{armure.name}} ({{armure.system.protection}}) {{/each}} Touché : {{touche}} - Blessures : {{blessuresTete}} + Blessures : + {{#each loc.blessures as |blessure idx| }} + {{blessure.name}} ({{blessure.malus}}) + {{/each}}
{{/each}} diff --git a/templates/dialogs/confront-dialog.hbs b/templates/dialogs/confront-dialog.hbs deleted file mode 100644 index 9e6a363..0000000 --- a/templates/dialogs/confront-dialog.hbs +++ /dev/null @@ -1,140 +0,0 @@ -
-
- {{#if img}} - - {{/if}} -

{{title}} ({{skill.value}})

-
- -
- -
- -
-

{{localize "ECRY.ui.execution"}} : {{executionTotal}}

-
- {{> systems/fvtt-ecryme/templates/dialogs/partial-confront-dice-area.hbs filter="execution"}} - {{> systems/fvtt-ecryme/templates/dialogs/partial-confront-bonus-area.hbs filter="execution"}} -
-
- -
-

{{localize "ECRY.ui.preservation"}} : {{preservationTotal}}

-
- {{> systems/fvtt-ecryme/templates/dialogs/partial-confront-dice-area.hbs filter="preservation"}} - {{> systems/fvtt-ecryme/templates/dialogs/partial-confront-bonus-area.hbs filter="preservation"}} -
-
- -
- -

{{localize "ECRY.ui.dicepool"}}

-
- {{> systems/fvtt-ecryme/templates/dialogs/partial-confront-dice-area.hbs filter="mainpool"}} -
- -

{{localize "ECRY.ui.bonuspool"}} (Total : {{count confrontBonus}})

-
- {{> systems/fvtt-ecryme/templates/dialogs/partial-confront-bonus-area.hbs filter="mainpool"}} -
- - {{#if weapon}} -
- {{localize "ECRY.ui.weapon"}} : - {{weapon.name}} ({{localize "ECRY.ui.effect"}} {{weapon.system.effect}}) -
- {{/if}} - - {{#if impactMalus}} -
- {{localize "ECRY.ui.impactmalus"}} : - {{impactMalus}} -
- {{/if}} - -
- {{localize "ECRY.ui.skilltranscendence"}} : - -
-
- {{localize "ECRY.ui.transcendapply"}} : - -
- - {{#if skill.spec}} -
- {{localize "ECRY.ui.spec"}} : - -
- {{/if}} - -
- {{localize "ECRY.ui.traitbonus"}} : - -
- -
- {{localize "ECRY.ui.traitmalus"}} : - -
- - {{#if annency}} -
- {{localize "ECRY.ui.annency"}} : {{annency.name}} - {{annency.system.base.description}} -
-
- {{localize "ECRY.ui.annencybonus"}} - -
- {{/if}} - -
- Bonus/Malus : - -
- - -
- -
\ No newline at end of file diff --git a/templates/dialogs/confront-start-dialog.hbs b/templates/dialogs/confront-start-dialog.hbs deleted file mode 100644 index 93d861f..0000000 --- a/templates/dialogs/confront-start-dialog.hbs +++ /dev/null @@ -1,13 +0,0 @@ -
-
- {{#if img}} - - {{/if}} -

{{title}}

-
- -
- -
- -
\ No newline at end of file diff --git a/templates/dialogs/partial-confront-bonus-area.hbs b/templates/dialogs/partial-confront-bonus-area.hbs deleted file mode 100644 index 62aa300..0000000 --- a/templates/dialogs/partial-confront-bonus-area.hbs +++ /dev/null @@ -1,10 +0,0 @@ -{{#each confrontBonus as |bonus idx|}} -{{#if (eq bonus.location ../filter)}} -
- - - - -
-{{/if}} -{{/each}} diff --git a/templates/dialogs/partial-confront-dice-area.hbs b/templates/dialogs/partial-confront-dice-area.hbs deleted file mode 100644 index 8b24afc..0000000 --- a/templates/dialogs/partial-confront-dice-area.hbs +++ /dev/null @@ -1,11 +0,0 @@ -{{#each availableDices as |dice idx|}} -{{#if (eq dice.location ../filter)}} -
- - - - -
-{{/if}} -{{/each}} \ No newline at end of file diff --git a/templates/dialogs/roll-dialog-generic.hbs b/templates/dialogs/roll-dialog-generic.hbs index f2f3edc..a9d69fd 100644 --- a/templates/dialogs/roll-dialog-generic.hbs +++ b/templates/dialogs/roll-dialog-generic.hbs @@ -42,8 +42,8 @@
Difficulté : - + {{selectOptions config.difficulte selected=difficulty valueAttr="key" labelAttr="label"}}
diff --git a/templates/items/item-arme-sheet.hbs b/templates/items/item-arme-sheet.hbs index 41d9aa0..c7382a2 100644 --- a/templates/items/item-arme-sheet.hbs +++ b/templates/items/item-arme-sheet.hbs @@ -54,6 +54,20 @@ {{/if}} + {{#if (eq system.typeArme "tir")}} +
  • + + +
    • +
  • + + +
    • + {{/if}} + {{#each system.specificites as |spec specId|}}
  • {{#if (isSpecArmeType specId @root.system.typeArme)}}