diff --git a/modules/mournblade-actor-sheet.js b/modules/mournblade-actor-sheet.js index 5a0c9ad..a9d5418 100644 --- a/modules/mournblade-actor-sheet.js +++ b/modules/mournblade-actor-sheet.js @@ -56,6 +56,7 @@ export class MournbladeActorSheet extends ActorSheet { equipements: duplicate(this.actor.getEquipments()), monnaies: duplicate(this.actor.getMonnaies()), runeEffects: duplicate(this.actor.getRuneEffects()), + config: game.system.mournblade.config, description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}), options: this.options, owner: this.document.isOwner, diff --git a/modules/mournblade-actor.js b/modules/mournblade-actor.js index c1d94f9..0ac7a66 100644 --- a/modules/mournblade-actor.js +++ b/modules/mournblade-actor.js @@ -52,6 +52,7 @@ export class MournbladeActor extends Actor { arme = duplicate(arme) let combat = this.getCombatValues() if (arme.system.typearme == "contact" || arme.system.typearme == "contactjet") { + arme.system.isMelee = true 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 @@ -61,6 +62,7 @@ export class MournbladeActor extends Actor { } } if (arme.system.typearme == "jet" || arme.system.typearme == "tir") { + arme.system.isDistance = true arme.system.competence = 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 @@ -414,6 +416,7 @@ export class MournbladeActor extends Actor { rollData.canEclatDoubleD20 = this.canEclatDoubleD20() rollData.doubleD20 = false rollData.attributs = MournbladeUtility.getAttributs() + rollData.selectDifficulte = true if (attrKey) { rollData.attrKey = attrKey @@ -476,6 +479,15 @@ export class MournbladeActor extends Actor { } let rollData = this.getCommonRollData(arme.system.attrKey, arme.system.competence._id) rollData.arme = arme + rollData.typeAttaque = "assaut" + rollData.typeCouvert = "aucun" + rollData.visee = false + rollData.ciblecourt = false + rollData.cibleconsciente = false + // Do not display difficulte if defense weapon or distance + if (rollData.armeDefense || rollData.arme.system.isDistance) { + rollData.selectDifficulte = false + } console.log("ARME!", rollData) let rollDialog = await MournbladeRollDialog.create(this, rollData) rollDialog.render(true) @@ -490,6 +502,7 @@ export class MournbladeActor extends Actor { if (arme.type == "bouclier") { arme = this.prepareBouclier(arme) } + rollData.degatsFormula = arme.system.totalDegats let roll = new Roll(arme.system.totalDegats).roll({ async: false }) await MournbladeUtility.showDiceSoNice(roll, game.settings.get("core", "rollMode")); let rollData = { diff --git a/modules/mournblade-config.js b/modules/mournblade-config.js new file mode 100644 index 0000000..9234347 --- /dev/null +++ b/modules/mournblade-config.js @@ -0,0 +1,15 @@ +export const MOURNBLADE_CONFIG = { + + attaques:{ + assaut: "Assaut", + precise: "Attaque Précise", + feinte: "Feinte", + coupbas: "Coup Bas", + }, + couverts:{ + aucun: {name: "Aucun", value: 0}, + rondache: {name: "Rondache ou léger (-2)", value: -2}, + pavois: { name: "Pavois ou à moitié (-5)", value: -5}, + complet: {name:"Quasi complet (-10)", value: -10}, + } +}; \ No newline at end of file diff --git a/modules/mournblade-item-sheet.js b/modules/mournblade-item-sheet.js index 617d21b..53f553b 100644 --- a/modules/mournblade-item-sheet.js +++ b/modules/mournblade-item-sheet.js @@ -64,6 +64,7 @@ export class MournbladeItemSheet extends ItemSheet { options: this.options, owner: this.document.isOwner, description: await TextEditor.enrichHTML(this.object.system.description, {async: true}), + config: game.system.mournblade.config, mr: (this.object.type == 'specialisation'), isGM: game.user.isGM } diff --git a/modules/mournblade-main.js b/modules/mournblade-main.js index 59213a5..612cc25 100644 --- a/modules/mournblade-main.js +++ b/modules/mournblade-main.js @@ -15,6 +15,7 @@ import { MournbladeActorSheet } from "./mournblade-actor-sheet.js"; import { MournbladeUtility } from "./mournblade-utility.js"; import { MournbladeCombat } from "./mournblade-combat.js"; import { MournbladeItem } from "./mournblade-item.js"; +import { MOURNBLADE_CONFIG } from "./mournblade-config.js"; /* -------------------------------------------- */ /* Foundry VTT Initialization */ @@ -45,7 +46,9 @@ Hooks.once("init", async function () { CONFIG.Combat.documentClass = MournbladeCombat CONFIG.Actor.documentClass = MournbladeActor CONFIG.Item.documentClass = MournbladeItem - game.system.mournblade = { } + game.system.mournblade = { + config : MOURNBLADE_CONFIG, + } /* -------------------------------------------- */ // Register sheet application classes diff --git a/modules/mournblade-roll-dialog.js b/modules/mournblade-roll-dialog.js index 50790dc..d76804a 100644 --- a/modules/mournblade-roll-dialog.js +++ b/modules/mournblade-roll-dialog.js @@ -52,7 +52,6 @@ export class MournbladeRollDialog extends Dialog { activateListeners(html) { super.activateListeners(html); - var dialog = this; function onLoad() { } $(function () { onLoad(); }); @@ -60,6 +59,9 @@ export class MournbladeRollDialog extends Dialog { html.find('#modificateur').change(async (event) => { this.rollData.modificateur = Number(event.currentTarget.value) }) + html.find('#typeAttaque').change(async (event) => { + this.rollData.typeAttaque = String(event.currentTarget.value) + }) html.find('#difficulte').change(async (event) => { this.rollData.difficulte = Number(event.currentTarget.value) }) @@ -75,5 +77,18 @@ export class MournbladeRollDialog extends Dialog { html.find('#doubleD20').change(async (event) => { this.rollData.doubleD20 = event.currentTarget.checked }) + html.find('#visee').change(async (event) => { + this.rollData.visee = event.currentTarget.checked + }) + html.find('#cibleconsciente').change(async (event) => { + this.rollData.cibleconsciente = event.currentTarget.checked + }) + html.find('#ciblecourt').change(async (event) => { + this.rollData.ciblecourt = event.currentTarget.checked + }) + html.find('#typeCouvert').change(async (event) => { + this.rollData.typeCouvert = String(event.currentTarget.value) + }) + } } \ No newline at end of file diff --git a/modules/mournblade-utility.js b/modules/mournblade-utility.js index 49091af..326c941 100644 --- a/modules/mournblade-utility.js +++ b/modules/mournblade-utility.js @@ -119,12 +119,12 @@ export class MournbladeUtility { return this.optionsStatusList; } - /* -------------------------------------------- */ + /* -------------------------------------------- */ static getPredilection(comp, predIdx) { let pred = duplicate(comp.system.predilections) - return duplicate(pred[predIdx] || {name: "Error!"} ) + return duplicate(pred[predIdx] || { name: "Error!" }) } - + /* -------------------------------------------- */ static async chatListeners(html) { @@ -139,6 +139,13 @@ export class MournbladeUtility { rollData.predilectionUsed = MournbladeUtility.getPredilection(rollData.competence, predIdx) await MournbladeUtility.rollMournblade(rollData) }) + + html.on("click", '.arme-roll-degats', async event => { + let messageId = MournbladeUtility.findChatMessageId(event.currentTarget) + let message = game.messages.get(messageId) + let rollData = message.getFlag("world", "mournblade-roll") + MournbladeUtility.rollDegatsFromAttaque(rollData) + }) } /* -------------------------------------------- */ @@ -337,10 +344,30 @@ export class MournbladeUtility { rollData.diceFormula += `+${rollData.attr.value}*2+${rollData.modificateur}` } - if (rollData.arme && rollData.arme.type == "arme") { + if (rollData.arme?.type == "arme") { rollData.diceFormula += `+${rollData.arme.system.bonusmaniementoff}` } + // Specific modifier for distance + if (rollData.arme?.system?.isDistance) { + if (rollData.visee) { + rollData.diceFormula += "+5" + } + if (rollData.cibleconsciente) { + rollData.diceFormula += `-${rollData.defender.system.attributs.adr.value}` + } + if (rollData.ciblecourt) { + if (rollData.difficulte <= 15) { // Portée courte ou moins + rollData.diceFormula += `-5` + } else { + rollData.diceFormula += `-10` + } + } + if (rollData.typeCouvert != "aucun") { + rollData.diceFormula += `-${rollData.config.couverts[rollData.typeCouvert].value}` + } + } + if (rollData.rune) { rollData.runeduree = Math.ceil((rollData.runeame + 3) / 3) if (rollData.runemode == "inscrire") { @@ -374,6 +401,66 @@ export class MournbladeUtility { } + /* -------------------------------------------- */ + static async rollDegatsFromAttaque(rollData) { + let maximize = false + let degatsMessage = "Degats normaux" + + if (rollData.arme?.system?.isMelee) { + if (rollData.typeAttaque == "assaut") { + rollData.degatsFormula = rollData.arme.system.totalDegats + if (rollData.isHeroique) { // Deux fois les dés de dégats + rollData.degatsFormula += " + " + rollData.arme.system.totalDegats + degatsMessage = "Dégats doublés" + } + } + if (rollData.typeAttaque == "precise") { + let degatsMessage = "Degats normaux" + if (rollData.isHeroique) { // Degats max + maximize = true + degatsMessage = "Dégats maximaux, ignore l'armure du défenseur" + rollData.ignoreDefenseArmor = true + } + } + if (rollData.typeAttaque == "feinte") { + degatsMessage = "Pas de dégats, mais bonus pour prochaine attaque" + rollData.degatsFormula = false + rollData.nextBonus = 5 + if (rollData.isHeroique) { // Bonus pour prochaine action + rollData.nextBonus = 10 + rollData.nextBonusDegats = 10 + } + } + if (rollData.typeAttaque == "coupbas") { + degatsMessage = "Pas de dégats, mais malus pour prochaine action complexe du défenseur" + rollData.degatsFormula = false + rollData.nextMalus = -5 + if (rollData.isHeroique) { // Malus pour prochaine action + rollData.nextMalus = -15 + } + } + } else { // Armes à distance + rollData.degatsFormula = rollData.arme.system.totalDegats + if (rollData.isHeroique) { // Deux fois les dés de dégats + rollData.degatsFormula += " + " + rollData.arme.system.totalDegats + } + } + // Perform the roll, show the dice + rollData.finalResult = 0 + rollData.degatsMessage = degatsMessage + if (rollData.degatsFormula) { + let degatsRoll = new Roll(rollData.degatsFormula).roll({ async: false, maximize: maximize }) + await this.showDiceSoNice(degatsRoll, game.settings.get("core", "rollMode")) + rollData.degatsRoll = duplicate(degatsRoll) + rollData.finalResult = degatsRoll.total + } + + this.createChatWithRollMode(rollData.alias, { + content: await renderTemplate(`systems/fvtt-mournblade/templates/chat-degats-result.html`, rollData) + }, rollData) + + } + /* -------------------------------------------- */ static async bonusRollMournblade(rollData) { rollData.bonusFormula = rollData.addedBonus @@ -482,6 +569,7 @@ export class MournbladeUtility { pointAmeOptions: this.getPointAmeOptions(), difficulte: 0, modificateur: 0, + config: game.system.mournblade.config, } MournbladeUtility.updateWithTarget(rollData) return rollData @@ -493,6 +581,7 @@ export class MournbladeUtility { if (target) { rollData.defenderTokenId = target.id let defender = game.canvas.tokens.get(rollData.defenderTokenId).actor + rollData.defender = defender.toObject() // Simpler rollData.armeDefense = defender.getBestDefenseValue() if (rollData.armeDefense) { rollData.difficulte = rollData.armeDefense.system.totalDefensif @@ -655,11 +744,11 @@ export class MournbladeUtility { /* -------------------------------------------- */ static async confirmDelete(actorSheet, li) { let itemId = li.data("item-id"); - let msgTxt = "

Are you sure to remove this Item ?"; + let msgTxt = "

Voulez vous supprimer cet item ?"; let buttons = { delete: { icon: '', - label: "Yes, remove it", + label: "Oui !", callback: () => { actorSheet.actor.deleteEmbeddedDocuments("Item", [itemId]); li.slideUp(200, () => actorSheet.render(false)); @@ -667,12 +756,12 @@ export class MournbladeUtility { }, cancel: { icon: '', - label: "Cancel" + label: "Non !" } } msgTxt += "

"; let d = new Dialog({ - title: "Confirm removal", + title: "Confirmer la suppression", content: msgTxt, buttons: buttons, default: "cancel" diff --git a/packs/armes/000040.log b/packs/armes/000048.log similarity index 100% rename from packs/armes/000040.log rename to packs/armes/000048.log diff --git a/packs/armes/CURRENT b/packs/armes/CURRENT index 59611b0..a6d5883 100644 --- a/packs/armes/CURRENT +++ b/packs/armes/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000046 diff --git a/packs/armes/LOG b/packs/armes/LOG index 02e8325..a13213d 100644 --- a/packs/armes/LOG +++ b/packs/armes/LOG @@ -1,8 +1,8 @@ -2023/12/21-19:17:33.593727 7f3322ffd6c0 Recovering log #36 -2023/12/21-19:17:33.639350 7f3322ffd6c0 Delete type=3 #34 -2023/12/21-19:17:33.639464 7f3322ffd6c0 Delete type=0 #36 -2023/12/21-19:20:44.881496 7f33223ff6c0 Level-0 table #41: started -2023/12/21-19:20:44.881541 7f33223ff6c0 Level-0 table #41: 0 bytes OK -2023/12/21-19:20:44.888812 7f33223ff6c0 Delete type=0 #39 -2023/12/21-19:20:44.900167 7f33223ff6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/12/21-19:20:44.900223 7f33223ff6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/22-07:52:34.496801 7f3322ffd6c0 Recovering log #44 +2023/12/22-07:52:34.507416 7f3322ffd6c0 Delete type=3 #42 +2023/12/22-07:52:34.507504 7f3322ffd6c0 Delete type=0 #44 +2023/12/22-09:30:01.987558 7f33223ff6c0 Level-0 table #49: started +2023/12/22-09:30:01.987624 7f33223ff6c0 Level-0 table #49: 0 bytes OK +2023/12/22-09:30:01.997520 7f33223ff6c0 Delete type=0 #47 +2023/12/22-09:30:02.010634 7f33223ff6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/22-09:30:02.017412 7f33223ff6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) diff --git a/packs/armes/LOG.old b/packs/armes/LOG.old index 1a29936..264cce0 100644 --- a/packs/armes/LOG.old +++ b/packs/armes/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-15:38:38.681898 7f35b8bfa6c0 Recovering log #32 -2023/12/21-15:38:38.691893 7f35b8bfa6c0 Delete type=3 #30 -2023/12/21-15:38:38.692031 7f35b8bfa6c0 Delete type=0 #32 -2023/12/21-15:39:48.799860 7f33223ff6c0 Level-0 table #37: started -2023/12/21-15:39:48.799891 7f33223ff6c0 Level-0 table #37: 0 bytes OK -2023/12/21-15:39:48.806560 7f33223ff6c0 Delete type=0 #35 -2023/12/21-15:39:48.820290 7f33223ff6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/12/21-15:39:48.828125 7f33223ff6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/21-20:53:10.652760 7f3322ffd6c0 Recovering log #40 +2023/12/21-20:53:10.664177 7f3322ffd6c0 Delete type=3 #38 +2023/12/21-20:53:10.664308 7f3322ffd6c0 Delete type=0 #40 +2023/12/21-20:54:12.924325 7f33223ff6c0 Level-0 table #45: started +2023/12/21-20:54:12.924370 7f33223ff6c0 Level-0 table #45: 0 bytes OK +2023/12/21-20:54:12.931190 7f33223ff6c0 Delete type=0 #43 +2023/12/21-20:54:12.938479 7f33223ff6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/21-20:54:12.945078 7f33223ff6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) diff --git a/packs/armes/MANIFEST-000038 b/packs/armes/MANIFEST-000038 deleted file mode 100644 index 139c3fe..0000000 Binary files a/packs/armes/MANIFEST-000038 and /dev/null differ diff --git a/packs/armes/MANIFEST-000046 b/packs/armes/MANIFEST-000046 new file mode 100644 index 0000000..64a9bcb Binary files /dev/null and b/packs/armes/MANIFEST-000046 differ diff --git a/packs/dons/000040.log b/packs/dons/000048.log similarity index 100% rename from packs/dons/000040.log rename to packs/dons/000048.log diff --git a/packs/dons/CURRENT b/packs/dons/CURRENT index 59611b0..a6d5883 100644 --- a/packs/dons/CURRENT +++ b/packs/dons/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000046 diff --git a/packs/dons/LOG b/packs/dons/LOG index cb2ce1c..f303e8a 100644 --- a/packs/dons/LOG +++ b/packs/dons/LOG @@ -1,8 +1,8 @@ -2023/12/21-19:17:33.734981 7f3323fff6c0 Recovering log #36 -2023/12/21-19:17:33.773456 7f3323fff6c0 Delete type=3 #34 -2023/12/21-19:17:33.773550 7f3323fff6c0 Delete type=0 #36 -2023/12/21-19:20:44.922857 7f33223ff6c0 Level-0 table #41: started -2023/12/21-19:20:44.922912 7f33223ff6c0 Level-0 table #41: 0 bytes OK -2023/12/21-19:20:44.929747 7f33223ff6c0 Delete type=0 #39 -2023/12/21-19:20:44.930040 7f33223ff6c0 Manual compaction at level-0 from '!items!5dGXNiL3WN4cAk7X' @ 72057594037927935 : 1 .. '!items!zzz9JrtWjELdoAfK' @ 0 : 0; will stop at (end) -2023/12/21-19:20:44.930127 7f33223ff6c0 Manual compaction at level-1 from '!items!5dGXNiL3WN4cAk7X' @ 72057594037927935 : 1 .. '!items!zzz9JrtWjELdoAfK' @ 0 : 0; will stop at (end) +2023/12/22-07:52:34.533537 7f33237fe6c0 Recovering log #44 +2023/12/22-07:52:34.544730 7f33237fe6c0 Delete type=3 #42 +2023/12/22-07:52:34.544954 7f33237fe6c0 Delete type=0 #44 +2023/12/22-09:30:02.010655 7f33223ff6c0 Level-0 table #49: started +2023/12/22-09:30:02.010677 7f33223ff6c0 Level-0 table #49: 0 bytes OK +2023/12/22-09:30:02.017303 7f33223ff6c0 Delete type=0 #47 +2023/12/22-09:30:02.017454 7f33223ff6c0 Manual compaction at level-0 from '!items!5dGXNiL3WN4cAk7X' @ 72057594037927935 : 1 .. '!items!zzz9JrtWjELdoAfK' @ 0 : 0; will stop at (end) +2023/12/22-09:30:02.017502 7f33223ff6c0 Manual compaction at level-1 from '!items!5dGXNiL3WN4cAk7X' @ 72057594037927935 : 1 .. '!items!zzz9JrtWjELdoAfK' @ 0 : 0; will stop at (end) diff --git a/packs/dons/LOG.old b/packs/dons/LOG.old index b41a1cd..1feff11 100644 --- a/packs/dons/LOG.old +++ b/packs/dons/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-15:38:38.721918 7f3323fff6c0 Recovering log #32 -2023/12/21-15:38:38.732673 7f3323fff6c0 Delete type=3 #30 -2023/12/21-15:38:38.732730 7f3323fff6c0 Delete type=0 #32 -2023/12/21-15:39:48.820322 7f33223ff6c0 Level-0 table #37: started -2023/12/21-15:39:48.820379 7f33223ff6c0 Level-0 table #37: 0 bytes OK -2023/12/21-15:39:48.827848 7f33223ff6c0 Delete type=0 #35 -2023/12/21-15:39:48.828148 7f33223ff6c0 Manual compaction at level-0 from '!items!5dGXNiL3WN4cAk7X' @ 72057594037927935 : 1 .. '!items!zzz9JrtWjELdoAfK' @ 0 : 0; will stop at (end) -2023/12/21-15:39:48.828211 7f33223ff6c0 Manual compaction at level-1 from '!items!5dGXNiL3WN4cAk7X' @ 72057594037927935 : 1 .. '!items!zzz9JrtWjELdoAfK' @ 0 : 0; will stop at (end) +2023/12/21-20:53:10.696297 7f3323fff6c0 Recovering log #40 +2023/12/21-20:53:10.707682 7f3323fff6c0 Delete type=3 #38 +2023/12/21-20:53:10.707772 7f3323fff6c0 Delete type=0 #40 +2023/12/21-20:54:12.945355 7f33223ff6c0 Level-0 table #45: started +2023/12/21-20:54:12.945427 7f33223ff6c0 Level-0 table #45: 0 bytes OK +2023/12/21-20:54:12.952599 7f33223ff6c0 Delete type=0 #43 +2023/12/21-20:54:12.973349 7f33223ff6c0 Manual compaction at level-0 from '!items!5dGXNiL3WN4cAk7X' @ 72057594037927935 : 1 .. '!items!zzz9JrtWjELdoAfK' @ 0 : 0; will stop at (end) +2023/12/21-20:54:12.973423 7f33223ff6c0 Manual compaction at level-1 from '!items!5dGXNiL3WN4cAk7X' @ 72057594037927935 : 1 .. '!items!zzz9JrtWjELdoAfK' @ 0 : 0; will stop at (end) diff --git a/packs/dons/MANIFEST-000038 b/packs/dons/MANIFEST-000038 deleted file mode 100644 index 7592ca2..0000000 Binary files a/packs/dons/MANIFEST-000038 and /dev/null differ diff --git a/packs/dons/MANIFEST-000046 b/packs/dons/MANIFEST-000046 new file mode 100644 index 0000000..ca8d9c1 Binary files /dev/null and b/packs/dons/MANIFEST-000046 differ diff --git a/packs/equipement/000040.log b/packs/equipement/000048.log similarity index 100% rename from packs/equipement/000040.log rename to packs/equipement/000048.log diff --git a/packs/equipement/CURRENT b/packs/equipement/CURRENT index 59611b0..a6d5883 100644 --- a/packs/equipement/CURRENT +++ b/packs/equipement/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000046 diff --git a/packs/equipement/LOG b/packs/equipement/LOG index 2a98123..b78fd2f 100644 --- a/packs/equipement/LOG +++ b/packs/equipement/LOG @@ -1,8 +1,8 @@ -2023/12/21-19:17:33.696684 7f33237fe6c0 Recovering log #36 -2023/12/21-19:17:33.731835 7f33237fe6c0 Delete type=3 #34 -2023/12/21-19:17:33.731930 7f33237fe6c0 Delete type=0 #36 -2023/12/21-19:20:44.900432 7f33223ff6c0 Level-0 table #41: started -2023/12/21-19:20:44.900494 7f33223ff6c0 Level-0 table #41: 0 bytes OK -2023/12/21-19:20:44.907220 7f33223ff6c0 Delete type=0 #39 -2023/12/21-19:20:44.929964 7f33223ff6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) -2023/12/21-19:20:44.930062 7f33223ff6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/12/22-07:52:34.522086 7f35b8bfa6c0 Recovering log #44 +2023/12/22-07:52:34.531643 7f35b8bfa6c0 Delete type=3 #42 +2023/12/22-07:52:34.531726 7f35b8bfa6c0 Delete type=0 #44 +2023/12/22-09:30:02.004438 7f33223ff6c0 Level-0 table #49: started +2023/12/22-09:30:02.004459 7f33223ff6c0 Level-0 table #49: 0 bytes OK +2023/12/22-09:30:02.010548 7f33223ff6c0 Delete type=0 #47 +2023/12/22-09:30:02.017441 7f33223ff6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/12/22-09:30:02.017488 7f33223ff6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) diff --git a/packs/equipement/LOG.old b/packs/equipement/LOG.old index 226ce6e..de6163e 100644 --- a/packs/equipement/LOG.old +++ b/packs/equipement/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-15:38:38.708703 7f33237fe6c0 Recovering log #32 -2023/12/21-15:38:38.718410 7f33237fe6c0 Delete type=3 #30 -2023/12/21-15:38:38.718471 7f33237fe6c0 Delete type=0 #32 -2023/12/21-15:39:48.806833 7f33223ff6c0 Level-0 table #37: started -2023/12/21-15:39:48.806886 7f33223ff6c0 Level-0 table #37: 0 bytes OK -2023/12/21-15:39:48.813500 7f33223ff6c0 Delete type=0 #35 -2023/12/21-15:39:48.828075 7f33223ff6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) -2023/12/21-15:39:48.828188 7f33223ff6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/12/21-20:53:10.682453 7f35b8bfa6c0 Recovering log #40 +2023/12/21-20:53:10.693155 7f35b8bfa6c0 Delete type=3 #38 +2023/12/21-20:53:10.693241 7f35b8bfa6c0 Delete type=0 #40 +2023/12/21-20:54:12.938497 7f33223ff6c0 Level-0 table #45: started +2023/12/21-20:54:12.938538 7f33223ff6c0 Level-0 table #45: 0 bytes OK +2023/12/21-20:54:12.944856 7f33223ff6c0 Delete type=0 #43 +2023/12/21-20:54:12.945098 7f33223ff6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/12/21-20:54:12.945131 7f33223ff6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) diff --git a/packs/equipement/MANIFEST-000038 b/packs/equipement/MANIFEST-000038 deleted file mode 100644 index bc60246..0000000 Binary files a/packs/equipement/MANIFEST-000038 and /dev/null differ diff --git a/packs/equipement/MANIFEST-000046 b/packs/equipement/MANIFEST-000046 new file mode 100644 index 0000000..ed2268e Binary files /dev/null and b/packs/equipement/MANIFEST-000046 differ diff --git a/packs/heritages/000040.log b/packs/heritages/000048.log similarity index 100% rename from packs/heritages/000040.log rename to packs/heritages/000048.log diff --git a/packs/heritages/CURRENT b/packs/heritages/CURRENT index 59611b0..a6d5883 100644 --- a/packs/heritages/CURRENT +++ b/packs/heritages/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000046 diff --git a/packs/heritages/LOG b/packs/heritages/LOG index 053315a..2693e3a 100644 --- a/packs/heritages/LOG +++ b/packs/heritages/LOG @@ -1,8 +1,8 @@ -2023/12/21-19:17:33.834030 7f35b8bfa6c0 Recovering log #36 -2023/12/21-19:17:33.890233 7f35b8bfa6c0 Delete type=3 #34 -2023/12/21-19:17:33.890765 7f35b8bfa6c0 Delete type=0 #36 -2023/12/21-19:20:44.938047 7f33223ff6c0 Level-0 table #41: started -2023/12/21-19:20:44.938083 7f33223ff6c0 Level-0 table #41: 0 bytes OK -2023/12/21-19:20:44.944658 7f33223ff6c0 Delete type=0 #39 -2023/12/21-19:20:44.959089 7f33223ff6c0 Manual compaction at level-0 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) -2023/12/21-19:20:44.959161 7f33223ff6c0 Manual compaction at level-1 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) +2023/12/22-07:52:34.559119 7f3323fff6c0 Recovering log #44 +2023/12/22-07:52:34.569372 7f3323fff6c0 Delete type=3 #42 +2023/12/22-07:52:34.569480 7f3323fff6c0 Delete type=0 #44 +2023/12/22-09:30:02.024156 7f33223ff6c0 Level-0 table #49: started +2023/12/22-09:30:02.024195 7f33223ff6c0 Level-0 table #49: 0 bytes OK +2023/12/22-09:30:02.030253 7f33223ff6c0 Delete type=0 #47 +2023/12/22-09:30:02.044251 7f33223ff6c0 Manual compaction at level-0 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) +2023/12/22-09:30:02.044330 7f33223ff6c0 Manual compaction at level-1 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) diff --git a/packs/heritages/LOG.old b/packs/heritages/LOG.old index 02e59cf..eeec930 100644 --- a/packs/heritages/LOG.old +++ b/packs/heritages/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-15:38:38.748077 7f3322ffd6c0 Recovering log #32 -2023/12/21-15:38:38.758754 7f3322ffd6c0 Delete type=3 #30 -2023/12/21-15:38:38.758819 7f3322ffd6c0 Delete type=0 #32 -2023/12/21-15:39:48.828342 7f33223ff6c0 Level-0 table #37: started -2023/12/21-15:39:48.828403 7f33223ff6c0 Level-0 table #37: 0 bytes OK -2023/12/21-15:39:48.834842 7f33223ff6c0 Delete type=0 #35 -2023/12/21-15:39:48.855589 7f33223ff6c0 Manual compaction at level-0 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) -2023/12/21-15:39:48.855668 7f33223ff6c0 Manual compaction at level-1 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) +2023/12/21-20:53:10.723977 7f33237fe6c0 Recovering log #40 +2023/12/21-20:53:10.735175 7f33237fe6c0 Delete type=3 #38 +2023/12/21-20:53:10.735332 7f33237fe6c0 Delete type=0 #40 +2023/12/21-20:54:12.952794 7f33223ff6c0 Level-0 table #45: started +2023/12/21-20:54:12.952845 7f33223ff6c0 Level-0 table #45: 0 bytes OK +2023/12/21-20:54:12.959372 7f33223ff6c0 Delete type=0 #43 +2023/12/21-20:54:12.973367 7f33223ff6c0 Manual compaction at level-0 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) +2023/12/21-20:54:12.973435 7f33223ff6c0 Manual compaction at level-1 from '!items!2GaJZsqr2c2mcDRv' @ 72057594037927935 : 1 .. '!items!ui4JGsGwHNlSXVK3' @ 0 : 0; will stop at (end) diff --git a/packs/heritages/MANIFEST-000038 b/packs/heritages/MANIFEST-000046 similarity index 73% rename from packs/heritages/MANIFEST-000038 rename to packs/heritages/MANIFEST-000046 index b9c66d2..e94b1ae 100644 Binary files a/packs/heritages/MANIFEST-000038 and b/packs/heritages/MANIFEST-000046 differ diff --git a/packs/metiers/000040.log b/packs/metiers/000048.log similarity index 100% rename from packs/metiers/000040.log rename to packs/metiers/000048.log diff --git a/packs/metiers/CURRENT b/packs/metiers/CURRENT index 59611b0..a6d5883 100644 --- a/packs/metiers/CURRENT +++ b/packs/metiers/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000046 diff --git a/packs/metiers/LOG b/packs/metiers/LOG index 5eeba02..1b2135f 100644 --- a/packs/metiers/LOG +++ b/packs/metiers/LOG @@ -1,8 +1,8 @@ -2023/12/21-19:17:33.894585 7f33237fe6c0 Recovering log #36 -2023/12/21-19:17:33.931836 7f33237fe6c0 Delete type=3 #34 -2023/12/21-19:17:33.931972 7f33237fe6c0 Delete type=0 #36 -2023/12/21-19:20:44.930300 7f33223ff6c0 Level-0 table #41: started -2023/12/21-19:20:44.930393 7f33223ff6c0 Level-0 table #41: 0 bytes OK -2023/12/21-19:20:44.937916 7f33223ff6c0 Delete type=0 #39 -2023/12/21-19:20:44.959070 7f33223ff6c0 Manual compaction at level-0 from '!items!09s33sFuju8zjPqI' @ 72057594037927935 : 1 .. '!items!xlyFCQClBZ1N3O1B' @ 0 : 0; will stop at (end) -2023/12/21-19:20:44.959134 7f33223ff6c0 Manual compaction at level-1 from '!items!09s33sFuju8zjPqI' @ 72057594037927935 : 1 .. '!items!xlyFCQClBZ1N3O1B' @ 0 : 0; will stop at (end) +2023/12/22-07:52:34.571285 7f35b8bfa6c0 Recovering log #44 +2023/12/22-07:52:34.581749 7f35b8bfa6c0 Delete type=3 #42 +2023/12/22-07:52:34.581843 7f35b8bfa6c0 Delete type=0 #44 +2023/12/22-09:30:02.030435 7f33223ff6c0 Level-0 table #49: started +2023/12/22-09:30:02.030488 7f33223ff6c0 Level-0 table #49: 0 bytes OK +2023/12/22-09:30:02.037748 7f33223ff6c0 Delete type=0 #47 +2023/12/22-09:30:02.044268 7f33223ff6c0 Manual compaction at level-0 from '!items!09s33sFuju8zjPqI' @ 72057594037927935 : 1 .. '!items!xlyFCQClBZ1N3O1B' @ 0 : 0; will stop at (end) +2023/12/22-09:30:02.044310 7f33223ff6c0 Manual compaction at level-1 from '!items!09s33sFuju8zjPqI' @ 72057594037927935 : 1 .. '!items!xlyFCQClBZ1N3O1B' @ 0 : 0; will stop at (end) diff --git a/packs/metiers/LOG.old b/packs/metiers/LOG.old index a431d77..1748482 100644 --- a/packs/metiers/LOG.old +++ b/packs/metiers/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-15:38:38.762194 7f33237fe6c0 Recovering log #32 -2023/12/21-15:38:38.772223 7f33237fe6c0 Delete type=3 #30 -2023/12/21-15:38:38.772283 7f33237fe6c0 Delete type=0 #32 -2023/12/21-15:39:48.848998 7f33223ff6c0 Level-0 table #37: started -2023/12/21-15:39:48.849024 7f33223ff6c0 Level-0 table #37: 0 bytes OK -2023/12/21-15:39:48.855462 7f33223ff6c0 Delete type=0 #35 -2023/12/21-15:39:48.855625 7f33223ff6c0 Manual compaction at level-0 from '!items!09s33sFuju8zjPqI' @ 72057594037927935 : 1 .. '!items!xlyFCQClBZ1N3O1B' @ 0 : 0; will stop at (end) -2023/12/21-15:39:48.855650 7f33223ff6c0 Manual compaction at level-1 from '!items!09s33sFuju8zjPqI' @ 72057594037927935 : 1 .. '!items!xlyFCQClBZ1N3O1B' @ 0 : 0; will stop at (end) +2023/12/21-20:53:10.738345 7f35b8bfa6c0 Recovering log #40 +2023/12/21-20:53:10.750665 7f35b8bfa6c0 Delete type=3 #38 +2023/12/21-20:53:10.750760 7f35b8bfa6c0 Delete type=0 #40 +2023/12/21-20:54:12.988395 7f33223ff6c0 Level-0 table #45: started +2023/12/21-20:54:12.988470 7f33223ff6c0 Level-0 table #45: 0 bytes OK +2023/12/21-20:54:12.995150 7f33223ff6c0 Delete type=0 #43 +2023/12/21-20:54:13.002487 7f33223ff6c0 Manual compaction at level-0 from '!items!09s33sFuju8zjPqI' @ 72057594037927935 : 1 .. '!items!xlyFCQClBZ1N3O1B' @ 0 : 0; will stop at (end) +2023/12/21-20:54:13.002561 7f33223ff6c0 Manual compaction at level-1 from '!items!09s33sFuju8zjPqI' @ 72057594037927935 : 1 .. '!items!xlyFCQClBZ1N3O1B' @ 0 : 0; will stop at (end) diff --git a/packs/metiers/MANIFEST-000038 b/packs/metiers/MANIFEST-000038 deleted file mode 100644 index 9289f45..0000000 Binary files a/packs/metiers/MANIFEST-000038 and /dev/null differ diff --git a/packs/metiers/MANIFEST-000046 b/packs/metiers/MANIFEST-000046 new file mode 100644 index 0000000..b176408 Binary files /dev/null and b/packs/metiers/MANIFEST-000046 differ diff --git a/packs/origines/000040.log b/packs/origines/000048.log similarity index 100% rename from packs/origines/000040.log rename to packs/origines/000048.log diff --git a/packs/origines/CURRENT b/packs/origines/CURRENT index 59611b0..a6d5883 100644 --- a/packs/origines/CURRENT +++ b/packs/origines/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000046 diff --git a/packs/origines/LOG b/packs/origines/LOG index 54ec56f..4fdefc4 100644 --- a/packs/origines/LOG +++ b/packs/origines/LOG @@ -1,8 +1,8 @@ -2023/12/21-19:17:33.780177 7f3322ffd6c0 Recovering log #36 -2023/12/21-19:17:33.829775 7f3322ffd6c0 Delete type=3 #34 -2023/12/21-19:17:33.829923 7f3322ffd6c0 Delete type=0 #36 -2023/12/21-19:20:44.915993 7f33223ff6c0 Level-0 table #41: started -2023/12/21-19:20:44.916063 7f33223ff6c0 Level-0 table #41: 0 bytes OK -2023/12/21-19:20:44.922657 7f33223ff6c0 Delete type=0 #39 -2023/12/21-19:20:44.930016 7f33223ff6c0 Manual compaction at level-0 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) -2023/12/21-19:20:44.930106 7f33223ff6c0 Manual compaction at level-1 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) +2023/12/22-07:52:34.546476 7f3322ffd6c0 Recovering log #44 +2023/12/22-07:52:34.557106 7f3322ffd6c0 Delete type=3 #42 +2023/12/22-07:52:34.557177 7f3322ffd6c0 Delete type=0 #44 +2023/12/22-09:30:02.017538 7f33223ff6c0 Level-0 table #49: started +2023/12/22-09:30:02.017564 7f33223ff6c0 Level-0 table #49: 0 bytes OK +2023/12/22-09:30:02.024036 7f33223ff6c0 Delete type=0 #47 +2023/12/22-09:30:02.044238 7f33223ff6c0 Manual compaction at level-0 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) +2023/12/22-09:30:02.044286 7f33223ff6c0 Manual compaction at level-1 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) diff --git a/packs/origines/LOG.old b/packs/origines/LOG.old index 0672991..6e3bfdb 100644 --- a/packs/origines/LOG.old +++ b/packs/origines/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-15:38:38.735509 7f35b8bfa6c0 Recovering log #32 -2023/12/21-15:38:38.744908 7f35b8bfa6c0 Delete type=3 #30 -2023/12/21-15:38:38.744979 7f35b8bfa6c0 Delete type=0 #32 -2023/12/21-15:39:48.835017 7f33223ff6c0 Level-0 table #37: started -2023/12/21-15:39:48.835057 7f33223ff6c0 Level-0 table #37: 0 bytes OK -2023/12/21-15:39:48.842344 7f33223ff6c0 Delete type=0 #35 -2023/12/21-15:39:48.855603 7f33223ff6c0 Manual compaction at level-0 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) -2023/12/21-15:39:48.855659 7f33223ff6c0 Manual compaction at level-1 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) +2023/12/21-20:53:10.710662 7f3322ffd6c0 Recovering log #40 +2023/12/21-20:53:10.720767 7f3322ffd6c0 Delete type=3 #38 +2023/12/21-20:53:10.720852 7f3322ffd6c0 Delete type=0 #40 +2023/12/21-20:54:12.959603 7f33223ff6c0 Level-0 table #45: started +2023/12/21-20:54:12.959656 7f33223ff6c0 Level-0 table #45: 0 bytes OK +2023/12/21-20:54:12.966466 7f33223ff6c0 Delete type=0 #43 +2023/12/21-20:54:12.973382 7f33223ff6c0 Manual compaction at level-0 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) +2023/12/21-20:54:12.973447 7f33223ff6c0 Manual compaction at level-1 from '!items!2t1KmBeQNuKK5qlN' @ 72057594037927935 : 1 .. '!items!yBvkQb9S64s908sR' @ 0 : 0; will stop at (end) diff --git a/packs/origines/MANIFEST-000038 b/packs/origines/MANIFEST-000038 deleted file mode 100644 index a49f23a..0000000 Binary files a/packs/origines/MANIFEST-000038 and /dev/null differ diff --git a/packs/origines/MANIFEST-000046 b/packs/origines/MANIFEST-000046 new file mode 100644 index 0000000..76d7a6a Binary files /dev/null and b/packs/origines/MANIFEST-000046 differ diff --git a/packs/protection/000040.log b/packs/protection/000048.log similarity index 100% rename from packs/protection/000040.log rename to packs/protection/000048.log diff --git a/packs/protection/CURRENT b/packs/protection/CURRENT index 59611b0..a6d5883 100644 --- a/packs/protection/CURRENT +++ b/packs/protection/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000046 diff --git a/packs/protection/LOG b/packs/protection/LOG index 98f0abc..b67867a 100644 --- a/packs/protection/LOG +++ b/packs/protection/LOG @@ -1,8 +1,8 @@ -2023/12/21-19:17:33.643159 7f35b8bfa6c0 Recovering log #36 -2023/12/21-19:17:33.693846 7f35b8bfa6c0 Delete type=3 #34 -2023/12/21-19:17:33.693987 7f35b8bfa6c0 Delete type=0 #36 -2023/12/21-19:20:44.907492 7f33223ff6c0 Level-0 table #41: started -2023/12/21-19:20:44.907557 7f33223ff6c0 Level-0 table #41: 0 bytes OK -2023/12/21-19:20:44.915742 7f33223ff6c0 Delete type=0 #39 -2023/12/21-19:20:44.929991 7f33223ff6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) -2023/12/21-19:20:44.930084 7f33223ff6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/12/22-07:52:34.509314 7f3323fff6c0 Recovering log #44 +2023/12/22-07:52:34.520050 7f3323fff6c0 Delete type=3 #42 +2023/12/22-07:52:34.520474 7f3323fff6c0 Delete type=0 #44 +2023/12/22-09:30:01.997688 7f33223ff6c0 Level-0 table #49: started +2023/12/22-09:30:01.997733 7f33223ff6c0 Level-0 table #49: 0 bytes OK +2023/12/22-09:30:02.004334 7f33223ff6c0 Delete type=0 #47 +2023/12/22-09:30:02.010645 7f33223ff6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/12/22-09:30:02.017426 7f33223ff6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) diff --git a/packs/protection/LOG.old b/packs/protection/LOG.old index ce99b64..ae9e33e 100644 --- a/packs/protection/LOG.old +++ b/packs/protection/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-15:38:38.695816 7f3322ffd6c0 Recovering log #32 -2023/12/21-15:38:38.705849 7f3322ffd6c0 Delete type=3 #30 -2023/12/21-15:38:38.705914 7f3322ffd6c0 Delete type=0 #32 -2023/12/21-15:39:48.813588 7f33223ff6c0 Level-0 table #37: started -2023/12/21-15:39:48.813615 7f33223ff6c0 Level-0 table #37: 0 bytes OK -2023/12/21-15:39:48.820057 7f33223ff6c0 Delete type=0 #35 -2023/12/21-15:39:48.828104 7f33223ff6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) -2023/12/21-15:39:48.828169 7f33223ff6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/12/21-20:53:10.667188 7f33237fe6c0 Recovering log #40 +2023/12/21-20:53:10.678311 7f33237fe6c0 Delete type=3 #38 +2023/12/21-20:53:10.678430 7f33237fe6c0 Delete type=0 #40 +2023/12/21-20:54:12.931369 7f33223ff6c0 Level-0 table #45: started +2023/12/21-20:54:12.931404 7f33223ff6c0 Level-0 table #45: 0 bytes OK +2023/12/21-20:54:12.938215 7f33223ff6c0 Delete type=0 #43 +2023/12/21-20:54:12.945036 7f33223ff6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/12/21-20:54:12.945115 7f33223ff6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) diff --git a/packs/protection/MANIFEST-000038 b/packs/protection/MANIFEST-000038 deleted file mode 100644 index 7d108c7..0000000 Binary files a/packs/protection/MANIFEST-000038 and /dev/null differ diff --git a/packs/protection/MANIFEST-000046 b/packs/protection/MANIFEST-000046 new file mode 100644 index 0000000..574cab1 Binary files /dev/null and b/packs/protection/MANIFEST-000046 differ diff --git a/packs/runes/000040.log b/packs/runes/000048.log similarity index 100% rename from packs/runes/000040.log rename to packs/runes/000048.log diff --git a/packs/runes/CURRENT b/packs/runes/CURRENT index 59611b0..a6d5883 100644 --- a/packs/runes/CURRENT +++ b/packs/runes/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000046 diff --git a/packs/runes/LOG b/packs/runes/LOG index 02a3a80..a4675b4 100644 --- a/packs/runes/LOG +++ b/packs/runes/LOG @@ -1,8 +1,8 @@ -2023/12/21-19:17:34.037650 7f35b8bfa6c0 Recovering log #36 -2023/12/21-19:17:34.082011 7f35b8bfa6c0 Delete type=3 #34 -2023/12/21-19:17:34.082183 7f35b8bfa6c0 Delete type=0 #36 -2023/12/21-19:20:44.967137 7f33223ff6c0 Level-0 table #41: started -2023/12/21-19:20:44.967184 7f33223ff6c0 Level-0 table #41: 0 bytes OK -2023/12/21-19:20:44.974006 7f33223ff6c0 Delete type=0 #39 -2023/12/21-19:20:44.974230 7f33223ff6c0 Manual compaction at level-0 from '!items!1JqWbEkHUoKXbsgn' @ 72057594037927935 : 1 .. '!items!xnCf2xIPzdsUoBTy' @ 0 : 0; will stop at (end) -2023/12/21-19:20:44.974271 7f33223ff6c0 Manual compaction at level-1 from '!items!1JqWbEkHUoKXbsgn' @ 72057594037927935 : 1 .. '!items!xnCf2xIPzdsUoBTy' @ 0 : 0; will stop at (end) +2023/12/22-07:52:34.607651 7f3323fff6c0 Recovering log #44 +2023/12/22-07:52:34.618669 7f3323fff6c0 Delete type=3 #42 +2023/12/22-07:52:34.618763 7f3323fff6c0 Delete type=0 #44 +2023/12/22-09:30:02.050897 7f33223ff6c0 Level-0 table #49: started +2023/12/22-09:30:02.050932 7f33223ff6c0 Level-0 table #49: 0 bytes OK +2023/12/22-09:30:02.057930 7f33223ff6c0 Delete type=0 #47 +2023/12/22-09:30:02.064390 7f33223ff6c0 Manual compaction at level-0 from '!items!1JqWbEkHUoKXbsgn' @ 72057594037927935 : 1 .. '!items!xnCf2xIPzdsUoBTy' @ 0 : 0; will stop at (end) +2023/12/22-09:30:02.064434 7f33223ff6c0 Manual compaction at level-1 from '!items!1JqWbEkHUoKXbsgn' @ 72057594037927935 : 1 .. '!items!xnCf2xIPzdsUoBTy' @ 0 : 0; will stop at (end) diff --git a/packs/runes/LOG.old b/packs/runes/LOG.old index 14120e8..7f17d57 100644 --- a/packs/runes/LOG.old +++ b/packs/runes/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-15:38:38.809473 7f3322ffd6c0 Recovering log #32 -2023/12/21-15:38:38.819369 7f3322ffd6c0 Delete type=3 #30 -2023/12/21-15:38:38.819436 7f3322ffd6c0 Delete type=0 #32 -2023/12/21-15:39:48.866633 7f33223ff6c0 Level-0 table #37: started -2023/12/21-15:39:48.866687 7f33223ff6c0 Level-0 table #37: 0 bytes OK -2023/12/21-15:39:48.873873 7f33223ff6c0 Delete type=0 #35 -2023/12/21-15:39:48.887535 7f33223ff6c0 Manual compaction at level-0 from '!items!1JqWbEkHUoKXbsgn' @ 72057594037927935 : 1 .. '!items!xnCf2xIPzdsUoBTy' @ 0 : 0; will stop at (end) -2023/12/21-15:39:48.887594 7f33223ff6c0 Manual compaction at level-1 from '!items!1JqWbEkHUoKXbsgn' @ 72057594037927935 : 1 .. '!items!xnCf2xIPzdsUoBTy' @ 0 : 0; will stop at (end) +2023/12/21-20:53:10.783266 7f33237fe6c0 Recovering log #40 +2023/12/21-20:53:10.795055 7f33237fe6c0 Delete type=3 #38 +2023/12/21-20:53:10.795163 7f33237fe6c0 Delete type=0 #40 +2023/12/21-20:54:12.973622 7f33223ff6c0 Level-0 table #45: started +2023/12/21-20:54:12.973662 7f33223ff6c0 Level-0 table #45: 0 bytes OK +2023/12/21-20:54:12.980149 7f33223ff6c0 Delete type=0 #43 +2023/12/21-20:54:13.002436 7f33223ff6c0 Manual compaction at level-0 from '!items!1JqWbEkHUoKXbsgn' @ 72057594037927935 : 1 .. '!items!xnCf2xIPzdsUoBTy' @ 0 : 0; will stop at (end) +2023/12/21-20:54:13.002526 7f33223ff6c0 Manual compaction at level-1 from '!items!1JqWbEkHUoKXbsgn' @ 72057594037927935 : 1 .. '!items!xnCf2xIPzdsUoBTy' @ 0 : 0; will stop at (end) diff --git a/packs/runes/MANIFEST-000038 b/packs/runes/MANIFEST-000038 deleted file mode 100644 index a40d5c1..0000000 Binary files a/packs/runes/MANIFEST-000038 and /dev/null differ diff --git a/packs/runes/MANIFEST-000046 b/packs/runes/MANIFEST-000046 new file mode 100644 index 0000000..3f2fae3 Binary files /dev/null and b/packs/runes/MANIFEST-000046 differ diff --git a/packs/skills/000040.log b/packs/skills/000048.log similarity index 100% rename from packs/skills/000040.log rename to packs/skills/000048.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index 59611b0..a6d5883 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000046 diff --git a/packs/skills/LOG b/packs/skills/LOG index 59c4e22..e053233 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,8 @@ -2023/12/21-19:17:33.539158 7f3323fff6c0 Recovering log #36 -2023/12/21-19:17:33.588928 7f3323fff6c0 Delete type=3 #34 -2023/12/21-19:17:33.589020 7f3323fff6c0 Delete type=0 #36 -2023/12/21-19:20:44.874404 7f33223ff6c0 Level-0 table #41: started -2023/12/21-19:20:44.874448 7f33223ff6c0 Level-0 table #41: 0 bytes OK -2023/12/21-19:20:44.881347 7f33223ff6c0 Delete type=0 #39 -2023/12/21-19:20:44.900142 7f33223ff6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/12/21-19:20:44.900210 7f33223ff6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/22-07:52:34.484917 7f33237fe6c0 Recovering log #44 +2023/12/22-07:52:34.495134 7f33237fe6c0 Delete type=3 #42 +2023/12/22-07:52:34.495237 7f33237fe6c0 Delete type=0 #44 +2023/12/22-09:30:01.953868 7f33223ff6c0 Level-0 table #49: started +2023/12/22-09:30:01.953936 7f33223ff6c0 Level-0 table #49: 0 bytes OK +2023/12/22-09:30:01.960462 7f33223ff6c0 Delete type=0 #47 +2023/12/22-09:30:01.977006 7f33223ff6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/22-09:30:01.977080 7f33223ff6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) diff --git a/packs/skills/LOG.old b/packs/skills/LOG.old index d698cbf..5e2da2d 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-15:38:38.668335 7f3323fff6c0 Recovering log #32 -2023/12/21-15:38:38.678141 7f3323fff6c0 Delete type=3 #30 -2023/12/21-15:38:38.678186 7f3323fff6c0 Delete type=0 #32 -2023/12/21-15:39:48.782931 7f33223ff6c0 Level-0 table #37: started -2023/12/21-15:39:48.783224 7f33223ff6c0 Level-0 table #37: 0 bytes OK -2023/12/21-15:39:48.789981 7f33223ff6c0 Delete type=0 #35 -2023/12/21-15:39:48.790146 7f33223ff6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/12/21-15:39:48.799834 7f33223ff6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/21-20:53:10.639268 7f3323fff6c0 Recovering log #40 +2023/12/21-20:53:10.650093 7f3323fff6c0 Delete type=3 #38 +2023/12/21-20:53:10.650190 7f3323fff6c0 Delete type=0 #40 +2023/12/21-20:54:12.899494 7f33223ff6c0 Level-0 table #45: started +2023/12/21-20:54:12.899538 7f33223ff6c0 Level-0 table #45: 0 bytes OK +2023/12/21-20:54:12.905877 7f33223ff6c0 Delete type=0 #43 +2023/12/21-20:54:12.906076 7f33223ff6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/21-20:54:12.917606 7f33223ff6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) diff --git a/packs/skills/MANIFEST-000038 b/packs/skills/MANIFEST-000038 deleted file mode 100644 index 9af4b86..0000000 Binary files a/packs/skills/MANIFEST-000038 and /dev/null differ diff --git a/packs/skills/MANIFEST-000046 b/packs/skills/MANIFEST-000046 new file mode 100644 index 0000000..9942f3a Binary files /dev/null and b/packs/skills/MANIFEST-000046 differ diff --git a/packs/tables/000040.log b/packs/tables/000048.log similarity index 100% rename from packs/tables/000040.log rename to packs/tables/000048.log diff --git a/packs/tables/CURRENT b/packs/tables/CURRENT index 59611b0..a6d5883 100644 --- a/packs/tables/CURRENT +++ b/packs/tables/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000046 diff --git a/packs/tables/LOG b/packs/tables/LOG index f53bee4..095f372 100644 --- a/packs/tables/LOG +++ b/packs/tables/LOG @@ -1,8 +1,8 @@ -2023/12/21-19:17:34.091820 7f33237fe6c0 Recovering log #36 -2023/12/21-19:17:34.138376 7f33237fe6c0 Delete type=3 #34 -2023/12/21-19:17:34.138520 7f33237fe6c0 Delete type=0 #36 -2023/12/21-19:20:44.959349 7f33223ff6c0 Level-0 table #41: started -2023/12/21-19:20:44.959415 7f33223ff6c0 Level-0 table #41: 0 bytes OK -2023/12/21-19:20:44.966819 7f33223ff6c0 Delete type=0 #39 -2023/12/21-19:20:44.974178 7f33223ff6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) -2023/12/21-19:20:44.974251 7f33223ff6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/12/22-07:52:34.620959 7f35b8bfa6c0 Recovering log #44 +2023/12/22-07:52:34.630880 7f35b8bfa6c0 Delete type=3 #42 +2023/12/22-07:52:34.630945 7f35b8bfa6c0 Delete type=0 #44 +2023/12/22-09:30:02.058119 7f33223ff6c0 Level-0 table #49: started +2023/12/22-09:30:02.058144 7f33223ff6c0 Level-0 table #49: 0 bytes OK +2023/12/22-09:30:02.064269 7f33223ff6c0 Delete type=0 #47 +2023/12/22-09:30:02.064425 7f33223ff6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/12/22-09:30:02.064474 7f33223ff6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) diff --git a/packs/tables/LOG.old b/packs/tables/LOG.old index e416736..35cdee6 100644 --- a/packs/tables/LOG.old +++ b/packs/tables/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-15:38:38.822806 7f33237fe6c0 Recovering log #32 -2023/12/21-15:38:38.833583 7f33237fe6c0 Delete type=3 #30 -2023/12/21-15:38:38.833639 7f33237fe6c0 Delete type=0 #32 -2023/12/21-15:39:48.874007 7f33223ff6c0 Level-0 table #37: started -2023/12/21-15:39:48.874038 7f33223ff6c0 Level-0 table #37: 0 bytes OK -2023/12/21-15:39:48.880506 7f33223ff6c0 Delete type=0 #35 -2023/12/21-15:39:48.887556 7f33223ff6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) -2023/12/21-15:39:48.887632 7f33223ff6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/12/21-20:53:10.798632 7f35b8bfa6c0 Recovering log #40 +2023/12/21-20:53:10.809536 7f35b8bfa6c0 Delete type=3 #38 +2023/12/21-20:53:10.809630 7f35b8bfa6c0 Delete type=0 #40 +2023/12/21-20:54:12.995275 7f33223ff6c0 Level-0 table #45: started +2023/12/21-20:54:12.995311 7f33223ff6c0 Level-0 table #45: 0 bytes OK +2023/12/21-20:54:13.002238 7f33223ff6c0 Delete type=0 #43 +2023/12/21-20:54:13.002508 7f33223ff6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/12/21-20:54:13.002579 7f33223ff6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) diff --git a/packs/tables/MANIFEST-000038 b/packs/tables/MANIFEST-000046 similarity index 79% rename from packs/tables/MANIFEST-000038 rename to packs/tables/MANIFEST-000046 index 4ec1167..18409fb 100644 Binary files a/packs/tables/MANIFEST-000038 and b/packs/tables/MANIFEST-000046 differ diff --git a/packs/tendances/000040.log b/packs/tendances/000048.log similarity index 100% rename from packs/tendances/000040.log rename to packs/tendances/000048.log diff --git a/packs/tendances/CURRENT b/packs/tendances/CURRENT index 59611b0..a6d5883 100644 --- a/packs/tendances/CURRENT +++ b/packs/tendances/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000046 diff --git a/packs/tendances/LOG b/packs/tendances/LOG index 3e67ede..f857aa8 100644 --- a/packs/tendances/LOG +++ b/packs/tendances/LOG @@ -1,8 +1,8 @@ -2023/12/21-19:17:33.934810 7f3323fff6c0 Recovering log #36 -2023/12/21-19:17:33.976700 7f3323fff6c0 Delete type=3 #34 -2023/12/21-19:17:33.977187 7f3323fff6c0 Delete type=0 #36 -2023/12/21-19:20:44.944802 7f33223ff6c0 Level-0 table #41: started -2023/12/21-19:20:44.944841 7f33223ff6c0 Level-0 table #41: 0 bytes OK -2023/12/21-19:20:44.951960 7f33223ff6c0 Delete type=0 #39 -2023/12/21-19:20:44.959106 7f33223ff6c0 Manual compaction at level-0 from '!items!0CYP1JpZu9mst5tK' @ 72057594037927935 : 1 .. '!items!zhPPsmTtLv7cyNHJ' @ 0 : 0; will stop at (end) -2023/12/21-19:20:44.959148 7f33223ff6c0 Manual compaction at level-1 from '!items!0CYP1JpZu9mst5tK' @ 72057594037927935 : 1 .. '!items!zhPPsmTtLv7cyNHJ' @ 0 : 0; will stop at (end) +2023/12/22-07:52:34.583964 7f33237fe6c0 Recovering log #44 +2023/12/22-07:52:34.593354 7f33237fe6c0 Delete type=3 #42 +2023/12/22-07:52:34.593406 7f33237fe6c0 Delete type=0 #44 +2023/12/22-09:30:02.044389 7f33223ff6c0 Level-0 table #49: started +2023/12/22-09:30:02.044418 7f33223ff6c0 Level-0 table #49: 0 bytes OK +2023/12/22-09:30:02.050768 7f33223ff6c0 Delete type=0 #47 +2023/12/22-09:30:02.064378 7f33223ff6c0 Manual compaction at level-0 from '!items!0CYP1JpZu9mst5tK' @ 72057594037927935 : 1 .. '!items!zhPPsmTtLv7cyNHJ' @ 0 : 0; will stop at (end) +2023/12/22-09:30:02.064413 7f33223ff6c0 Manual compaction at level-1 from '!items!0CYP1JpZu9mst5tK' @ 72057594037927935 : 1 .. '!items!zhPPsmTtLv7cyNHJ' @ 0 : 0; will stop at (end) diff --git a/packs/tendances/LOG.old b/packs/tendances/LOG.old index 19e4a9e..80eec66 100644 --- a/packs/tendances/LOG.old +++ b/packs/tendances/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-15:38:38.775141 7f3323fff6c0 Recovering log #32 -2023/12/21-15:38:38.786017 7f3323fff6c0 Delete type=3 #30 -2023/12/21-15:38:38.786087 7f3323fff6c0 Delete type=0 #32 -2023/12/21-15:39:48.842675 7f33223ff6c0 Level-0 table #37: started -2023/12/21-15:39:48.842717 7f33223ff6c0 Level-0 table #37: 0 bytes OK -2023/12/21-15:39:48.848873 7f33223ff6c0 Delete type=0 #35 -2023/12/21-15:39:48.855615 7f33223ff6c0 Manual compaction at level-0 from '!items!0CYP1JpZu9mst5tK' @ 72057594037927935 : 1 .. '!items!zhPPsmTtLv7cyNHJ' @ 0 : 0; will stop at (end) -2023/12/21-15:39:48.855677 7f33223ff6c0 Manual compaction at level-1 from '!items!0CYP1JpZu9mst5tK' @ 72057594037927935 : 1 .. '!items!zhPPsmTtLv7cyNHJ' @ 0 : 0; will stop at (end) +2023/12/21-20:53:10.753954 7f3323fff6c0 Recovering log #40 +2023/12/21-20:53:10.764272 7f3323fff6c0 Delete type=3 #38 +2023/12/21-20:53:10.764389 7f3323fff6c0 Delete type=0 #40 +2023/12/21-20:54:12.966619 7f33223ff6c0 Level-0 table #45: started +2023/12/21-20:54:12.966654 7f33223ff6c0 Level-0 table #45: 0 bytes OK +2023/12/21-20:54:12.973183 7f33223ff6c0 Delete type=0 #43 +2023/12/21-20:54:12.973405 7f33223ff6c0 Manual compaction at level-0 from '!items!0CYP1JpZu9mst5tK' @ 72057594037927935 : 1 .. '!items!zhPPsmTtLv7cyNHJ' @ 0 : 0; will stop at (end) +2023/12/21-20:54:12.973461 7f33223ff6c0 Manual compaction at level-1 from '!items!0CYP1JpZu9mst5tK' @ 72057594037927935 : 1 .. '!items!zhPPsmTtLv7cyNHJ' @ 0 : 0; will stop at (end) diff --git a/packs/tendances/MANIFEST-000038 b/packs/tendances/MANIFEST-000038 deleted file mode 100644 index ca2a663..0000000 Binary files a/packs/tendances/MANIFEST-000038 and /dev/null differ diff --git a/packs/tendances/MANIFEST-000046 b/packs/tendances/MANIFEST-000046 new file mode 100644 index 0000000..a287009 Binary files /dev/null and b/packs/tendances/MANIFEST-000046 differ diff --git a/packs/traits-chaotiques/000040.log b/packs/traits-chaotiques/000048.log similarity index 100% rename from packs/traits-chaotiques/000040.log rename to packs/traits-chaotiques/000048.log diff --git a/packs/traits-chaotiques/CURRENT b/packs/traits-chaotiques/CURRENT index 59611b0..a6d5883 100644 --- a/packs/traits-chaotiques/CURRENT +++ b/packs/traits-chaotiques/CURRENT @@ -1 +1 @@ -MANIFEST-000038 +MANIFEST-000046 diff --git a/packs/traits-chaotiques/LOG b/packs/traits-chaotiques/LOG index b99d422..0950efc 100644 --- a/packs/traits-chaotiques/LOG +++ b/packs/traits-chaotiques/LOG @@ -1,8 +1,8 @@ -2023/12/21-19:17:33.986130 7f3322ffd6c0 Recovering log #36 -2023/12/21-19:17:34.030179 7f3322ffd6c0 Delete type=3 #34 -2023/12/21-19:17:34.030355 7f3322ffd6c0 Delete type=0 #36 -2023/12/21-19:20:44.952141 7f33223ff6c0 Level-0 table #41: started -2023/12/21-19:20:44.952182 7f33223ff6c0 Level-0 table #41: 0 bytes OK -2023/12/21-19:20:44.958894 7f33223ff6c0 Delete type=0 #39 -2023/12/21-19:20:44.959120 7f33223ff6c0 Manual compaction at level-0 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) -2023/12/21-19:20:44.959174 7f33223ff6c0 Manual compaction at level-1 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) +2023/12/22-07:52:34.595239 7f3322ffd6c0 Recovering log #44 +2023/12/22-07:52:34.606082 7f3322ffd6c0 Delete type=3 #42 +2023/12/22-07:52:34.606189 7f3322ffd6c0 Delete type=0 #44 +2023/12/22-09:30:02.037908 7f33223ff6c0 Level-0 table #49: started +2023/12/22-09:30:02.037952 7f33223ff6c0 Level-0 table #49: 0 bytes OK +2023/12/22-09:30:02.044100 7f33223ff6c0 Delete type=0 #47 +2023/12/22-09:30:02.044279 7f33223ff6c0 Manual compaction at level-0 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) +2023/12/22-09:30:02.044319 7f33223ff6c0 Manual compaction at level-1 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) diff --git a/packs/traits-chaotiques/LOG.old b/packs/traits-chaotiques/LOG.old index a599937..5cbece0 100644 --- a/packs/traits-chaotiques/LOG.old +++ b/packs/traits-chaotiques/LOG.old @@ -1,8 +1,8 @@ -2023/12/21-15:38:38.789880 7f35b8bfa6c0 Recovering log #32 -2023/12/21-15:38:38.806442 7f35b8bfa6c0 Delete type=3 #30 -2023/12/21-15:38:38.806511 7f35b8bfa6c0 Delete type=0 #32 -2023/12/21-15:39:48.880716 7f33223ff6c0 Level-0 table #37: started -2023/12/21-15:39:48.880801 7f33223ff6c0 Level-0 table #37: 0 bytes OK -2023/12/21-15:39:48.887313 7f33223ff6c0 Delete type=0 #35 -2023/12/21-15:39:48.887577 7f33223ff6c0 Manual compaction at level-0 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) -2023/12/21-15:39:48.887612 7f33223ff6c0 Manual compaction at level-1 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) +2023/12/21-20:53:10.768462 7f3322ffd6c0 Recovering log #40 +2023/12/21-20:53:10.779653 7f3322ffd6c0 Delete type=3 #38 +2023/12/21-20:53:10.779757 7f3322ffd6c0 Delete type=0 #40 +2023/12/21-20:54:12.980375 7f33223ff6c0 Level-0 table #45: started +2023/12/21-20:54:12.980428 7f33223ff6c0 Level-0 table #45: 0 bytes OK +2023/12/21-20:54:12.988146 7f33223ff6c0 Delete type=0 #43 +2023/12/21-20:54:13.002466 7f33223ff6c0 Manual compaction at level-0 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) +2023/12/21-20:54:13.002544 7f33223ff6c0 Manual compaction at level-1 from '!items!3J0HKjcVtBT39BiR' @ 72057594037927935 : 1 .. '!items!zeOtWz6oscp8Su5l' @ 0 : 0; will stop at (end) diff --git a/packs/traits-chaotiques/MANIFEST-000038 b/packs/traits-chaotiques/MANIFEST-000038 deleted file mode 100644 index 374a977..0000000 Binary files a/packs/traits-chaotiques/MANIFEST-000038 and /dev/null differ diff --git a/packs/traits-chaotiques/MANIFEST-000046 b/packs/traits-chaotiques/MANIFEST-000046 new file mode 100644 index 0000000..07be60e Binary files /dev/null and b/packs/traits-chaotiques/MANIFEST-000046 differ diff --git a/styles/simple.css b/styles/simple.css index 8a8ac1a..b59bd39 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -1130,6 +1130,11 @@ ul, li { margin:2px; } +.chat-card-button-degats { + background: linear-gradient(to bottom, #e2c256fc 5%, #b85b04ab 100%); + background-color: #7d5d3b00; +} + .chat-card-button:hover { background: linear-gradient(to bottom, #800000 5%, #3e0101 100%); background-color: red; diff --git a/templates/chat-degats-result.html b/templates/chat-degats-result.html index 9564ebc..355d2bd 100644 --- a/templates/chat-degats-result.html +++ b/templates/chat-degats-result.html @@ -18,8 +18,15 @@
diff --git a/templates/chat-generic-result.html b/templates/chat-generic-result.html index 3c94b48..8f3c1fd 100644 --- a/templates/chat-generic-result.html +++ b/templates/chat-generic-result.html @@ -20,6 +20,16 @@ diff --git a/templates/roll-dialog-generic.html b/templates/roll-dialog-generic.html index 7a7280f..453a365 100644 --- a/templates/roll-dialog-generic.html +++ b/templates/roll-dialog-generic.html @@ -10,17 +10,18 @@
{{#if (eq attrKey "tochoose")}} - Attribut - + Attribut + {{else}} - {{attr.label}} - {{attr.value}} + {{attr.label}} + {{attr.value}} {{/if}}
@@ -48,14 +49,87 @@
Points d'Ame - {{#select runeame}} {{{pointAmeOptions}}} {{/select}}
+ {{/if}} + {{#if arme}} +
+ Arme : + {{arme.name}} (+{{arme.system.bonusmaniementoff}}) +
+ {{#if arme.system.isMelee}} +
+ Attaque : + +
+ {{/if}} + {{/if}} + + + {{#if arme}} + {{#if arme.system.isMelee}} + {{#if armeDefense}} +
+ Défense adversaire : + {{difficulte}} +
+ {{/if}} + {{/if}} + {{#if arme.system.isDistance}} +
+ Bonus de visée (+5) ? : + +
+ {{#if defender}} +
+ La cible est consciente du tir (-{{defender.system.attributs.adr.value}})? : + +
+ {{else}} +
+ Pas de cible désignée ! +
+ {{/if}} +
+ La cible court (-5/-10)? : + +
+
+ Couvert ? : + +
+
+ Portée : + +
+ {{/if}} {{/if}}
@@ -68,12 +142,7 @@
- {{#if armeDefense}} -
- Défense adversaire : - {{difficulte}} -
- {{else}} + {{#if selectDifficulte}}
Difficulté : +
{{/if}}