diff --git a/modules/hawkmoon-actor-sheet.js b/modules/hawkmoon-actor-sheet.js index d51915b..04d95f8 100644 --- a/modules/hawkmoon-actor-sheet.js +++ b/modules/hawkmoon-actor-sheet.js @@ -146,6 +146,23 @@ export class HawkmoonActorSheet extends ActorSheet { let armeId = li.data("item-id") this.actor.rollArmeOffensif(armeId) }) + + html.find('.roll-assomer').click((event) => { + this.actor.rollAssomer() + }) + html.find('.roll-coup-bas').click((event) => { + this.actor.rollCoupBas() + }) + html.find('.roll-immobiliser').click((event) => { + this.actor.rollImmobiliser() + }) + html.find('.roll-repousser').click((event) => { + this.actor.rollRepousser() + }) + html.find('.roll-desengager').click((event) => { + this.actor.rollDesengager() + }) + html.find('.roll-arme-degats').click((event) => { const li = $(event.currentTarget).parents(".item") let armeId = li.data("item-id") diff --git a/modules/hawkmoon-actor.js b/modules/hawkmoon-actor.js index abed56b..81be0c5 100644 --- a/modules/hawkmoon-actor.js +++ b/modules/hawkmoon-actor.js @@ -74,8 +74,8 @@ export class HawkmoonActor extends Actor { arme.system.competence = 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 - arme.system.totalDefensif = combat.defenseTotal + arme.system.competence.system.niveau + arme.system.seuildefense + bonusDefense + 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 @@ -211,7 +211,7 @@ export class HawkmoonActor extends Actor { vitesseTotal: this.getVitesseBase() + this.system.combat.vitessebonus, defenseBase: this.getDefenseBase(), protection: this.getProtection(), - defenseTotal: this.getDefenseBase() + this.system.combat.defensebonus + this.getProtection() - this.getTotalAdversite() + defenseTotal: this.getDefenseBase() + this.system.combat.defensebonus + this.getProtection() - this.getTotalAdversite() + (this.system.combat.defensetotale ? 3 : 0) } return combat } @@ -388,6 +388,9 @@ export class HawkmoonActor extends Actor { /* -------------------------------------------- */ changeEtatCombativite(value) { + if ( value === "vaincu") { + value = 200 + } let sante = duplicate(this.system.sante) sante.etat += Number(value) sante.etat = Math.max(sante.etat, 0) @@ -567,6 +570,9 @@ export class HawkmoonActor extends Actor { rollData.talents = [] rollData.attrKey2 = "none" 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.isMonte = this.system.combat.monte if (attrKey) { rollData.attrKey = attrKey @@ -619,7 +625,54 @@ export class HawkmoonActor extends Actor { let rollDialog = await HawkmoonRollDialog.create(this, rollData) rollDialog.render(true) } - + /* -------------------------------------------- */ + async rollAssomer() { + let rollData = this.getCommonRollData("pui", undefined, "Filouterie") + rollData.assomer = true + rollData.conditionsCommunes = true + HawkmoonUtility.updateWithTarget(rollData) + let rollDialog = await HawkmoonRollDialog.create(this, rollData) + rollDialog.render(true) + } + /* -------------------------------------------- */ + async rollCoupBas() { + let rollData = this.getCommonRollData("pui", undefined, "Mêlée") + rollData.coupBas = true + rollData.conditionsCommunes = true + HawkmoonUtility.updateWithTarget(rollData) + let rollDialog = await HawkmoonRollDialog.create(this, rollData) + rollDialog.render(true) + } + /* -------------------------------------------- */ + async rollImmobiliser() { + let rollData = this.getCommonRollData("pui", undefined, "Mêlée") + rollData.immobiliser = true + rollData.conditionsCommunes = true + rollData.cibleconsciente = true + HawkmoonUtility.updateWithTarget(rollData) + let rollDialog = await HawkmoonRollDialog.create(this, rollData) + rollDialog.render(true) + } + /* -------------------------------------------- */ + async rollRepousser() { + let rollData = this.getCommonRollData("pui", undefined, "Mêlée") + rollData.repousser = true + rollData.conditionsCommunes = true + rollData.cibleconsciente = true + HawkmoonUtility.updateWithTarget(rollData) + let rollDialog = await HawkmoonRollDialog.create(this, rollData) + rollDialog.render(true) + } + /* -------------------------------------------- */ + async rollDesengager() { + let rollData = this.getCommonRollData("adr", undefined, "Mouvements") + rollData.desengager = true + rollData.conditionsCommunes = true + HawkmoonUtility.updateWithTarget(rollData) + let rollDialog = await HawkmoonRollDialog.create(this, rollData) + rollDialog.render(true) + } + /* -------------------------------------------- */ async rollArmeDegats(armeId, targetVigueur = undefined, rollDataInput = undefined) { let arme = this.items.get(armeId) @@ -641,19 +694,25 @@ export class HawkmoonActor extends Actor { if (rollDataInput?.attaqueCharge) { bonus = 5 } + if (rollDataInput?.chargeCavalerie) { + bonus = 6 + } roll = new Roll("2d10rr10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll({ async: false }) } else { if (rollDataInput?.attaqueCharge) { bonus = 3 } + if (rollDataInput?.chargeCavalerie) { + bonus = 4 + } roll = new Roll("1d10+" + arme.system.totalDegats + "+" + bonus + "+" + bonus2).roll({ async: false }) } await HawkmoonUtility.showDiceSoNice(roll, game.settings.get("core", "rollMode")); let nbEtatPerdus = 0 if (targetVigueur) { nbEtatPerdus = Math.floor(roll.total / targetVigueur) - } - console.log(roll) + } + //console.log(roll) let rollData = { arme: arme, finalResult: roll.total, diff --git a/modules/hawkmoon-roll-dialog.js b/modules/hawkmoon-roll-dialog.js index 1b6d4d9..8002aa9 100644 --- a/modules/hawkmoon-roll-dialog.js +++ b/modules/hawkmoon-roll-dialog.js @@ -93,6 +93,15 @@ export class HawkmoonRollDialog extends Dialog { html.find('#defenseur-au-sol').change((event) => { this.rollData.defenseurAuSol = event.currentTarget.checked }) + html.find('#ambidextre-1').change((event) => { + this.rollData.ambidextre1 = event.currentTarget.checked + }) + html.find('#ambidextre-2').change((event) => { + this.rollData.ambidextre2 = event.currentTarget.checked + }) + html.find('#attaque-monte').change((event) => { + this.rollData.attqueMonte = event.currentTarget.checked + }) html.find('#defenseur-aveugle').change((event) => { this.rollData.defenseurAveugle = event.currentTarget.checked }) @@ -108,6 +117,21 @@ export class HawkmoonRollDialog extends Dialog { html.find('#attaque-charge').change((event) => { this.rollData.attaqueCharge = event.currentTarget.checked }) + html.find('#charge-cavalerie').change((event) => { + this.rollData.chargeCavalerie = event.currentTarget.checked + }) + html.find('#attaquants-multiple').change((event) => { + this.rollData.attaquantsMultiples = event.currentTarget.checked + }) + html.find('#soutiens').change((event) => { + this.rollData.soutiens = Number(event.currentTarget.value) + }) + html.find('#feinte').change((event) => { + this.rollData.feinte = event.currentTarget.checked + }) + html.find('#contenir').change((event) => { + this.rollData.contenir = event.currentTarget.checked + }) html.find('#attaque-desarme').change((event) => { this.rollData.attaqueDesarme = event.currentTarget.checked }) diff --git a/modules/hawkmoon-utility.js b/modules/hawkmoon-utility.js index 3e49a93..0ec725f 100644 --- a/modules/hawkmoon-utility.js +++ b/modules/hawkmoon-utility.js @@ -140,7 +140,7 @@ export class HawkmoonUtility { let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget) let message = game.messages.get(messageId) let rollData = message.getFlag("world", "hawkmoon-roll") - let actor = this.getActorFromRollData(rollData) + let actor = HawkmoonUtility.getActorFromRollData(rollData) await actor.setPredilectionUsed(rollData.competence._id, predIdx) rollData.competence = duplicate(actor.getCompetence(rollData.competence._id)) HawkmoonUtility.rollHawkmoon(rollData) @@ -150,14 +150,14 @@ export class HawkmoonUtility { let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget) let message = game.messages.get(messageId) let rollData = message.getFlag("world", "hawkmoon-roll") - let actor = this.getActorFromRollData(rollData) + let actor = HawkmoonUtility.getActorFromRollData(rollData) actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur, rollData) }) html.on("click", '.roll-chat-degat-devastateur', async event => { let messageId = HawkmoonUtility.findChatMessageId(event.currentTarget) let message = game.messages.get(messageId) let rollData = message.getFlag("world", "hawkmoon-roll") - let actor = this.getActorFromRollData(rollData) + let actor = HawkmoonUtility.getActorFromRollData(rollData) rollData.applyCoupDevastateur = true actor.rollArmeDegats(rollData.arme._id, rollData.targetVigueur, rollData) }) @@ -411,6 +411,16 @@ export class HawkmoonUtility { if (rollData.bonusArmeNaturelle) { rollData.diceFormula += `+${rollData.bonusArmeNaturelle}` } + if (rollData.attaquantsMultiples) { + rollData.diceFormula += `+3` + } + if (rollData.hasAmbidextre) { + if ( rollData.attaqueAmbidextre1) { + rollData.diceFormula += `-3` + } else if ( rollData.attaqueAmbidextre2) { + rollData.diceFormula += `-5` + } + } if (rollData.defenseurAuSol) { rollData.diceFormula += `+3` } @@ -426,7 +436,10 @@ export class HawkmoonUtility { if (rollData.defenseurImmobilise) { rollData.diceFormula += `+5` } - + if (rollData.soutiens > 0) { // 1 soutien = +3, 2 soutiens = +4, 3 soutiens = +5 + rollData.diceFormula += `+${rollData.soutiens+2}` + } + if (rollData.arme?.system.isDistance) { rollData.difficulte = __distanceDifficulte[rollData.distanceTir] rollData.difficulte += __tireurDeplacement[rollData.tireurDeplacement] @@ -438,13 +451,16 @@ export class HawkmoonUtility { if (rollData.attaqueDesarme) { rollData.difficulte += 10 } - + // Ajout adversités rollData.diceFormula += `-${rollData.nbAdversites}` if (rollData.arme && rollData.arme.type == "arme") { rollData.diceFormula += `+${rollData.arme.system.bonusmaniementoff}` } + + // Gestion de la feinte éventuelle + rollData.nbCombativitePerdu = 1 let myRoll = new Roll(rollData.diceFormula).roll({ async: false }) await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode")) @@ -456,15 +472,26 @@ export class HawkmoonUtility { if (rollData.isInit) { actor.setFlag("world", "last-initiative", rollData.finalResult) } + if (rollData.feinte) { + actor.changeBonneAventure(-1) + if ( rollData.isHeroique) { + rollData.nbCombativitePerdu = "vaincu" + } else if ( rollData.isSuccess) { + rollData.nbCombativitePerdu = 2 + } + } this.createChatWithRollMode(rollData.alias, { content: await renderTemplate(`systems/fvtt-hawkmoon-cyd/templates/chat-generic-result.html`, rollData) }, rollData) - if (rollData.arme && rollData.isSuccess && rollData.defenderTokenId) { - this.applyCombativite(rollData, 1) + if ( (rollData.coupBas || rollData.arme) && rollData.isSuccess && rollData.defenderTokenId) { + this.applyCombativite(rollData, rollData.nbCombativitePerdu) + } + if (rollData.coupBas && rollData.isSuccess && rollData.defenderTokenId) { + let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor + defender.incDecAdversite("bleue", -2) } - } /* -------------------------------------------- */ @@ -601,7 +628,12 @@ export class HawkmoonUtility { cibleCouvert: "aucun", distanceTir: "porteemoyenne", attaqueCharge: false, - attaqueDesarme: false + attaqueDesarme: false, + attaqueAmbidextre1 : false, + attaqueAmbidextre2 : false, + chargeCavalerie : false, + contenir : false, + soutiens : 0 } return rollData } @@ -615,9 +647,17 @@ export class HawkmoonUtility { rollData.armeDefense = defender.getBestDefenseValue() rollData.targetVigueur = defender.getVigueur() rollData.protectionDefenseur = defender.getProtection() - if (rollData.armeDefense) { + if (rollData.immobiliser || rollData.repousser) { + let combatValues = defender.getCombatValues() + rollData.difficulte = combatValues.defenseTotal + (rollData.armeDefense && rollData.cibleconsciente ? 5 : 0) + } else if (rollData.coupBas) { + let combatValues = defender.getCombatValues() + rollData.difficulte = combatValues.defenseTotal + }else if ( rollData.assomer) { + rollData.difficulte = 3 + (defender.system.attributs.tre.value * 2) + } else if (rollData.armeDefense) { rollData.difficulte = rollData.armeDefense.system.totalDefensif - if ( !rollData.arme.system.armenaturelle && !rollData.arme.system.armefortune ){ + if ( !rollData.desengager && !rollData.arme.system.armenaturelle && !rollData.arme.system.armefortune ){ if (rollData.armeDefense.system.armenaturelle || rollData.armeDefense.system.armefortune) { rollData.bonusArmeNaturelle = 3 } @@ -639,7 +679,7 @@ export class HawkmoonUtility { let msg = game.messages.get(msgId) if (msg) { let rollData = msg.getFlag("world", "hawkmoon-roll") - let actor = this.getActorFromRollData(rollData) + let actor = HawkmoonUtility.getActorFromRollData(rollData) actor.changeBonneAventure(changed) rollData.isReroll = true rollData.textBonus = "Bonus de Points d'Aventure" @@ -658,7 +698,7 @@ export class HawkmoonUtility { let msg = game.messages.get(msgId) if (msg) { let rollData = msg.getFlag("world", "hawkmoon-roll") - let actor = this.getActorFromRollData(rollData) + let actor = HawkmoonUtility.getActorFromRollData(rollData) actor.changeEclat(changed) rollData.isReroll = true rollData.textBonus = "Bonus d'Eclat" @@ -677,13 +717,13 @@ export class HawkmoonUtility { let canApplyBA = function (li) { let message = game.messages.get(li.attr("data-message-id")) let rollData = message.getFlag("world", "hawkmoon-roll") - let actor = this.getActorFromRollData(rollData) + let actor = HawkmoonUtility.getActorFromRollData(rollData) return (!rollData.isReroll && actor.getBonneAventure() > 0) } let canApplyPE = function (li) { let message = game.messages.get(li.attr("data-message-id")) let rollData = message.getFlag("world", "hawkmoon-roll") - let actor = this.getActorFromRollData(rollData) + let actor = HawkmoonUtility.getActorFromRollData(rollData) return (!rollData.isReroll && actor.getEclat() > 0) } options.push( diff --git a/packs/aides-de-jeu/000114.log b/packs/aides-de-jeu/000138.log similarity index 100% rename from packs/aides-de-jeu/000114.log rename to packs/aides-de-jeu/000138.log diff --git a/packs/aides-de-jeu/CURRENT b/packs/aides-de-jeu/CURRENT index b59a6ba..0eb07d3 100644 --- a/packs/aides-de-jeu/CURRENT +++ b/packs/aides-de-jeu/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000136 diff --git a/packs/aides-de-jeu/LOG b/packs/aides-de-jeu/LOG index fb6559f..77205b2 100644 --- a/packs/aides-de-jeu/LOG +++ b/packs/aides-de-jeu/LOG @@ -1,8 +1,8 @@ -2024/02/24-17:02:14.754352 7f04234006c0 Recovering log #110 -2024/02/24-17:02:14.807801 7f04234006c0 Delete type=3 #108 -2024/02/24-17:02:14.807944 7f04234006c0 Delete type=0 #110 -2024/02/24-17:02:44.940487 7f0421a006c0 Level-0 table #115: started -2024/02/24-17:02:44.940520 7f0421a006c0 Level-0 table #115: 0 bytes OK -2024/02/24-17:02:44.990896 7f0421a006c0 Delete type=0 #113 -2024/02/24-17:02:44.991050 7f0421a006c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end) -2024/02/24-17:02:44.991066 7f0421a006c0 Manual compaction at level-1 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end) +2024/04/01-22:07:51.566443 7f2f096006c0 Recovering log #134 +2024/04/01-22:07:51.577334 7f2f096006c0 Delete type=3 #132 +2024/04/01-22:07:51.577410 7f2f096006c0 Delete type=0 #134 +2024/04/01-22:13:32.050850 7f2f03a006c0 Level-0 table #139: started +2024/04/01-22:13:32.050905 7f2f03a006c0 Level-0 table #139: 0 bytes OK +2024/04/01-22:13:32.057948 7f2f03a006c0 Delete type=0 #137 +2024/04/01-22:13:32.058093 7f2f03a006c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end) +2024/04/01-22:13:32.058108 7f2f03a006c0 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 ba024c7..d4a043c 100644 --- a/packs/aides-de-jeu/LOG.old +++ b/packs/aides-de-jeu/LOG.old @@ -1,8 +1,8 @@ -2024/02/24-15:27:21.161901 7f0422a006c0 Recovering log #106 -2024/02/24-15:27:21.172307 7f0422a006c0 Delete type=3 #104 -2024/02/24-15:27:21.172420 7f0422a006c0 Delete type=0 #106 -2024/02/24-15:54:11.160992 7f0421a006c0 Level-0 table #111: started -2024/02/24-15:54:11.161043 7f0421a006c0 Level-0 table #111: 0 bytes OK -2024/02/24-15:54:11.168984 7f0421a006c0 Delete type=0 #109 -2024/02/24-15:54:11.169375 7f0421a006c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end) -2024/02/24-15:54:11.169407 7f0421a006c0 Manual compaction at level-1 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end) +2024/04/01-20:54:39.296804 7f2f0aa006c0 Recovering log #130 +2024/04/01-20:54:39.306972 7f2f0aa006c0 Delete type=3 #128 +2024/04/01-20:54:39.307035 7f2f0aa006c0 Delete type=0 #130 +2024/04/01-22:07:29.430307 7f2f03a006c0 Level-0 table #135: started +2024/04/01-22:07:29.430369 7f2f03a006c0 Level-0 table #135: 0 bytes OK +2024/04/01-22:07:29.436789 7f2f03a006c0 Delete type=0 #133 +2024/04/01-22:07:29.450601 7f2f03a006c0 Manual compaction at level-0 from '!journal!MUbViCE2PkVxlzqe' @ 72057594037927935 : 1 .. '!journal.pages!gVybbv17TFY8o3Y4.fQidyqfF1TbsZKHM' @ 0 : 0; will stop at (end) +2024/04/01-22:07:29.450636 7f2f03a006c0 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-000112 b/packs/aides-de-jeu/MANIFEST-000136 similarity index 77% rename from packs/aides-de-jeu/MANIFEST-000112 rename to packs/aides-de-jeu/MANIFEST-000136 index 75889e6..64b6fc1 100644 Binary files a/packs/aides-de-jeu/MANIFEST-000112 and b/packs/aides-de-jeu/MANIFEST-000136 differ diff --git a/packs/armes/000114.log b/packs/armes/000138.log similarity index 100% rename from packs/armes/000114.log rename to packs/armes/000138.log diff --git a/packs/armes/CURRENT b/packs/armes/CURRENT index b59a6ba..0eb07d3 100644 --- a/packs/armes/CURRENT +++ b/packs/armes/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000136 diff --git a/packs/armes/LOG b/packs/armes/LOG index 15f5f7c..d3e54d9 100644 --- a/packs/armes/LOG +++ b/packs/armes/LOG @@ -1,8 +1,8 @@ -2024/02/24-17:02:14.261072 7f0422a006c0 Recovering log #110 -2024/02/24-17:02:14.336608 7f0422a006c0 Delete type=3 #108 -2024/02/24-17:02:14.336726 7f0422a006c0 Delete type=0 #110 -2024/02/24-17:02:44.653079 7f0421a006c0 Level-0 table #115: started -2024/02/24-17:02:44.653100 7f0421a006c0 Level-0 table #115: 0 bytes OK -2024/02/24-17:02:44.684887 7f0421a006c0 Delete type=0 #113 -2024/02/24-17:02:44.722405 7f0421a006c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end) -2024/02/24-17:02:44.722456 7f0421a006c0 Manual compaction at level-1 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end) +2024/04/01-22:07:51.476426 7f2f08c006c0 Recovering log #134 +2024/04/01-22:07:51.486878 7f2f08c006c0 Delete type=3 #132 +2024/04/01-22:07:51.486968 7f2f08c006c0 Delete type=0 #134 +2024/04/01-22:13:31.982119 7f2f03a006c0 Level-0 table #139: started +2024/04/01-22:13:31.982141 7f2f03a006c0 Level-0 table #139: 0 bytes OK +2024/04/01-22:13:31.988528 7f2f03a006c0 Delete type=0 #137 +2024/04/01-22:13:32.002072 7f2f03a006c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end) +2024/04/01-22:13:32.002126 7f2f03a006c0 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 95bef37..ae833b7 100644 --- a/packs/armes/LOG.old +++ b/packs/armes/LOG.old @@ -1,8 +1,8 @@ -2024/02/24-15:27:21.061930 7f0428e006c0 Recovering log #106 -2024/02/24-15:27:21.072272 7f0428e006c0 Delete type=3 #104 -2024/02/24-15:27:21.072358 7f0428e006c0 Delete type=0 #106 -2024/02/24-15:54:11.103417 7f0421a006c0 Level-0 table #111: started -2024/02/24-15:54:11.103455 7f0421a006c0 Level-0 table #111: 0 bytes OK -2024/02/24-15:54:11.109891 7f0421a006c0 Delete type=0 #109 -2024/02/24-15:54:11.118172 7f0421a006c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end) -2024/02/24-15:54:11.118244 7f0421a006c0 Manual compaction at level-1 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end) +2024/04/01-20:54:39.206727 7f2f096006c0 Recovering log #130 +2024/04/01-20:54:39.217337 7f2f096006c0 Delete type=3 #128 +2024/04/01-20:54:39.217418 7f2f096006c0 Delete type=0 #130 +2024/04/01-22:07:29.396472 7f2f03a006c0 Level-0 table #135: started +2024/04/01-22:07:29.396496 7f2f03a006c0 Level-0 table #135: 0 bytes OK +2024/04/01-22:07:29.402800 7f2f03a006c0 Delete type=0 #133 +2024/04/01-22:07:29.402967 7f2f03a006c0 Manual compaction at level-0 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end) +2024/04/01-22:07:29.402999 7f2f03a006c0 Manual compaction at level-1 from '!items!0fit7HelSjaFtXcW' @ 72057594037927935 : 1 .. '!items!wxrzP3NyiHiYnAMJ' @ 0 : 0; will stop at (end) diff --git a/packs/armes/MANIFEST-000112 b/packs/armes/MANIFEST-000112 deleted file mode 100644 index 25b52a9..0000000 Binary files a/packs/armes/MANIFEST-000112 and /dev/null differ diff --git a/packs/armes/MANIFEST-000136 b/packs/armes/MANIFEST-000136 new file mode 100644 index 0000000..16a5354 Binary files /dev/null and b/packs/armes/MANIFEST-000136 differ diff --git a/packs/competences-creatures/000114.log b/packs/competences-creatures/000138.log similarity index 100% rename from packs/competences-creatures/000114.log rename to packs/competences-creatures/000138.log diff --git a/packs/competences-creatures/CURRENT b/packs/competences-creatures/CURRENT index b59a6ba..0eb07d3 100644 --- a/packs/competences-creatures/CURRENT +++ b/packs/competences-creatures/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000136 diff --git a/packs/competences-creatures/LOG b/packs/competences-creatures/LOG index ebd501b..472204b 100644 --- a/packs/competences-creatures/LOG +++ b/packs/competences-creatures/LOG @@ -1,8 +1,8 @@ -2024/02/24-17:02:14.147016 7f0422a006c0 Recovering log #110 -2024/02/24-17:02:14.207871 7f0422a006c0 Delete type=3 #108 -2024/02/24-17:02:14.207942 7f0422a006c0 Delete type=0 #110 -2024/02/24-17:02:44.579150 7f0421a006c0 Level-0 table #115: started -2024/02/24-17:02:44.579252 7f0421a006c0 Level-0 table #115: 0 bytes OK -2024/02/24-17:02:44.616456 7f0421a006c0 Delete type=0 #113 -2024/02/24-17:02:44.722366 7f0421a006c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end) -2024/02/24-17:02:44.722432 7f0421a006c0 Manual compaction at level-1 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end) +2024/04/01-22:07:51.452809 7f2f08c006c0 Recovering log #134 +2024/04/01-22:07:51.463021 7f2f08c006c0 Delete type=3 #132 +2024/04/01-22:07:51.463077 7f2f08c006c0 Delete type=0 #134 +2024/04/01-22:13:31.975221 7f2f03a006c0 Level-0 table #139: started +2024/04/01-22:13:31.975257 7f2f03a006c0 Level-0 table #139: 0 bytes OK +2024/04/01-22:13:31.982008 7f2f03a006c0 Delete type=0 #137 +2024/04/01-22:13:32.002059 7f2f03a006c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end) +2024/04/01-22:13:32.002136 7f2f03a006c0 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 d2f8b54..87675fd 100644 --- a/packs/competences-creatures/LOG.old +++ b/packs/competences-creatures/LOG.old @@ -1,8 +1,8 @@ -2024/02/24-15:27:21.032928 7f0428e006c0 Recovering log #106 -2024/02/24-15:27:21.043854 7f0428e006c0 Delete type=3 #104 -2024/02/24-15:27:21.043981 7f0428e006c0 Delete type=0 #106 -2024/02/24-15:54:11.088997 7f0421a006c0 Level-0 table #111: started -2024/02/24-15:54:11.089081 7f0421a006c0 Level-0 table #111: 0 bytes OK -2024/02/24-15:54:11.096233 7f0421a006c0 Delete type=0 #109 -2024/02/24-15:54:11.118114 7f0421a006c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end) -2024/02/24-15:54:11.118212 7f0421a006c0 Manual compaction at level-1 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end) +2024/04/01-20:54:39.182267 7f2f096006c0 Recovering log #130 +2024/04/01-20:54:39.192171 7f2f096006c0 Delete type=3 #128 +2024/04/01-20:54:39.192286 7f2f096006c0 Delete type=0 #130 +2024/04/01-22:07:29.376886 7f2f03a006c0 Level-0 table #135: started +2024/04/01-22:07:29.376924 7f2f03a006c0 Level-0 table #135: 0 bytes OK +2024/04/01-22:07:29.382840 7f2f03a006c0 Delete type=0 #133 +2024/04/01-22:07:29.402928 7f2f03a006c0 Manual compaction at level-0 from '!items!0nhTxujlIUB63Aqt' @ 72057594037927935 : 1 .. '!items!tFU5yISK6spdNWco' @ 0 : 0; will stop at (end) +2024/04/01-22:07:29.402961 7f2f03a006c0 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-000112 b/packs/competences-creatures/MANIFEST-000112 deleted file mode 100644 index 6b59959..0000000 Binary files a/packs/competences-creatures/MANIFEST-000112 and /dev/null differ diff --git a/packs/competences-creatures/MANIFEST-000136 b/packs/competences-creatures/MANIFEST-000136 new file mode 100644 index 0000000..57766e5 Binary files /dev/null and b/packs/competences-creatures/MANIFEST-000136 differ diff --git a/packs/competences/000114.log b/packs/competences/000138.log similarity index 100% rename from packs/competences/000114.log rename to packs/competences/000138.log diff --git a/packs/competences/CURRENT b/packs/competences/CURRENT index b59a6ba..0eb07d3 100644 --- a/packs/competences/CURRENT +++ b/packs/competences/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000136 diff --git a/packs/competences/LOG b/packs/competences/LOG index ab2160f..261ab65 100644 --- a/packs/competences/LOG +++ b/packs/competences/LOG @@ -1,8 +1,8 @@ -2024/02/24-17:02:14.032746 7f0422a006c0 Recovering log #110 -2024/02/24-17:02:14.083633 7f0422a006c0 Delete type=3 #108 -2024/02/24-17:02:14.083731 7f0422a006c0 Delete type=0 #110 -2024/02/24-17:02:44.458715 7f0421a006c0 Level-0 table #115: started -2024/02/24-17:02:44.458743 7f0421a006c0 Level-0 table #115: 0 bytes OK -2024/02/24-17:02:44.496165 7f0421a006c0 Delete type=0 #113 -2024/02/24-17:02:44.578914 7f0421a006c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end) -2024/02/24-17:02:44.579004 7f0421a006c0 Manual compaction at level-1 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end) +2024/04/01-22:07:51.425994 7f2f08c006c0 Recovering log #134 +2024/04/01-22:07:51.437211 7f2f08c006c0 Delete type=3 #132 +2024/04/01-22:07:51.437281 7f2f08c006c0 Delete type=0 #134 +2024/04/01-22:13:31.947285 7f2f03a006c0 Level-0 table #139: started +2024/04/01-22:13:31.947371 7f2f03a006c0 Level-0 table #139: 0 bytes OK +2024/04/01-22:13:31.954193 7f2f03a006c0 Delete type=0 #137 +2024/04/01-22:13:31.965060 7f2f03a006c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end) +2024/04/01-22:13:31.975114 7f2f03a006c0 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 b10abe0..df05878 100644 --- a/packs/competences/LOG.old +++ b/packs/competences/LOG.old @@ -1,8 +1,8 @@ -2024/02/24-15:27:21.005371 7f0428e006c0 Recovering log #106 -2024/02/24-15:27:21.017229 7f0428e006c0 Delete type=3 #104 -2024/02/24-15:27:21.017431 7f0428e006c0 Delete type=0 #106 -2024/02/24-15:54:11.070055 7f0421a006c0 Level-0 table #111: started -2024/02/24-15:54:11.070105 7f0421a006c0 Level-0 table #111: 0 bytes OK -2024/02/24-15:54:11.076878 7f0421a006c0 Delete type=0 #109 -2024/02/24-15:54:11.088751 7f0421a006c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end) -2024/02/24-15:54:11.088816 7f0421a006c0 Manual compaction at level-1 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end) +2024/04/01-20:54:39.156310 7f2f096006c0 Recovering log #130 +2024/04/01-20:54:39.166480 7f2f096006c0 Delete type=3 #128 +2024/04/01-20:54:39.166647 7f2f096006c0 Delete type=0 #130 +2024/04/01-22:07:29.363532 7f2f03a006c0 Level-0 table #135: started +2024/04/01-22:07:29.363586 7f2f03a006c0 Level-0 table #135: 0 bytes OK +2024/04/01-22:07:29.370456 7f2f03a006c0 Delete type=0 #133 +2024/04/01-22:07:29.376809 7f2f03a006c0 Manual compaction at level-0 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end) +2024/04/01-22:07:29.376842 7f2f03a006c0 Manual compaction at level-1 from '!items!15IDGG6JoZnRCQtY' @ 72057594037927935 : 1 .. '!items!yI1zY5k8mAdx9wHK' @ 0 : 0; will stop at (end) diff --git a/packs/competences/MANIFEST-000112 b/packs/competences/MANIFEST-000112 deleted file mode 100644 index bc7c3cb..0000000 Binary files a/packs/competences/MANIFEST-000112 and /dev/null differ diff --git a/packs/competences/MANIFEST-000136 b/packs/competences/MANIFEST-000136 new file mode 100644 index 0000000..df2958f Binary files /dev/null and b/packs/competences/MANIFEST-000136 differ diff --git a/packs/equipement/000114.log b/packs/equipement/000138.log similarity index 100% rename from packs/equipement/000114.log rename to packs/equipement/000138.log diff --git a/packs/equipement/CURRENT b/packs/equipement/CURRENT index b59a6ba..0eb07d3 100644 --- a/packs/equipement/CURRENT +++ b/packs/equipement/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000136 diff --git a/packs/equipement/LOG b/packs/equipement/LOG index ddd9ca7..2a63be5 100644 --- a/packs/equipement/LOG +++ b/packs/equipement/LOG @@ -1,8 +1,8 @@ -2024/02/24-17:02:14.437580 7f0422a006c0 Recovering log #110 -2024/02/24-17:02:14.523339 7f0422a006c0 Delete type=3 #108 -2024/02/24-17:02:14.523459 7f0422a006c0 Delete type=0 #110 -2024/02/24-17:02:44.791691 7f0421a006c0 Level-0 table #115: started -2024/02/24-17:02:44.791718 7f0421a006c0 Level-0 table #115: 0 bytes OK -2024/02/24-17:02:44.828354 7f0421a006c0 Delete type=0 #113 -2024/02/24-17:02:44.865482 7f0421a006c0 Manual compaction at level-0 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end) -2024/02/24-17:02:44.865534 7f0421a006c0 Manual compaction at level-1 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end) +2024/04/01-22:07:51.500239 7f2f08c006c0 Recovering log #134 +2024/04/01-22:07:51.510328 7f2f08c006c0 Delete type=3 #132 +2024/04/01-22:07:51.510446 7f2f08c006c0 Delete type=0 #134 +2024/04/01-22:13:32.002229 7f2f03a006c0 Level-0 table #139: started +2024/04/01-22:13:32.002366 7f2f03a006c0 Level-0 table #139: 0 bytes OK +2024/04/01-22:13:32.009059 7f2f03a006c0 Delete type=0 #137 +2024/04/01-22:13:32.029514 7f2f03a006c0 Manual compaction at level-0 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end) +2024/04/01-22:13:32.029552 7f2f03a006c0 Manual compaction at level-1 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end) diff --git a/packs/equipement/LOG.old b/packs/equipement/LOG.old index 2dbe6c4..a61da31 100644 --- a/packs/equipement/LOG.old +++ b/packs/equipement/LOG.old @@ -1,8 +1,8 @@ -2024/02/24-15:27:21.088831 7f0428e006c0 Recovering log #106 -2024/02/24-15:27:21.099682 7f0428e006c0 Delete type=3 #104 -2024/02/24-15:27:21.099779 7f0428e006c0 Delete type=0 #106 -2024/02/24-15:54:11.125392 7f0421a006c0 Level-0 table #111: started -2024/02/24-15:54:11.125461 7f0421a006c0 Level-0 table #111: 0 bytes OK -2024/02/24-15:54:11.132402 7f0421a006c0 Delete type=0 #109 -2024/02/24-15:54:11.146985 7f0421a006c0 Manual compaction at level-0 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end) -2024/02/24-15:54:11.147070 7f0421a006c0 Manual compaction at level-1 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end) +2024/04/01-20:54:39.230551 7f2f096006c0 Recovering log #130 +2024/04/01-20:54:39.241470 7f2f096006c0 Delete type=3 #128 +2024/04/01-20:54:39.241521 7f2f096006c0 Delete type=0 #130 +2024/04/01-22:07:29.409907 7f2f03a006c0 Level-0 table #135: started +2024/04/01-22:07:29.409931 7f2f03a006c0 Level-0 table #135: 0 bytes OK +2024/04/01-22:07:29.416151 7f2f03a006c0 Delete type=0 #133 +2024/04/01-22:07:29.430115 7f2f03a006c0 Manual compaction at level-0 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end) +2024/04/01-22:07:29.430150 7f2f03a006c0 Manual compaction at level-1 from '!items!0BopmCu8vGK2923j' @ 72057594037927935 : 1 .. '!items!zYx0Ak2y1LNTcKlO' @ 0 : 0; will stop at (end) diff --git a/packs/equipement/MANIFEST-000112 b/packs/equipement/MANIFEST-000112 deleted file mode 100644 index 42df54c..0000000 Binary files a/packs/equipement/MANIFEST-000112 and /dev/null differ diff --git a/packs/equipement/MANIFEST-000136 b/packs/equipement/MANIFEST-000136 new file mode 100644 index 0000000..163333a Binary files /dev/null and b/packs/equipement/MANIFEST-000136 differ diff --git a/packs/historiques/000114.log b/packs/historiques/000138.log similarity index 100% rename from packs/historiques/000114.log rename to packs/historiques/000138.log diff --git a/packs/historiques/CURRENT b/packs/historiques/CURRENT index b59a6ba..0eb07d3 100644 --- a/packs/historiques/CURRENT +++ b/packs/historiques/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000136 diff --git a/packs/historiques/LOG b/packs/historiques/LOG index b557c36..0f5bca0 100644 --- a/packs/historiques/LOG +++ b/packs/historiques/LOG @@ -1,8 +1,8 @@ -2024/02/24-17:02:14.210347 7f04234006c0 Recovering log #110 -2024/02/24-17:02:14.257923 7f04234006c0 Delete type=3 #108 -2024/02/24-17:02:14.257978 7f04234006c0 Delete type=0 #110 -2024/02/24-17:02:44.616568 7f0421a006c0 Level-0 table #115: started -2024/02/24-17:02:44.616772 7f0421a006c0 Level-0 table #115: 0 bytes OK -2024/02/24-17:02:44.652984 7f0421a006c0 Delete type=0 #113 -2024/02/24-17:02:44.722386 7f0421a006c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end) -2024/02/24-17:02:44.722444 7f0421a006c0 Manual compaction at level-1 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end) +2024/04/01-22:07:51.464548 7f2f096006c0 Recovering log #134 +2024/04/01-22:07:51.474762 7f2f096006c0 Delete type=3 #132 +2024/04/01-22:07:51.474814 7f2f096006c0 Delete type=0 #134 +2024/04/01-22:13:31.994868 7f2f03a006c0 Level-0 table #139: started +2024/04/01-22:13:31.994897 7f2f03a006c0 Level-0 table #139: 0 bytes OK +2024/04/01-22:13:32.001931 7f2f03a006c0 Delete type=0 #137 +2024/04/01-22:13:32.002088 7f2f03a006c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end) +2024/04/01-22:13:32.002104 7f2f03a006c0 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 7dbf523..b819ad6 100644 --- a/packs/historiques/LOG.old +++ b/packs/historiques/LOG.old @@ -1,8 +1,8 @@ -2024/02/24-15:27:21.047067 7f0422a006c0 Recovering log #106 -2024/02/24-15:27:21.058242 7f0422a006c0 Delete type=3 #104 -2024/02/24-15:27:21.058369 7f0422a006c0 Delete type=0 #106 -2024/02/24-15:54:11.096381 7f0421a006c0 Level-0 table #111: started -2024/02/24-15:54:11.096419 7f0421a006c0 Level-0 table #111: 0 bytes OK -2024/02/24-15:54:11.103263 7f0421a006c0 Delete type=0 #109 -2024/02/24-15:54:11.118151 7f0421a006c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end) -2024/02/24-15:54:11.118228 7f0421a006c0 Manual compaction at level-1 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end) +2024/04/01-20:54:39.194244 7f2f0aa006c0 Recovering log #130 +2024/04/01-20:54:39.205006 7f2f0aa006c0 Delete type=3 #128 +2024/04/01-20:54:39.205058 7f2f0aa006c0 Delete type=0 #130 +2024/04/01-22:07:29.382979 7f2f03a006c0 Level-0 table #135: started +2024/04/01-22:07:29.383007 7f2f03a006c0 Level-0 table #135: 0 bytes OK +2024/04/01-22:07:29.390105 7f2f03a006c0 Delete type=0 #133 +2024/04/01-22:07:29.402938 7f2f03a006c0 Manual compaction at level-0 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end) +2024/04/01-22:07:29.402955 7f2f03a006c0 Manual compaction at level-1 from '!items!15foLG7y3LUXNzkK' @ 72057594037927935 : 1 .. '!items!z1HtkvazCGHut7cz' @ 0 : 0; will stop at (end) diff --git a/packs/historiques/MANIFEST-000112 b/packs/historiques/MANIFEST-000112 deleted file mode 100644 index c22aa10..0000000 Binary files a/packs/historiques/MANIFEST-000112 and /dev/null differ diff --git a/packs/historiques/MANIFEST-000136 b/packs/historiques/MANIFEST-000136 new file mode 100644 index 0000000..6e74131 Binary files /dev/null and b/packs/historiques/MANIFEST-000136 differ diff --git a/packs/mutations/000024.log b/packs/mutations/000048.log similarity index 100% rename from packs/mutations/000024.log rename to packs/mutations/000048.log diff --git a/packs/mutations/CURRENT b/packs/mutations/CURRENT index 5af92b2..a6d5883 100644 --- a/packs/mutations/CURRENT +++ b/packs/mutations/CURRENT @@ -1 +1 @@ -MANIFEST-000022 +MANIFEST-000046 diff --git a/packs/mutations/LOG b/packs/mutations/LOG index 14f4b68..fbe8d57 100644 --- a/packs/mutations/LOG +++ b/packs/mutations/LOG @@ -1,8 +1,8 @@ -2024/02/24-17:02:14.085660 7f04234006c0 Recovering log #20 -2024/02/24-17:02:14.143480 7f04234006c0 Delete type=3 #18 -2024/02/24-17:02:14.143544 7f04234006c0 Delete type=0 #20 -2024/02/24-17:02:44.549664 7f0421a006c0 Level-0 table #25: started -2024/02/24-17:02:44.549704 7f0421a006c0 Level-0 table #25: 0 bytes OK -2024/02/24-17:02:44.578703 7f0421a006c0 Delete type=0 #23 -2024/02/24-17:02:44.578982 7f0421a006c0 Manual compaction at level-0 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end) -2024/02/24-17:02:44.579068 7f0421a006c0 Manual compaction at level-1 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end) +2024/04/01-22:07:51.439395 7f2f096006c0 Recovering log #44 +2024/04/01-22:07:51.449639 7f2f096006c0 Delete type=3 #42 +2024/04/01-22:07:51.449809 7f2f096006c0 Delete type=0 #44 +2024/04/01-22:13:31.988644 7f2f03a006c0 Level-0 table #49: started +2024/04/01-22:13:31.988670 7f2f03a006c0 Level-0 table #49: 0 bytes OK +2024/04/01-22:13:31.994741 7f2f03a006c0 Delete type=0 #47 +2024/04/01-22:13:32.002081 7f2f03a006c0 Manual compaction at level-0 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end) +2024/04/01-22:13:32.002145 7f2f03a006c0 Manual compaction at level-1 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end) diff --git a/packs/mutations/LOG.old b/packs/mutations/LOG.old index 54e9041..87dd69c 100644 --- a/packs/mutations/LOG.old +++ b/packs/mutations/LOG.old @@ -1,7 +1,8 @@ -2024/02/24-15:27:21.020239 7f0422a006c0 Recovering log #16 -2024/02/24-15:27:21.030468 7f0422a006c0 Delete type=3 #14 -2024/02/24-15:27:21.030604 7f0422a006c0 Delete type=0 #16 -2024/02/24-15:54:11.077049 7f0421a006c0 Level-0 table #21: started -2024/02/24-15:54:11.082085 7f0421a006c0 Level-0 table #21: 56385 bytes OK -2024/02/24-15:54:11.088423 7f0421a006c0 Delete type=0 #19 -2024/02/24-15:54:11.088774 7f0421a006c0 Manual compaction at level-0 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end) +2024/04/01-20:54:39.168907 7f2f0aa006c0 Recovering log #40 +2024/04/01-20:54:39.180221 7f2f0aa006c0 Delete type=3 #38 +2024/04/01-20:54:39.180329 7f2f0aa006c0 Delete type=0 #40 +2024/04/01-22:07:29.370572 7f2f03a006c0 Level-0 table #45: started +2024/04/01-22:07:29.370596 7f2f03a006c0 Level-0 table #45: 0 bytes OK +2024/04/01-22:07:29.376673 7f2f03a006c0 Delete type=0 #43 +2024/04/01-22:07:29.376821 7f2f03a006c0 Manual compaction at level-0 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end) +2024/04/01-22:07:29.376834 7f2f03a006c0 Manual compaction at level-1 from '!folders!5d4Zn28TUcPxRyXd' @ 72057594037927935 : 1 .. '!items!zttESycGKltfwCzJ' @ 0 : 0; will stop at (end) diff --git a/packs/mutations/MANIFEST-000022 b/packs/mutations/MANIFEST-000022 deleted file mode 100644 index e92b6a9..0000000 Binary files a/packs/mutations/MANIFEST-000022 and /dev/null differ diff --git a/packs/mutations/MANIFEST-000046 b/packs/mutations/MANIFEST-000046 new file mode 100644 index 0000000..e01da1d Binary files /dev/null and b/packs/mutations/MANIFEST-000046 differ diff --git a/packs/profils/000114.log b/packs/profils/000138.log similarity index 100% rename from packs/profils/000114.log rename to packs/profils/000138.log diff --git a/packs/profils/CURRENT b/packs/profils/CURRENT index b59a6ba..0eb07d3 100644 --- a/packs/profils/CURRENT +++ b/packs/profils/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000136 diff --git a/packs/profils/LOG b/packs/profils/LOG index d509b5e..8070b60 100644 --- a/packs/profils/LOG +++ b/packs/profils/LOG @@ -1,8 +1,8 @@ -2024/02/24-17:02:14.526210 7f04234006c0 Recovering log #110 -2024/02/24-17:02:14.575335 7f04234006c0 Delete type=3 #108 -2024/02/24-17:02:14.575449 7f04234006c0 Delete type=0 #110 -2024/02/24-17:02:44.828537 7f0421a006c0 Level-0 table #115: started -2024/02/24-17:02:44.828579 7f0421a006c0 Level-0 table #115: 0 bytes OK -2024/02/24-17:02:44.865276 7f0421a006c0 Delete type=0 #113 -2024/02/24-17:02:44.865499 7f0421a006c0 Manual compaction at level-0 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end) -2024/02/24-17:02:44.865526 7f0421a006c0 Manual compaction at level-1 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end) +2024/04/01-22:07:51.513697 7f2f096006c0 Recovering log #134 +2024/04/01-22:07:51.524162 7f2f096006c0 Delete type=3 #132 +2024/04/01-22:07:51.524250 7f2f096006c0 Delete type=0 #134 +2024/04/01-22:13:32.009193 7f2f03a006c0 Level-0 table #139: started +2024/04/01-22:13:32.009221 7f2f03a006c0 Level-0 table #139: 0 bytes OK +2024/04/01-22:13:32.016206 7f2f03a006c0 Delete type=0 #137 +2024/04/01-22:13:32.029527 7f2f03a006c0 Manual compaction at level-0 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end) +2024/04/01-22:13:32.029566 7f2f03a006c0 Manual compaction at level-1 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end) diff --git a/packs/profils/LOG.old b/packs/profils/LOG.old index c0f19bb..10a9363 100644 --- a/packs/profils/LOG.old +++ b/packs/profils/LOG.old @@ -1,8 +1,8 @@ -2024/02/24-15:27:21.104005 7f0422a006c0 Recovering log #106 -2024/02/24-15:27:21.114826 7f0422a006c0 Delete type=3 #104 -2024/02/24-15:27:21.114958 7f0422a006c0 Delete type=0 #106 -2024/02/24-15:54:11.118395 7f0421a006c0 Level-0 table #111: started -2024/02/24-15:54:11.118462 7f0421a006c0 Level-0 table #111: 0 bytes OK -2024/02/24-15:54:11.125114 7f0421a006c0 Delete type=0 #109 -2024/02/24-15:54:11.146962 7f0421a006c0 Manual compaction at level-0 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end) -2024/02/24-15:54:11.147039 7f0421a006c0 Manual compaction at level-1 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end) +2024/04/01-20:54:39.244713 7f2f0aa006c0 Recovering log #130 +2024/04/01-20:54:39.256127 7f2f0aa006c0 Delete type=3 #128 +2024/04/01-20:54:39.256187 7f2f0aa006c0 Delete type=0 #130 +2024/04/01-22:07:29.403047 7f2f03a006c0 Level-0 table #135: started +2024/04/01-22:07:29.403129 7f2f03a006c0 Level-0 table #135: 0 bytes OK +2024/04/01-22:07:29.409782 7f2f03a006c0 Delete type=0 #133 +2024/04/01-22:07:29.430103 7f2f03a006c0 Manual compaction at level-0 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end) +2024/04/01-22:07:29.430143 7f2f03a006c0 Manual compaction at level-1 from '!items!26mRstKhCJoXkhu1' @ 72057594037927935 : 1 .. '!items!tFQqcxmkS3MT6ASE' @ 0 : 0; will stop at (end) diff --git a/packs/profils/MANIFEST-000112 b/packs/profils/MANIFEST-000112 deleted file mode 100644 index 9993f96..0000000 Binary files a/packs/profils/MANIFEST-000112 and /dev/null differ diff --git a/packs/profils/MANIFEST-000136 b/packs/profils/MANIFEST-000136 new file mode 100644 index 0000000..34fcbde Binary files /dev/null and b/packs/profils/MANIFEST-000136 differ diff --git a/packs/protections/000114.log b/packs/protections/000138.log similarity index 100% rename from packs/protections/000114.log rename to packs/protections/000138.log diff --git a/packs/protections/CURRENT b/packs/protections/CURRENT index b59a6ba..0eb07d3 100644 --- a/packs/protections/CURRENT +++ b/packs/protections/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000136 diff --git a/packs/protections/LOG b/packs/protections/LOG index d651b51..21fae01 100644 --- a/packs/protections/LOG +++ b/packs/protections/LOG @@ -1,8 +1,8 @@ -2024/02/24-17:02:14.339214 7f04234006c0 Recovering log #110 -2024/02/24-17:02:14.435163 7f04234006c0 Delete type=3 #108 -2024/02/24-17:02:14.435306 7f04234006c0 Delete type=0 #110 -2024/02/24-17:02:44.685074 7f0421a006c0 Level-0 table #115: started -2024/02/24-17:02:44.685104 7f0421a006c0 Level-0 table #115: 0 bytes OK -2024/02/24-17:02:44.722233 7f0421a006c0 Delete type=0 #113 -2024/02/24-17:02:44.722419 7f0421a006c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end) -2024/02/24-17:02:44.722468 7f0421a006c0 Manual compaction at level-1 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end) +2024/04/01-22:07:51.488998 7f2f096006c0 Recovering log #134 +2024/04/01-22:07:51.498770 7f2f096006c0 Delete type=3 #132 +2024/04/01-22:07:51.498840 7f2f096006c0 Delete type=0 #134 +2024/04/01-22:13:32.023304 7f2f03a006c0 Level-0 table #139: started +2024/04/01-22:13:32.023327 7f2f03a006c0 Level-0 table #139: 0 bytes OK +2024/04/01-22:13:32.029397 7f2f03a006c0 Delete type=0 #137 +2024/04/01-22:13:32.029559 7f2f03a006c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end) +2024/04/01-22:13:32.029582 7f2f03a006c0 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 6b87772..a70ccc5 100644 --- a/packs/protections/LOG.old +++ b/packs/protections/LOG.old @@ -1,8 +1,8 @@ -2024/02/24-15:27:21.075001 7f0422a006c0 Recovering log #106 -2024/02/24-15:27:21.085800 7f0422a006c0 Delete type=3 #104 -2024/02/24-15:27:21.085899 7f0422a006c0 Delete type=0 #106 -2024/02/24-15:54:11.110073 7f0421a006c0 Level-0 table #111: started -2024/02/24-15:54:11.110113 7f0421a006c0 Level-0 table #111: 0 bytes OK -2024/02/24-15:54:11.117605 7f0421a006c0 Delete type=0 #109 -2024/02/24-15:54:11.118195 7f0421a006c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end) -2024/02/24-15:54:11.118259 7f0421a006c0 Manual compaction at level-1 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end) +2024/04/01-20:54:39.219310 7f2f0aa006c0 Recovering log #130 +2024/04/01-20:54:39.229233 7f2f0aa006c0 Delete type=3 #128 +2024/04/01-20:54:39.229286 7f2f0aa006c0 Delete type=0 #130 +2024/04/01-22:07:29.390224 7f2f03a006c0 Level-0 table #135: started +2024/04/01-22:07:29.390248 7f2f03a006c0 Level-0 table #135: 0 bytes OK +2024/04/01-22:07:29.396354 7f2f03a006c0 Delete type=0 #133 +2024/04/01-22:07:29.402947 7f2f03a006c0 Manual compaction at level-0 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end) +2024/04/01-22:07:29.402979 7f2f03a006c0 Manual compaction at level-1 from '!items!16iPa2yIzB0V3pxb' @ 72057594037927935 : 1 .. '!items!yszkersMTE4p9VzP' @ 0 : 0; will stop at (end) diff --git a/packs/protections/MANIFEST-000112 b/packs/protections/MANIFEST-000112 deleted file mode 100644 index c81cb92..0000000 Binary files a/packs/protections/MANIFEST-000112 and /dev/null differ diff --git a/packs/protections/MANIFEST-000136 b/packs/protections/MANIFEST-000136 new file mode 100644 index 0000000..3f77c6f Binary files /dev/null and b/packs/protections/MANIFEST-000136 differ diff --git a/packs/tables/000114.log b/packs/tables/000138.log similarity index 100% rename from packs/tables/000114.log rename to packs/tables/000138.log diff --git a/packs/tables/CURRENT b/packs/tables/CURRENT index b59a6ba..0eb07d3 100644 --- a/packs/tables/CURRENT +++ b/packs/tables/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000136 diff --git a/packs/tables/LOG b/packs/tables/LOG index b88604d..bafbb96 100644 --- a/packs/tables/LOG +++ b/packs/tables/LOG @@ -1,7 +1,7 @@ -2024/02/24-17:02:14.698353 7f0422a006c0 Recovering log #110 -2024/02/24-17:02:14.751354 7f0422a006c0 Delete type=3 #108 -2024/02/24-17:02:14.751472 7f0422a006c0 Delete type=0 #110 -2024/02/24-17:02:44.865788 7f0421a006c0 Level-0 table #115: started -2024/02/24-17:02:44.865841 7f0421a006c0 Level-0 table #115: 0 bytes OK -2024/02/24-17:02:44.903145 7f0421a006c0 Delete type=0 #113 -2024/02/24-17:02:44.991021 7f0421a006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/04/01-22:07:51.553651 7f2f08c006c0 Recovering log #134 +2024/04/01-22:07:51.563632 7f2f08c006c0 Delete type=3 #132 +2024/04/01-22:07:51.563737 7f2f08c006c0 Delete type=0 #134 +2024/04/01-22:13:32.029646 7f2f03a006c0 Level-0 table #139: started +2024/04/01-22:13:32.029716 7f2f03a006c0 Level-0 table #139: 0 bytes OK +2024/04/01-22:13:32.037023 7f2f03a006c0 Delete type=0 #137 +2024/04/01-22:13:32.058060 7f2f03a006c0 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 80f3c37..5352749 100644 --- a/packs/tables/LOG.old +++ b/packs/tables/LOG.old @@ -1,7 +1,7 @@ -2024/02/24-15:27:21.147525 7f0428e006c0 Recovering log #106 -2024/02/24-15:27:21.158940 7f0428e006c0 Delete type=3 #104 -2024/02/24-15:27:21.159095 7f0428e006c0 Delete type=0 #106 -2024/02/24-15:54:11.147250 7f0421a006c0 Level-0 table #111: started -2024/02/24-15:54:11.147304 7f0421a006c0 Level-0 table #111: 0 bytes OK -2024/02/24-15:54:11.154258 7f0421a006c0 Delete type=0 #109 -2024/02/24-15:54:11.169343 7f0421a006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/04/01-20:54:39.285480 7f2f096006c0 Recovering log #130 +2024/04/01-20:54:39.295117 7f2f096006c0 Delete type=3 #128 +2024/04/01-20:54:39.295173 7f2f096006c0 Delete type=0 #130 +2024/04/01-22:07:29.436918 7f2f03a006c0 Level-0 table #135: started +2024/04/01-22:07:29.436940 7f2f03a006c0 Level-0 table #135: 0 bytes OK +2024/04/01-22:07:29.443678 7f2f03a006c0 Delete type=0 #133 +2024/04/01-22:07:29.450617 7f2f03a006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/tables/MANIFEST-000112 b/packs/tables/MANIFEST-000112 deleted file mode 100644 index 8d372eb..0000000 Binary files a/packs/tables/MANIFEST-000112 and /dev/null differ diff --git a/packs/tables/MANIFEST-000136 b/packs/tables/MANIFEST-000136 new file mode 100644 index 0000000..01ba2a6 Binary files /dev/null and b/packs/tables/MANIFEST-000136 differ diff --git a/packs/talents-cellule/000114.log b/packs/talents-cellule/000138.log similarity index 100% rename from packs/talents-cellule/000114.log rename to packs/talents-cellule/000138.log diff --git a/packs/talents-cellule/CURRENT b/packs/talents-cellule/CURRENT index b59a6ba..0eb07d3 100644 --- a/packs/talents-cellule/CURRENT +++ b/packs/talents-cellule/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000136 diff --git a/packs/talents-cellule/LOG b/packs/talents-cellule/LOG index f5c73da..4f81f4c 100644 --- a/packs/talents-cellule/LOG +++ b/packs/talents-cellule/LOG @@ -1,8 +1,8 @@ -2024/02/24-17:02:14.645196 7f04234006c0 Recovering log #110 -2024/02/24-17:02:14.695718 7f04234006c0 Delete type=3 #108 -2024/02/24-17:02:14.695825 7f04234006c0 Delete type=0 #110 -2024/02/24-17:02:44.722585 7f0421a006c0 Level-0 table #115: started -2024/02/24-17:02:44.722636 7f0421a006c0 Level-0 table #115: 0 bytes OK -2024/02/24-17:02:44.757179 7f0421a006c0 Delete type=0 #113 -2024/02/24-17:02:44.865438 7f0421a006c0 Manual compaction at level-0 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end) -2024/02/24-17:02:44.865505 7f0421a006c0 Manual compaction at level-1 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end) +2024/04/01-22:07:51.541663 7f2f096006c0 Recovering log #134 +2024/04/01-22:07:51.551894 7f2f096006c0 Delete type=3 #132 +2024/04/01-22:07:51.551956 7f2f096006c0 Delete type=0 #134 +2024/04/01-22:13:32.037141 7f2f03a006c0 Level-0 table #139: started +2024/04/01-22:13:32.037165 7f2f03a006c0 Level-0 table #139: 0 bytes OK +2024/04/01-22:13:32.043337 7f2f03a006c0 Delete type=0 #137 +2024/04/01-22:13:32.058073 7f2f03a006c0 Manual compaction at level-0 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end) +2024/04/01-22:13:32.058100 7f2f03a006c0 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 7864198..e13be19 100644 --- a/packs/talents-cellule/LOG.old +++ b/packs/talents-cellule/LOG.old @@ -1,8 +1,8 @@ -2024/02/24-15:27:21.133687 7f0422a006c0 Recovering log #106 -2024/02/24-15:27:21.144258 7f0422a006c0 Delete type=3 #104 -2024/02/24-15:27:21.144398 7f0422a006c0 Delete type=0 #106 -2024/02/24-15:54:11.139284 7f0421a006c0 Level-0 table #111: started -2024/02/24-15:54:11.139329 7f0421a006c0 Level-0 table #111: 0 bytes OK -2024/02/24-15:54:11.146766 7f0421a006c0 Delete type=0 #109 -2024/02/24-15:54:11.147022 7f0421a006c0 Manual compaction at level-0 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end) -2024/02/24-15:54:11.147086 7f0421a006c0 Manual compaction at level-1 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end) +2024/04/01-20:54:39.272484 7f2f0aa006c0 Recovering log #130 +2024/04/01-20:54:39.283495 7f2f0aa006c0 Delete type=3 #128 +2024/04/01-20:54:39.283642 7f2f0aa006c0 Delete type=0 #130 +2024/04/01-22:07:29.423844 7f2f03a006c0 Level-0 table #135: started +2024/04/01-22:07:29.423879 7f2f03a006c0 Level-0 table #135: 0 bytes OK +2024/04/01-22:07:29.429991 7f2f03a006c0 Delete type=0 #133 +2024/04/01-22:07:29.430136 7f2f03a006c0 Manual compaction at level-0 from '!items!0jRgc9a9L8i7j1Uk' @ 72057594037927935 : 1 .. '!items!yRTYaNKyXBX9wHhb' @ 0 : 0; will stop at (end) +2024/04/01-22:07:29.430157 7f2f03a006c0 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-000112 b/packs/talents-cellule/MANIFEST-000112 deleted file mode 100644 index 9091711..0000000 Binary files a/packs/talents-cellule/MANIFEST-000112 and /dev/null differ diff --git a/packs/talents-cellule/MANIFEST-000136 b/packs/talents-cellule/MANIFEST-000136 new file mode 100644 index 0000000..3001504 Binary files /dev/null and b/packs/talents-cellule/MANIFEST-000136 differ diff --git a/packs/talents/000114.log b/packs/talents/000138.log similarity index 100% rename from packs/talents/000114.log rename to packs/talents/000138.log diff --git a/packs/talents/CURRENT b/packs/talents/CURRENT index b59a6ba..0eb07d3 100644 --- a/packs/talents/CURRENT +++ b/packs/talents/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000136 diff --git a/packs/talents/LOG b/packs/talents/LOG index fdf2c78..4ac5b83 100644 --- a/packs/talents/LOG +++ b/packs/talents/LOG @@ -1,8 +1,8 @@ -2024/02/24-17:02:14.577964 7f0422a006c0 Recovering log #110 -2024/02/24-17:02:14.640152 7f0422a006c0 Delete type=3 #108 -2024/02/24-17:02:14.640271 7f0422a006c0 Delete type=0 #110 -2024/02/24-17:02:44.757322 7f0421a006c0 Level-0 table #115: started -2024/02/24-17:02:44.757355 7f0421a006c0 Level-0 table #115: 0 bytes OK -2024/02/24-17:02:44.791441 7f0421a006c0 Delete type=0 #113 -2024/02/24-17:02:44.865464 7f0421a006c0 Manual compaction at level-0 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end) -2024/02/24-17:02:44.940472 7f0421a006c0 Manual compaction at level-1 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end) +2024/04/01-22:07:51.527118 7f2f08c006c0 Recovering log #134 +2024/04/01-22:07:51.538380 7f2f08c006c0 Delete type=3 #132 +2024/04/01-22:07:51.538521 7f2f08c006c0 Delete type=0 #134 +2024/04/01-22:13:32.016392 7f2f03a006c0 Level-0 table #139: started +2024/04/01-22:13:32.016433 7f2f03a006c0 Level-0 table #139: 0 bytes OK +2024/04/01-22:13:32.023186 7f2f03a006c0 Delete type=0 #137 +2024/04/01-22:13:32.029544 7f2f03a006c0 Manual compaction at level-0 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end) +2024/04/01-22:13:32.029574 7f2f03a006c0 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 b9a0c18..e93f4ea 100644 --- a/packs/talents/LOG.old +++ b/packs/talents/LOG.old @@ -1,8 +1,8 @@ -2024/02/24-15:27:21.118243 7f0428e006c0 Recovering log #106 -2024/02/24-15:27:21.129173 7f0428e006c0 Delete type=3 #104 -2024/02/24-15:27:21.129296 7f0428e006c0 Delete type=0 #106 -2024/02/24-15:54:11.132596 7f0421a006c0 Level-0 table #111: started -2024/02/24-15:54:11.132647 7f0421a006c0 Level-0 table #111: 0 bytes OK -2024/02/24-15:54:11.139085 7f0421a006c0 Delete type=0 #109 -2024/02/24-15:54:11.147003 7f0421a006c0 Manual compaction at level-0 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end) -2024/02/24-15:54:11.147054 7f0421a006c0 Manual compaction at level-1 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end) +2024/04/01-20:54:39.258969 7f2f096006c0 Recovering log #130 +2024/04/01-20:54:39.269646 7f2f096006c0 Delete type=3 #128 +2024/04/01-20:54:39.269730 7f2f096006c0 Delete type=0 #130 +2024/04/01-22:07:29.416373 7f2f03a006c0 Level-0 table #135: started +2024/04/01-22:07:29.416405 7f2f03a006c0 Level-0 table #135: 0 bytes OK +2024/04/01-22:07:29.423666 7f2f03a006c0 Delete type=0 #133 +2024/04/01-22:07:29.430125 7f2f03a006c0 Manual compaction at level-0 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end) +2024/04/01-22:07:29.430164 7f2f03a006c0 Manual compaction at level-1 from '!items!07bq0fsbn653i81y' @ 72057594037927935 : 1 .. '!items!zKvlDHBalR4UdwUx' @ 0 : 0; will stop at (end) diff --git a/packs/talents/MANIFEST-000112 b/packs/talents/MANIFEST-000112 deleted file mode 100644 index 717e07c..0000000 Binary files a/packs/talents/MANIFEST-000112 and /dev/null differ diff --git a/packs/talents/MANIFEST-000136 b/packs/talents/MANIFEST-000136 new file mode 100644 index 0000000..f8f64c9 Binary files /dev/null and b/packs/talents/MANIFEST-000136 differ diff --git a/styles/simple.css b/styles/simple.css index 75bcce2..7b16d23 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -285,6 +285,10 @@ background-image: url("../assets/ui/hawkmoon_background_01.png"); } + .sheet.journal-entry .journal-sidebar { + color: #000; + } + .background-sheet-header { background-image: url("../assets/ui/hawkmoon_background_01.png"); background-blend-mode: soft-light; diff --git a/system.json b/system.json index 8d2438a..1f6c247 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.3", + "version": "11.1.6", "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.3.zip", + "download": "https://www.uberwald.me/gitea/public/fvtt-hawkmoon-cyd/archive/fvtt-hawkmoon-cyd-11.1.6.zip", "languages": [ { "lang": "fr", diff --git a/template.json b/template.json index be54cef..36f17cc 100644 --- a/template.json +++ b/template.json @@ -86,7 +86,9 @@ "vitessebonus": 0, "bonusdegats": 0, "attaquebonus": 0, - "defensebonus": 0 + "defensebonus": 0, + "defensetotale": false, + "monte": false } }, "npccore": { diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 57ad5d8..4b25ccc 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -296,6 +296,19 @@ diff --git a/templates/chat-generic-result.html b/templates/chat-generic-result.html index 8884a78..4cd061f 100644 --- a/templates/chat-generic-result.html +++ b/templates/chat-generic-result.html @@ -78,12 +78,64 @@ {{/if}} {{#if isSuccess}} + + {{#if immobiliser}} + {{#if isHeroique}} +
  • Votre cible est immobilisée, et vous pouvez faire une action complexe.
    • + {{else}} +
  • Votre cible est immobilisée.
    • + {{/if}} + {{/if}} + + {{#if desengager}} + {{#if isSuccess}} +
  • Vous vous désengagez de votre adversaire.
    • + {{else}} +
  • Vous ne parvenez pas à vous désengager de votre adversaire, il a un bonus de +3 pour vous attaquer
    • + {{/if}} + {{/if}} + + {{#if repousser}} + {{#if isHeroique}} +
  • Votre cible est repoussée de 3 mètres et tombe au sol.
    • + {{else}} +
  • Votre cible tombe au sol.
    • + {{/if}} + {{/if}} + + {{#if assomer}} + {{#if isHeroique}} +
  • Votre cible est assomée pour [[/r 1d10+10]] minutes.
    • + {{else}} +
  • Votre cible est assomée pour [[/r 1d10]] minutes.
    • + {{/if}} + {{/if}} + + {{#if coupBas}} +
  • La cible a reçu 2 adversités bleues et a perdu 1 niveau de combativité (auto).
    • + {{#if isHeroique}} +
  • Et votre cible perd sa prochaine action complexe.
    • + {{/if}} + {{/if}} + {{#if arme}} -
  • Votre adversaire a perdu 1 Etat de Combativité (auto)
    • - {{#if (not arme.system.onlevelonly)}} - - {{#if coupDevastateur}} - + {{#if contenir}} + {{#if isHeroique}} +
  • Aucun dégât, mais tous les adversaires dont le Seuil de Défense + 10 est atteint ou dépassé par le résultat de la manœuvre ne peuvent déclarer d’attaque contre le personnage lors de leur prochaine action complexe (à ce tour de jeu ou au suivant).
    • + {{else}} +
  • Aucun dégât, mais la cible de cette manœuvre ne peut pas déclarer d’attaque contre vous lors de sa prochaine action complexe (à ce tour de jeu ou au suivant).
    • + {{/if}} + {{else}} + {{#if (eq nbCombativitePerdu "vaincu")}} +
  • Votre adversaire est vaincu !
    • + {{else}} +
  • Votre adversaire a perdu {{nbCombativitePerdu}} Etat de Combativité (auto)
    • + {{#if (not arme.system.onlevelonly)}} + + {{#if coupDevastateur}} + + {{/if}} + {{/if}} {{/if}} {{/if}} {{/if}} diff --git a/templates/roll-dialog-generic.html b/templates/roll-dialog-generic.html index 2ce58f1..cefb8fa 100644 --- a/templates/roll-dialog-generic.html +++ b/templates/roll-dialog-generic.html @@ -74,6 +74,32 @@ {{/if}} + {{#if conditionsCommunes}} +
    + En surplomb, défenseur au sol (+3)? + +
    +
    + Défenseur aveuglé (+10)? + +
    +
    + Défenseur de dos (+5)? + +
    +
    + Défenseur immobilisé (+5)? + +
    + {{/if}} + + {{#if (or immobiliser repousser)}} +
    + Cible consciente? + +
    + {{/if}} + {{#if arme}} {{#if arme.system.isMelee}} {{#if bonusArmeNaturelle}} @@ -83,9 +109,38 @@ {{/if}}
    - En surplomb ou défenseur au sol (+3)? + En surplomb, défenseur au sol (+3)?
    +
    + Attaquants multiples (après le premier) (+3)? + +
    + {{#if hasAmbidextre}} +
    + Première attaque avec deux armes? + +
    +
    + Seconde attaque avec deux armes? + +
    + {{/if}} + {{#if hasFeinte}} +
    + Feinte (cout : 1 BA) ? + +
    + {{/if}} +
    + Soutiens + +
    Défenseur aveuglé (+10)? @@ -106,10 +161,20 @@ Charge ?
    +
    + Contenir? + +
    Désarmer (SD+10)?
    + {{#if isMonte}} +
    + Charge de cavalerie? + +
    + {{/if}} {{else}}
    Tireur en déplacement ?