From fac158e0add759146da5278b6c60c1149a329b2c Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Thu, 2 May 2024 09:27:16 +0200 Subject: [PATCH] Fix v11/v12 --- modules/hawkmoon-actor-sheet.js | 25 +++--- modules/hawkmoon-actor.js | 75 ++++++++++-------- modules/hawkmoon-automation.js | 4 +- modules/hawkmoon-cellule-sheet.js | 13 +-- modules/hawkmoon-config.js | 12 +++ modules/hawkmoon-creature-sheet.js | 2 +- modules/hawkmoon-item-sheet.js | 29 +++---- modules/hawkmoon-main.js | 4 +- modules/hawkmoon-roll-dialog.js | 3 +- modules/hawkmoon-utility.js | 20 ++--- packs/aides-de-jeu/{000154.log => 000158.log} | 0 packs/aides-de-jeu/CURRENT | 2 +- packs/aides-de-jeu/LOG | 16 ++-- packs/aides-de-jeu/LOG.old | 16 ++-- .../{MANIFEST-000152 => MANIFEST-000156} | Bin 166 -> 166 bytes packs/armes/{000154.log => 000158.log} | 0 packs/armes/CURRENT | 2 +- packs/armes/LOG | 16 ++-- packs/armes/LOG.old | 16 ++-- packs/armes/MANIFEST-000152 | Bin 138 -> 0 bytes packs/armes/MANIFEST-000156 | Bin 0 -> 138 bytes .../{000154.log => 000158.log} | 0 packs/competences-creatures/CURRENT | 2 +- packs/competences-creatures/LOG | 16 ++-- packs/competences-creatures/LOG.old | 16 ++-- packs/competences-creatures/MANIFEST-000152 | Bin 138 -> 0 bytes packs/competences-creatures/MANIFEST-000156 | Bin 0 -> 138 bytes packs/competences/{000154.log => 000158.log} | 0 packs/competences/CURRENT | 2 +- packs/competences/LOG | 16 ++-- packs/competences/LOG.old | 16 ++-- packs/competences/MANIFEST-000152 | Bin 138 -> 0 bytes packs/competences/MANIFEST-000156 | Bin 0 -> 138 bytes packs/equipement/{000154.log => 000158.log} | 0 packs/equipement/CURRENT | 2 +- packs/equipement/LOG | 16 ++-- packs/equipement/LOG.old | 16 ++-- packs/equipement/MANIFEST-000152 | Bin 141 -> 0 bytes packs/equipement/MANIFEST-000156 | Bin 0 -> 141 bytes packs/historiques/{000154.log => 000158.log} | 0 packs/historiques/CURRENT | 2 +- packs/historiques/LOG | 16 ++-- packs/historiques/LOG.old | 16 ++-- packs/historiques/MANIFEST-000152 | Bin 139 -> 0 bytes packs/historiques/MANIFEST-000156 | Bin 0 -> 139 bytes packs/mutations/{000064.log => 000068.log} | 0 packs/mutations/CURRENT | 2 +- packs/mutations/LOG | 16 ++-- packs/mutations/LOG.old | 16 ++-- packs/mutations/MANIFEST-000062 | Bin 139 -> 0 bytes packs/mutations/MANIFEST-000066 | Bin 0 -> 139 bytes packs/profils/{000154.log => 000158.log} | 0 packs/profils/CURRENT | 2 +- packs/profils/LOG | 16 ++-- packs/profils/LOG.old | 16 ++-- packs/profils/MANIFEST-000152 | Bin 139 -> 0 bytes packs/profils/MANIFEST-000156 | Bin 0 -> 139 bytes packs/protections/{000154.log => 000158.log} | 0 packs/protections/CURRENT | 2 +- packs/protections/LOG | 16 ++-- packs/protections/LOG.old | 16 ++-- packs/protections/MANIFEST-000152 | Bin 138 -> 0 bytes packs/protections/MANIFEST-000156 | Bin 0 -> 138 bytes packs/tables/{000154.log => 000158.log} | 0 packs/tables/CURRENT | 2 +- packs/tables/LOG | 14 ++-- packs/tables/LOG.old | 14 ++-- packs/tables/MANIFEST-000152 | Bin 69 -> 0 bytes packs/tables/MANIFEST-000156 | Bin 0 -> 69 bytes .../{000154.log => 000158.log} | 0 packs/talents-cellule/CURRENT | 2 +- packs/talents-cellule/LOG | 16 ++-- packs/talents-cellule/LOG.old | 16 ++-- packs/talents-cellule/MANIFEST-000152 | Bin 138 -> 0 bytes packs/talents-cellule/MANIFEST-000156 | Bin 0 -> 138 bytes packs/talents/{000154.log => 000158.log} | 0 packs/talents/CURRENT | 2 +- packs/talents/LOG | 16 ++-- packs/talents/LOG.old | 16 ++-- packs/talents/MANIFEST-000152 | Bin 141 -> 0 bytes packs/talents/MANIFEST-000156 | Bin 0 -> 141 bytes system.json | 8 +- templates/roll-dialog-generic.html | 13 +-- 83 files changed, 314 insertions(+), 298 deletions(-) create mode 100644 modules/hawkmoon-config.js rename packs/aides-de-jeu/{000154.log => 000158.log} (100%) rename packs/aides-de-jeu/{MANIFEST-000152 => MANIFEST-000156} (77%) rename packs/armes/{000154.log => 000158.log} (100%) delete mode 100644 packs/armes/MANIFEST-000152 create mode 100644 packs/armes/MANIFEST-000156 rename packs/competences-creatures/{000154.log => 000158.log} (100%) delete mode 100644 packs/competences-creatures/MANIFEST-000152 create mode 100644 packs/competences-creatures/MANIFEST-000156 rename packs/competences/{000154.log => 000158.log} (100%) delete mode 100644 packs/competences/MANIFEST-000152 create mode 100644 packs/competences/MANIFEST-000156 rename packs/equipement/{000154.log => 000158.log} (100%) delete mode 100644 packs/equipement/MANIFEST-000152 create mode 100644 packs/equipement/MANIFEST-000156 rename packs/historiques/{000154.log => 000158.log} (100%) delete mode 100644 packs/historiques/MANIFEST-000152 create mode 100644 packs/historiques/MANIFEST-000156 rename packs/mutations/{000064.log => 000068.log} (100%) delete mode 100644 packs/mutations/MANIFEST-000062 create mode 100644 packs/mutations/MANIFEST-000066 rename packs/profils/{000154.log => 000158.log} (100%) delete mode 100644 packs/profils/MANIFEST-000152 create mode 100644 packs/profils/MANIFEST-000156 rename packs/protections/{000154.log => 000158.log} (100%) delete mode 100644 packs/protections/MANIFEST-000152 create mode 100644 packs/protections/MANIFEST-000156 rename packs/tables/{000154.log => 000158.log} (100%) delete mode 100644 packs/tables/MANIFEST-000152 create mode 100644 packs/tables/MANIFEST-000156 rename packs/talents-cellule/{000154.log => 000158.log} (100%) delete mode 100644 packs/talents-cellule/MANIFEST-000152 create mode 100644 packs/talents-cellule/MANIFEST-000156 rename packs/talents/{000154.log => 000158.log} (100%) delete mode 100644 packs/talents/MANIFEST-000152 create mode 100644 packs/talents/MANIFEST-000156 diff --git a/modules/hawkmoon-actor-sheet.js b/modules/hawkmoon-actor-sheet.js index 04d95f8..57b3fd7 100644 --- a/modules/hawkmoon-actor-sheet.js +++ b/modules/hawkmoon-actor-sheet.js @@ -12,7 +12,7 @@ export class HawkmoonActorSheet extends ActorSheet { /** @override */ static get defaultOptions() { - return mergeObject(super.defaultOptions, { + return foundry.utils.mergeObject(super.defaultOptions, { classes: ["fvtt-hawkmoon-cyd", "sheet", "actor"], template: "systems/fvtt-hawkmoon-cyd/templates/actor-sheet.html", width: 640, @@ -25,7 +25,7 @@ export class HawkmoonActorSheet extends ActorSheet { /* -------------------------------------------- */ async getData() { - const objectData = duplicate(this.object) + const objectData = foundry.utils.duplicate(this.object) let formData = { title: this.title, @@ -39,17 +39,17 @@ export class HawkmoonActorSheet extends ActorSheet { effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)), limited: this.object.limited, skills: this.actor.getSkills(), - armes: duplicate(this.actor.getWeapons()), - monnaies: duplicate(this.actor.getMonnaies()), - protections: duplicate(this.actor.getArmors()), - historiques: duplicate(this.actor.getHistoriques() || []), - talents: duplicate(this.actor.getTalents() || []), - mutations: duplicate(this.actor.getMutations() || []), + armes: foundry.utils.duplicate(this.actor.getWeapons()), + monnaies: foundry.utils.duplicate(this.actor.getMonnaies()), + protections: foundry.utils.duplicate(this.actor.getArmors()), + historiques: foundry.utils.duplicate(this.actor.getHistoriques() || []), + talents: foundry.utils.duplicate(this.actor.getTalents() || []), + mutations: foundry.utils.duplicate(this.actor.getMutations() || []), talentsCell: this.getCelluleTalents(), - profils: duplicate(this.actor.getProfils() || []), + profils: foundry.utils.duplicate(this.actor.getProfils() || []), combat: this.actor.getCombatValues(), - equipements: duplicate(this.actor.getEquipments()), - artefacts: duplicate(this.actor.getArtefacts()), + equipements: foundry.utils.duplicate(this.actor.getEquipments()), + artefacts: foundry.utils.duplicate(this.actor.getArtefacts()), 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(), @@ -61,7 +61,8 @@ export class HawkmoonActorSheet extends ActorSheet { options: this.options, owner: this.document.isOwner, editScore: this.options.editScore, - isGM: game.user.isGM + isGM: game.user.isGM, + config: game.system.hawkmoon.config } this.formData = formData; diff --git a/modules/hawkmoon-actor.js b/modules/hawkmoon-actor.js index 81be0c5..b51a8b9 100644 --- a/modules/hawkmoon-actor.js +++ b/modules/hawkmoon-actor.js @@ -67,22 +67,22 @@ export class HawkmoonActor extends Actor { /* -------------------------------------------- */ prepareArme(arme) { - arme = duplicate(arme) + arme = foundry.utils.duplicate(arme) let combat = this.getCombatValues() if (arme.system.typearme == "contact" || arme.system.typearme == "contactjet") { let bonusDefense = this.getBonusDefenseFromTalents() - arme.system.competence = duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "mêlée")) + arme.system.competence = foundry.utils.duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "mêlée")) arme.system.attrKey = "pui" arme.system.totalDegats = arme.system.degats + "+" + combat.bonusDegatsTotal - arme.system.totalOffensif = this.system.attributs.pui.value + arme.system.competence.system.niveau + arme.system.bonusmaniementoff + (this.system.combat.monte ? 3 : 0 ) - arme.system.totalDefensif = combat.defenseTotal + arme.system.competence.system.niveau + arme.system.seuildefense + bonusDefense + (this.system.combat.monte ? 3 : 0 ) + arme.system.totalOffensif = this.system.attributs.pui.value + arme.system.competence.system.niveau + arme.system.bonusmaniementoff + (this.system.combat.monte ? 3 : 0) + arme.system.totalDefensif = combat.defenseTotal + arme.system.competence.system.niveau + arme.system.seuildefense + bonusDefense + (this.system.combat.monte ? 3 : 0) 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 } if (arme.system.typearme == "jet" || arme.system.typearme == "tir") { - arme.system.competence = duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "armes à distance")) + arme.system.competence = foundry.utils.duplicate(this.items.find(item => item.type == "competence" && item.name.toLowerCase() == "armes à distance")) arme.system.attrKey = "adr" arme.system.totalOffensif = this.system.attributs.adr.value + arme.system.competence.system.niveau + arme.system.bonusmaniementoff arme.system.totalDegats = arme.system.degats @@ -146,7 +146,7 @@ export class HawkmoonActor extends Actor { getSkills() { let comp = [] for (let item of this.items) { - item = duplicate(item) + item = foundry.utils.duplicate(item) if (item.type == "competence") { item.system.attribut1total = item.system.niveau + (this.system.attributs[item.system.attribut1]?.value || 0) item.system.attribut2total = item.system.niveau + (this.system.attributs[item.system.attribut2]?.value || 0) @@ -168,7 +168,7 @@ export class HawkmoonActor extends Actor { /* ----------------------- --------------------- */ addMember(actorId) { - let members = duplicate(this.system.members) + let members = foundry.utils.duplicate(this.system.members) members.push({ id: actorId }) this.update({ 'system.members': members }) } @@ -249,7 +249,7 @@ export class HawkmoonActor extends Actor { getItemById(id) { let item = this.items.find(item => item.id == id); if (item) { - item = duplicate(item) + item = foundry.utils.duplicate(item) } return item; } @@ -282,7 +282,7 @@ export class HawkmoonActor extends Actor { checkAttribut(attribut, minLevel) { let attr = this.system.attributs.find(at => at.labelnorm == attribut.toLowerCase()) if (attr && attr.value >= minLevel) { - return { isValid: true, attr: duplicate(attr) } + return { isValid: true, attr: foundry.utils.duplicate(attr) } } return { isValid: false } } @@ -290,11 +290,11 @@ export class HawkmoonActor extends Actor { checkAttributOrCompetenceLevel(compName, minLevel) { let comp = this.items.find(i => i.type == "competence" && i.name.toLowerCase() == compName.toLowerCase() && i.system.niveau >= minLevel) if (comp) { - return { isValid: true, item: duplicate(comp) } + return { isValid: true, item: foundry.utils.duplicate(comp) } } else { for (let attrKey in this.system.attributs) { if (this.system.attributs[attrKey].label.toLowerCase() == compName.toLowerCase() && this.system.attributs[attrKey].value >= minLevel) { - return { isValid: true, item: duplicate(this.system.attributs[attrKey]) } + return { isValid: true, item: foundry.utils.duplicate(this.system.attributs[attrKey]) } } } } @@ -304,7 +304,7 @@ export class HawkmoonActor extends Actor { addCompetenceBonus(compName, bonus, baCost) { let comp = this.items.find(i => i.type == "competence" && i.name.toLowerCase() == compName.toLowerCase()) if (comp) { - comp = duplicate(comp) + comp = foundry.utils.duplicate(comp) comp.system.bonus = bonus comp.system.baCost = baCost return { isValid: true, item: comp } @@ -388,10 +388,10 @@ export class HawkmoonActor extends Actor { /* -------------------------------------------- */ changeEtatCombativite(value) { - if ( value === "vaincu") { + if (value === "vaincu") { value = 200 } - let sante = duplicate(this.system.sante) + let sante = foundry.utils.duplicate(this.system.sante) sante.etat += Number(value) sante.etat = Math.max(sante.etat, 0) sante.etat = Math.min(sante.etat, 5) @@ -400,10 +400,10 @@ export class HawkmoonActor extends Actor { ChatMessage.create({ content: `${this.name} est vaincu !` }) } // 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")) { + 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: `${this.name} ne subit pas les 2 adversités rouge grâce à Encaissement. Pensez à les ajouter à la fin de la scène !` }) - } else if (sante.etat == this.system.sante.nbcombativite-1 && this.items.find(item => item.type == "talent" && item.name.toLowerCase().includes("vaillant"))) { + } else if (sante.etat == this.system.sante.nbcombativite - 1 && this.items.find(item => item.type == "talent" && item.name.toLowerCase().includes("vaillant"))) { ChatMessage.create({ content: `${this.name} ne subit pas les 2 adversités rouge grâce à Vaillant. Pensez à les ajouter à la fin de la scène !` }) } else { ChatMessage.create({ content: `${this.name} subit 2 adversités rouge !` }) @@ -425,13 +425,13 @@ export class HawkmoonActor extends Actor { getSubActors() { let subActors = []; for (let id of this.system.subactors) { - subActors.push(duplicate(game.actors.get(id))); + subActors.push(foundry.utils.duplicate(game.actors.get(id))); } return subActors; } /* -------------------------------------------- */ async addSubActor(subActorId) { - let subActors = duplicate(this.system.subactors); + let subActors = foundry.utils.duplicate(this.system.subactors); subActors.push(subActorId); await this.update({ 'system.subactors': subActors }); } @@ -453,7 +453,7 @@ export class HawkmoonActor extends Actor { /* -------------------------------------------- */ async incDecAdversite(adv, incDec = 0) { - let adversite = duplicate(this.system.adversite) + let adversite = foundry.utils.duplicate(this.system.adversite) adversite[adv] += Number(incDec) adversite[adv] = Math.max(adversite[adv], 0) this.update({ 'system.adversite': adversite }) @@ -500,7 +500,7 @@ export class HawkmoonActor extends Actor { /* -------------------------------------------- */ async setPredilectionUsed(compId, predIdx) { let comp = this.items.get(compId) - let pred = duplicate(comp.system.predilections) + let pred = foundry.utils.duplicate(comp.system.predilections) pred[predIdx].used = true await this.updateEmbeddedDocuments('Item', [{ _id: compId, 'system.predilections': pred }]) } @@ -522,7 +522,7 @@ export class HawkmoonActor extends Actor { } if (arme.system.totalDefensif > maxDef) { maxDef = arme.system.totalDefensif - bestArme = duplicate(arme) + bestArme = foundry.utils.duplicate(arme) } } return bestArme @@ -537,7 +537,7 @@ export class HawkmoonActor extends Actor { for (let auto of talent.system.automations) { if (auto.eventtype === "prepare-roll") { if (auto.competence.toLowerCase() == competence.name.toLowerCase()) { - talent = duplicate(talent) + talent = foundry.utils.duplicate(talent) talent.system.bonus = auto.bonus talent.system.baCost = auto.baCost talents.push(talent) @@ -569,26 +569,33 @@ export class HawkmoonActor extends Actor { 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) + rollData.coupDevastateur = this.items.find(it => it.type == "talent" && it.name.toLowerCase() == "coup dévastateur" && !it.system.used) rollData.hasAmbidextre = this.items.find(it => it.type == "talent" && it.name.toLowerCase() == "ambidextre") - rollData.hasFeinte = this.system.bonneaventure.actuelle >0 && this.items.find(it => it.type == "talent" && it.name.toLowerCase() == "feinte") + rollData.hasFeinte = this.system.bonneaventure.actuelle > 0 && this.items.find(it => it.type == "talent" && it.name.toLowerCase() == "feinte") rollData.isMonte = this.system.combat.monte + rollData.config = game.system.hawkmoon.config if (attrKey) { rollData.attrKey = attrKey if (attrKey != "tochoose") { rollData.actionImg = "systems/fvtt-hawkmoon-cyd/assets/icons/" + this.system.attributs[attrKey].labelnorm + ".webp" - rollData.attr = duplicate(this.system.attributs[attrKey]) + rollData.attr = foundry.utils.duplicate(this.system.attributs[attrKey]) } } if (compId) { - rollData.competence = duplicate(this.items.get(compId) || {}) - rollData.maitrises = rollData.competence.system.predilections.filter(p => p.maitrise) + rollData.competence = foundry.utils.duplicate(this.items.get(compId) || {}) + let maitrises = [ { key: "none", label: "Aucune" } ] + rollData.competence.system.predilections.forEach(function(item){ + if (item.maitrise ) { + maitrises.push({key: item.id, label: item.name}); + } + }) + rollData.maitrises = maitrises // rollData.competence.system.predilections.filter(p => p.maitrise) rollData.actionImg = rollData.competence?.img rollData.talents = this.searchRelevantTalents(rollData.competence) } if (compName) { - rollData.competence = duplicate(this.items.find(item => item.name.toLowerCase() == compName.toLowerCase()) || {}) + rollData.competence = foundry.utils.duplicate(this.items.find(item => item.name.toLowerCase() == compName.toLowerCase()) || {}) rollData.actionImg = rollData.competence?.img } return rollData @@ -672,7 +679,7 @@ export class HawkmoonActor extends Actor { let rollDialog = await HawkmoonRollDialog.create(this, rollData) rollDialog.render(true) } - + /* -------------------------------------------- */ async rollArmeDegats(armeId, targetVigueur = undefined, rollDataInput = undefined) { let arme = this.items.get(armeId) @@ -687,7 +694,7 @@ export class HawkmoonActor extends Actor { 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 }]) + this.updateEmbeddedDocuments('Item', [{ _id: talent.id, 'system.used': true }]) } if (rollDataInput?.isHeroique) { @@ -697,7 +704,7 @@ export class HawkmoonActor extends Actor { if (rollDataInput?.chargeCavalerie) { bonus = 6 } - roll = new Roll("2d10rr10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll({ async: false }) + roll = await new Roll("2d10rr10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll() } else { if (rollDataInput?.attaqueCharge) { bonus = 3 @@ -705,13 +712,13 @@ export class HawkmoonActor extends Actor { if (rollDataInput?.chargeCavalerie) { bonus = 4 } - roll = new Roll("1d10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll({ async: false }) + roll = await new Roll("1d10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll() } 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, diff --git a/modules/hawkmoon-automation.js b/modules/hawkmoon-automation.js index fd2160e..bfc1d23 100644 --- a/modules/hawkmoon-automation.js +++ b/modules/hawkmoon-automation.js @@ -14,10 +14,10 @@ export class HawkmoonAutomation { this.__objectTypes = { } Object.entries(game.data.model.Actor).forEach(kv => { - this.__objectTypes[kv[0]] = duplicate(kv[1]) + this.__objectTypes[kv[0]] = foundry.utils.duplicate(kv[1]) }) Object.entries(game.data.model.Item).forEach(kv => { - this.__objectTypes[kv[0]] = duplicate(kv[1]) + this.__objectTypes[kv[0]] = foundry.utils.duplicate(kv[1]) }) } diff --git a/modules/hawkmoon-cellule-sheet.js b/modules/hawkmoon-cellule-sheet.js index 050c7f1..85ace08 100644 --- a/modules/hawkmoon-cellule-sheet.js +++ b/modules/hawkmoon-cellule-sheet.js @@ -15,7 +15,7 @@ export class HawkmoonCelluleSheet extends ActorSheet { /** @override */ static get defaultOptions() { - return mergeObject(super.defaultOptions, { + return foundry.utils.mergeObject(super.defaultOptions, { classes: ["fvtt-hawkmoon-cyd", "sheet", "actor"], template: "systems/fvtt-hawkmoon-cyd/templates/cellule-sheet.html", width: 640, @@ -28,7 +28,7 @@ export class HawkmoonCelluleSheet extends ActorSheet { /* -------------------------------------------- */ async getData() { - const objectData = duplicate(this.object) + const objectData = foundry.utils.duplicate(this.object) let formData = { title: this.title, @@ -41,15 +41,16 @@ export class HawkmoonCelluleSheet extends ActorSheet { system: objectData.system, effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)), limited: this.object.limited, - talents: duplicate(this.actor.getTalents() || {}), - ressources: duplicate(this.actor.getRessources()), - contacts: duplicate(this.actor.getContacts()), + talents: foundry.utils.duplicate(this.actor.getTalents() || {}), + ressources: foundry.utils.duplicate(this.actor.getRessources()), + contacts: foundry.utils.duplicate(this.actor.getContacts()), members: this.getMembers(), description: await TextEditor.enrichHTML(this.object.system.description, { async: true }), options: this.options, owner: this.document.isOwner, editScore: this.options.editScore, - isGM: game.user.isGM + isGM: game.user.isGM, + config: game.system.hawkmoon.config } this.formData = formData; diff --git a/modules/hawkmoon-config.js b/modules/hawkmoon-config.js new file mode 100644 index 0000000..77858bf --- /dev/null +++ b/modules/hawkmoon-config.js @@ -0,0 +1,12 @@ +export const HAWKMOON_CONFIG = { + + optionsDifficulte: [ + { key: "0", label: "Aucune/Inconnue" }, + { key: "5", label: "Facile (5)" }, + { key: "10", label: "Moyenne (10)" }, + { key: "15", label: "Ardue (15)" }, + { key: "20", label: "Hasardeuse (20)" }, + { key: "25", label: "Insensée (25)" }, + { key: "30", label: "Pure Folie (30)" } + ], +} \ No newline at end of file diff --git a/modules/hawkmoon-creature-sheet.js b/modules/hawkmoon-creature-sheet.js index fb27b59..7333f30 100644 --- a/modules/hawkmoon-creature-sheet.js +++ b/modules/hawkmoon-creature-sheet.js @@ -13,7 +13,7 @@ export class HawkmoonCreatureSheet extends HawkmoonActorSheet { /** @override */ static get defaultOptions() { - return mergeObject(super.defaultOptions, { + return foundry.utils.mergeObject(super.defaultOptions, { classes: ["fvtt-hawkmoon-cyd", "sheet", "actor"], template: "systems/fvtt-hawkmoon-cyd/templates/creature-sheet.html", width: 640, diff --git a/modules/hawkmoon-item-sheet.js b/modules/hawkmoon-item-sheet.js index 6f8afd0..f335b9a 100644 --- a/modules/hawkmoon-item-sheet.js +++ b/modules/hawkmoon-item-sheet.js @@ -9,7 +9,7 @@ export class HawkmoonItemSheet extends ItemSheet { /** @override */ static get defaultOptions() { - return mergeObject(super.defaultOptions, { + return foundry.utils.mergeObject(super.defaultOptions, { classes: ["fvtt-hawkmoon-cyd", "sheet", "item"], template: "systems/fvtt-hawkmoon-cyd/templates/item-sheet.html", dragDrop: [{ dragSelector: null, dropSelector: null }], @@ -48,7 +48,7 @@ export class HawkmoonItemSheet extends ItemSheet { /* -------------------------------------------- */ async getData() { - const objectData = duplicate(this.object) + const objectData = foundry.utils.duplicate(this.object) let formData = { title: this.title, id: this.id, @@ -64,7 +64,8 @@ export class HawkmoonItemSheet extends ItemSheet { owner: this.document.isOwner, description: await TextEditor.enrichHTML(this.object.system.description, {async: true}), mr: (this.object.type == 'specialisation'), - isGM: game.user.isGM + isGM: game.user.isGM, + config: game.system.hawkmoon.config } if ( objectData.type == "don") { @@ -89,7 +90,7 @@ export class HawkmoonItemSheet extends ItemSheet { /* -------------------------------------------- */ postItem() { - let chatData = duplicate(HawkmoonUtility.data(this.item)); + let chatData = foundry.utils.duplicate(HawkmoonUtility.data(this.item)); if (this.actor) { chatData.actor = { id: this.actor.id }; } @@ -132,7 +133,7 @@ export class HawkmoonItemSheet extends ItemSheet { html.find('.edit-predilection').change(ev => { const li = $(ev.currentTarget).parents(".prediction-item") let index = li.data("prediction-index") - let pred = duplicate(this.object.system.predilections) + let pred = foundry.utils.duplicate(this.object.system.predilections) pred[index].name = ev.currentTarget.value pred[index].id = pred[index].id || randomID(16) this.object.update( { 'system.predilections': pred }) @@ -140,7 +141,7 @@ export class HawkmoonItemSheet extends ItemSheet { html.find('.edit-predilection-description').change(ev => { const li = $(ev.currentTarget).parents(".prediction-item") let index = li.data("prediction-index") - let pred = duplicate(this.object.system.predilections) + let pred = foundry.utils.duplicate(this.object.system.predilections) pred[index].description = ev.currentTarget.value pred[index].id = pred[index].id || randomID(16) this.object.update( { 'system.predilections': pred }) @@ -148,7 +149,7 @@ export class HawkmoonItemSheet extends ItemSheet { html.find('.predilection-acquise').change(ev => { const li = $(ev.currentTarget).parents(".prediction-item") let index = li.data("prediction-index") - let pred = duplicate(this.object.system.predilections) + let pred = foundry.utils.duplicate(this.object.system.predilections) pred[index].acquise = ev.currentTarget.checked pred[index].id = pred[index].id || randomID(16) this.object.update( { 'system.predilections': pred }) @@ -156,7 +157,7 @@ export class HawkmoonItemSheet extends ItemSheet { html.find('.predilection-maitrise').change(ev => { const li = $(ev.currentTarget).parents(".prediction-item") let index = li.data("prediction-index") - let pred = duplicate(this.object.system.predilections) + let pred = foundry.utils.duplicate(this.object.system.predilections) pred[index].maitrise = ev.currentTarget.checked pred[index].id = pred[index].id || randomID(16) this.object.update( { 'system.predilections': pred }) @@ -164,41 +165,41 @@ export class HawkmoonItemSheet extends ItemSheet { html.find('.predilection-used').change(ev => { const li = $(ev.currentTarget).parents(".prediction-item") let index = li.data("prediction-index") - let pred = duplicate(this.object.system.predilections) + let pred = foundry.utils.duplicate(this.object.system.predilections) pred[index].used = ev.currentTarget.checked pred[index].id = pred[index].id || randomID(16) this.object.update( { 'system.predilections': pred }) }) html.find('#add-predilection').click(ev => { - let pred = duplicate(this.object.system.predilections) + let pred = foundry.utils.duplicate(this.object.system.predilections) pred.push( { name: "Nouvelle prédilection", id: randomID(16), used: false }) this.object.update( { 'system.predilections': pred }) }) html.find('.delete-prediction').click(ev => { const li = $(ev.currentTarget).parents(".prediction-item") let index = li.data("prediction-index") - let pred = duplicate(this.object.system.predilections) + let pred = foundry.utils.duplicate(this.object.system.predilections) pred.splice(index,1) this.object.update( { 'system.predilections': pred }) }) html.find('#add-automation').click(ev => { - let autom = duplicate(this.object.system.automations) + let autom = foundry.utils.duplicate(this.object.system.automations) autom.push( { eventtype: "on-drop", name: "Automatisation 1", bonusname: "vigueur", bonus: 0, competence: "", minLevel: 0, baCost: 0, id: randomID(16) }) this.object.update( { 'system.automations': autom }) }) html.find('.delete-automation').click(ev => { const li = $(ev.currentTarget).parents(".automation-item") let index = li.data("automation-index") - let autom = duplicate(this.object.system.automations) + let autom = foundry.utils.duplicate(this.object.system.automations) autom.splice(index,1) this.object.update( { 'system.automations': autom }) }) html.find('.automation-edit-field').change(ev => { let index = $(ev.currentTarget).data("automation-index") let field = $(ev.currentTarget).data("automation-field") - let auto = duplicate(this.object.system.automations) + let auto = foundry.utils.duplicate(this.object.system.automations) auto[index][field] = ev.currentTarget.value auto[index].id = auto[index].id || randomID(16) this.object.update( { 'system.automations': auto }) diff --git a/modules/hawkmoon-main.js b/modules/hawkmoon-main.js index 6025a18..a05c4c3 100644 --- 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 { HAWKMOON_CONFIG } from "./hawkmoon-config.js"; /* -------------------------------------------- */ /* Foundry VTT Initialization */ @@ -50,7 +51,8 @@ Hooks.once("init", async function () { CONFIG.Item.documentClass = HawkmoonItem game.system.hawkmoon = { HawkmoonUtility, - HawkmoonAutomation + HawkmoonAutomation, + config : HAWKMOON_CONFIG } /* -------------------------------------------- */ diff --git a/modules/hawkmoon-roll-dialog.js b/modules/hawkmoon-roll-dialog.js index 8002aa9..818d329 100644 --- a/modules/hawkmoon-roll-dialog.js +++ b/modules/hawkmoon-roll-dialog.js @@ -60,7 +60,8 @@ export class HawkmoonRollDialog extends Dialog { html.find('#modificateur').change(async (event) => { this.rollData.modificateur = Number(event.currentTarget.value) }) - html.find('#difficulte').change(async (event) => { + html.find('#difficulte').change( (event) => { + console.log("Difficulte: " + event.currentTarget.value) this.rollData.difficulte = Number(event.currentTarget.value) }) html.find('#attrKey').change(async (event) => { diff --git a/modules/hawkmoon-utility.js b/modules/hawkmoon-utility.js index dda1fc5..0da5ea1 100644 --- a/modules/hawkmoon-utility.js +++ b/modules/hawkmoon-utility.js @@ -142,7 +142,7 @@ export class HawkmoonUtility { let rollData = message.getFlag("world", "hawkmoon-roll") let actor = HawkmoonUtility.getActorFromRollData(rollData) await actor.setPredilectionUsed(rollData.competence._id, predIdx) - rollData.competence = duplicate(actor.getCompetence(rollData.competence._id)) + rollData.competence = foundry.utils.duplicate(actor.getCompetence(rollData.competence._id)) HawkmoonUtility.rollHawkmoon(rollData) }) @@ -256,7 +256,7 @@ export class HawkmoonUtility { let id = rollData.rollId; let oldRollData = this.rollDataStore[id] || {}; - let newRollData = mergeObject(oldRollData, rollData); + let newRollData = foundry.utils.mergeObject(oldRollData, rollData); this.rollDataStore[id] = newRollData; } @@ -364,10 +364,10 @@ export class HawkmoonUtility { } if (!rollData.attr) { rollData.actionImg = "systems/fvtt-hawkmoon-cyd/assets/icons/" + actor.system.attributs[rollData.attrKey].labelnorm + ".webp" - rollData.attr = duplicate(actor.system.attributs[rollData.attrKey]) + rollData.attr = foundry.utils.duplicate(actor.system.attributs[rollData.attrKey]) } if (rollData.attrKey2 != "none") { - rollData.attr2 = duplicate(actor.system.attributs[rollData.attrKey2]) + rollData.attr2 = foundry.utils.duplicate(actor.system.attributs[rollData.attrKey2]) } if (rollData.maitriseId != "none") { @@ -379,7 +379,7 @@ export class HawkmoonUtility { //console.log("BEFORE COMP", rollData) if (rollData.competence) { - rollData.predilections = duplicate(rollData.competence.system.predilections || []) + rollData.predilections = foundry.utils.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}` @@ -463,9 +463,9 @@ export class HawkmoonUtility { // Gestion de la feinte éventuelle rollData.nbCombativitePerdu = 1 - let myRoll = new Roll(rollData.diceFormula).roll({ async: false }) + let myRoll = await new Roll(rollData.diceFormula).roll() await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode")) - rollData.roll = duplicate(myRoll) + rollData.roll = foundry.utils.duplicate(myRoll) console.log(">>>> ", myRoll) rollData.finalResult = myRoll.total @@ -511,9 +511,9 @@ export class HawkmoonUtility { static async bonusRollHawkmoon(rollData) { rollData.bonusFormula = rollData.addedBonus - let bonusRoll = new Roll(rollData.bonusFormula).roll({ async: false }) + let bonusRoll = await new Roll(rollData.bonusFormula).roll() await this.showDiceSoNice(bonusRoll, game.settings.get("core", "rollMode")); - rollData.bonusRoll = duplicate(bonusRoll) + rollData.bonusRoll = foundry.utils.duplicate(bonusRoll) rollData.finalResult += rollData.bonusRoll.total @@ -547,7 +547,7 @@ export class HawkmoonUtility { /* -------------------------------------------- */ static blindMessageToGM(chatOptions) { - let chatGM = duplicate(chatOptions); + let chatGM = foundry.utils.duplicate(chatOptions); chatGM.whisper = this.getUsers(user => user.isGM); chatGM.content = "Blinde message of " + game.user.name + "
" + chatOptions.content; console.log("blindMessageToGM", chatGM); diff --git a/packs/aides-de-jeu/000154.log b/packs/aides-de-jeu/000158.log similarity index 100% rename from packs/aides-de-jeu/000154.log rename to packs/aides-de-jeu/000158.log diff --git a/packs/aides-de-jeu/CURRENT b/packs/aides-de-jeu/CURRENT index cbc14b7..c16f179 100644 --- a/packs/aides-de-jeu/CURRENT +++ b/packs/aides-de-jeu/CURRENT @@ -1 +1 @@ -MANIFEST-000152 +MANIFEST-000156 diff --git a/packs/aides-de-jeu/LOG b/packs/aides-de-jeu/LOG index 64dc113..bf5f302 100644 --- a/packs/aides-de-jeu/LOG +++ b/packs/aides-de-jeu/LOG @@ -1,8 +1,8 @@ -2024/04/24-19:19:44.588303 7fcc654006c0 Recovering log #150 -2024/04/24-19:19:45.046737 7fcc654006c0 Delete type=3 #148 -2024/04/24-19:19:45.047257 7fcc654006c0 Delete type=0 #150 -2024/04/24-20:38:33.674583 7fcc5e4006c0 Level-0 table #155: started -2024/04/24-20:38:33.674627 7fcc5e4006c0 Level-0 table #155: 0 bytes OK -2024/04/24-20:38:33.681197 7fcc5e4006c0 Delete type=0 #153 -2024/04/24-20:38:33.681325 7fcc5e4006c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end) -2024/04/24-20:38:33.681347 7fcc5e4006c0 Manual compaction at level-1 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end) +2024/05/01-23:27:23.214075 7f830ea006c0 Recovering log #154 +2024/05/01-23:27:23.268127 7f830ea006c0 Delete type=3 #152 +2024/05/01-23:27:23.268203 7f830ea006c0 Delete type=0 #154 +2024/05/02-09:11:36.500967 7f830e0006c0 Level-0 table #159: started +2024/05/02-09:11:36.501026 7f830e0006c0 Level-0 table #159: 0 bytes OK +2024/05/02-09:11:36.542679 7f830e0006c0 Delete type=0 #157 +2024/05/02-09:11:36.573785 7f830e0006c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end) +2024/05/02-09:11:36.573829 7f830e0006c0 Manual compaction at level-1 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end) diff --git a/packs/aides-de-jeu/LOG.old b/packs/aides-de-jeu/LOG.old index b9fb3ce..64dc113 100644 --- a/packs/aides-de-jeu/LOG.old +++ b/packs/aides-de-jeu/LOG.old @@ -1,8 +1,8 @@ -2024/04/07-18:44:43.940864 7f38a3e006c0 Recovering log #146 -2024/04/07-18:44:43.951368 7f38a3e006c0 Delete type=3 #144 -2024/04/07-18:44:43.951425 7f38a3e006c0 Delete type=0 #146 -2024/04/07-18:53:15.757658 7f38a10006c0 Level-0 table #151: started -2024/04/07-18:53:15.757696 7f38a10006c0 Level-0 table #151: 0 bytes OK -2024/04/07-18:53:15.765139 7f38a10006c0 Delete type=0 #149 -2024/04/07-18:53:15.765299 7f38a10006c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end) -2024/04/07-18:53:15.765326 7f38a10006c0 Manual compaction at level-1 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end) +2024/04/24-19:19:44.588303 7fcc654006c0 Recovering log #150 +2024/04/24-19:19:45.046737 7fcc654006c0 Delete type=3 #148 +2024/04/24-19:19:45.047257 7fcc654006c0 Delete type=0 #150 +2024/04/24-20:38:33.674583 7fcc5e4006c0 Level-0 table #155: started +2024/04/24-20:38:33.674627 7fcc5e4006c0 Level-0 table #155: 0 bytes OK +2024/04/24-20:38:33.681197 7fcc5e4006c0 Delete type=0 #153 +2024/04/24-20:38:33.681325 7fcc5e4006c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end) +2024/04/24-20:38:33.681347 7fcc5e4006c0 Manual compaction at level-1 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end) diff --git a/packs/aides-de-jeu/MANIFEST-000152 b/packs/aides-de-jeu/MANIFEST-000156 similarity index 77% rename from packs/aides-de-jeu/MANIFEST-000152 rename to packs/aides-de-jeu/MANIFEST-000156 index 5868963c0458e78a61eeb01d9f3b84f3143abf14..93537851b3524211d62e0268e3645cc933901051 100644 GIT binary patch delta 41 scmZ3+xQuZ^i<0B9uPR&&j7)PGIT@JeF|x4q-F|)rBrp#oumC6k0RI&VhyVZp delta 41 rcmZ3+xQuZ^i&9s083z{wBhySqP6p;#j4Uj6V#j}j1ZIH*<^Tl%*@_6w diff --git a/packs/armes/000154.log b/packs/armes/000158.log similarity index 100% rename from packs/armes/000154.log rename to packs/armes/000158.log diff --git a/packs/armes/CURRENT b/packs/armes/CURRENT index cbc14b7..c16f179 100644 --- a/packs/armes/CURRENT +++ b/packs/armes/CURRENT @@ -1 +1 @@ -MANIFEST-000152 +MANIFEST-000156 diff --git a/packs/armes/LOG b/packs/armes/LOG index 6b47a1c..afda4d8 100644 --- a/packs/armes/LOG +++ b/packs/armes/LOG @@ -1,8 +1,8 @@ -2024/04/24-19:19:43.144098 7fcc5fe006c0 Recovering log #150 -2024/04/24-19:19:43.367448 7fcc5fe006c0 Delete type=3 #148 -2024/04/24-19:19:43.367549 7fcc5fe006c0 Delete type=0 #150 -2024/04/24-20:38:33.619450 7fcc5e4006c0 Level-0 table #155: started -2024/04/24-20:38:33.619488 7fcc5e4006c0 Level-0 table #155: 0 bytes OK -2024/04/24-20:38:33.626512 7fcc5e4006c0 Delete type=0 #153 -2024/04/24-20:38:33.632878 7fcc5e4006c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end) -2024/04/24-20:38:33.639837 7fcc5e4006c0 Manual compaction at level-1 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end) +2024/05/01-23:27:22.766524 7f830fe006c0 Recovering log #154 +2024/05/01-23:27:22.827125 7f830fe006c0 Delete type=3 #152 +2024/05/01-23:27:22.827181 7f830fe006c0 Delete type=0 #154 +2024/05/02-09:11:36.254083 7f830e0006c0 Level-0 table #159: started +2024/05/02-09:11:36.254116 7f830e0006c0 Level-0 table #159: 0 bytes OK +2024/05/02-09:11:36.280718 7f830e0006c0 Delete type=0 #157 +2024/05/02-09:11:36.280946 7f830e0006c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end) +2024/05/02-09:11:36.280969 7f830e0006c0 Manual compaction at level-1 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end) diff --git a/packs/armes/LOG.old b/packs/armes/LOG.old index cc8c55a..6b47a1c 100644 --- a/packs/armes/LOG.old +++ b/packs/armes/LOG.old @@ -1,8 +1,8 @@ -2024/04/07-18:44:43.841800 7f38a2a006c0 Recovering log #146 -2024/04/07-18:44:43.851587 7f38a2a006c0 Delete type=3 #144 -2024/04/07-18:44:43.851700 7f38a2a006c0 Delete type=0 #146 -2024/04/07-18:53:15.687706 7f38a10006c0 Level-0 table #151: started -2024/04/07-18:53:15.687751 7f38a10006c0 Level-0 table #151: 0 bytes OK -2024/04/07-18:53:15.694223 7f38a10006c0 Delete type=0 #149 -2024/04/07-18:53:15.709272 7f38a10006c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end) -2024/04/07-18:53:15.709352 7f38a10006c0 Manual compaction at level-1 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end) +2024/04/24-19:19:43.144098 7fcc5fe006c0 Recovering log #150 +2024/04/24-19:19:43.367448 7fcc5fe006c0 Delete type=3 #148 +2024/04/24-19:19:43.367549 7fcc5fe006c0 Delete type=0 #150 +2024/04/24-20:38:33.619450 7fcc5e4006c0 Level-0 table #155: started +2024/04/24-20:38:33.619488 7fcc5e4006c0 Level-0 table #155: 0 bytes OK +2024/04/24-20:38:33.626512 7fcc5e4006c0 Delete type=0 #153 +2024/04/24-20:38:33.632878 7fcc5e4006c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end) +2024/04/24-20:38:33.639837 7fcc5e4006c0 Manual compaction at level-1 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end) diff --git a/packs/armes/MANIFEST-000152 b/packs/armes/MANIFEST-000152 deleted file mode 100644 index bbee6c006bfbf1be50d7e57e736fb0a9c7b50377..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmZoU$UH}1FGfR%d|sU$UH}1FGfR%yy~9Sx49S?ndUNb XGBD3$WHHQodQclAFb^cK04M+eFz+Rt literal 0 HcmV?d00001 diff --git a/packs/competences-creatures/000154.log b/packs/competences-creatures/000158.log similarity index 100% rename from packs/competences-creatures/000154.log rename to packs/competences-creatures/000158.log diff --git a/packs/competences-creatures/CURRENT b/packs/competences-creatures/CURRENT index cbc14b7..c16f179 100644 --- a/packs/competences-creatures/CURRENT +++ b/packs/competences-creatures/CURRENT @@ -1 +1 @@ -MANIFEST-000152 +MANIFEST-000156 diff --git a/packs/competences-creatures/LOG b/packs/competences-creatures/LOG index d03c22c..271ffe8 100644 --- a/packs/competences-creatures/LOG +++ b/packs/competences-creatures/LOG @@ -1,8 +1,8 @@ -2024/04/24-19:19:43.017708 7fcc64a006c0 Recovering log #150 -2024/04/24-19:19:43.076452 7fcc64a006c0 Delete type=3 #148 -2024/04/24-19:19:43.076601 7fcc64a006c0 Delete type=0 #150 -2024/04/24-20:38:33.605428 7fcc5e4006c0 Level-0 table #155: started -2024/04/24-20:38:33.605456 7fcc5e4006c0 Level-0 table #155: 0 bytes OK -2024/04/24-20:38:33.612661 7fcc5e4006c0 Delete type=0 #153 -2024/04/24-20:38:33.619414 7fcc5e4006c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end) -2024/04/24-20:38:33.626638 7fcc5e4006c0 Manual compaction at level-1 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end) +2024/05/01-23:27:22.646130 7f830fe006c0 Recovering log #154 +2024/05/01-23:27:22.699363 7f830fe006c0 Delete type=3 #152 +2024/05/01-23:27:22.699494 7f830fe006c0 Delete type=0 #154 +2024/05/02-09:11:36.159323 7f830e0006c0 Level-0 table #159: started +2024/05/02-09:11:36.159401 7f830e0006c0 Level-0 table #159: 0 bytes OK +2024/05/02-09:11:36.198682 7f830e0006c0 Delete type=0 #157 +2024/05/02-09:11:36.254049 7f830e0006c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end) +2024/05/02-09:11:36.280920 7f830e0006c0 Manual compaction at level-1 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end) diff --git a/packs/competences-creatures/LOG.old b/packs/competences-creatures/LOG.old index b26616f..d03c22c 100644 --- a/packs/competences-creatures/LOG.old +++ b/packs/competences-creatures/LOG.old @@ -1,8 +1,8 @@ -2024/04/07-18:44:43.814328 7f38a2a006c0 Recovering log #146 -2024/04/07-18:44:43.824924 7f38a2a006c0 Delete type=3 #144 -2024/04/07-18:44:43.825056 7f38a2a006c0 Delete type=0 #146 -2024/04/07-18:53:15.694330 7f38a10006c0 Level-0 table #151: started -2024/04/07-18:53:15.694352 7f38a10006c0 Level-0 table #151: 0 bytes OK -2024/04/07-18:53:15.702258 7f38a10006c0 Delete type=0 #149 -2024/04/07-18:53:15.709293 7f38a10006c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end) -2024/04/07-18:53:15.709368 7f38a10006c0 Manual compaction at level-1 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end) +2024/04/24-19:19:43.017708 7fcc64a006c0 Recovering log #150 +2024/04/24-19:19:43.076452 7fcc64a006c0 Delete type=3 #148 +2024/04/24-19:19:43.076601 7fcc64a006c0 Delete type=0 #150 +2024/04/24-20:38:33.605428 7fcc5e4006c0 Level-0 table #155: started +2024/04/24-20:38:33.605456 7fcc5e4006c0 Level-0 table #155: 0 bytes OK +2024/04/24-20:38:33.612661 7fcc5e4006c0 Delete type=0 #153 +2024/04/24-20:38:33.619414 7fcc5e4006c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end) +2024/04/24-20:38:33.626638 7fcc5e4006c0 Manual compaction at level-1 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end) diff --git a/packs/competences-creatures/MANIFEST-000152 b/packs/competences-creatures/MANIFEST-000152 deleted file mode 100644 index 05bd3f508b91a380a760399a7eee0403492ea4fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmdOIQNEMNz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDy2eaiF|#B!w^-32 zFC(O)G%Lq5)XB`)v9N@ZkpT=~@+EGerj?$--e$!GDSqL}`HUP8dET#A=WsDFGR`pgoS$2eSd>_jU&PMDy2eaiF|#B!w^-32 zFC(O)G%Lq5)XB`)v9N@ZkpT=~@+EGerj?$--e$!GDSqL}`HUP8`C~ev2e=p*ndUNb XGBD3$WZ~cpbq@du%mWE5015yAEO;Y` literal 0 HcmV?d00001 diff --git a/packs/competences/000154.log b/packs/competences/000158.log similarity index 100% rename from packs/competences/000154.log rename to packs/competences/000158.log diff --git a/packs/competences/CURRENT b/packs/competences/CURRENT index cbc14b7..c16f179 100644 --- a/packs/competences/CURRENT +++ b/packs/competences/CURRENT @@ -1 +1 @@ -MANIFEST-000152 +MANIFEST-000156 diff --git a/packs/competences/LOG b/packs/competences/LOG index 94982aa..81aa1b9 100644 --- a/packs/competences/LOG +++ b/packs/competences/LOG @@ -1,8 +1,8 @@ -2024/04/24-19:19:42.882823 7fcc64a006c0 Recovering log #150 -2024/04/24-19:19:42.947075 7fcc64a006c0 Delete type=3 #148 -2024/04/24-19:19:42.947209 7fcc64a006c0 Delete type=0 #150 -2024/04/24-20:38:33.592157 7fcc5e4006c0 Level-0 table #155: started -2024/04/24-20:38:33.592206 7fcc5e4006c0 Level-0 table #155: 0 bytes OK -2024/04/24-20:38:33.598509 7fcc5e4006c0 Delete type=0 #153 -2024/04/24-20:38:33.605418 7fcc5e4006c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end) -2024/04/24-20:38:33.612914 7fcc5e4006c0 Manual compaction at level-1 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end) +2024/05/01-23:27:22.506421 7f830fe006c0 Recovering log #154 +2024/05/01-23:27:22.564236 7f830fe006c0 Delete type=3 #152 +2024/05/01-23:27:22.564295 7f830fe006c0 Delete type=0 #154 +2024/05/02-09:11:36.098373 7f830e0006c0 Level-0 table #159: started +2024/05/02-09:11:36.098417 7f830e0006c0 Level-0 table #159: 0 bytes OK +2024/05/02-09:11:36.119557 7f830e0006c0 Delete type=0 #157 +2024/05/02-09:11:36.120001 7f830e0006c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end) +2024/05/02-09:11:36.159292 7f830e0006c0 Manual compaction at level-1 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end) diff --git a/packs/competences/LOG.old b/packs/competences/LOG.old index 2edb42e..94982aa 100644 --- a/packs/competences/LOG.old +++ b/packs/competences/LOG.old @@ -1,8 +1,8 @@ -2024/04/07-18:44:43.786249 7f38a2a006c0 Recovering log #146 -2024/04/07-18:44:43.797379 7f38a2a006c0 Delete type=3 #144 -2024/04/07-18:44:43.797432 7f38a2a006c0 Delete type=0 #146 -2024/04/07-18:53:15.681177 7f38a10006c0 Level-0 table #151: started -2024/04/07-18:53:15.681197 7f38a10006c0 Level-0 table #151: 0 bytes OK -2024/04/07-18:53:15.687480 7f38a10006c0 Delete type=0 #149 -2024/04/07-18:53:15.709243 7f38a10006c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end) -2024/04/07-18:53:15.709312 7f38a10006c0 Manual compaction at level-1 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end) +2024/04/24-19:19:42.882823 7fcc64a006c0 Recovering log #150 +2024/04/24-19:19:42.947075 7fcc64a006c0 Delete type=3 #148 +2024/04/24-19:19:42.947209 7fcc64a006c0 Delete type=0 #150 +2024/04/24-20:38:33.592157 7fcc5e4006c0 Level-0 table #155: started +2024/04/24-20:38:33.592206 7fcc5e4006c0 Level-0 table #155: 0 bytes OK +2024/04/24-20:38:33.598509 7fcc5e4006c0 Delete type=0 #153 +2024/04/24-20:38:33.605418 7fcc5e4006c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end) +2024/04/24-20:38:33.612914 7fcc5e4006c0 Manual compaction at level-1 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end) diff --git a/packs/competences/MANIFEST-000152 b/packs/competences/MANIFEST-000152 deleted file mode 100644 index 106c9d5dfc1c09dbfb82a7f30fb0f749adc0a6de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmXRqm+qO!z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMD`k-E3F|#B!w^-58 z)YHY?-OMXLDlf=6uq2X^kpT=~@|B*3RgtFI7P*co6_({5-i-VZ`N}@_Yg`PBOfwld X8JK4=vhe#dZ`%kGm<1A;0~7!NMzbUt diff --git a/packs/competences/MANIFEST-000156 b/packs/competences/MANIFEST-000156 new file mode 100644 index 0000000000000000000000000000000000000000..ad6384be45985e46055debd50b7a0afa2460f639 GIT binary patch literal 138 zcmXRqm+qO!z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMD`k-E3F|#B!w^-58 z)YHY?-OMXLDlf=6uq2X^kpT=~@|B*3RgtFI7P*co6_({5-i-VZ`Jl@kWn2u5Omi7I X8JOoWvhdfgo5ltbm6gT<21YGIwtyOC#efMn(oOfXP=yRv0*D8&w+m_=O~U=lC;Dhse)g^yMBm10&N+ aMotFiS&S^x8UF~%uLFt90*TB4i2wj)Vki3m diff --git a/packs/equipement/MANIFEST-000156 b/packs/equipement/MANIFEST-000156 new file mode 100644 index 0000000000000000000000000000000000000000..fd8e1275afdfaf9cb651514d8bab59783732681b GIT binary patch literal 141 zcmaDHA96K`fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ_4ji|dBx0<)ZAi4 z1E>6gT<21YGIwtyOC#efMn(oOfXP=yRv0*D8&w+m_=O~U=lC;Dhsfv2EcD@KU}T!h Z$jQJwkCA0MW82&4V<3@vAdv+i5db>WCn*2` literal 0 HcmV?d00001 diff --git a/packs/historiques/000154.log b/packs/historiques/000158.log similarity index 100% rename from packs/historiques/000154.log rename to packs/historiques/000158.log diff --git a/packs/historiques/CURRENT b/packs/historiques/CURRENT index cbc14b7..c16f179 100644 --- a/packs/historiques/CURRENT +++ b/packs/historiques/CURRENT @@ -1 +1 @@ -MANIFEST-000152 +MANIFEST-000156 diff --git a/packs/historiques/LOG b/packs/historiques/LOG index d3c2a4c..2bc16c3 100644 --- a/packs/historiques/LOG +++ b/packs/historiques/LOG @@ -1,8 +1,8 @@ -2024/04/24-19:19:43.080280 7fcc5fe006c0 Recovering log #150 -2024/04/24-19:19:43.137577 7fcc5fe006c0 Delete type=3 #148 -2024/04/24-19:19:43.137905 7fcc5fe006c0 Delete type=0 #150 -2024/04/24-20:38:33.612932 7fcc5e4006c0 Level-0 table #155: started -2024/04/24-20:38:33.613011 7fcc5e4006c0 Level-0 table #155: 0 bytes OK -2024/04/24-20:38:33.619236 7fcc5e4006c0 Delete type=0 #153 -2024/04/24-20:38:33.626625 7fcc5e4006c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end) -2024/04/24-20:38:33.632899 7fcc5e4006c0 Manual compaction at level-1 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end) +2024/05/01-23:27:22.707186 7f830ea006c0 Recovering log #154 +2024/05/01-23:27:22.759982 7f830ea006c0 Delete type=3 #152 +2024/05/01-23:27:22.760146 7f830ea006c0 Delete type=0 #154 +2024/05/02-09:11:36.220285 7f830e0006c0 Level-0 table #159: started +2024/05/02-09:11:36.220327 7f830e0006c0 Level-0 table #159: 0 bytes OK +2024/05/02-09:11:36.253856 7f830e0006c0 Delete type=0 #157 +2024/05/02-09:11:36.280901 7f830e0006c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end) +2024/05/02-09:11:36.280958 7f830e0006c0 Manual compaction at level-1 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end) diff --git a/packs/historiques/LOG.old b/packs/historiques/LOG.old index 113b6a5..d3c2a4c 100644 --- a/packs/historiques/LOG.old +++ b/packs/historiques/LOG.old @@ -1,8 +1,8 @@ -2024/04/07-18:44:43.827816 7f38a3e006c0 Recovering log #146 -2024/04/07-18:44:43.838730 7f38a3e006c0 Delete type=3 #144 -2024/04/07-18:44:43.838786 7f38a3e006c0 Delete type=0 #146 -2024/04/07-18:53:15.702497 7f38a10006c0 Level-0 table #151: started -2024/04/07-18:53:15.702540 7f38a10006c0 Level-0 table #151: 0 bytes OK -2024/04/07-18:53:15.708964 7f38a10006c0 Delete type=0 #149 -2024/04/07-18:53:15.709333 7f38a10006c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end) -2024/04/07-18:53:15.709410 7f38a10006c0 Manual compaction at level-1 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end) +2024/04/24-19:19:43.080280 7fcc5fe006c0 Recovering log #150 +2024/04/24-19:19:43.137577 7fcc5fe006c0 Delete type=3 #148 +2024/04/24-19:19:43.137905 7fcc5fe006c0 Delete type=0 #150 +2024/04/24-20:38:33.612932 7fcc5e4006c0 Level-0 table #155: started +2024/04/24-20:38:33.613011 7fcc5e4006c0 Level-0 table #155: 0 bytes OK +2024/04/24-20:38:33.619236 7fcc5e4006c0 Delete type=0 #153 +2024/04/24-20:38:33.626625 7fcc5e4006c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end) +2024/04/24-20:38:33.632899 7fcc5e4006c0 Manual compaction at level-1 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end) diff --git a/packs/historiques/MANIFEST-000152 b/packs/historiques/MANIFEST-000152 deleted file mode 100644 index 12f7b9d034f942e6a22b545f67203f91c654b3d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139 zcmYd_7ygjMz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdVU(CykcfaYHqQj zp=nyakGpxLu}^4(Usbj@BO?PCz~rk8Jxa36604luJxWW=ldBjFAo7x#hSgjQj7&2b YIT@H|F|rusZkW>s5|{-Nm;)350B9E^?f?J) diff --git a/packs/historiques/MANIFEST-000156 b/packs/historiques/MANIFEST-000156 new file mode 100644 index 0000000000000000000000000000000000000000..1c138a0d4a07bf501c98906d1e9b055fd3923c2c GIT binary patch literal 139 zcmYd_7ygjMz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdVU(CykcfaYHqQj zp=nyakGpxLu}^4(Usbj@BO?PCz~rk8Jxa36604luJxWW=ldBjFAo4{Dn;vp8Ffz?$ Y`pgoS$2eSd>_jU&PKNdT`pgoS$2eSd>_jU&PKNdTU}SRUWMFn-SnkJdBx0<)ZAi4 zBeUF~;u7x+XRrK-?2J-FMn(oOfXSD*1r{b(uyL*y&_*spOhFfz?# YnkJdBx0<)ZAi4 zBeUF~;u7x+XRrK-?2J-FMn(oOfXSD*1r{b(uyL*#=lca(84Ffz?$ YB8yKWjANMIgFU;$770K4lYWdHyG literal 0 HcmV?d00001 diff --git a/packs/protections/000154.log b/packs/protections/000158.log similarity index 100% rename from packs/protections/000154.log rename to packs/protections/000158.log diff --git a/packs/protections/CURRENT b/packs/protections/CURRENT index cbc14b7..c16f179 100644 --- a/packs/protections/CURRENT +++ b/packs/protections/CURRENT @@ -1 +1 @@ -MANIFEST-000152 +MANIFEST-000156 diff --git a/packs/protections/LOG b/packs/protections/LOG index 2b4ef7b..9962de2 100644 --- a/packs/protections/LOG +++ b/packs/protections/LOG @@ -1,8 +1,8 @@ -2024/04/24-19:19:43.378670 7fcc654006c0 Recovering log #150 -2024/04/24-19:19:43.554194 7fcc654006c0 Delete type=3 #148 -2024/04/24-19:19:43.554281 7fcc654006c0 Delete type=0 #150 -2024/04/24-20:38:33.626647 7fcc5e4006c0 Level-0 table #155: started -2024/04/24-20:38:33.626669 7fcc5e4006c0 Level-0 table #155: 0 bytes OK -2024/04/24-20:38:33.632751 7fcc5e4006c0 Delete type=0 #153 -2024/04/24-20:38:33.639816 7fcc5e4006c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end) -2024/04/24-20:38:33.647329 7fcc5e4006c0 Manual compaction at level-1 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end) +2024/05/01-23:27:22.833117 7f830ea006c0 Recovering log #154 +2024/05/01-23:27:22.891228 7f830ea006c0 Delete type=3 #152 +2024/05/01-23:27:22.891391 7f830ea006c0 Delete type=0 #154 +2024/05/02-09:11:36.311160 7f830e0006c0 Level-0 table #159: started +2024/05/02-09:11:36.311216 7f830e0006c0 Level-0 table #159: 0 bytes OK +2024/05/02-09:11:36.346904 7f830e0006c0 Delete type=0 #157 +2024/05/02-09:11:36.432927 7f830e0006c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end) +2024/05/02-09:11:36.433001 7f830e0006c0 Manual compaction at level-1 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end) diff --git a/packs/protections/LOG.old b/packs/protections/LOG.old index c19ef83..2b4ef7b 100644 --- a/packs/protections/LOG.old +++ b/packs/protections/LOG.old @@ -1,8 +1,8 @@ -2024/04/07-18:44:43.856327 7f38a3e006c0 Recovering log #146 -2024/04/07-18:44:43.867226 7f38a3e006c0 Delete type=3 #144 -2024/04/07-18:44:43.867361 7f38a3e006c0 Delete type=0 #146 -2024/04/07-18:53:15.723744 7f38a10006c0 Level-0 table #151: started -2024/04/07-18:53:15.723796 7f38a10006c0 Level-0 table #151: 0 bytes OK -2024/04/07-18:53:15.730185 7f38a10006c0 Delete type=0 #149 -2024/04/07-18:53:15.736963 7f38a10006c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end) -2024/04/07-18:53:15.736999 7f38a10006c0 Manual compaction at level-1 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end) +2024/04/24-19:19:43.378670 7fcc654006c0 Recovering log #150 +2024/04/24-19:19:43.554194 7fcc654006c0 Delete type=3 #148 +2024/04/24-19:19:43.554281 7fcc654006c0 Delete type=0 #150 +2024/04/24-20:38:33.626647 7fcc5e4006c0 Level-0 table #155: started +2024/04/24-20:38:33.626669 7fcc5e4006c0 Level-0 table #155: 0 bytes OK +2024/04/24-20:38:33.632751 7fcc5e4006c0 Delete type=0 #153 +2024/04/24-20:38:33.639816 7fcc5e4006c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end) +2024/04/24-20:38:33.647329 7fcc5e4006c0 Manual compaction at level-1 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end) diff --git a/packs/protections/MANIFEST-000152 b/packs/protections/MANIFEST-000152 deleted file mode 100644 index 369f58464267712d8b838e62f658f83b1c233d40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmWI2S*D)Iz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDx>{0RF|#B!w^-58 zEHfa{sM52_$so+QpdyKpkpT=~@|DF^*{Mavz9FtA1(sn|0gQYQc|Rkz8(a*GOfwld X8JK4=vhYSQE1 diff --git a/packs/protections/MANIFEST-000156 b/packs/protections/MANIFEST-000156 new file mode 100644 index 0000000000000000000000000000000000000000..63d4372199c3be86b3313373ff283a76723c0341 GIT binary patch literal 138 zcmWI2S*D)Iz{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDx>{0RF|#B!w^-58 zEHfa{sM52_$so+QpdyKpkpT=~@|DF^*{Mavz9FtA1(sn|0gQYQ`PT0(C0q=QOmi7I X8JOoWvhaBcO=kfK%mWE5015yA^eH2f literal 0 HcmV?d00001 diff --git a/packs/tables/000154.log b/packs/tables/000158.log similarity index 100% rename from packs/tables/000154.log rename to packs/tables/000158.log diff --git a/packs/tables/CURRENT b/packs/tables/CURRENT index cbc14b7..c16f179 100644 --- a/packs/tables/CURRENT +++ b/packs/tables/CURRENT @@ -1 +1 @@ -MANIFEST-000152 +MANIFEST-000156 diff --git a/packs/tables/LOG b/packs/tables/LOG index 6209df7..94a6a16 100644 --- a/packs/tables/LOG +++ b/packs/tables/LOG @@ -1,7 +1,7 @@ -2024/04/24-19:19:44.361715 7fcc5fe006c0 Recovering log #150 -2024/04/24-19:19:44.586287 7fcc5fe006c0 Delete type=3 #148 -2024/04/24-19:19:44.586391 7fcc5fe006c0 Delete type=0 #150 -2024/04/24-20:38:33.660752 7fcc5e4006c0 Level-0 table #155: started -2024/04/24-20:38:33.660779 7fcc5e4006c0 Level-0 table #155: 0 bytes OK -2024/04/24-20:38:33.667170 7fcc5e4006c0 Delete type=0 #153 -2024/04/24-20:38:33.674538 7fcc5e4006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/05/01-23:27:23.155659 7f830fe006c0 Recovering log #154 +2024/05/01-23:27:23.211858 7f830fe006c0 Delete type=3 #152 +2024/05/01-23:27:23.211931 7f830fe006c0 Delete type=0 #154 +2024/05/02-09:11:36.479300 7f830e0006c0 Level-0 table #159: started +2024/05/02-09:11:36.479347 7f830e0006c0 Level-0 table #159: 0 bytes OK +2024/05/02-09:11:36.500681 7f830e0006c0 Delete type=0 #157 +2024/05/02-09:11:36.573763 7f830e0006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/tables/LOG.old b/packs/tables/LOG.old index 866526a..6209df7 100644 --- a/packs/tables/LOG.old +++ b/packs/tables/LOG.old @@ -1,7 +1,7 @@ -2024/04/07-18:44:43.927559 7f38a2a006c0 Recovering log #146 -2024/04/07-18:44:43.937525 7f38a2a006c0 Delete type=3 #144 -2024/04/07-18:44:43.937610 7f38a2a006c0 Delete type=0 #146 -2024/04/07-18:53:15.737130 7f38a10006c0 Level-0 table #151: started -2024/04/07-18:53:15.737157 7f38a10006c0 Level-0 table #151: 0 bytes OK -2024/04/07-18:53:15.743304 7f38a10006c0 Delete type=0 #149 -2024/04/07-18:53:15.765257 7f38a10006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/04/24-19:19:44.361715 7fcc5fe006c0 Recovering log #150 +2024/04/24-19:19:44.586287 7fcc5fe006c0 Delete type=3 #148 +2024/04/24-19:19:44.586391 7fcc5fe006c0 Delete type=0 #150 +2024/04/24-20:38:33.660752 7fcc5e4006c0 Level-0 table #155: started +2024/04/24-20:38:33.660779 7fcc5e4006c0 Level-0 table #155: 0 bytes OK +2024/04/24-20:38:33.667170 7fcc5e4006c0 Delete type=0 #153 +2024/04/24-20:38:33.674538 7fcc5e4006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/tables/MANIFEST-000152 b/packs/tables/MANIFEST-000152 deleted file mode 100644 index 8b6871a603b66ca7275024a175c7d786eb395527..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 69 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAeo;J^|2r-QMy8pJoD9sf T7+Dy!`~OLT1ZIH*<^Tl%J>nC_ diff --git a/packs/tables/MANIFEST-000156 b/packs/tables/MANIFEST-000156 new file mode 100644 index 0000000000000000000000000000000000000000..ef652a8a57465288ef021bdcde1ce10cdab4a0e8 GIT binary patch literal 69 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAevyg&1wSqZMy9!poD9tK U7+Dyiv+nH!3CsftEC31s07SPGQ2+n{ literal 0 HcmV?d00001 diff --git a/packs/talents-cellule/000154.log b/packs/talents-cellule/000158.log similarity index 100% rename from packs/talents-cellule/000154.log rename to packs/talents-cellule/000158.log diff --git a/packs/talents-cellule/CURRENT b/packs/talents-cellule/CURRENT index cbc14b7..c16f179 100644 --- a/packs/talents-cellule/CURRENT +++ b/packs/talents-cellule/CURRENT @@ -1 +1 @@ -MANIFEST-000152 +MANIFEST-000156 diff --git a/packs/talents-cellule/LOG b/packs/talents-cellule/LOG index d2f3f95..95857ff 100644 --- a/packs/talents-cellule/LOG +++ b/packs/talents-cellule/LOG @@ -1,8 +1,8 @@ -2024/04/24-19:19:44.119776 7fcc654006c0 Recovering log #150 -2024/04/24-19:19:44.337580 7fcc654006c0 Delete type=3 #148 -2024/04/24-19:19:44.337645 7fcc654006c0 Delete type=0 #150 -2024/04/24-20:38:33.653632 7fcc5e4006c0 Level-0 table #155: started -2024/04/24-20:38:33.653654 7fcc5e4006c0 Level-0 table #155: 0 bytes OK -2024/04/24-20:38:33.660555 7fcc5e4006c0 Delete type=0 #153 -2024/04/24-20:38:33.667354 7fcc5e4006c0 Manual compaction at level-0 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end) -2024/04/24-20:38:33.674567 7fcc5e4006c0 Manual compaction at level-1 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end) +2024/05/01-23:27:23.095384 7f830ea006c0 Recovering log #154 +2024/05/01-23:27:23.149683 7f830ea006c0 Delete type=3 #152 +2024/05/01-23:27:23.149830 7f830ea006c0 Delete type=0 #154 +2024/05/02-09:11:36.433090 7f830e0006c0 Level-0 table #159: started +2024/05/02-09:11:36.433201 7f830e0006c0 Level-0 table #159: 0 bytes OK +2024/05/02-09:11:36.479084 7f830e0006c0 Delete type=0 #157 +2024/05/02-09:11:36.573733 7f830e0006c0 Manual compaction at level-0 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end) +2024/05/02-09:11:36.573816 7f830e0006c0 Manual compaction at level-1 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end) diff --git a/packs/talents-cellule/LOG.old b/packs/talents-cellule/LOG.old index 6d91591..d2f3f95 100644 --- a/packs/talents-cellule/LOG.old +++ b/packs/talents-cellule/LOG.old @@ -1,8 +1,8 @@ -2024/04/07-18:44:43.914538 7f38a3e006c0 Recovering log #146 -2024/04/07-18:44:43.925326 7f38a3e006c0 Delete type=3 #144 -2024/04/07-18:44:43.925381 7f38a3e006c0 Delete type=0 #146 -2024/04/07-18:53:15.743399 7f38a10006c0 Level-0 table #151: started -2024/04/07-18:53:15.743418 7f38a10006c0 Level-0 table #151: 0 bytes OK -2024/04/07-18:53:15.750623 7f38a10006c0 Delete type=0 #149 -2024/04/07-18:53:15.765268 7f38a10006c0 Manual compaction at level-0 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end) -2024/04/07-18:53:15.765292 7f38a10006c0 Manual compaction at level-1 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end) +2024/04/24-19:19:44.119776 7fcc654006c0 Recovering log #150 +2024/04/24-19:19:44.337580 7fcc654006c0 Delete type=3 #148 +2024/04/24-19:19:44.337645 7fcc654006c0 Delete type=0 #150 +2024/04/24-20:38:33.653632 7fcc5e4006c0 Level-0 table #155: started +2024/04/24-20:38:33.653654 7fcc5e4006c0 Level-0 table #155: 0 bytes OK +2024/04/24-20:38:33.660555 7fcc5e4006c0 Delete type=0 #153 +2024/04/24-20:38:33.667354 7fcc5e4006c0 Manual compaction at level-0 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end) +2024/04/24-20:38:33.674567 7fcc5e4006c0 Manual compaction at level-1 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end) diff --git a/packs/talents-cellule/MANIFEST-000152 b/packs/talents-cellule/MANIFEST-000152 deleted file mode 100644 index c0e6c02f5810c797f731d076311a1ed16091e7b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmbPp;_Qn=21Z7yoYb<^oRlOzr^=Gl^338?=ltA)#G=HK{33QH*2&KDikT&;xy6bG zSwZQ^mWh@=7MbQ*hN0Pvj0|7^ldlX4iA?nKu8eSsuq^k;NMaO*$QQHJ9_3WSYy! X$-q31kwv&X<%2j#U>-D literal 0 HcmV?d00001 diff --git a/packs/talents/000154.log b/packs/talents/000158.log similarity index 100% rename from packs/talents/000154.log rename to packs/talents/000158.log diff --git a/packs/talents/CURRENT b/packs/talents/CURRENT index cbc14b7..c16f179 100644 --- a/packs/talents/CURRENT +++ b/packs/talents/CURRENT @@ -1 +1 @@ -MANIFEST-000152 +MANIFEST-000156 diff --git a/packs/talents/LOG b/packs/talents/LOG index e701a29..1665045 100644 --- a/packs/talents/LOG +++ b/packs/talents/LOG @@ -1,8 +1,8 @@ -2024/04/24-19:19:43.897208 7fcc5fe006c0 Recovering log #150 -2024/04/24-19:19:44.108234 7fcc5fe006c0 Delete type=3 #148 -2024/04/24-19:19:44.108303 7fcc5fe006c0 Delete type=0 #150 -2024/04/24-20:38:33.647346 7fcc5e4006c0 Level-0 table #155: started -2024/04/24-20:38:33.647386 7fcc5e4006c0 Level-0 table #155: 0 bytes OK -2024/04/24-20:38:33.653476 7fcc5e4006c0 Delete type=0 #153 -2024/04/24-20:38:33.660725 7fcc5e4006c0 Manual compaction at level-0 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end) -2024/04/24-20:38:33.667392 7fcc5e4006c0 Manual compaction at level-1 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end) +2024/05/01-23:27:23.034782 7f830fe006c0 Recovering log #154 +2024/05/01-23:27:23.088133 7f830fe006c0 Delete type=3 #152 +2024/05/01-23:27:23.088245 7f830fe006c0 Delete type=0 #154 +2024/05/02-09:11:36.281168 7f830e0006c0 Level-0 table #159: started +2024/05/02-09:11:36.281215 7f830e0006c0 Level-0 table #159: 0 bytes OK +2024/05/02-09:11:36.310895 7f830e0006c0 Delete type=0 #157 +2024/05/02-09:11:36.432910 7f830e0006c0 Manual compaction at level-0 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end) +2024/05/02-09:11:36.432956 7f830e0006c0 Manual compaction at level-1 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end) diff --git a/packs/talents/LOG.old b/packs/talents/LOG.old index 2c4bc8e..e701a29 100644 --- a/packs/talents/LOG.old +++ b/packs/talents/LOG.old @@ -1,8 +1,8 @@ -2024/04/07-18:44:43.899194 7f38a2a006c0 Recovering log #146 -2024/04/07-18:44:43.910211 7f38a2a006c0 Delete type=3 #144 -2024/04/07-18:44:43.910272 7f38a2a006c0 Delete type=0 #146 -2024/04/07-18:53:15.730328 7f38a10006c0 Level-0 table #151: started -2024/04/07-18:53:15.730351 7f38a10006c0 Level-0 table #151: 0 bytes OK -2024/04/07-18:53:15.736844 7f38a10006c0 Delete type=0 #149 -2024/04/07-18:53:15.736987 7f38a10006c0 Manual compaction at level-0 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end) -2024/04/07-18:53:15.737010 7f38a10006c0 Manual compaction at level-1 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end) +2024/04/24-19:19:43.897208 7fcc5fe006c0 Recovering log #150 +2024/04/24-19:19:44.108234 7fcc5fe006c0 Delete type=3 #148 +2024/04/24-19:19:44.108303 7fcc5fe006c0 Delete type=0 #150 +2024/04/24-20:38:33.647346 7fcc5e4006c0 Level-0 table #155: started +2024/04/24-20:38:33.647386 7fcc5e4006c0 Level-0 table #155: 0 bytes OK +2024/04/24-20:38:33.653476 7fcc5e4006c0 Delete type=0 #153 +2024/04/24-20:38:33.660725 7fcc5e4006c0 Manual compaction at level-0 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end) +2024/04/24-20:38:33.667392 7fcc5e4006c0 Manual compaction at level-1 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end) diff --git a/packs/talents/MANIFEST-000152 b/packs/talents/MANIFEST-000152 deleted file mode 100644 index a96290cba250e2be8a183402d33d1173472c1801..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmd1xtW`*2U}TiaNi9pwNlDUksw_z@&n!-L&d)7KEJ`fNFJfn6J->-fUNN&IHMdyN zz&xqYAgwql&&<>~)55Tlk&yumVDeSoWjQV$PKh}|CZQ?ip%sh=A@Wx*ES${Ez{oU{ Zk&}UW79-0+#&7XunIMr_AdxvB5dg^cC!7EP diff --git a/packs/talents/MANIFEST-000156 b/packs/talents/MANIFEST-000156 new file mode 100644 index 0000000000000000000000000000000000000000..cacd73901101b2c7d32d19445a41914a0a4ff185 GIT binary patch literal 141 zcmd1xtW`*2U}TiaNi9pwNlDUksw_z@&n!-L&d)7KEJ`fNFJfn6J->-fUNN&IHMdyN zz&xqYAgwql&&<>~)55Tlk&yumVDeSoWjQV$PKh}|CZQ?ip%sh=A@VJLUpToL7@6iW ZaxyT_V`MqVm}6}@5hOAXB(eY`0sxqRCEox5 literal 0 HcmV?d00001 diff --git a/system.json b/system.json index 764c644..e3127d7 100644 --- a/system.json +++ b/system.json @@ -1,7 +1,7 @@ { "id": "fvtt-hawkmoon-cyd", "description": "Hawkmoon RPG for FoundryVTT (CYD system - French)", - "version": "11.1.7", + "version": "12.0.0", "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.1.7.zip", + "download": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/archive/fvtt-hawkmoon-cyd-12.0.0.zip", "languages": [ { "lang": "fr", @@ -245,7 +245,7 @@ "url": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd", "background": "systems/fvtt-hawkmoon-cyd/assets/ui/fond_hawkmoon.webp", "compatibility": { - "minimum": "10", - "verified": "11" + "minimum": "11", + "verified": "12" } } \ No newline at end of file diff --git a/templates/roll-dialog-generic.html b/templates/roll-dialog-generic.html index cefb8fa..7bc2bd8 100644 --- a/templates/roll-dialog-generic.html +++ b/templates/roll-dialog-generic.html @@ -263,17 +263,8 @@ {{else}}
Difficulté : - + {{selectOptions config.optionsDifficulte selected=difficulte nameAttr="key" labelAttr="label"}}
{{/if}}