From c32be6b24d7055ada96710514de9ea798de93f95 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Tue, 4 Feb 2025 21:20:54 +0100 Subject: [PATCH] Init, competences de base, fix creation de perso, etc --- modules/actors/tedeum-actor-sheet.js | 7 + modules/actors/tedeum-actor.js | 86 ++++++++++++ modules/app/tedeum-character-creator.js | 6 +- modules/app/tedeum-combat.js | 1 + modules/common/tedeum-config.js | 125 +++++++++--------- modules/data/tedeum-schema-pj.js | 2 +- modules/tedeum-main.js | 2 +- packs/armes/{000078.log => 000095.log} | 0 packs/armes/CURRENT | 2 +- packs/armes/LOG | 21 +-- packs/armes/LOG.old | 14 +- packs/armes/MANIFEST-000076 | Bin 373 -> 0 bytes packs/armes/MANIFEST-000093 | Bin 0 -> 173 bytes packs/armures/{000078.log => 000095.log} | 0 packs/armures/CURRENT | 2 +- packs/armures/LOG | 21 +-- packs/armures/LOG.old | 14 +- packs/armures/MANIFEST-000076 | Bin 371 -> 0 bytes packs/armures/MANIFEST-000093 | Bin 0 -> 172 bytes packs/competences/{000009.ldb => 000089.ldb} | Bin 37215 -> 38122 bytes packs/competences/{000074.log => 000092.log} | 0 packs/competences/CURRENT | 2 +- packs/competences/LOG | 14 +- packs/competences/LOG.old | 21 ++- packs/competences/MANIFEST-000072 | Bin 171 -> 0 bytes packs/competences/MANIFEST-000090 | Bin 0 -> 173 bytes packs/education/{000084.log => 000100.log} | 0 packs/education/CURRENT | 2 +- packs/education/LOG | 14 +- packs/education/LOG.old | 14 +- .../{MANIFEST-000082 => MANIFEST-000098} | Bin 173 -> 173 bytes packs/graces/{000078.log => 000094.log} | 0 packs/graces/CURRENT | 2 +- packs/graces/LOG | 14 +- packs/graces/LOG.old | 14 +- .../{MANIFEST-000076 => MANIFEST-000092} | Bin 169 -> 169 bytes packs/maladies/{000078.log => 000094.log} | 0 packs/maladies/CURRENT | 2 +- packs/maladies/LOG | 14 +- packs/maladies/LOG.old | 14 +- .../{MANIFEST-000076 => MANIFEST-000092} | Bin 168 -> 168 bytes packs/scenes/{000016.log => 000032.log} | 0 packs/scenes/CURRENT | 2 +- packs/scenes/LOG | 14 +- packs/scenes/LOG.old | 14 +- .../{MANIFEST-000014 => MANIFEST-000030} | Bin 207 -> 207 bytes packs/simples/{000078.log => 000094.log} | 0 packs/simples/CURRENT | 2 +- packs/simples/LOG | 14 +- packs/simples/LOG.old | 14 +- .../{MANIFEST-000076 => MANIFEST-000092} | Bin 169 -> 169 bytes postcss/tedeum.css | 6 + styles/tedeum.css | 7 + system.json | 4 +- templates/actors/actor-sheet.hbs | 7 +- templates/chat/chat-degats-result.hbs | 23 ++++ .../dialogs/character-creator-finished.hbs | 27 ++-- templates/items/item-competence-sheet.hbs | 2 +- 58 files changed, 354 insertions(+), 212 deletions(-) rename packs/armes/{000078.log => 000095.log} (100%) delete mode 100644 packs/armes/MANIFEST-000076 create mode 100644 packs/armes/MANIFEST-000093 rename packs/armures/{000078.log => 000095.log} (100%) delete mode 100644 packs/armures/MANIFEST-000076 create mode 100644 packs/armures/MANIFEST-000093 rename packs/competences/{000009.ldb => 000089.ldb} (67%) rename packs/competences/{000074.log => 000092.log} (100%) delete mode 100644 packs/competences/MANIFEST-000072 create mode 100644 packs/competences/MANIFEST-000090 rename packs/education/{000084.log => 000100.log} (100%) rename packs/education/{MANIFEST-000082 => MANIFEST-000098} (73%) rename packs/graces/{000078.log => 000094.log} (100%) rename packs/graces/{MANIFEST-000076 => MANIFEST-000092} (75%) rename packs/maladies/{000078.log => 000094.log} (100%) rename packs/maladies/{MANIFEST-000076 => MANIFEST-000092} (76%) rename packs/scenes/{000016.log => 000032.log} (100%) rename packs/scenes/{MANIFEST-000014 => MANIFEST-000030} (84%) rename packs/simples/{000078.log => 000094.log} (100%) rename packs/simples/{MANIFEST-000076 => MANIFEST-000092} (75%) create mode 100644 templates/chat/chat-degats-result.hbs diff --git a/modules/actors/tedeum-actor-sheet.js b/modules/actors/tedeum-actor-sheet.js index 8b3852a..fa1b9a7 100644 --- a/modules/actors/tedeum-actor-sheet.js +++ b/modules/actors/tedeum-actor-sheet.js @@ -49,6 +49,8 @@ export class TeDeumActorPJSheet extends ActorSheet { poisons: this.actor.getPoisons(), combat: this.actor.prepareCombat(), bonusDegats: this.actor.getBonusDegats(), + nbActions: this.actor.getNbActions(), + initiative: this.actor.getInitiative(), pointsArmuresLourdes: this.actor.getNbArmures(), nbArmuresLourdes: this.actor.getNbArmuresLourdesActuel(), santeModifier: this.actor.getSanteModifier(), @@ -125,6 +127,11 @@ export class TeDeumActorPJSheet extends ActorSheet { const armeId = $(event.currentTarget).data("arme-id") this.actor.rollArme(armeId) }); + html.find('.roll-degats').click((event) => { + const armeId = $(event.currentTarget).data("arme-id") + this.actor.rollDegatsArme(armeId) + }); + html.find('.lock-unlock-sheet').click((event) => { this.options.editScore = !this.options.editScore; diff --git a/modules/actors/tedeum-actor.js b/modules/actors/tedeum-actor.js index f969077..69c6a00 100644 --- a/modules/actors/tedeum-actor.js +++ b/modules/actors/tedeum-actor.js @@ -50,6 +50,60 @@ export class TeDeumActor extends Actor { /* -------------------------------------------- */ async prepareData() { super.prepareData() + + let updates = [] + let memoriser = this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "mémoriser") + let newScore = this.getCommonBaseValue(this.system.caracteristiques.adresse.value) + if (memoriser && memoriser?.system.score != newScore) { + updates.push({ _id: memoriser.id, "system.score": Number(newScore) }) + } + + let perception = this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "perception") + newScore = this.getCommonBaseValue(this.system.caracteristiques.sensibilite.value) + if (perception && perception.system.score != newScore) { + updates.push({ _id: perception.id, "system.score": Number(newScore) }) + } + + let charme = this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "charme") + newScore = this.getCommonBaseValue(this.system.caracteristiques.entregent.value) + if (charme && charme?.system.score != newScore) { + updates.push({ _id: charme.id, "system.score": Number(newScore) }) + } + + let endurance = this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "endurance") + newScore = this.getCommonBaseValue(this.system.caracteristiques.complexion.value) + if (endurance && endurance?.system.score != newScore) { + updates.push({ _id: endurance.id, "system.score": Number(newScore) }) + } + + let course = this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "course") + newScore = this.getCommonBaseValue(this.system.caracteristiques.adresse.value) + if (course && course?.system.score != newScore) { + updates.push({ _id: course.id, "system.score": Number(newScore) }) + } + + let initiative = this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "initiative") + newScore = this.getCommonBaseValue(this.system.caracteristiques.adresse.value) + if (initiative && initiative?.system.score != newScore) { + updates.push({ _id: initiative.id, "system.score": Number(newScore) }) + } + + let actionsTour = this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "actions/tour") + newScore = this.getCommonBaseValue(this.system.caracteristiques.adresse.value) + if (actionsTour && actionsTour?.system.score != newScore) { + updates.push({ _id: actionsTour.id, "system.score": Number(newScore) }) + } + + let effort = this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "effort") + newScore = this.getCommonBaseValue(this.system.caracteristiques.puissance.value) + if (effort && effort?.system.score != newScore) { + updates.push({ _id: effort.id, "system.score": Number(newScore) }) + } + + if (updates.length > 0) { + await this.updateEmbeddedDocuments('Item', updates) + } + } /* -------------------------------------------- */ @@ -75,6 +129,13 @@ export class TeDeumActor extends Actor { this.updateSource({ prototypeToken }); } + /* -------------------------------------------- */ + getCommonBaseValue(value) { + return game.system.tedeum.config.COMMON_VALUE[value]?.value || 0 + } + getInitiative() { + return game.system.tedeum.config.COMMON_VALUE[this.system.caracteristiques.adresse.value]?.value || 0 + } /* -------------------------------------------- */ getBonusDegats() { return game.system.tedeum.config.BONUS_DEGATS[this.system.caracteristiques.puissance.value] @@ -86,6 +147,9 @@ export class TeDeumActor extends Actor { getNbActions() { return game.system.tedeum.config.ACTIONS_PAR_TOUR[this.system.caracteristiques.adresse.value] } + getInitiative() { + return game.system.tedeum.config.ACTIONS_PAR_TOUR[this.system.caracteristiques.adresse.value] + } getNbArmuresLourdesActuel() { let armures = this.getArmures() let nb = 0 @@ -503,6 +567,28 @@ export class TeDeumActor extends Actor { this.startRoll(rollData).catch("Error on startRoll") } + /* -------------------------------------------- */ + async rollDegatsArme(armeId) { + let weapon = this.items.get(armeId) + if (weapon) { + let bDegats = this.getBonusDegats() + let formula = weapon.system.degats + "+" + bDegats.value + let degatsRoll = await new Roll(formula).roll() + await TeDeumUtility.showDiceSoNice(degatsRoll, game.settings.get("core", "rollMode") ) + let rollData = this.getCommonRollData() + rollData.mode = "degats" + rollData.formula = formula + rollData.arme = foundry.utils.duplicate(weapon) + rollData.degatsRoll = foundry.utils.duplicate(degatsRoll) + rollData.degats = degatsRoll.total + + let msg = await TeDeumUtility.createChatWithRollMode(rollData.alias, { + content: await renderTemplate(`systems/fvtt-te-deum/templates/chat/chat-degats-result.hbs`, rollData) + }) + await msg.setFlag("world", "te-deum-rolldata", rollData) + console.log("Rolldata result", rollData) + } + } /* -------------------------------------------- */ rollArme(armeId, compName = undefined) { diff --git a/modules/app/tedeum-character-creator.js b/modules/app/tedeum-character-creator.js index b125987..27e5829 100644 --- a/modules/app/tedeum-character-creator.js +++ b/modules/app/tedeum-character-creator.js @@ -306,7 +306,7 @@ export class TeDeumCharacterCreator { let context = { title: "Création de personnage", subtitle: "Origine Sociale", - sexeChoice: { "homme": "Homme", "femme": "Femme" }, + sexeChoice: { "Homme": "Homme", "Femme": "Femme" }, religionChoice: { "catholique": "Catholique", "protestante": "Protestante" }, origineChoice: game.system.tedeum.config.origineSociale } @@ -406,7 +406,7 @@ export class TeDeumCharacterCreator { } this.grimauds = foundry.utils.duplicate(stage.items.find(item => item.id === choiceResult.selectedItem)) - context.title = `LesPetits Grimauds - ${this.grimauds.name}"` + context.title = `LesPetits Grimauds - ${this.grimauds.name}` TeDeumUtility.prepareEducationContent(this.grimauds); context.label = "Valider l'augmentation de caracteristique" @@ -530,7 +530,7 @@ export class TeDeumCharacterCreator { updates[`system.caracteristiques.${key}.value`] = Number(this.caracBonus[key].value)+1 } updates['system.genre'] = this.sexe - updates['system.religion'] = this.religion + updates['system.religion'] = TeDeumUtility.upperFirst(this.religion) updates['system.statutocial'] = this.origineSociale.label updates['system.equipmentfree'] = this.ageViril.system.trousseau actor.update( updates); diff --git a/modules/app/tedeum-combat.js b/modules/app/tedeum-combat.js index 238c366..345b337 100644 --- a/modules/app/tedeum-combat.js +++ b/modules/app/tedeum-combat.js @@ -5,6 +5,7 @@ export class TeDeumCombat extends Combat { /* -------------------------------------------- */ async rollInitiative(ids, formula = undefined, messageOptions = {} ) { + console.log("Roll INIT !") ids = typeof ids === "string" ? [ids] : ids; for (let cId of ids) { const c = this.combatants.get(cId); diff --git a/modules/common/tedeum-config.js b/modules/common/tedeum-config.js index 796f05f..ffebcde 100644 --- a/modules/common/tedeum-config.js +++ b/modules/common/tedeum-config.js @@ -4,33 +4,35 @@ export const SYSTEM_ID = "fvtt-te-deum"; export const TEDEUM_CONFIG = { BONUS_DEGATS: [{}, { label: "1d4", value: -2 }, { label: "1d6", value: -1 }, { label: "1d8", value: 0 }, - { label: "1d10", value: 1 }, { label: "1d12", value: 2 }, { label: "1d20", value: 3 }], + { label: "1d10", value: 1 }, { label: "1d12", value: 2 }, { label: "1d20", value: 3 }], MAX_ARMURES_LOURDES: [{}, { value: 1 }, { value: 3 }, { value: 5 }, - { value: 7 }, { value: 9 }, { value: 11 }], + { value: 7 }, { value: 9 }, { value: 11 }], ACTIONS_PAR_TOUR: [{}, { value: 1 }, { value: 2 }, { value: 2 }, - { value: 3 }, { value: 3 }, { value: 4 }], + { value: 3 }, { value: 3 }, { value: 4 }], + COMMON_VALUE: [{}, { value: 1 }, { value: 2 }, { value: 3 }, + { value: 4 }, { value: 5 }, { value: 6 }], COUT_XP: [{}, { value: 10 }, { value: 10 }, { value: 10 }, - { value: 10 }, { value: 30 }, { value: 50 }], + { value: 10 }, { value: 30 }, { value: 50 }], LOCALISATION: { - "pieddroit": { label: "Pied Droit", value: 1, locMod:0, id: "pieddroit", nbArmure: 1, score: {min: 1, max:1}, coord: { top: 500, left: 0 } }, - "jambedroite": { label: "Jambe Droite", value: 1, locMod:-1,id: "jambedroite", nbArmure: 1, score: {min: 3, max:4},coord: { top: 400, left: 100 } }, - "jambegauche": { label: "Jambe Gauche", value: 1, locMod:-1,id: "jambegauche", nbArmure: 1, score: {min: 5, max:6},coord: { top: 400, left: 300 } }, - "piedgauche": { label: "Pied Gauche", value: 1, locMod:0,id: "piedgauche", nbArmure: 1, score: {min: 2, max:2},coord: { top: 500, left: 400 } }, - "maindroite": { label: "Main Droite", value: 1, locMod:0,id: "maindroite", nbArmure: 1, score: {min: 7, max:7},coord: { top: 0, left: 0 } }, - "maingauche": { label: "Main Gauche", value: 1, locMod:0,id: "maingauche", nbArmure: 1, score: {min: 8, max:8},coord: { top: 0, left: 400 } }, - "brasdroit": { label: "Bras Droit", value: 1, locMod:-1,id: "brasdroit", nbArmure: 2, score: {min: 9, max:10},coord: { top: 200, left: 0 } }, - "brasgauche": { label: "Bras Gauche", value: 1, locMod:-1,id: "brasgauche", nbArmure: 2, score: {min: 11, max:12},coord: { top: 200, left: 400 } }, - "corps": { label: "Corps", value: 1, id: "corps", locMod:-2,nbArmure: 2, score: {min: 13, max:17},coord: { top: 200, left: 200 } }, - "tete": { label: "Tête", value: 1, id: "tete", locMod:-2,nbArmure: 2 , score: {min: 18, max:20},coord: { top: 0, left: 200 }}, + "pieddroit": { label: "Pied Droit", value: 1, locMod: 0, id: "pieddroit", nbArmure: 1, score: { min: 1, max: 1 }, coord: { top: 500, left: 0 } }, + "jambedroite": { label: "Jambe Droite", value: 1, locMod: -1, id: "jambedroite", nbArmure: 1, score: { min: 3, max: 4 }, coord: { top: 400, left: 100 } }, + "jambegauche": { label: "Jambe Gauche", value: 1, locMod: -1, id: "jambegauche", nbArmure: 1, score: { min: 5, max: 6 }, coord: { top: 400, left: 300 } }, + "piedgauche": { label: "Pied Gauche", value: 1, locMod: 0, id: "piedgauche", nbArmure: 1, score: { min: 2, max: 2 }, coord: { top: 500, left: 400 } }, + "maindroite": { label: "Main Droite", value: 1, locMod: 0, id: "maindroite", nbArmure: 1, score: { min: 7, max: 7 }, coord: { top: 0, left: 0 } }, + "maingauche": { label: "Main Gauche", value: 1, locMod: 0, id: "maingauche", nbArmure: 1, score: { min: 8, max: 8 }, coord: { top: 0, left: 400 } }, + "brasdroit": { label: "Bras Droit", value: 1, locMod: -1, id: "brasdroit", nbArmure: 2, score: { min: 9, max: 10 }, coord: { top: 200, left: 0 } }, + "brasgauche": { label: "Bras Gauche", value: 1, locMod: -1, id: "brasgauche", nbArmure: 2, score: { min: 11, max: 12 }, coord: { top: 200, left: 400 } }, + "corps": { label: "Corps", value: 1, id: "corps", locMod: -2, nbArmure: 2, score: { min: 13, max: 17 }, coord: { top: 200, left: 200 } }, + "tete": { label: "Tête", value: 1, id: "tete", locMod: -2, nbArmure: 2, score: { min: 18, max: 20 }, coord: { top: 0, left: 200 } }, }, ARME_SPECIFICITE: { - "encombrante": { label: "Encombrante", id: "encombrante", melee: true, tir: true}, + "encombrante": { label: "Encombrante", id: "encombrante", melee: true, tir: true }, "maintiendistance": { label: "Maintien à distance", id: "maintiendistance", melee: true, tir: false }, - "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}, + "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 }, "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 }, @@ -41,18 +43,23 @@ export const TEDEUM_CONFIG = { }, ARME_PORTEES: { - "brulepourpoint": { label: "Brûle-pourpoint", difficulty: "facile", id: "brulepourpoint"}, - "courte": { label: "Courte", difficulty: "pardefaut", id: "courte"}, - "moyenne": { label: "Moyenne", difficulty: "difficile", id: "moyenne"}, - "longue": { label: "Longue", difficulty: "perilleux", id: "longue"}, - "extreme": { label: "Extrême", difficulty: "desespere", id: "extreme"}, + "brulepourpoint": { label: "Brûle-pourpoint", difficulty: "facile", id: "brulepourpoint" }, + "courte": { label: "Courte", difficulty: "pardefaut", id: "courte" }, + "moyenne": { label: "Moyenne", difficulty: "difficile", id: "moyenne" }, + "longue": { label: "Longue", difficulty: "perilleux", id: "longue" }, + "extreme": { label: "Extrême", difficulty: "desespere", id: "extreme" }, + }, + + genre: { + Homme: { label: "Homme", value: "Homme" }, + Femme: { label: "Femme", value: "Femme" } }, descriptionValeurOdd: { 1: { valeur: 1, qualite: "Mauvais", dice: "d4", negativeDice: "d20", savoir: "Sot", sensibilite: "Obtus", entregent: "Rustaud", puissance: "Menu", complexion: "Anémique", adresse: "Empesé" }, 2: { valeur: 2, qualite: "Médiocre", dice: "d6", negativeDice: "d12", savoir: "Limité", sensibilite: "Etriqué", entregent: "Frustre", puissance: "Délicat", complexion: "Languide", adresse: "Gauche" }, 3: { valeur: 3, qualite: "Correct", dice: "d8", negativeDice: "d10", savoir: "Mêlé", sensibilite: "Ouvert", entregent: "Badin", puissance: "Membru", complexion: "Dispos", adresse: "Ingambe" }, - 4: { valeur: 4, qualite: "Bon", dice: "d10", negativeDice: "d8", savoir: "Lettré", sensibilite: "Fin", entregent: "Disert", puissance: "Vigoureux", complexion: "Gaillard", adresse: "Leste" }, + 4: { valeur: 4, qualite: "Bon", dice: "d10", negativeDice: "d8", savoir: "Lettré", sensibilite: "Fin", entregent: "Disert", puissance: "Vigoureux", complexion: "Gaillard", adresse: "Leste" }, 5: { valeur: 5, qualite: "Bon", dice: "d10", negativeDice: "d8", savoir: "Lettré", sensibilite: "Fin", entregent: "Disert", puissance: "Vigoureux", complexion: "Gaillard", adresse: "Leste" }, 6: { valeur: 6, qualite: "Bon", dice: "d10", negativeDice: "d8", savoir: "Lettré", sensibilite: "Fin", entregent: "Disert", puissance: "Vigoureux", complexion: "Gaillard", adresse: "Leste" }, 7: { valeur: 7, qualite: "Excellent", dice: "d12", negativeDice: "d6", savoir: "Docte", sensibilite: "Subtil", entregent: "Galant", puissance: "Musculeux", complexion: "Sanguin", adresse: "Preste" }, @@ -70,12 +77,12 @@ export const TEDEUM_CONFIG = { 5: { valeur: 5, qualite: "Excellent", dice: "d12", negativeDice: "d6", savoir: "Docte", sensibilite: "Subtil", entregent: "Galant", puissance: "Musculeux", complexion: "Sanguin", adresse: "Preste" }, 6: { valeur: 6, qualite: "Admirable", dice: "d20", negativeDice: "d4", savoir: "Humaniste", sensibilite: "Spirituel", entregent: "Sémillant", puissance: "Hercule", complexion: "Aguerri", adresse: "Alerte" }, }, - diceValeur: [ "d4", "d6", "d8", "d10", "d12", "d20" ], - degatsArmure : { - sansarmure : { label: "Sans armure"}, - cuir : { label: "Cuir"}, - plates : { label: "Plates"}, - mailles : { label: "Mailles"}, + diceValeur: ["d4", "d6", "d8", "d10", "d12", "d20"], + degatsArmure: { + sansarmure: { label: "Sans armure" }, + cuir: { label: "Cuir" }, + plates: { label: "Plates" }, + mailles: { label: "Mailles" }, }, caracteristiques: { @@ -87,10 +94,10 @@ export const TEDEUM_CONFIG = { adresse: { id: "adresse", value: "adresse", label: "Adresse" }, }, allonges: { - courte: { courte: {malus: 0}, moyenne: {malus:-1}, longue: {malus:-2}, treslongue:{malus:0, esquive: 2 } }, - moyenne: { courte: {malus: 0}, moyenne: {malus:0}, longue: {malus:-1}, treslongue:{malus:0, esquive: 2 } }, - longue: { courte: {malus: -2}, moyenne: {malus:-1}, longue: {malus:0}, treslongue:{malus:-1, esquive: 1 } }, - treslongue: { courte: {malus:0, esquive: 2 }, moyenne:{malus:0, esquive: 2 }, longue: {malus:0, esquive: 1 }, treslongue:{malus:0 } }, + courte: { courte: { malus: 0 }, moyenne: { malus: -1 }, longue: { malus: -2 }, treslongue: { malus: 0, esquive: 2 } }, + moyenne: { courte: { malus: 0 }, moyenne: { malus: 0 }, longue: { malus: -1 }, treslongue: { malus: 0, esquive: 2 } }, + longue: { courte: { malus: -2 }, moyenne: { malus: -1 }, longue: { malus: 0 }, treslongue: { malus: -1, esquive: 1 } }, + treslongue: { courte: { malus: 0, esquive: 2 }, moyenne: { malus: 0, esquive: 2 }, longue: { malus: 0, esquive: 1 }, treslongue: { malus: 0 } }, }, providence: [ { labelM: "Brebis égarée", labelF: "Brebis égarée", value: 0, diceValue: "0" }, @@ -114,7 +121,7 @@ export const TEDEUM_CONFIG = { courte: { label: "Courte", value: "courte" }, moyenne: { label: "Moyenne", value: "moyenne" }, longue: { label: "Longue", value: "longue" }, - treslongue: { label: "Très longue", value: "treslongue"} + treslongue: { label: "Très longue", value: "treslongue" } }, armeCompetences: { bagarre: { label: "Bagarre", value: "bagarre" }, @@ -131,9 +138,9 @@ export const TEDEUM_CONFIG = { arquebusade: { label: "Arquebusade", value: "arquebusade" } }, difficulte: { - aucune: { label: "Aucune", key: "aucune", value: 0 }, - routine: { label: "Routine", key: "routine", value: 3 }, - facile: { label: "Facile", key: "facile",value: 5 }, + aucune: { label: "Aucune", key: "aucune", value: 0 }, + 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 }, @@ -147,29 +154,29 @@ export const TEDEUM_CONFIG = { }, etapesEducation: { pouponniere: { label: "La Pouponnière", value: "pouponniere", agemin: 0, agemax: 6, nbCompetences: 2, nbCaracteristiques: 3, hasQuestionnaire: true, hasDebouches: false, hasMultiplier: false, canCompetencesOpt: false }, - petitsgrimauds: { label: "La classe des Petits Grimauds", value: "petitsgrimauds", agemin: 7, agemax: 12,nbCompetences: 10, nbCaracteristiques: 3, hasDebouches: false, hasQuestionnaire: true, hasMultiplier: false, canCompetencesOpt: false }, + petitsgrimauds: { label: "La classe des Petits Grimauds", value: "petitsgrimauds", agemin: 7, agemax: 12, nbCompetences: 10, nbCaracteristiques: 3, hasDebouches: false, hasQuestionnaire: true, hasMultiplier: false, canCompetencesOpt: false }, rosevie: { label: "Les Roses de la Vie", value: "rosevie", agemin: 13, agemax: 16, nbCompetences: 2, nbCaracteristiques: 3, hasQuestionnaire: true, hasDebouches: true, hasMultiplier: false, canCompetencesOpt: false }, ageviril: { label: "L'Age Viril", value: "ageviril", agemin: 17, agemax: 17, nbCompetences: 9, nbCaracteristiques: 2, hasQuestionnaire: false, hasDebouches: false, hasMultiplier: true, canCompetencesOpt: true }, }, origineSociale: { - noblesseepee: { label: "Noblesse d'épée", id: "noblesseepee", caracteristiques: {entregent: 1, puissance: 1}, cagnotte: 10, cagnotteUnit: "livres", value: 1 }, - noblessecloche: { label: "Noblesse de cloche", id: "noblessecloche", caracteristiques: {entregent: 1, savoir: 1}, cagnotte: 50, cagnotteUnit: "livres", value: 2 }, - hautenoblesse: { label: "Haute noblesse (Illégitime)", id: "hautenoblesse", caracteristiques: {complexion: 1, puissance: 1}, cagnotte: 20, cagnotteUnit: "livres", value: 3 }, - hautebourgeoisie: { label: "Haute bourgeoisie", id: "hautebourgeoisie", caracteristiques: {savoir: 1, sensibilite: 1}, cagnotte: 60, cagnotteUnit: "livres",value: 4 }, - petitebourgeoisie: { label: "Petite bourgeoisie (Marchands)", caracteristiques: {entregent: 1, sensibilite: 1}, cagnotte: 20, cagnotteUnit: "livres",id: "petitebourgeoisie", value: 5 }, - artisan: { label: "Artisans", id: "artisan", caracteristiques: {adresse: 1, sensibilite: 1}, cagnotte: 10, cagnotteUnit: "livres",value: 6 }, - laboureur: { label: "Laboureurs", id: "laboureur", caracteristiques: {entregent: 1, complexion: 1}, cagnotte: 10, cagnotteUnit: "livres",value: 7 }, - domesticite: { label: "Domesticité", id: "domesticite", caracteristiques: {entregent: 1, adresse: 1}, cagnotte: 2, cagnotteUnit: "sous",value: 8 }, - paysannerie: { label: "Paysannerie", id: "paysannerie", caracteristiques: {puissance: 1, complexion: 1}, cagnotte: 1, cagnotteUnit: "sous", value: 9 }, - gueux: { label: "Gueux", id: "gueux", caracteristiques: {adresse: 1, complexion: 1}, cagnotte: 4, cagnotteUnit: "deniers", value: 10 }, + noblesseepee: { label: "Noblesse d'épée", id: "noblesseepee", caracteristiques: { entregent: 1, puissance: 1 }, cagnotte: 10, cagnotteUnit: "livres", value: 1 }, + noblessecloche: { label: "Noblesse de cloche", id: "noblessecloche", caracteristiques: { entregent: 1, savoir: 1 }, cagnotte: 50, cagnotteUnit: "livres", value: 2 }, + hautenoblesse: { label: "Haute noblesse (Illégitime)", id: "hautenoblesse", caracteristiques: { complexion: 1, puissance: 1 }, cagnotte: 20, cagnotteUnit: "livres", value: 3 }, + hautebourgeoisie: { label: "Haute bourgeoisie", id: "hautebourgeoisie", caracteristiques: { savoir: 1, sensibilite: 1 }, cagnotte: 60, cagnotteUnit: "livres", value: 4 }, + petitebourgeoisie: { label: "Petite bourgeoisie (Marchands)", caracteristiques: { entregent: 1, sensibilite: 1 }, cagnotte: 20, cagnotteUnit: "livres", id: "petitebourgeoisie", value: 5 }, + artisan: { label: "Artisans", id: "artisan", caracteristiques: { adresse: 1, sensibilite: 1 }, cagnotte: 10, cagnotteUnit: "livres", value: 6 }, + laboureur: { label: "Laboureurs", id: "laboureur", caracteristiques: { entregent: 1, complexion: 1 }, cagnotte: 10, cagnotteUnit: "livres", value: 7 }, + domesticite: { label: "Domesticité", id: "domesticite", caracteristiques: { entregent: 1, adresse: 1 }, cagnotte: 2, cagnotteUnit: "sous", value: 8 }, + paysannerie: { label: "Paysannerie", id: "paysannerie", caracteristiques: { puissance: 1, complexion: 1 }, cagnotte: 1, cagnotteUnit: "sous", value: 9 }, + gueux: { label: "Gueux", id: "gueux", caracteristiques: { adresse: 1, complexion: 1 }, cagnotte: 4, cagnotteUnit: "deniers", value: 10 }, }, bonusMalus: [ - { value: "-2", label: "-2 niveaux" }, - { value: "-1", label: "-1 niveau" }, - { value: "0", label: "Aucun" }, - { value: "1", label: "+1 niveau" }, - { value: "2", label: "+2 niveaux" } - ], + { value: "-2", label: "-2 niveaux" }, + { value: "-1", label: "-1 niveau" }, + { value: "0", label: "Aucun" }, + { value: "1", label: "+1 niveau" }, + { value: "2", label: "+2 niveaux" } + ], blessures: { indemne: { value: 0, label: "Indemne", key: "indemne", degatsMax: -1, count: 0, modifier: 0 }, estafilade: { value: 1, label: "Estafilade", key: "estafilade", degatsMin: 0, degatsMax: 2, count: 1, modifier: 0 }, @@ -181,7 +188,7 @@ export const TEDEUM_CONFIG = { virulence: { aucune: { label: "Aucune", value: "aucune", modifier: 0 }, fatigue: { label: "Fatigue", value: "fatigue", modifier: 0 }, - epuisement: { label: "Epuisement", value: "epuisement",modifier: -1 }, + epuisement: { label: "Epuisement", value: "epuisement", modifier: -1 }, souffrance: { label: "Souffrance", value: "souffrance", modifier: -2 }, agonie: { label: "Agonie", value: "agonie", modifier: -3 } }, @@ -193,9 +200,9 @@ export const TEDEUM_CONFIG = { }, virulencePoison: { aucune: { label: "Aucune", value: "aucune", modifier: 0 }, - nausee: { label: "Nausées & Vertiges", value: "nausee", modifier:0 }, - inflammation: { label: "Inflammations & Vomissements", value: "inflammation", modifier: -1 }, - elancement: { label: "Elancements & Hémorragies", value: "elancement" , modifier: -2 }, + nausee: { label: "Nausées & Vertiges", value: "nausee", modifier: 0 }, + inflammation: { label: "Inflammations & Vomissements", value: "inflammation", modifier: -1 }, + elancement: { label: "Elancements & Hémorragies", value: "elancement", modifier: -2 }, convulsion: { label: "Convulsions & Délire hallucinatoire", value: "convulsion", modifier: -3 }, mort: { label: "Inconscience & Mort", value: "mort", modifier: -12 } } diff --git a/modules/data/tedeum-schema-pj.js b/modules/data/tedeum-schema-pj.js index 10e2fd0..e712db1 100644 --- a/modules/data/tedeum-schema-pj.js +++ b/modules/data/tedeum-schema-pj.js @@ -44,7 +44,7 @@ export class TeDeumPJSchema extends foundry.abstract.TypeDataModel { schema.vetements = new fields.HTMLField({required: true, blank: true}); schema.equipmentfree = new fields.HTMLField({required: true, blank: true}); - schema.genre = new fields.StringField({required: true, choices: ["Homme", "Femme"], initial: "Femme"}); + schema.genre = new fields.StringField({required: true, choices: game.system.tedeum.config.genre, initial: "Femme"}); schema.age = new fields.StringField({ required: false, blank: true, initial: undefined }); schema.statutocial = new fields.StringField({ required: false, blank: true, initial: undefined }); schema.chargestitre = new fields.StringField({ required: false, blank: true, initial: undefined }); diff --git a/modules/tedeum-main.js b/modules/tedeum-main.js index a90bdef..db5b0c5 100644 --- a/modules/tedeum-main.js +++ b/modules/tedeum-main.js @@ -61,7 +61,7 @@ Hooks.once("init", async function () { TeDeumUtility.onSocketMesssage(data) }); - //CONFIG.Combat.documentClass = TeDeumCombat + CONFIG.Combat.documentClass = TeDeumCombat CONFIG.Actor.documentClass = TeDeumActor; CONFIG.Item.documentClass = TeDeumItem CONFIG.Actor.dataModels = { diff --git a/packs/armes/000078.log b/packs/armes/000095.log similarity index 100% rename from packs/armes/000078.log rename to packs/armes/000095.log diff --git a/packs/armes/CURRENT b/packs/armes/CURRENT index f24fe8e..f60e23b 100644 --- a/packs/armes/CURRENT +++ b/packs/armes/CURRENT @@ -1 +1 @@ -MANIFEST-000076 +MANIFEST-000093 diff --git a/packs/armes/LOG b/packs/armes/LOG index 9a75d72..4ba8687 100644 --- a/packs/armes/LOG +++ b/packs/armes/LOG @@ -1,14 +1,7 @@ -2025/02/04-09:19:54.434475 7ff0d9ffb6c0 Recovering log #74 -2025/02/04-09:19:54.506466 7ff0d9ffb6c0 Delete type=3 #72 -2025/02/04-09:19:54.506527 7ff0d9ffb6c0 Delete type=0 #74 -2025/02/04-09:26:38.706734 7ff0d7ff76c0 Level-0 table #79: started -2025/02/04-09:26:38.709998 7ff0d7ff76c0 Level-0 table #79: 503 bytes OK -2025/02/04-09:26:38.716107 7ff0d7ff76c0 Delete type=0 #77 -2025/02/04-09:26:38.736363 7ff0d7ff76c0 Manual compaction at level-0 from '!folders!InCQeTRdT5jXMX82' @ 72057594037927935 : 1 .. '!items!wxIHkrq98eQ3cOvp' @ 0 : 0; will stop at '!folders!K314mT3VJDeFkOvc' @ 39 : 1 -2025/02/04-09:26:38.736373 7ff0d7ff76c0 Compacting 1@0 + 1@1 files -2025/02/04-09:26:38.740078 7ff0d7ff76c0 Generated table #80@0: 38 keys, 30816 bytes -2025/02/04-09:26:38.740094 7ff0d7ff76c0 Compacted 1@0 + 1@1 files => 30816 bytes -2025/02/04-09:26:38.746692 7ff0d7ff76c0 compacted to: files[ 0 1 0 0 0 0 0 ] -2025/02/04-09:26:38.746823 7ff0d7ff76c0 Delete type=2 #9 -2025/02/04-09:26:38.746954 7ff0d7ff76c0 Delete type=2 #79 -2025/02/04-09:26:38.747062 7ff0d7ff76c0 Manual compaction at level-0 from '!folders!K314mT3VJDeFkOvc' @ 39 : 1 .. '!items!wxIHkrq98eQ3cOvp' @ 0 : 0; will stop at (end) +2025/02/04-21:02:31.762956 7ffae7fff6c0 Recovering log #91 +2025/02/04-21:02:31.818029 7ffae7fff6c0 Delete type=3 #89 +2025/02/04-21:02:31.818138 7ffae7fff6c0 Delete type=0 #91 +2025/02/04-21:19:59.587312 7ffae6bff6c0 Level-0 table #96: started +2025/02/04-21:19:59.587344 7ffae6bff6c0 Level-0 table #96: 0 bytes OK +2025/02/04-21:19:59.594402 7ffae6bff6c0 Delete type=0 #94 +2025/02/04-21:19:59.600680 7ffae6bff6c0 Manual compaction at level-0 from '!folders!InCQeTRdT5jXMX82' @ 72057594037927935 : 1 .. '!items!wxIHkrq98eQ3cOvp' @ 0 : 0; will stop at (end) diff --git a/packs/armes/LOG.old b/packs/armes/LOG.old index 899db6e..4b13ab4 100644 --- a/packs/armes/LOG.old +++ b/packs/armes/LOG.old @@ -1,7 +1,7 @@ -2025/02/04-08:00:17.903907 7ff0d9ffb6c0 Recovering log #70 -2025/02/04-08:00:17.922132 7ff0d9ffb6c0 Delete type=3 #68 -2025/02/04-08:00:17.922272 7ff0d9ffb6c0 Delete type=0 #70 -2025/02/04-08:13:20.820823 7ff0d7ff76c0 Level-0 table #75: started -2025/02/04-08:13:20.820928 7ff0d7ff76c0 Level-0 table #75: 0 bytes OK -2025/02/04-08:13:20.827281 7ff0d7ff76c0 Delete type=0 #73 -2025/02/04-08:13:20.848781 7ff0d7ff76c0 Manual compaction at level-0 from '!folders!InCQeTRdT5jXMX82' @ 72057594037927935 : 1 .. '!items!wxIHkrq98eQ3cOvp' @ 0 : 0; will stop at (end) +2025/02/04-20:38:48.117192 7ffaecbf96c0 Recovering log #87 +2025/02/04-20:38:48.132558 7ffaecbf96c0 Delete type=3 #85 +2025/02/04-20:38:48.132625 7ffaecbf96c0 Delete type=0 #87 +2025/02/04-21:02:18.061942 7ffae6bff6c0 Level-0 table #92: started +2025/02/04-21:02:18.061980 7ffae6bff6c0 Level-0 table #92: 0 bytes OK +2025/02/04-21:02:18.096060 7ffae6bff6c0 Delete type=0 #90 +2025/02/04-21:02:18.239725 7ffae6bff6c0 Manual compaction at level-0 from '!folders!InCQeTRdT5jXMX82' @ 72057594037927935 : 1 .. '!items!wxIHkrq98eQ3cOvp' @ 0 : 0; will stop at (end) diff --git a/packs/armes/MANIFEST-000076 b/packs/armes/MANIFEST-000076 deleted file mode 100644 index c5743b6a6cd70e9e57f0660607995f9c66ce3a0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmbPJDtoGpfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfDVUNN&IHMdx?yu#BX zyQt98A~n!B*}trSQI-J=*cmyGd|*^mOv}$nNi8Z?^vrV(ObrQ22{Fxz@QtuAVq}J> zBV^8GFR5A%21X`dP6lQ_7B$((2fG7-Tt6T;fJL31!T&om!V+&|LzCPP<1jCmRJUyZ ovSdbeh$Vzo#Ao;KtAd&v$fC~5Kv)YKgFhQ1Cp%-n18Vpa07iUX{Qv*} diff --git a/packs/armes/MANIFEST-000093 b/packs/armes/MANIFEST-000093 new file mode 100644 index 0000000000000000000000000000000000000000..c5894b96fbf1238d7e00983f4be5b88a7294e9a7 GIT binary patch literal 173 zcmd`pgoS$2eSd>_jU&P9wsF;?Ylag9gtmtiQ zXp$RZ9OmVc>Xz+amdvQm00!)g0S`VfBGh^2IR~bO1f_(SW<~f$SQs%fL)6JDW|pMp z7AuxlczR?P6(mlZI|Lge2$aqQ<{U}TEpWMGbGQU8)8Py^z|1G$MT>Hsxl BEx7;y literal 0 HcmV?d00001 diff --git a/packs/armures/000078.log b/packs/armures/000095.log similarity index 100% rename from packs/armures/000078.log rename to packs/armures/000095.log diff --git a/packs/armures/CURRENT b/packs/armures/CURRENT index f24fe8e..f60e23b 100644 --- a/packs/armures/CURRENT +++ b/packs/armures/CURRENT @@ -1 +1 @@ -MANIFEST-000076 +MANIFEST-000093 diff --git a/packs/armures/LOG b/packs/armures/LOG index 9a805ed..86c2fe6 100644 --- a/packs/armures/LOG +++ b/packs/armures/LOG @@ -1,14 +1,7 @@ -2025/02/04-09:19:54.509779 7ff0d8ff96c0 Recovering log #74 -2025/02/04-09:19:54.552287 7ff0d8ff96c0 Delete type=3 #72 -2025/02/04-09:19:54.552375 7ff0d8ff96c0 Delete type=0 #74 -2025/02/04-09:26:38.667727 7ff0d7ff76c0 Level-0 table #79: started -2025/02/04-09:26:38.671062 7ff0d7ff76c0 Level-0 table #79: 516 bytes OK -2025/02/04-09:26:38.677967 7ff0d7ff76c0 Delete type=0 #77 -2025/02/04-09:26:38.697044 7ff0d7ff76c0 Manual compaction at level-0 from '!folders!2wTJBj3dicRKzNOE' @ 72057594037927935 : 1 .. '!items!ufvhWG5V8pX0qrtR' @ 0 : 0; will stop at '!folders!q2WrapdNFvwEyGP6' @ 30 : 1 -2025/02/04-09:26:38.697055 7ff0d7ff76c0 Compacting 1@0 + 1@1 files -2025/02/04-09:26:38.700419 7ff0d7ff76c0 Generated table #80@0: 29 keys, 11991 bytes -2025/02/04-09:26:38.700444 7ff0d7ff76c0 Compacted 1@0 + 1@1 files => 11991 bytes -2025/02/04-09:26:38.706249 7ff0d7ff76c0 compacted to: files[ 0 1 0 0 0 0 0 ] -2025/02/04-09:26:38.706348 7ff0d7ff76c0 Delete type=2 #9 -2025/02/04-09:26:38.706497 7ff0d7ff76c0 Delete type=2 #79 -2025/02/04-09:26:38.706643 7ff0d7ff76c0 Manual compaction at level-0 from '!folders!q2WrapdNFvwEyGP6' @ 30 : 1 .. '!items!ufvhWG5V8pX0qrtR' @ 0 : 0; will stop at (end) +2025/02/04-21:02:31.823403 7ffaed3fa6c0 Recovering log #91 +2025/02/04-21:02:31.879026 7ffaed3fa6c0 Delete type=3 #89 +2025/02/04-21:02:31.879103 7ffaed3fa6c0 Delete type=0 #91 +2025/02/04-21:19:59.594567 7ffae6bff6c0 Level-0 table #96: started +2025/02/04-21:19:59.594605 7ffae6bff6c0 Level-0 table #96: 0 bytes OK +2025/02/04-21:19:59.600531 7ffae6bff6c0 Delete type=0 #94 +2025/02/04-21:19:59.600692 7ffae6bff6c0 Manual compaction at level-0 from '!folders!2wTJBj3dicRKzNOE' @ 72057594037927935 : 1 .. '!items!ufvhWG5V8pX0qrtR' @ 0 : 0; will stop at (end) diff --git a/packs/armures/LOG.old b/packs/armures/LOG.old index bcfce82..7f9509c 100644 --- a/packs/armures/LOG.old +++ b/packs/armures/LOG.old @@ -1,7 +1,7 @@ -2025/02/04-08:00:17.927699 7ff0d87f86c0 Recovering log #70 -2025/02/04-08:00:17.946011 7ff0d87f86c0 Delete type=3 #68 -2025/02/04-08:00:17.946134 7ff0d87f86c0 Delete type=0 #70 -2025/02/04-08:13:20.827534 7ff0d7ff76c0 Level-0 table #75: started -2025/02/04-08:13:20.827585 7ff0d7ff76c0 Level-0 table #75: 0 bytes OK -2025/02/04-08:13:20.833823 7ff0d7ff76c0 Delete type=0 #73 -2025/02/04-08:13:20.848813 7ff0d7ff76c0 Manual compaction at level-0 from '!folders!2wTJBj3dicRKzNOE' @ 72057594037927935 : 1 .. '!items!ufvhWG5V8pX0qrtR' @ 0 : 0; will stop at (end) +2025/02/04-20:38:48.136363 7ffae7fff6c0 Recovering log #87 +2025/02/04-20:38:48.155326 7ffae7fff6c0 Delete type=3 #85 +2025/02/04-20:38:48.155397 7ffae7fff6c0 Delete type=0 #87 +2025/02/04-21:02:18.203925 7ffae6bff6c0 Level-0 table #92: started +2025/02/04-21:02:18.203951 7ffae6bff6c0 Level-0 table #92: 0 bytes OK +2025/02/04-21:02:18.239602 7ffae6bff6c0 Delete type=0 #90 +2025/02/04-21:02:18.293406 7ffae6bff6c0 Manual compaction at level-0 from '!folders!2wTJBj3dicRKzNOE' @ 72057594037927935 : 1 .. '!items!ufvhWG5V8pX0qrtR' @ 0 : 0; will stop at (end) diff --git a/packs/armures/MANIFEST-000076 b/packs/armures/MANIFEST-000076 deleted file mode 100644 index d29f8bd0f713663d222562455b0127114fc27349..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmb2sHh$U4z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&P8Fub5eqnp><`npTz( z?rs`pQ4nEJSX2_k$i)B#?2MdyVigtB@^eyBi;5ME%0s-IvW!zQlY_jg{QO-RnIXyu z8RPbYm%$gwgI*22c%&&J5f&KPi=3f=?&dVya_ diff --git a/packs/armures/MANIFEST-000093 b/packs/armures/MANIFEST-000093 new file mode 100644 index 0000000000000000000000000000000000000000..9c1afb0bb17f01d7aa6b143eec2965d376ac041b GIT binary patch literal 172 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 38122 bytes +2025/02/04-21:02:18.293094 7ffae6bff6c0 compacted to: files[ 0 1 0 0 0 0 0 ] +2025/02/04-21:02:18.293225 7ffae6bff6c0 Delete type=2 #84 +2025/02/04-21:02:18.293350 7ffae6bff6c0 Delete type=2 #88 +2025/02/04-21:02:18.359444 7ffae6bff6c0 Manual compaction at level-0 from '!items!npVNacEzrQqLbyaS' @ 128 : 1 .. '!items!yx4k7lQHGcom99mk' @ 0 : 0; will stop at (end) diff --git a/packs/competences/MANIFEST-000072 b/packs/competences/MANIFEST-000072 deleted file mode 100644 index b01a7a208a04acaa69a31b974f42621572fc1c08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmWfX@JMfCU}TiaNi9pwNlDUksw_z@&n!-L&d)7KEJ`fNFJfhoSIjI)%`H}}tT4$o z&k6K!PtMP^w9L(B6l4Gcc1F(oi`pgoS$2eSd>_jU&P8Fub5eqnp>=xR}kix znCx0r6j#j CxR!B3ufq042Us~77@3ke8JJU8&N5YN?79HrrvUkBKt2HICJIad delta 39 qcmZ3>xR!B3uR_O>-btJcj7-6t49p=cXPK7RHOGVaAwYf@kPiUo{t55^ diff --git a/packs/graces/000078.log b/packs/graces/000094.log similarity index 100% rename from packs/graces/000078.log rename to packs/graces/000094.log diff --git a/packs/graces/CURRENT b/packs/graces/CURRENT index f24fe8e..5b83d76 100644 --- a/packs/graces/CURRENT +++ b/packs/graces/CURRENT @@ -1 +1 @@ -MANIFEST-000076 +MANIFEST-000092 diff --git a/packs/graces/LOG b/packs/graces/LOG index 3097d27..3040b83 100644 --- a/packs/graces/LOG +++ b/packs/graces/LOG @@ -1,7 +1,7 @@ -2025/02/04-09:19:54.611542 7ff0d87f86c0 Recovering log #74 -2025/02/04-09:19:54.654193 7ff0d87f86c0 Delete type=3 #72 -2025/02/04-09:19:54.654311 7ff0d87f86c0 Delete type=0 #74 -2025/02/04-09:26:38.678121 7ff0d7ff76c0 Level-0 table #79: started -2025/02/04-09:26:38.678170 7ff0d7ff76c0 Level-0 table #79: 0 bytes OK -2025/02/04-09:26:38.684288 7ff0d7ff76c0 Delete type=0 #77 -2025/02/04-09:26:38.706592 7ff0d7ff76c0 Manual compaction at level-0 from '!items!17mjvwS8R3B6LloG' @ 72057594037927935 : 1 .. '!items!zUYIVOuFpRur9aAR' @ 0 : 0; will stop at (end) +2025/02/04-21:02:31.946534 7ffaecbf96c0 Recovering log #90 +2025/02/04-21:02:32.006272 7ffaecbf96c0 Delete type=3 #88 +2025/02/04-21:02:32.006340 7ffaecbf96c0 Delete type=0 #90 +2025/02/04-21:19:59.607214 7ffae6bff6c0 Level-0 table #95: started +2025/02/04-21:19:59.607270 7ffae6bff6c0 Level-0 table #95: 0 bytes OK +2025/02/04-21:19:59.614924 7ffae6bff6c0 Delete type=0 #93 +2025/02/04-21:19:59.628053 7ffae6bff6c0 Manual compaction at level-0 from '!items!17mjvwS8R3B6LloG' @ 72057594037927935 : 1 .. '!items!zUYIVOuFpRur9aAR' @ 0 : 0; will stop at (end) diff --git a/packs/graces/LOG.old b/packs/graces/LOG.old index cec5642..31e26a1 100644 --- a/packs/graces/LOG.old +++ b/packs/graces/LOG.old @@ -1,7 +1,7 @@ -2025/02/04-08:00:17.979633 7ff0d97fa6c0 Recovering log #70 -2025/02/04-08:00:17.997627 7ff0d97fa6c0 Delete type=3 #68 -2025/02/04-08:00:17.997723 7ff0d97fa6c0 Delete type=0 #70 -2025/02/04-08:13:20.834087 7ff0d7ff76c0 Level-0 table #75: started -2025/02/04-08:13:20.834167 7ff0d7ff76c0 Level-0 table #75: 0 bytes OK -2025/02/04-08:13:20.841491 7ff0d7ff76c0 Delete type=0 #73 -2025/02/04-08:13:20.848838 7ff0d7ff76c0 Manual compaction at level-0 from '!items!17mjvwS8R3B6LloG' @ 72057594037927935 : 1 .. '!items!zUYIVOuFpRur9aAR' @ 0 : 0; will stop at (end) +2025/02/04-20:38:48.178017 7ffaed3fa6c0 Recovering log #86 +2025/02/04-20:38:48.195489 7ffaed3fa6c0 Delete type=3 #84 +2025/02/04-20:38:48.195570 7ffaed3fa6c0 Delete type=0 #86 +2025/02/04-21:02:18.323881 7ffae6bff6c0 Level-0 table #91: started +2025/02/04-21:02:18.323917 7ffae6bff6c0 Level-0 table #91: 0 bytes OK +2025/02/04-21:02:18.359316 7ffae6bff6c0 Delete type=0 #89 +2025/02/04-21:02:18.400688 7ffae6bff6c0 Manual compaction at level-0 from '!items!17mjvwS8R3B6LloG' @ 72057594037927935 : 1 .. '!items!zUYIVOuFpRur9aAR' @ 0 : 0; will stop at (end) diff --git a/packs/graces/MANIFEST-000076 b/packs/graces/MANIFEST-000092 similarity index 75% rename from packs/graces/MANIFEST-000076 rename to packs/graces/MANIFEST-000092 index 86e07a3ba1e4232be8238eca4c778fb1e92c14f2..88af993199d5dcf91235bd0a4f57d7b4c6988b70 100644 GIT binary patch delta 37 pcmZ3xL;I@24iGmE$W34|1OT^12m=5B delta 37 pcmZ3@IU2S8juAUA-;5CFN32tNP- diff --git a/packs/maladies/000078.log b/packs/maladies/000094.log similarity index 100% rename from packs/maladies/000078.log rename to packs/maladies/000094.log diff --git a/packs/maladies/CURRENT b/packs/maladies/CURRENT index f24fe8e..5b83d76 100644 --- a/packs/maladies/CURRENT +++ b/packs/maladies/CURRENT @@ -1 +1 @@ -MANIFEST-000076 +MANIFEST-000092 diff --git a/packs/maladies/LOG b/packs/maladies/LOG index b15830f..24abc52 100644 --- a/packs/maladies/LOG +++ b/packs/maladies/LOG @@ -1,7 +1,7 @@ -2025/02/04-09:19:54.657231 7ff0d9ffb6c0 Recovering log #74 -2025/02/04-09:19:54.709822 7ff0d9ffb6c0 Delete type=3 #72 -2025/02/04-09:19:54.709925 7ff0d9ffb6c0 Delete type=0 #74 -2025/02/04-09:26:38.690563 7ff0d7ff76c0 Level-0 table #79: started -2025/02/04-09:26:38.690616 7ff0d7ff76c0 Level-0 table #79: 0 bytes OK -2025/02/04-09:26:38.696918 7ff0d7ff76c0 Delete type=0 #77 -2025/02/04-09:26:38.706627 7ff0d7ff76c0 Manual compaction at level-0 from '!items!1icaxIywAwDXQcMz' @ 72057594037927935 : 1 .. '!items!ysGehYm1VkMWrI22' @ 0 : 0; will stop at (end) +2025/02/04-21:02:32.008917 7ffae7fff6c0 Recovering log #90 +2025/02/04-21:02:32.066076 7ffae7fff6c0 Delete type=3 #88 +2025/02/04-21:02:32.066142 7ffae7fff6c0 Delete type=0 #90 +2025/02/04-21:19:59.600777 7ffae6bff6c0 Level-0 table #95: started +2025/02/04-21:19:59.600804 7ffae6bff6c0 Level-0 table #95: 0 bytes OK +2025/02/04-21:19:59.607063 7ffae6bff6c0 Delete type=0 #93 +2025/02/04-21:19:59.628035 7ffae6bff6c0 Manual compaction at level-0 from '!items!1icaxIywAwDXQcMz' @ 72057594037927935 : 1 .. '!items!ysGehYm1VkMWrI22' @ 0 : 0; will stop at (end) diff --git a/packs/maladies/LOG.old b/packs/maladies/LOG.old index 236ec3b..45b2002 100644 --- a/packs/maladies/LOG.old +++ b/packs/maladies/LOG.old @@ -1,7 +1,7 @@ -2025/02/04-08:00:18.002150 7ff0d9ffb6c0 Recovering log #70 -2025/02/04-08:00:18.018218 7ff0d9ffb6c0 Delete type=3 #68 -2025/02/04-08:00:18.018368 7ff0d9ffb6c0 Delete type=0 #70 -2025/02/04-08:13:20.855703 7ff0d7ff76c0 Level-0 table #75: started -2025/02/04-08:13:20.855761 7ff0d7ff76c0 Level-0 table #75: 0 bytes OK -2025/02/04-08:13:20.862045 7ff0d7ff76c0 Delete type=0 #73 -2025/02/04-08:13:20.876086 7ff0d7ff76c0 Manual compaction at level-0 from '!items!1icaxIywAwDXQcMz' @ 72057594037927935 : 1 .. '!items!ysGehYm1VkMWrI22' @ 0 : 0; will stop at (end) +2025/02/04-20:38:48.198544 7ffaecbf96c0 Recovering log #86 +2025/02/04-20:38:48.214754 7ffaecbf96c0 Delete type=3 #84 +2025/02/04-20:38:48.214825 7ffaecbf96c0 Delete type=0 #86 +2025/02/04-21:02:18.293419 7ffae6bff6c0 Level-0 table #91: started +2025/02/04-21:02:18.293451 7ffae6bff6c0 Level-0 table #91: 0 bytes OK +2025/02/04-21:02:18.323734 7ffae6bff6c0 Delete type=0 #89 +2025/02/04-21:02:18.400668 7ffae6bff6c0 Manual compaction at level-0 from '!items!1icaxIywAwDXQcMz' @ 72057594037927935 : 1 .. '!items!ysGehYm1VkMWrI22' @ 0 : 0; will stop at (end) diff --git a/packs/maladies/MANIFEST-000076 b/packs/maladies/MANIFEST-000092 similarity index 76% rename from packs/maladies/MANIFEST-000076 rename to packs/maladies/MANIFEST-000092 index 462e2b7a49218e6a6e6dcc1964c32f0ae4211004..3c69bcbd6930a6ea11e6cfda39659bbae276aef7 100644 GIT binary patch delta 37 pcmZ3%xPoy)m)s|de+C>3j7+hd49syXf?sxAodx2?0l5h*f&klw3C{ok delta 37 pcmZ3%xPoy)m)yaorAizOj7+|q49tEkf_4X%E&_4=fZPBUK>)*w2x|ZU diff --git a/packs/scenes/000016.log b/packs/scenes/000032.log similarity index 100% rename from packs/scenes/000016.log rename to packs/scenes/000032.log diff --git a/packs/scenes/CURRENT b/packs/scenes/CURRENT index 23b73d9..caa721a 100644 --- a/packs/scenes/CURRENT +++ b/packs/scenes/CURRENT @@ -1 +1 @@ -MANIFEST-000014 +MANIFEST-000030 diff --git a/packs/scenes/LOG b/packs/scenes/LOG index 5960132..0ddc821 100644 --- a/packs/scenes/LOG +++ b/packs/scenes/LOG @@ -1,7 +1,7 @@ -2025/02/04-09:19:54.763626 7ff0d97fa6c0 Recovering log #12 -2025/02/04-09:19:54.816435 7ff0d97fa6c0 Delete type=3 #10 -2025/02/04-09:19:54.816506 7ff0d97fa6c0 Delete type=0 #12 -2025/02/04-09:26:38.723408 7ff0d7ff76c0 Level-0 table #17: started -2025/02/04-09:26:38.723459 7ff0d7ff76c0 Level-0 table #17: 0 bytes OK -2025/02/04-09:26:38.729963 7ff0d7ff76c0 Delete type=0 #15 -2025/02/04-09:26:38.747040 7ff0d7ff76c0 Manual compaction at level-0 from '!scenes!FJXugdbkBpEJEdR6' @ 72057594037927935 : 1 .. '!scenes!FJXugdbkBpEJEdR6' @ 0 : 0; will stop at (end) +2025/02/04-21:02:32.128293 7ffae77fe6c0 Recovering log #28 +2025/02/04-21:02:32.186729 7ffae77fe6c0 Delete type=3 #26 +2025/02/04-21:02:32.186791 7ffae77fe6c0 Delete type=0 #28 +2025/02/04-21:19:59.621374 7ffae6bff6c0 Level-0 table #33: started +2025/02/04-21:19:59.621404 7ffae6bff6c0 Level-0 table #33: 0 bytes OK +2025/02/04-21:19:59.627903 7ffae6bff6c0 Delete type=0 #31 +2025/02/04-21:19:59.628082 7ffae6bff6c0 Manual compaction at level-0 from '!scenes!FJXugdbkBpEJEdR6' @ 72057594037927935 : 1 .. '!scenes!FJXugdbkBpEJEdR6' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/LOG.old b/packs/scenes/LOG.old index 67221d4..89776e6 100644 --- a/packs/scenes/LOG.old +++ b/packs/scenes/LOG.old @@ -1,7 +1,7 @@ -2025/02/04-08:00:18.047866 7ff0d8ff96c0 Recovering log #8 -2025/02/04-08:00:18.069047 7ff0d8ff96c0 Delete type=3 #6 -2025/02/04-08:00:18.069271 7ff0d8ff96c0 Delete type=0 #8 -2025/02/04-08:13:20.862238 7ff0d7ff76c0 Level-0 table #13: started -2025/02/04-08:13:20.862284 7ff0d7ff76c0 Level-0 table #13: 0 bytes OK -2025/02/04-08:13:20.869551 7ff0d7ff76c0 Delete type=0 #11 -2025/02/04-08:13:20.876104 7ff0d7ff76c0 Manual compaction at level-0 from '!scenes!FJXugdbkBpEJEdR6' @ 72057594037927935 : 1 .. '!scenes!FJXugdbkBpEJEdR6' @ 0 : 0; will stop at (end) +2025/02/04-20:38:48.235842 7ffae77fe6c0 Recovering log #24 +2025/02/04-20:38:48.252695 7ffae77fe6c0 Delete type=3 #22 +2025/02/04-20:38:48.252769 7ffae77fe6c0 Delete type=0 #24 +2025/02/04-21:02:18.400699 7ffae6bff6c0 Level-0 table #29: started +2025/02/04-21:02:18.400727 7ffae6bff6c0 Level-0 table #29: 0 bytes OK +2025/02/04-21:02:18.426905 7ffae6bff6c0 Delete type=0 #27 +2025/02/04-21:02:18.527523 7ffae6bff6c0 Manual compaction at level-0 from '!scenes!FJXugdbkBpEJEdR6' @ 72057594037927935 : 1 .. '!scenes!FJXugdbkBpEJEdR6' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/MANIFEST-000014 b/packs/scenes/MANIFEST-000030 similarity index 84% rename from packs/scenes/MANIFEST-000014 rename to packs/scenes/MANIFEST-000030 index 2ca51639cc05f8c019909e15bf0964b1a2865e3a..cf2fff62cdd97c2d4d277c4c8db53391be3f212e 100644 GIT binary patch delta 37 pcmX@lc%E^>M!6l5&sK3TFfz$=GB7K!u(UbUW`MW~K&}!C3joT32g?8e delta 37 pcmX@lc%E^>M!6z|X_Gh@7@7Dv8JGoFSghrX?}E4jK&}uA3jnit2IBw# diff --git a/packs/simples/000078.log b/packs/simples/000094.log similarity index 100% rename from packs/simples/000078.log rename to packs/simples/000094.log diff --git a/packs/simples/CURRENT b/packs/simples/CURRENT index f24fe8e..5b83d76 100644 --- a/packs/simples/CURRENT +++ b/packs/simples/CURRENT @@ -1 +1 @@ -MANIFEST-000076 +MANIFEST-000092 diff --git a/packs/simples/LOG b/packs/simples/LOG index 821aa67..2853d09 100644 --- a/packs/simples/LOG +++ b/packs/simples/LOG @@ -1,7 +1,7 @@ -2025/02/04-09:19:54.713036 7ff0d8ff96c0 Recovering log #74 -2025/02/04-09:19:54.760457 7ff0d8ff96c0 Delete type=3 #72 -2025/02/04-09:19:54.760553 7ff0d8ff96c0 Delete type=0 #74 -2025/02/04-09:26:38.716224 7ff0d7ff76c0 Level-0 table #79: started -2025/02/04-09:26:38.716249 7ff0d7ff76c0 Level-0 table #79: 0 bytes OK -2025/02/04-09:26:38.723229 7ff0d7ff76c0 Delete type=0 #77 -2025/02/04-09:26:38.747021 7ff0d7ff76c0 Manual compaction at level-0 from '!items!1bAL2MQVpVBd0c5Z' @ 72057594037927935 : 1 .. '!items!zs67k4sxCid6oTK3' @ 0 : 0; will stop at (end) +2025/02/04-21:02:32.068229 7ffaed3fa6c0 Recovering log #90 +2025/02/04-21:02:32.124706 7ffaed3fa6c0 Delete type=3 #88 +2025/02/04-21:02:32.124766 7ffaed3fa6c0 Delete type=0 #90 +2025/02/04-21:19:59.615064 7ffae6bff6c0 Level-0 table #95: started +2025/02/04-21:19:59.615100 7ffae6bff6c0 Level-0 table #95: 0 bytes OK +2025/02/04-21:19:59.621260 7ffae6bff6c0 Delete type=0 #93 +2025/02/04-21:19:59.628066 7ffae6bff6c0 Manual compaction at level-0 from '!items!1bAL2MQVpVBd0c5Z' @ 72057594037927935 : 1 .. '!items!zs67k4sxCid6oTK3' @ 0 : 0; will stop at (end) diff --git a/packs/simples/LOG.old b/packs/simples/LOG.old index ae630af..a0b0bec 100644 --- a/packs/simples/LOG.old +++ b/packs/simples/LOG.old @@ -1,7 +1,7 @@ -2025/02/04-08:00:18.024798 7ff0d87f86c0 Recovering log #70 -2025/02/04-08:00:18.041483 7ff0d87f86c0 Delete type=3 #68 -2025/02/04-08:00:18.041605 7ff0d87f86c0 Delete type=0 #70 -2025/02/04-08:13:20.869725 7ff0d7ff76c0 Level-0 table #75: started -2025/02/04-08:13:20.869764 7ff0d7ff76c0 Level-0 table #75: 0 bytes OK -2025/02/04-08:13:20.875871 7ff0d7ff76c0 Delete type=0 #73 -2025/02/04-08:13:20.876118 7ff0d7ff76c0 Manual compaction at level-0 from '!items!1bAL2MQVpVBd0c5Z' @ 72057594037927935 : 1 .. '!items!zs67k4sxCid6oTK3' @ 0 : 0; will stop at (end) +2025/02/04-20:38:48.217235 7ffae7fff6c0 Recovering log #86 +2025/02/04-20:38:48.232340 7ffae7fff6c0 Delete type=3 #84 +2025/02/04-20:38:48.232418 7ffae7fff6c0 Delete type=0 #86 +2025/02/04-21:02:18.359457 7ffae6bff6c0 Level-0 table #91: started +2025/02/04-21:02:18.359479 7ffae6bff6c0 Level-0 table #91: 0 bytes OK +2025/02/04-21:02:18.400500 7ffae6bff6c0 Delete type=0 #89 +2025/02/04-21:02:18.427028 7ffae6bff6c0 Manual compaction at level-0 from '!items!1bAL2MQVpVBd0c5Z' @ 72057594037927935 : 1 .. '!items!zs67k4sxCid6oTK3' @ 0 : 0; will stop at (end) diff --git a/packs/simples/MANIFEST-000076 b/packs/simples/MANIFEST-000092 similarity index 75% rename from packs/simples/MANIFEST-000076 rename to packs/simples/MANIFEST-000092 index 749fc491a1910f77f270557f5a131db88b512987..ff76ad60ab8d442d1c7a9444eb8db5f64be14462 100644 GIT binary patch delta 37 pcmZ3-*-6}7@2%I8JPW8RHRP*js {{upperFirst arme.system.typeArme}} {{upperFirst arme.system.competence}} - {{arme.system.degats}} + {{arme.system.degats}}
 
@@ -375,8 +375,9 @@
  • - +
  • diff --git a/templates/chat/chat-degats-result.hbs b/templates/chat/chat-degats-result.hbs new file mode 100644 index 0000000..50941d2 --- /dev/null +++ b/templates/chat/chat-degats-result.hbs @@ -0,0 +1,23 @@ +
    + {{#if actorImg}} + {{alias}} + {{/if}} +

    {{alias}}

    +
    + +
    + + {{#if img}} +
    + {{name}} +
    + {{/if}} + +
    +
      +
    • Dégats de {{arme.name}}: {{formula}}
      • +
    • Dégats infligés : {{degats}}
      • +
    +
    + +
diff --git a/templates/dialogs/character-creator-finished.hbs b/templates/dialogs/character-creator-finished.hbs index 66e1b51..f626182 100644 --- a/templates/dialogs/character-creator-finished.hbs +++ b/templates/dialogs/character-creator-finished.hbs @@ -1,17 +1,28 @@
-

Création de personnage terminée !

+

Création de personnage terminée !

-
- L'ensemble des choix a été appliqué sur la fiche de personnage nouvellement créée. +
+ L'ensemble des choix a été appliqué sur la fiche de personnage nouvellement créée. +
- Le Trousseau issu de l'Age Viril a été copié dans zone d'équipement libre de la fiche de personnage, à vous de créer les objets de jeu nécessaires (armes, richesses, etc.). +
+ Le Trousseau issu de l'Age Viril a été copié dans zone d'équipement libre de la fiche de personnage, à vous de créer + les objets de jeu nécessaires (armes, richesses, etc.). +
- Vous devez maintenant choisir un Grâce, en fonction des pré-requis de votre personnage, et l'appliquer sur la fiche de personnage. +
+ Vous devez maintenant choisir un Grâce, en fonction des pré-requis de votre personnage, et l'appliquer sur la fiche + de personnage. +
- Vous pouvez également choisir un nom pour votre personnage, et le renseigner dans la fiche de personnage. +
+ Vous pouvez également choisir un nom pour votre personnage, et le renseigner dans la fiche de personnage. +
- Enfin, vous pouvez choisir un portrait pour votre personnage. +
+ Enfin, vous pouvez choisir un portrait pour votre personnage. +
-
+
\ No newline at end of file diff --git a/templates/items/item-competence-sheet.hbs b/templates/items/item-competence-sheet.hbs index a7654ee..9c93bbd 100644 --- a/templates/items/item-competence-sheet.hbs +++ b/templates/items/item-competence-sheet.hbs @@ -33,7 +33,7 @@
  • + name="system.score" value="{{system.score}}" data-dtype="Number" {{#if system.isBase}}disabled{{/if}}/>