diff --git a/images/icons/appliquer-degats.webp b/images/icons/appliquer-degats.webp new file mode 100644 index 0000000..afb73a4 Binary files /dev/null and b/images/icons/appliquer-degats.webp differ diff --git a/modules/common/tedeum-utility.js b/modules/common/tedeum-utility.js index b9286d0..82bcb35 100644 --- a/modules/common/tedeum-utility.js +++ b/modules/common/tedeum-utility.js @@ -201,11 +201,13 @@ export class TeDeumUtility { ui.notifications.info("Opposition démarrée avec " + rollData.alias); } else { // Perform the opposition - let rWinner = this.currentOpposition + let isAttackWinner = true + let rWinner = this.currentOpposition let rLooser = rollData if (rWinner.total < rLooser.total) { rWinner = rollData rLooser = this.currentOpposition + isAttackWinner = false } this.currentOpposition = undefined // Reset opposition let oppositionData = { @@ -216,14 +218,32 @@ export class TeDeumUtility { content: await renderTemplate(`systems/fvtt-te-deum/templates/chat/chat-opposition-result.hbs`, oppositionData) }) await msg.setFlag("world", "te-deum-rolldata", rollData) + + // Si le gagnant est l'attaquant, appliquer les dégats sur la victime + if ( isAttackWinner && rWinner.isSuccess && rWinner.mode == "arme" && rWinner.arme?.system.typeArme == "melee" && rWinner.defenderTokenId) { + this.appliquerDegats(rWinner) + } + console.log("Rolldata result", rollData) } } + /* -------------------------------------------- */ /* -------------------------------------------- */ + static async appliquerDegats(rollData) { + await this.processAttaqueMelee(rollData) + let defenderToken = canvas.tokens.placeables.find(t => t.id == rollData.defenderTokenId) + if (defenderToken) { + let actor = defenderToken.actor + await actor.appliquerDegats(rollData) + } else { + ui.notifications.error("Impossible de trouver la cible de l'attaque, aucun degats appliqué") + } + } + /* -------------------------------------------- */ /* -------------------------------------------- */ static async chatListeners(html) { - html.on("click", '.chat-command-button', event => { + html.on("click", '.chat-command-opposition', event => { let messageId = TeDeumUtility.findChatMessageId(event.currentTarget) let message = game.messages.get(messageId) let rollData = message.getFlag("world", "te-deum-rolldata") @@ -231,6 +251,14 @@ export class TeDeumUtility { TeDeumUtility.manageOpposition(rollData, messageId) } }) + html.on("click", '.chat-command-appliquer-degats', event => { + let messageId = TeDeumUtility.findChatMessageId(event.currentTarget) + let message = game.messages.get(messageId) + let rollData = message.getFlag("world", "te-deum-rolldata") + if (rollData) { + TeDeumUtility.appliquerDegats(rollData, messageId) + } + }) } /* -------------------------------------------- */ @@ -466,18 +494,13 @@ export class TeDeumUtility { /* -------------------------------------------- */ static async processAttaqueMelee(rollData) { - if (rollData.arme?.system.typeArme != "melee") { - return - } - if (rollData.isSuccess) { - await this.getLocalisation(rollData) - let actor = game.actors.get(rollData.actorId) - let bDegats = actor.getBonusDegats() - let degatsRoll = await new Roll(rollData.arme.system.degats + "+" + bDegats.value).roll() - await this.showDiceSoNice(degatsRoll, game.settings.get("core", "rollMode")) - rollData.degatsRoll = foundry.utils.duplicate(degatsRoll) - rollData.degats = degatsRoll.total - } + await this.getLocalisation(rollData) + let actor = game.actors.get(rollData.actorId) + let bDegats = actor.getBonusDegats() + let degatsRoll = await new Roll(rollData.arme.system.degats + "+" + bDegats.value).roll() + await this.showDiceSoNice(degatsRoll, game.settings.get("core", "rollMode")) + rollData.degatsRoll = foundry.utils.duplicate(degatsRoll) + rollData.degats = degatsRoll.total } /* -------------------------------------------- */ @@ -520,7 +543,6 @@ export class TeDeumUtility { await this.computeResults(rollData) await this.processAttaqueDistance(rollData) - await this.processAttaqueMelee(rollData) let msg = await this.createChatWithRollMode(rollData.alias, { content: await renderTemplate(`systems/fvtt-te-deum/templates/chat/chat-generic-result.hbs`, rollData) @@ -536,15 +558,6 @@ export class TeDeumUtility { if (rollData.isReussiteCritique || rollData.isEchecCritique) { actor.modifyXP(rollData.carac.key, 1) } - - // gestion degats automatique - if (rollData.arme && rollData.defenderTokenId) { - let defenderToken = canvas.tokens.placeables.find(t => t.id == rollData.defenderTokenId) - if (defenderToken) { - let actor = defenderToken.actor - await actor.appliquerDegats(rollData) - } - } } /* -------------------------------------------- */ diff --git a/packs/aides/000075.log b/packs/aides/000079.log similarity index 100% rename from packs/aides/000075.log rename to packs/aides/000079.log diff --git a/packs/aides/CURRENT b/packs/aides/CURRENT index 60f8f3c..c7a124b 100644 --- a/packs/aides/CURRENT +++ b/packs/aides/CURRENT @@ -1 +1 @@ -MANIFEST-000073 +MANIFEST-000077 diff --git a/packs/aides/LOG b/packs/aides/LOG index c90ae1e..8311f58 100644 --- a/packs/aides/LOG +++ b/packs/aides/LOG @@ -1,7 +1,7 @@ -2025/03/11-13:28:14.628624 7f24c6ffd6c0 Recovering log #70 -2025/03/11-13:28:14.638344 7f24c6ffd6c0 Delete type=3 #68 -2025/03/11-13:28:14.638409 7f24c6ffd6c0 Delete type=0 #70 -2025/03/11-13:44:45.762189 7f24c4bff6c0 Level-0 table #76: started -2025/03/11-13:44:45.762249 7f24c4bff6c0 Level-0 table #76: 0 bytes OK -2025/03/11-13:44:45.768757 7f24c4bff6c0 Delete type=0 #74 -2025/03/11-13:44:45.768912 7f24c4bff6c0 Manual compaction at level-0 from '!journal!uNwJgi4kXBCiZmAH' @ 72057594037927935 : 1 .. '!journal.pages!uNwJgi4kXBCiZmAH.onhNU0mXhOpdNZJF' @ 0 : 0; will stop at (end) +2025/03/11-18:04:31.143055 7f24c6ffd6c0 Recovering log #75 +2025/03/11-18:04:31.153035 7f24c6ffd6c0 Delete type=3 #73 +2025/03/11-18:04:31.153146 7f24c6ffd6c0 Delete type=0 #75 +2025/03/11-18:27:51.833675 7f24c4bff6c0 Level-0 table #80: started +2025/03/11-18:27:51.833743 7f24c4bff6c0 Level-0 table #80: 0 bytes OK +2025/03/11-18:27:51.840981 7f24c4bff6c0 Delete type=0 #78 +2025/03/11-18:27:51.853984 7f24c4bff6c0 Manual compaction at level-0 from '!journal!uNwJgi4kXBCiZmAH' @ 72057594037927935 : 1 .. '!journal.pages!uNwJgi4kXBCiZmAH.onhNU0mXhOpdNZJF' @ 0 : 0; will stop at (end) diff --git a/packs/aides/LOG.old b/packs/aides/LOG.old index 71fde29..c90ae1e 100644 --- a/packs/aides/LOG.old +++ b/packs/aides/LOG.old @@ -1,12 +1,7 @@ -2025/03/10-23:31:25.144627 7f24c6ffd6c0 Delete type=3 #1 -2025/03/10-23:38:21.197987 7f24c4bff6c0 Level-0 table #71: started -2025/03/10-23:38:21.198012 7f24c4bff6c0 Level-0 table #71: 0 bytes OK -2025/03/10-23:38:21.234633 7f24c4bff6c0 Delete type=0 #69 -2025/03/10-23:38:21.382112 7f24c4bff6c0 Manual compaction at level-0 from '!journal!uNwJgi4kXBCiZmAH' @ 72057594037927935 : 1 .. '!journal.pages!uNwJgi4kXBCiZmAH.onhNU0mXhOpdNZJF' @ 0 : 0; will stop at '!journal.pages!uNwJgi4kXBCiZmAH.onhNU0mXhOpdNZJF' @ 17 : 1 -2025/03/10-23:38:21.382128 7f24c4bff6c0 Compacting 2@0 + 0@1 files -2025/03/10-23:38:21.400520 7f24c4bff6c0 Generated table #72@0: 5 keys, 3660 bytes -2025/03/10-23:38:21.400564 7f24c4bff6c0 Compacted 2@0 + 0@1 files => 3660 bytes -2025/03/10-23:38:21.437389 7f24c4bff6c0 compacted to: files[ 0 1 0 0 0 0 0 ] -2025/03/10-23:38:21.437554 7f24c4bff6c0 Delete type=2 #65 -2025/03/10-23:38:21.437773 7f24c4bff6c0 Delete type=2 #18 -2025/03/10-23:38:21.437958 7f24c4bff6c0 Manual compaction at level-0 from '!journal.pages!uNwJgi4kXBCiZmAH.onhNU0mXhOpdNZJF' @ 17 : 1 .. '!journal.pages!uNwJgi4kXBCiZmAH.onhNU0mXhOpdNZJF' @ 0 : 0; will stop at (end) +2025/03/11-13:28:14.628624 7f24c6ffd6c0 Recovering log #70 +2025/03/11-13:28:14.638344 7f24c6ffd6c0 Delete type=3 #68 +2025/03/11-13:28:14.638409 7f24c6ffd6c0 Delete type=0 #70 +2025/03/11-13:44:45.762189 7f24c4bff6c0 Level-0 table #76: started +2025/03/11-13:44:45.762249 7f24c4bff6c0 Level-0 table #76: 0 bytes OK +2025/03/11-13:44:45.768757 7f24c4bff6c0 Delete type=0 #74 +2025/03/11-13:44:45.768912 7f24c4bff6c0 Manual compaction at level-0 from '!journal!uNwJgi4kXBCiZmAH' @ 72057594037927935 : 1 .. '!journal.pages!uNwJgi4kXBCiZmAH.onhNU0mXhOpdNZJF' @ 0 : 0; will stop at (end) diff --git a/packs/aides/MANIFEST-000073 b/packs/aides/MANIFEST-000077 similarity index 58% rename from packs/aides/MANIFEST-000073 rename to packs/aides/MANIFEST-000077 index 4d0fa57..539a1c8 100644 Binary files a/packs/aides/MANIFEST-000073 and b/packs/aides/MANIFEST-000077 differ diff --git a/packs/armes/000177.log b/packs/armes/000181.log similarity index 100% rename from packs/armes/000177.log rename to packs/armes/000181.log diff --git a/packs/armes/CURRENT b/packs/armes/CURRENT index fb6ed1a..9289f7a 100644 --- a/packs/armes/CURRENT +++ b/packs/armes/CURRENT @@ -1 +1 @@ -MANIFEST-000175 +MANIFEST-000179 diff --git a/packs/armes/LOG b/packs/armes/LOG index a573860..ce5ebb5 100644 --- a/packs/armes/LOG +++ b/packs/armes/LOG @@ -1,7 +1,7 @@ -2025/03/11-13:28:14.531093 7f24c5ffb6c0 Recovering log #172 -2025/03/11-13:28:14.541728 7f24c5ffb6c0 Delete type=3 #170 -2025/03/11-13:28:14.541774 7f24c5ffb6c0 Delete type=0 #172 -2025/03/11-13:44:45.683900 7f24c4bff6c0 Level-0 table #178: started -2025/03/11-13:44:45.683936 7f24c4bff6c0 Level-0 table #178: 0 bytes OK -2025/03/11-13:44:45.690560 7f24c4bff6c0 Delete type=0 #176 -2025/03/11-13:44:45.703381 7f24c4bff6c0 Manual compaction at level-0 from '!folders!InCQeTRdT5jXMX82' @ 72057594037927935 : 1 .. '!items!wxIHkrq98eQ3cOvp' @ 0 : 0; will stop at (end) +2025/03/11-18:04:31.045395 7f24c5ffb6c0 Recovering log #177 +2025/03/11-18:04:31.056356 7f24c5ffb6c0 Delete type=3 #175 +2025/03/11-18:04:31.056467 7f24c5ffb6c0 Delete type=0 #177 +2025/03/11-18:27:51.772304 7f24c4bff6c0 Level-0 table #182: started +2025/03/11-18:27:51.772338 7f24c4bff6c0 Level-0 table #182: 0 bytes OK +2025/03/11-18:27:51.778305 7f24c4bff6c0 Delete type=0 #180 +2025/03/11-18:27:51.798039 7f24c4bff6c0 Manual compaction at level-0 from '!folders!InCQeTRdT5jXMX82' @ 72057594037927935 : 1 .. '!items!wxIHkrq98eQ3cOvp' @ 0 : 0; will stop at (end) diff --git a/packs/armes/LOG.old b/packs/armes/LOG.old index d7ed06d..a573860 100644 --- a/packs/armes/LOG.old +++ b/packs/armes/LOG.old @@ -1,12 +1,7 @@ -2025/03/10-23:31:24.993995 7f24c57fa6c0 Delete type=3 #1 -2025/03/10-23:38:20.848488 7f24c4bff6c0 Level-0 table #173: started -2025/03/10-23:38:20.848536 7f24c4bff6c0 Level-0 table #173: 0 bytes OK -2025/03/10-23:38:20.883672 7f24c4bff6c0 Delete type=0 #171 -2025/03/10-23:38:21.045164 7f24c4bff6c0 Manual compaction at level-0 from '!folders!InCQeTRdT5jXMX82' @ 72057594037927935 : 1 .. '!items!wxIHkrq98eQ3cOvp' @ 0 : 0; will stop at '!items!wxIHkrq98eQ3cOvp' @ 29 : 1 -2025/03/10-23:38:21.045186 7f24c4bff6c0 Compacting 2@0 + 0@1 files -2025/03/10-23:38:21.057146 7f24c4bff6c0 Generated table #174@0: 38 keys, 30816 bytes -2025/03/10-23:38:21.057182 7f24c4bff6c0 Compacted 2@0 + 0@1 files => 30816 bytes -2025/03/10-23:38:21.092494 7f24c4bff6c0 compacted to: files[ 0 1 0 0 0 0 0 ] -2025/03/10-23:38:21.092662 7f24c4bff6c0 Delete type=2 #167 -2025/03/10-23:38:21.092880 7f24c4bff6c0 Delete type=2 #80 -2025/03/10-23:38:21.093053 7f24c4bff6c0 Manual compaction at level-0 from '!items!wxIHkrq98eQ3cOvp' @ 29 : 1 .. '!items!wxIHkrq98eQ3cOvp' @ 0 : 0; will stop at (end) +2025/03/11-13:28:14.531093 7f24c5ffb6c0 Recovering log #172 +2025/03/11-13:28:14.541728 7f24c5ffb6c0 Delete type=3 #170 +2025/03/11-13:28:14.541774 7f24c5ffb6c0 Delete type=0 #172 +2025/03/11-13:44:45.683900 7f24c4bff6c0 Level-0 table #178: started +2025/03/11-13:44:45.683936 7f24c4bff6c0 Level-0 table #178: 0 bytes OK +2025/03/11-13:44:45.690560 7f24c4bff6c0 Delete type=0 #176 +2025/03/11-13:44:45.703381 7f24c4bff6c0 Manual compaction at level-0 from '!folders!InCQeTRdT5jXMX82' @ 72057594037927935 : 1 .. '!items!wxIHkrq98eQ3cOvp' @ 0 : 0; will stop at (end) diff --git a/packs/armes/MANIFEST-000175 b/packs/armes/MANIFEST-000179 similarity index 72% rename from packs/armes/MANIFEST-000175 rename to packs/armes/MANIFEST-000179 index c2e14d0..abc69b4 100644 Binary files a/packs/armes/MANIFEST-000175 and b/packs/armes/MANIFEST-000179 differ diff --git a/packs/armures/000177.log b/packs/armures/000181.log similarity index 100% rename from packs/armures/000177.log rename to packs/armures/000181.log diff --git a/packs/armures/CURRENT b/packs/armures/CURRENT index fb6ed1a..9289f7a 100644 --- a/packs/armures/CURRENT +++ b/packs/armures/CURRENT @@ -1 +1 @@ -MANIFEST-000175 +MANIFEST-000179 diff --git a/packs/armures/LOG b/packs/armures/LOG index 0fa7a92..b73b9f7 100644 --- a/packs/armures/LOG +++ b/packs/armures/LOG @@ -1,7 +1,7 @@ -2025/03/11-13:28:14.544961 7f24c6ffd6c0 Recovering log #172 -2025/03/11-13:28:14.555248 7f24c6ffd6c0 Delete type=3 #170 -2025/03/11-13:28:14.555342 7f24c6ffd6c0 Delete type=0 #172 -2025/03/11-13:44:45.668267 7f24c4bff6c0 Level-0 table #178: started -2025/03/11-13:44:45.668337 7f24c4bff6c0 Level-0 table #178: 0 bytes OK -2025/03/11-13:44:45.675505 7f24c4bff6c0 Delete type=0 #176 -2025/03/11-13:44:45.703361 7f24c4bff6c0 Manual compaction at level-0 from '!folders!2wTJBj3dicRKzNOE' @ 72057594037927935 : 1 .. '!items!ufvhWG5V8pX0qrtR' @ 0 : 0; will stop at (end) +2025/03/11-18:04:31.059498 7f24c6ffd6c0 Recovering log #177 +2025/03/11-18:04:31.068855 7f24c6ffd6c0 Delete type=3 #175 +2025/03/11-18:04:31.068919 7f24c6ffd6c0 Delete type=0 #177 +2025/03/11-18:27:51.778439 7f24c4bff6c0 Level-0 table #182: started +2025/03/11-18:27:51.778466 7f24c4bff6c0 Level-0 table #182: 0 bytes OK +2025/03/11-18:27:51.784375 7f24c4bff6c0 Delete type=0 #180 +2025/03/11-18:27:51.798058 7f24c4bff6c0 Manual compaction at level-0 from '!folders!2wTJBj3dicRKzNOE' @ 72057594037927935 : 1 .. '!items!ufvhWG5V8pX0qrtR' @ 0 : 0; will stop at (end) diff --git a/packs/armures/LOG.old b/packs/armures/LOG.old index 98b1db8..0fa7a92 100644 --- a/packs/armures/LOG.old +++ b/packs/armures/LOG.old @@ -1,12 +1,7 @@ -2025/03/10-23:31:25.013659 7f24c6ffd6c0 Delete type=3 #1 -2025/03/10-23:38:20.782267 7f24c4bff6c0 Level-0 table #173: started -2025/03/10-23:38:20.782316 7f24c4bff6c0 Level-0 table #173: 0 bytes OK -2025/03/10-23:38:20.817051 7f24c4bff6c0 Delete type=0 #171 -2025/03/10-23:38:20.943587 7f24c4bff6c0 Manual compaction at level-0 from '!folders!2wTJBj3dicRKzNOE' @ 72057594037927935 : 1 .. '!items!ufvhWG5V8pX0qrtR' @ 0 : 0; will stop at '!items!ufvhWG5V8pX0qrtR' @ 10 : 1 -2025/03/10-23:38:20.943603 7f24c4bff6c0 Compacting 2@0 + 0@1 files -2025/03/10-23:38:20.956100 7f24c4bff6c0 Generated table #174@0: 29 keys, 11991 bytes -2025/03/10-23:38:20.956127 7f24c4bff6c0 Compacted 2@0 + 0@1 files => 11991 bytes -2025/03/10-23:38:20.991272 7f24c4bff6c0 compacted to: files[ 0 1 0 0 0 0 0 ] -2025/03/10-23:38:20.991382 7f24c4bff6c0 Delete type=2 #167 -2025/03/10-23:38:20.991495 7f24c4bff6c0 Delete type=2 #80 -2025/03/10-23:38:21.093013 7f24c4bff6c0 Manual compaction at level-0 from '!items!ufvhWG5V8pX0qrtR' @ 10 : 1 .. '!items!ufvhWG5V8pX0qrtR' @ 0 : 0; will stop at (end) +2025/03/11-13:28:14.544961 7f24c6ffd6c0 Recovering log #172 +2025/03/11-13:28:14.555248 7f24c6ffd6c0 Delete type=3 #170 +2025/03/11-13:28:14.555342 7f24c6ffd6c0 Delete type=0 #172 +2025/03/11-13:44:45.668267 7f24c4bff6c0 Level-0 table #178: started +2025/03/11-13:44:45.668337 7f24c4bff6c0 Level-0 table #178: 0 bytes OK +2025/03/11-13:44:45.675505 7f24c4bff6c0 Delete type=0 #176 +2025/03/11-13:44:45.703361 7f24c4bff6c0 Manual compaction at level-0 from '!folders!2wTJBj3dicRKzNOE' @ 72057594037927935 : 1 .. '!items!ufvhWG5V8pX0qrtR' @ 0 : 0; will stop at (end) diff --git a/packs/armures/MANIFEST-000175 b/packs/armures/MANIFEST-000179 similarity index 77% rename from packs/armures/MANIFEST-000175 rename to packs/armures/MANIFEST-000179 index ed5d3da..0511aad 100644 Binary files a/packs/armures/MANIFEST-000175 and b/packs/armures/MANIFEST-000179 differ diff --git a/packs/competences/000174.log b/packs/competences/000178.log similarity index 100% rename from packs/competences/000174.log rename to packs/competences/000178.log diff --git a/packs/competences/CURRENT b/packs/competences/CURRENT index 647a5d6..4802dbe 100644 --- a/packs/competences/CURRENT +++ b/packs/competences/CURRENT @@ -1 +1 @@ -MANIFEST-000172 +MANIFEST-000176 diff --git a/packs/competences/LOG b/packs/competences/LOG index dc9e41b..a202a31 100644 --- a/packs/competences/LOG +++ b/packs/competences/LOG @@ -1,7 +1,7 @@ -2025/03/11-13:28:14.513253 7f24c67fc6c0 Recovering log #169 -2025/03/11-13:28:14.526554 7f24c67fc6c0 Delete type=3 #167 -2025/03/11-13:28:14.526600 7f24c67fc6c0 Delete type=0 #169 -2025/03/11-13:44:45.675611 7f24c4bff6c0 Level-0 table #175: started -2025/03/11-13:44:45.675642 7f24c4bff6c0 Level-0 table #175: 0 bytes OK -2025/03/11-13:44:45.683758 7f24c4bff6c0 Delete type=0 #173 -2025/03/11-13:44:45.703372 7f24c4bff6c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!yx4k7lQHGcom99mk' @ 0 : 0; will stop at (end) +2025/03/11-18:04:31.031690 7f24c57fa6c0 Recovering log #174 +2025/03/11-18:04:31.041244 7f24c57fa6c0 Delete type=3 #172 +2025/03/11-18:04:31.041294 7f24c57fa6c0 Delete type=0 #174 +2025/03/11-18:27:51.791921 7f24c4bff6c0 Level-0 table #179: started +2025/03/11-18:27:51.791971 7f24c4bff6c0 Level-0 table #179: 0 bytes OK +2025/03/11-18:27:51.797892 7f24c4bff6c0 Delete type=0 #177 +2025/03/11-18:27:51.798085 7f24c4bff6c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!yx4k7lQHGcom99mk' @ 0 : 0; will stop at (end) diff --git a/packs/competences/LOG.old b/packs/competences/LOG.old index 865ebe9..dc9e41b 100644 --- a/packs/competences/LOG.old +++ b/packs/competences/LOG.old @@ -1,12 +1,7 @@ -2025/03/10-23:31:24.961268 7f24c5ffb6c0 Delete type=3 #1 -2025/03/10-23:38:20.748036 7f24c4bff6c0 Level-0 table #170: started -2025/03/10-23:38:20.748112 7f24c4bff6c0 Level-0 table #170: 0 bytes OK -2025/03/10-23:38:20.781778 7f24c4bff6c0 Delete type=0 #168 -2025/03/10-23:38:20.883798 7f24c4bff6c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!yx4k7lQHGcom99mk' @ 0 : 0; will stop at '!items!yx4k7lQHGcom99mk' @ 17 : 1 -2025/03/10-23:38:20.883809 7f24c4bff6c0 Compacting 2@0 + 0@1 files -2025/03/10-23:38:20.911381 7f24c4bff6c0 Generated table #171@0: 116 keys, 38122 bytes -2025/03/10-23:38:20.911421 7f24c4bff6c0 Compacted 2@0 + 0@1 files => 38122 bytes -2025/03/10-23:38:20.943176 7f24c4bff6c0 compacted to: files[ 0 1 0 0 0 0 0 ] -2025/03/10-23:38:20.943325 7f24c4bff6c0 Delete type=2 #164 -2025/03/10-23:38:20.943483 7f24c4bff6c0 Delete type=2 #89 -2025/03/10-23:38:21.092992 7f24c4bff6c0 Manual compaction at level-0 from '!items!yx4k7lQHGcom99mk' @ 17 : 1 .. '!items!yx4k7lQHGcom99mk' @ 0 : 0; will stop at (end) +2025/03/11-13:28:14.513253 7f24c67fc6c0 Recovering log #169 +2025/03/11-13:28:14.526554 7f24c67fc6c0 Delete type=3 #167 +2025/03/11-13:28:14.526600 7f24c67fc6c0 Delete type=0 #169 +2025/03/11-13:44:45.675611 7f24c4bff6c0 Level-0 table #175: started +2025/03/11-13:44:45.675642 7f24c4bff6c0 Level-0 table #175: 0 bytes OK +2025/03/11-13:44:45.683758 7f24c4bff6c0 Delete type=0 #173 +2025/03/11-13:44:45.703372 7f24c4bff6c0 Manual compaction at level-0 from '!folders!4OPhigzcPv46qbWW' @ 72057594037927935 : 1 .. '!items!yx4k7lQHGcom99mk' @ 0 : 0; will stop at (end) diff --git a/packs/competences/MANIFEST-000172 b/packs/competences/MANIFEST-000176 similarity index 71% rename from packs/competences/MANIFEST-000172 rename to packs/competences/MANIFEST-000176 index 9920a63..14e058d 100644 Binary files a/packs/competences/MANIFEST-000172 and b/packs/competences/MANIFEST-000176 differ diff --git a/packs/education/000184.log b/packs/education/000189.log similarity index 100% rename from packs/education/000184.log rename to packs/education/000189.log diff --git a/packs/education/CURRENT b/packs/education/CURRENT index d3170b5..7832dba 100644 --- a/packs/education/CURRENT +++ b/packs/education/CURRENT @@ -1 +1 @@ -MANIFEST-000182 +MANIFEST-000187 diff --git a/packs/education/LOG b/packs/education/LOG index 4ee1013..1b346b1 100644 --- a/packs/education/LOG +++ b/packs/education/LOG @@ -1,14 +1,7 @@ -2025/03/11-13:28:14.558461 7f24c57fa6c0 Recovering log #179 -2025/03/11-13:28:14.568052 7f24c57fa6c0 Delete type=3 #177 -2025/03/11-13:28:14.568097 7f24c57fa6c0 Delete type=0 #179 -2025/03/11-13:44:45.690663 7f24c4bff6c0 Level-0 table #185: started -2025/03/11-13:44:45.696528 7f24c4bff6c0 Level-0 table #185: 269024 bytes OK -2025/03/11-13:44:45.703042 7f24c4bff6c0 Delete type=0 #183 -2025/03/11-13:44:45.703394 7f24c4bff6c0 Manual compaction at level-0 from '!folders!9PQi3Lv54rpcxavo' @ 72057594037927935 : 1 .. '!items!zGlRtP7zSnkjuuue' @ 0 : 0; will stop at '!items!zGlRtP7zSnkjuuue' @ 421 : 1 -2025/03/11-13:44:45.703398 7f24c4bff6c0 Compacting 1@0 + 1@1 files -2025/03/11-13:44:45.709467 7f24c4bff6c0 Generated table #186@0: 71 keys, 263379 bytes -2025/03/11-13:44:45.709502 7f24c4bff6c0 Compacted 1@0 + 1@1 files => 263379 bytes -2025/03/11-13:44:45.715665 7f24c4bff6c0 compacted to: files[ 0 1 0 0 0 0 0 ] -2025/03/11-13:44:45.715844 7f24c4bff6c0 Delete type=2 #181 -2025/03/11-13:44:45.716087 7f24c4bff6c0 Delete type=2 #185 -2025/03/11-13:44:45.737317 7f24c4bff6c0 Manual compaction at level-0 from '!items!zGlRtP7zSnkjuuue' @ 421 : 1 .. '!items!zGlRtP7zSnkjuuue' @ 0 : 0; will stop at (end) +2025/03/11-18:04:31.072608 7f24c67fc6c0 Recovering log #184 +2025/03/11-18:04:31.084241 7f24c67fc6c0 Delete type=3 #182 +2025/03/11-18:04:31.084398 7f24c67fc6c0 Delete type=0 #184 +2025/03/11-18:27:51.784510 7f24c4bff6c0 Level-0 table #190: started +2025/03/11-18:27:51.784541 7f24c4bff6c0 Level-0 table #190: 0 bytes OK +2025/03/11-18:27:51.791721 7f24c4bff6c0 Delete type=0 #188 +2025/03/11-18:27:51.798072 7f24c4bff6c0 Manual compaction at level-0 from '!folders!9PQi3Lv54rpcxavo' @ 72057594037927935 : 1 .. '!items!zGlRtP7zSnkjuuue' @ 0 : 0; will stop at (end) diff --git a/packs/education/LOG.old b/packs/education/LOG.old index 352cf9f..4ee1013 100644 --- a/packs/education/LOG.old +++ b/packs/education/LOG.old @@ -1,12 +1,14 @@ -2025/03/10-23:31:25.035606 7f24c5ffb6c0 Delete type=3 #1 -2025/03/10-23:38:21.093118 7f24c4bff6c0 Level-0 table #180: started -2025/03/10-23:38:21.093189 7f24c4bff6c0 Level-0 table #180: 0 bytes OK -2025/03/10-23:38:21.133310 7f24c4bff6c0 Delete type=0 #178 -2025/03/10-23:38:21.234756 7f24c4bff6c0 Manual compaction at level-0 from '!folders!9PQi3Lv54rpcxavo' @ 72057594037927935 : 1 .. '!items!zGlRtP7zSnkjuuue' @ 0 : 0; will stop at '!items!zGlRtP7zSnkjuuue' @ 297 : 1 -2025/03/10-23:38:21.234765 7f24c4bff6c0 Compacting 2@0 + 0@1 files -2025/03/10-23:38:21.251024 7f24c4bff6c0 Generated table #181@0: 71 keys, 246338 bytes -2025/03/10-23:38:21.251049 7f24c4bff6c0 Compacted 2@0 + 0@1 files => 246338 bytes -2025/03/10-23:38:21.280185 7f24c4bff6c0 compacted to: files[ 0 1 0 0 0 0 0 ] -2025/03/10-23:38:21.280319 7f24c4bff6c0 Delete type=2 #174 -2025/03/10-23:38:21.280476 7f24c4bff6c0 Delete type=2 #143 -2025/03/10-23:38:21.437896 7f24c4bff6c0 Manual compaction at level-0 from '!items!zGlRtP7zSnkjuuue' @ 297 : 1 .. '!items!zGlRtP7zSnkjuuue' @ 0 : 0; will stop at (end) +2025/03/11-13:28:14.558461 7f24c57fa6c0 Recovering log #179 +2025/03/11-13:28:14.568052 7f24c57fa6c0 Delete type=3 #177 +2025/03/11-13:28:14.568097 7f24c57fa6c0 Delete type=0 #179 +2025/03/11-13:44:45.690663 7f24c4bff6c0 Level-0 table #185: started +2025/03/11-13:44:45.696528 7f24c4bff6c0 Level-0 table #185: 269024 bytes OK +2025/03/11-13:44:45.703042 7f24c4bff6c0 Delete type=0 #183 +2025/03/11-13:44:45.703394 7f24c4bff6c0 Manual compaction at level-0 from '!folders!9PQi3Lv54rpcxavo' @ 72057594037927935 : 1 .. '!items!zGlRtP7zSnkjuuue' @ 0 : 0; will stop at '!items!zGlRtP7zSnkjuuue' @ 421 : 1 +2025/03/11-13:44:45.703398 7f24c4bff6c0 Compacting 1@0 + 1@1 files +2025/03/11-13:44:45.709467 7f24c4bff6c0 Generated table #186@0: 71 keys, 263379 bytes +2025/03/11-13:44:45.709502 7f24c4bff6c0 Compacted 1@0 + 1@1 files => 263379 bytes +2025/03/11-13:44:45.715665 7f24c4bff6c0 compacted to: files[ 0 1 0 0 0 0 0 ] +2025/03/11-13:44:45.715844 7f24c4bff6c0 Delete type=2 #181 +2025/03/11-13:44:45.716087 7f24c4bff6c0 Delete type=2 #185 +2025/03/11-13:44:45.737317 7f24c4bff6c0 Manual compaction at level-0 from '!items!zGlRtP7zSnkjuuue' @ 421 : 1 .. '!items!zGlRtP7zSnkjuuue' @ 0 : 0; will stop at (end) diff --git a/packs/education/MANIFEST-000182 b/packs/education/MANIFEST-000182 deleted file mode 100644 index 1c01a3e..0000000 Binary files a/packs/education/MANIFEST-000182 and /dev/null differ diff --git a/packs/education/MANIFEST-000187 b/packs/education/MANIFEST-000187 new file mode 100644 index 0000000..cf342d4 Binary files /dev/null and b/packs/education/MANIFEST-000187 differ diff --git a/packs/graces/000176.log b/packs/graces/000180.log similarity index 100% rename from packs/graces/000176.log rename to packs/graces/000180.log diff --git a/packs/graces/CURRENT b/packs/graces/CURRENT index ff4f65a..62cd86f 100644 --- a/packs/graces/CURRENT +++ b/packs/graces/CURRENT @@ -1 +1 @@ -MANIFEST-000174 +MANIFEST-000178 diff --git a/packs/graces/LOG b/packs/graces/LOG index 2464c62..bb8160f 100644 --- a/packs/graces/LOG +++ b/packs/graces/LOG @@ -1,7 +1,7 @@ -2025/03/11-13:28:14.573012 7f24c67fc6c0 Recovering log #171 -2025/03/11-13:28:14.583548 7f24c67fc6c0 Delete type=3 #169 -2025/03/11-13:28:14.583672 7f24c67fc6c0 Delete type=0 #171 -2025/03/11-13:44:45.722734 7f24c4bff6c0 Level-0 table #177: started -2025/03/11-13:44:45.722788 7f24c4bff6c0 Level-0 table #177: 0 bytes OK -2025/03/11-13:44:45.730379 7f24c4bff6c0 Delete type=0 #175 -2025/03/11-13:44:45.737367 7f24c4bff6c0 Manual compaction at level-0 from '!items!17mjvwS8R3B6LloG' @ 72057594037927935 : 1 .. '!items!zUYIVOuFpRur9aAR' @ 0 : 0; will stop at (end) +2025/03/11-18:04:31.089058 7f24c57fa6c0 Recovering log #176 +2025/03/11-18:04:31.099719 7f24c57fa6c0 Delete type=3 #174 +2025/03/11-18:04:31.099830 7f24c57fa6c0 Delete type=0 #176 +2025/03/11-18:27:51.804396 7f24c4bff6c0 Level-0 table #181: started +2025/03/11-18:27:51.804421 7f24c4bff6c0 Level-0 table #181: 0 bytes OK +2025/03/11-18:27:51.810625 7f24c4bff6c0 Delete type=0 #179 +2025/03/11-18:27:51.823828 7f24c4bff6c0 Manual compaction at level-0 from '!items!17mjvwS8R3B6LloG' @ 72057594037927935 : 1 .. '!items!zUYIVOuFpRur9aAR' @ 0 : 0; will stop at (end) diff --git a/packs/graces/LOG.old b/packs/graces/LOG.old index 6a82a3e..2464c62 100644 --- a/packs/graces/LOG.old +++ b/packs/graces/LOG.old @@ -1,12 +1,7 @@ -2025/03/10-23:31:25.056605 7f24c57fa6c0 Delete type=3 #1 -2025/03/10-23:38:20.817317 7f24c4bff6c0 Level-0 table #172: started -2025/03/10-23:38:20.817371 7f24c4bff6c0 Level-0 table #172: 0 bytes OK -2025/03/10-23:38:20.848305 7f24c4bff6c0 Delete type=0 #170 -2025/03/10-23:38:20.991553 7f24c4bff6c0 Manual compaction at level-0 from '!items!17mjvwS8R3B6LloG' @ 72057594037927935 : 1 .. '!items!zUYIVOuFpRur9aAR' @ 0 : 0; will stop at '!items!zUYIVOuFpRur9aAR' @ 40 : 1 -2025/03/10-23:38:20.991564 7f24c4bff6c0 Compacting 2@0 + 0@1 files -2025/03/10-23:38:21.011010 7f24c4bff6c0 Generated table #173@0: 49 keys, 19338 bytes -2025/03/10-23:38:21.011048 7f24c4bff6c0 Compacted 2@0 + 0@1 files => 19338 bytes -2025/03/10-23:38:21.044466 7f24c4bff6c0 compacted to: files[ 0 1 0 0 0 0 0 ] -2025/03/10-23:38:21.044683 7f24c4bff6c0 Delete type=2 #166 -2025/03/10-23:38:21.045035 7f24c4bff6c0 Delete type=2 #9 -2025/03/10-23:38:21.093032 7f24c4bff6c0 Manual compaction at level-0 from '!items!zUYIVOuFpRur9aAR' @ 40 : 1 .. '!items!zUYIVOuFpRur9aAR' @ 0 : 0; will stop at (end) +2025/03/11-13:28:14.573012 7f24c67fc6c0 Recovering log #171 +2025/03/11-13:28:14.583548 7f24c67fc6c0 Delete type=3 #169 +2025/03/11-13:28:14.583672 7f24c67fc6c0 Delete type=0 #171 +2025/03/11-13:44:45.722734 7f24c4bff6c0 Level-0 table #177: started +2025/03/11-13:44:45.722788 7f24c4bff6c0 Level-0 table #177: 0 bytes OK +2025/03/11-13:44:45.730379 7f24c4bff6c0 Delete type=0 #175 +2025/03/11-13:44:45.737367 7f24c4bff6c0 Manual compaction at level-0 from '!items!17mjvwS8R3B6LloG' @ 72057594037927935 : 1 .. '!items!zUYIVOuFpRur9aAR' @ 0 : 0; will stop at (end) diff --git a/packs/graces/MANIFEST-000174 b/packs/graces/MANIFEST-000178 similarity index 73% rename from packs/graces/MANIFEST-000174 rename to packs/graces/MANIFEST-000178 index c023404..9d5d1e0 100644 Binary files a/packs/graces/MANIFEST-000174 and b/packs/graces/MANIFEST-000178 differ diff --git a/packs/maladies/000176.log b/packs/maladies/000180.log similarity index 100% rename from packs/maladies/000176.log rename to packs/maladies/000180.log diff --git a/packs/maladies/CURRENT b/packs/maladies/CURRENT index ff4f65a..62cd86f 100644 --- a/packs/maladies/CURRENT +++ b/packs/maladies/CURRENT @@ -1 +1 @@ -MANIFEST-000174 +MANIFEST-000178 diff --git a/packs/maladies/LOG b/packs/maladies/LOG index 25b3f08..5cfcc92 100644 --- a/packs/maladies/LOG +++ b/packs/maladies/LOG @@ -1,7 +1,7 @@ -2025/03/11-13:28:14.587087 7f24c5ffb6c0 Recovering log #171 -2025/03/11-13:28:14.597186 7f24c5ffb6c0 Delete type=3 #169 -2025/03/11-13:28:14.597233 7f24c5ffb6c0 Delete type=0 #171 -2025/03/11-13:44:45.716209 7f24c4bff6c0 Level-0 table #177: started -2025/03/11-13:44:45.716245 7f24c4bff6c0 Level-0 table #177: 0 bytes OK -2025/03/11-13:44:45.722570 7f24c4bff6c0 Delete type=0 #175 -2025/03/11-13:44:45.737346 7f24c4bff6c0 Manual compaction at level-0 from '!items!1icaxIywAwDXQcMz' @ 72057594037927935 : 1 .. '!items!ysGehYm1VkMWrI22' @ 0 : 0; will stop at (end) +2025/03/11-18:04:31.102877 7f24c5ffb6c0 Recovering log #176 +2025/03/11-18:04:31.112795 7f24c5ffb6c0 Delete type=3 #174 +2025/03/11-18:04:31.112850 7f24c5ffb6c0 Delete type=0 #176 +2025/03/11-18:27:51.798175 7f24c4bff6c0 Level-0 table #181: started +2025/03/11-18:27:51.798273 7f24c4bff6c0 Level-0 table #181: 0 bytes OK +2025/03/11-18:27:51.804291 7f24c4bff6c0 Delete type=0 #179 +2025/03/11-18:27:51.823814 7f24c4bff6c0 Manual compaction at level-0 from '!items!1icaxIywAwDXQcMz' @ 72057594037927935 : 1 .. '!items!ysGehYm1VkMWrI22' @ 0 : 0; will stop at (end) diff --git a/packs/maladies/LOG.old b/packs/maladies/LOG.old index ccd340a..25b3f08 100644 --- a/packs/maladies/LOG.old +++ b/packs/maladies/LOG.old @@ -1,12 +1,7 @@ -2025/03/10-23:31:25.078373 7f24c6ffd6c0 Delete type=3 #1 -2025/03/10-23:38:21.163282 7f24c4bff6c0 Level-0 table #172: started -2025/03/10-23:38:21.163304 7f24c4bff6c0 Level-0 table #172: 0 bytes OK -2025/03/10-23:38:21.197873 7f24c4bff6c0 Delete type=0 #170 -2025/03/10-23:38:21.336040 7f24c4bff6c0 Manual compaction at level-0 from '!items!1icaxIywAwDXQcMz' @ 72057594037927935 : 1 .. '!items!ysGehYm1VkMWrI22' @ 0 : 0; will stop at '!items!ysGehYm1VkMWrI22' @ 14 : 1 -2025/03/10-23:38:21.336048 7f24c4bff6c0 Compacting 2@0 + 0@1 files -2025/03/10-23:38:21.352195 7f24c4bff6c0 Generated table #173@0: 17 keys, 11815 bytes -2025/03/10-23:38:21.352248 7f24c4bff6c0 Compacted 2@0 + 0@1 files => 11815 bytes -2025/03/10-23:38:21.381545 7f24c4bff6c0 compacted to: files[ 0 1 0 0 0 0 0 ] -2025/03/10-23:38:21.381733 7f24c4bff6c0 Delete type=2 #166 -2025/03/10-23:38:21.381975 7f24c4bff6c0 Delete type=2 #9 -2025/03/10-23:38:21.437938 7f24c4bff6c0 Manual compaction at level-0 from '!items!ysGehYm1VkMWrI22' @ 14 : 1 .. '!items!ysGehYm1VkMWrI22' @ 0 : 0; will stop at (end) +2025/03/11-13:28:14.587087 7f24c5ffb6c0 Recovering log #171 +2025/03/11-13:28:14.597186 7f24c5ffb6c0 Delete type=3 #169 +2025/03/11-13:28:14.597233 7f24c5ffb6c0 Delete type=0 #171 +2025/03/11-13:44:45.716209 7f24c4bff6c0 Level-0 table #177: started +2025/03/11-13:44:45.716245 7f24c4bff6c0 Level-0 table #177: 0 bytes OK +2025/03/11-13:44:45.722570 7f24c4bff6c0 Delete type=0 #175 +2025/03/11-13:44:45.737346 7f24c4bff6c0 Manual compaction at level-0 from '!items!1icaxIywAwDXQcMz' @ 72057594037927935 : 1 .. '!items!ysGehYm1VkMWrI22' @ 0 : 0; will stop at (end) diff --git a/packs/maladies/MANIFEST-000174 b/packs/maladies/MANIFEST-000178 similarity index 73% rename from packs/maladies/MANIFEST-000174 rename to packs/maladies/MANIFEST-000178 index 02723b7..6c31691 100644 Binary files a/packs/maladies/MANIFEST-000174 and b/packs/maladies/MANIFEST-000178 differ diff --git a/packs/scenes/000114.log b/packs/scenes/000118.log similarity index 100% rename from packs/scenes/000114.log rename to packs/scenes/000118.log diff --git a/packs/scenes/CURRENT b/packs/scenes/CURRENT index b59a6ba..2b6390e 100644 --- a/packs/scenes/CURRENT +++ b/packs/scenes/CURRENT @@ -1 +1 @@ -MANIFEST-000112 +MANIFEST-000116 diff --git a/packs/scenes/LOG b/packs/scenes/LOG index 50545b5..b9b3664 100644 --- a/packs/scenes/LOG +++ b/packs/scenes/LOG @@ -1,7 +1,7 @@ -2025/03/11-13:28:14.613748 7f24c57fa6c0 Recovering log #109 -2025/03/11-13:28:14.624991 7f24c57fa6c0 Delete type=3 #107 -2025/03/11-13:28:14.625043 7f24c57fa6c0 Delete type=0 #109 -2025/03/11-13:44:45.755608 7f24c4bff6c0 Level-0 table #115: started -2025/03/11-13:44:45.755668 7f24c4bff6c0 Level-0 table #115: 0 bytes OK -2025/03/11-13:44:45.761995 7f24c4bff6c0 Delete type=0 #113 -2025/03/11-13:44:45.768901 7f24c4bff6c0 Manual compaction at level-0 from '!scenes!FJXugdbkBpEJEdR6' @ 72057594037927935 : 1 .. '!scenes!FJXugdbkBpEJEdR6' @ 0 : 0; will stop at (end) +2025/03/11-18:04:31.129320 7f24c67fc6c0 Recovering log #114 +2025/03/11-18:04:31.139477 7f24c67fc6c0 Delete type=3 #112 +2025/03/11-18:04:31.139583 7f24c67fc6c0 Delete type=0 #114 +2025/03/11-18:27:51.817747 7f24c4bff6c0 Level-0 table #119: started +2025/03/11-18:27:51.817804 7f24c4bff6c0 Level-0 table #119: 0 bytes OK +2025/03/11-18:27:51.823741 7f24c4bff6c0 Delete type=0 #117 +2025/03/11-18:27:51.823845 7f24c4bff6c0 Manual compaction at level-0 from '!scenes!FJXugdbkBpEJEdR6' @ 72057594037927935 : 1 .. '!scenes!FJXugdbkBpEJEdR6' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/LOG.old b/packs/scenes/LOG.old index c70ad89..50545b5 100644 --- a/packs/scenes/LOG.old +++ b/packs/scenes/LOG.old @@ -1,13 +1,7 @@ -2025/03/10-23:31:25.122264 7f24c6ffd6c0 Delete type=3 #1 -2025/03/10-23:38:21.438081 7f24c4bff6c0 Level-0 table #110: started -2025/03/10-23:38:21.438134 7f24c4bff6c0 Level-0 table #110: 0 bytes OK -2025/03/10-23:38:21.471820 7f24c4bff6c0 Delete type=0 #108 -2025/03/10-23:38:21.606178 7f24c4bff6c0 Manual compaction at level-0 from '!scenes!FJXugdbkBpEJEdR6' @ 72057594037927935 : 1 .. '!scenes!FJXugdbkBpEJEdR6' @ 0 : 0; will stop at '!scenes!T55C6Rrtsfqgk7A9' @ 1 : 1 -2025/03/10-23:38:21.606190 7f24c4bff6c0 Compacting 3@0 + 0@1 files -2025/03/10-23:38:21.630582 7f24c4bff6c0 Generated table #111@0: 1 keys, 1334 bytes -2025/03/10-23:38:21.630628 7f24c4bff6c0 Compacted 3@0 + 0@1 files => 1334 bytes -2025/03/10-23:38:21.659198 7f24c4bff6c0 compacted to: files[ 0 1 0 0 0 0 0 ] -2025/03/10-23:38:21.659366 7f24c4bff6c0 Delete type=2 #104 -2025/03/10-23:38:21.659569 7f24c4bff6c0 Delete type=2 #5 -2025/03/10-23:38:21.659708 7f24c4bff6c0 Delete type=2 #9 -2025/03/10-23:38:21.659897 7f24c4bff6c0 Manual compaction at level-0 from '!scenes!T55C6Rrtsfqgk7A9' @ 1 : 1 .. '!scenes!FJXugdbkBpEJEdR6' @ 0 : 0; will stop at (end) +2025/03/11-13:28:14.613748 7f24c57fa6c0 Recovering log #109 +2025/03/11-13:28:14.624991 7f24c57fa6c0 Delete type=3 #107 +2025/03/11-13:28:14.625043 7f24c57fa6c0 Delete type=0 #109 +2025/03/11-13:44:45.755608 7f24c4bff6c0 Level-0 table #115: started +2025/03/11-13:44:45.755668 7f24c4bff6c0 Level-0 table #115: 0 bytes OK +2025/03/11-13:44:45.761995 7f24c4bff6c0 Delete type=0 #113 +2025/03/11-13:44:45.768901 7f24c4bff6c0 Manual compaction at level-0 from '!scenes!FJXugdbkBpEJEdR6' @ 72057594037927935 : 1 .. '!scenes!FJXugdbkBpEJEdR6' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/MANIFEST-000112 b/packs/scenes/MANIFEST-000116 similarity index 81% rename from packs/scenes/MANIFEST-000112 rename to packs/scenes/MANIFEST-000116 index c87c650..72e6f1c 100644 Binary files a/packs/scenes/MANIFEST-000112 and b/packs/scenes/MANIFEST-000116 differ diff --git a/packs/simples/000176.log b/packs/simples/000180.log similarity index 100% rename from packs/simples/000176.log rename to packs/simples/000180.log diff --git a/packs/simples/CURRENT b/packs/simples/CURRENT index ff4f65a..62cd86f 100644 --- a/packs/simples/CURRENT +++ b/packs/simples/CURRENT @@ -1 +1 @@ -MANIFEST-000174 +MANIFEST-000178 diff --git a/packs/simples/LOG b/packs/simples/LOG index f1a42bc..c12a150 100644 --- a/packs/simples/LOG +++ b/packs/simples/LOG @@ -1,7 +1,7 @@ -2025/03/11-13:28:14.600224 7f24c6ffd6c0 Recovering log #171 -2025/03/11-13:28:14.609993 7f24c6ffd6c0 Delete type=3 #169 -2025/03/11-13:28:14.610100 7f24c6ffd6c0 Delete type=0 #171 -2025/03/11-13:44:45.730600 7f24c4bff6c0 Level-0 table #177: started -2025/03/11-13:44:45.730666 7f24c4bff6c0 Level-0 table #177: 0 bytes OK -2025/03/11-13:44:45.737103 7f24c4bff6c0 Delete type=0 #175 -2025/03/11-13:44:45.737471 7f24c4bff6c0 Manual compaction at level-0 from '!items!1bAL2MQVpVBd0c5Z' @ 72057594037927935 : 1 .. '!items!zs67k4sxCid6oTK3' @ 0 : 0; will stop at (end) +2025/03/11-18:04:31.115280 7f24c6ffd6c0 Recovering log #176 +2025/03/11-18:04:31.125809 7f24c6ffd6c0 Delete type=3 #174 +2025/03/11-18:04:31.125868 7f24c6ffd6c0 Delete type=0 #176 +2025/03/11-18:27:51.810753 7f24c4bff6c0 Level-0 table #181: started +2025/03/11-18:27:51.810792 7f24c4bff6c0 Level-0 table #181: 0 bytes OK +2025/03/11-18:27:51.817530 7f24c4bff6c0 Delete type=0 #179 +2025/03/11-18:27:51.823838 7f24c4bff6c0 Manual compaction at level-0 from '!items!1bAL2MQVpVBd0c5Z' @ 72057594037927935 : 1 .. '!items!zs67k4sxCid6oTK3' @ 0 : 0; will stop at (end) diff --git a/packs/simples/LOG.old b/packs/simples/LOG.old index 5b8676c..f1a42bc 100644 --- a/packs/simples/LOG.old +++ b/packs/simples/LOG.old @@ -1,12 +1,7 @@ -2025/03/10-23:31:25.099812 7f24c57fa6c0 Delete type=3 #1 -2025/03/10-23:38:21.133424 7f24c4bff6c0 Level-0 table #172: started -2025/03/10-23:38:21.133448 7f24c4bff6c0 Level-0 table #172: 0 bytes OK -2025/03/10-23:38:21.163168 7f24c4bff6c0 Delete type=0 #170 -2025/03/10-23:38:21.280576 7f24c4bff6c0 Manual compaction at level-0 from '!items!1bAL2MQVpVBd0c5Z' @ 72057594037927935 : 1 .. '!items!zs67k4sxCid6oTK3' @ 0 : 0; will stop at '!items!zs67k4sxCid6oTK3' @ 35 : 1 -2025/03/10-23:38:21.280587 7f24c4bff6c0 Compacting 2@0 + 0@1 files -2025/03/10-23:38:21.298736 7f24c4bff6c0 Generated table #173@0: 36 keys, 20664 bytes -2025/03/10-23:38:21.298771 7f24c4bff6c0 Compacted 2@0 + 0@1 files => 20664 bytes -2025/03/10-23:38:21.335783 7f24c4bff6c0 compacted to: files[ 0 1 0 0 0 0 0 ] -2025/03/10-23:38:21.335886 7f24c4bff6c0 Delete type=2 #166 -2025/03/10-23:38:21.335988 7f24c4bff6c0 Delete type=2 #9 -2025/03/10-23:38:21.437919 7f24c4bff6c0 Manual compaction at level-0 from '!items!zs67k4sxCid6oTK3' @ 35 : 1 .. '!items!zs67k4sxCid6oTK3' @ 0 : 0; will stop at (end) +2025/03/11-13:28:14.600224 7f24c6ffd6c0 Recovering log #171 +2025/03/11-13:28:14.609993 7f24c6ffd6c0 Delete type=3 #169 +2025/03/11-13:28:14.610100 7f24c6ffd6c0 Delete type=0 #171 +2025/03/11-13:44:45.730600 7f24c4bff6c0 Level-0 table #177: started +2025/03/11-13:44:45.730666 7f24c4bff6c0 Level-0 table #177: 0 bytes OK +2025/03/11-13:44:45.737103 7f24c4bff6c0 Delete type=0 #175 +2025/03/11-13:44:45.737471 7f24c4bff6c0 Manual compaction at level-0 from '!items!1bAL2MQVpVBd0c5Z' @ 72057594037927935 : 1 .. '!items!zs67k4sxCid6oTK3' @ 0 : 0; will stop at (end) diff --git a/packs/simples/MANIFEST-000174 b/packs/simples/MANIFEST-000178 similarity index 73% rename from packs/simples/MANIFEST-000174 rename to packs/simples/MANIFEST-000178 index eb849d0..139f54a 100644 Binary files a/packs/simples/MANIFEST-000174 and b/packs/simples/MANIFEST-000178 differ diff --git a/templates/chat/chat-generic-result.hbs b/templates/chat/chat-generic-result.hbs index 2cae409..3dcac2f 100644 --- a/templates/chat/chat-generic-result.hbs +++ b/templates/chat/chat-generic-result.hbs @@ -46,6 +46,7 @@ {{else}}
  • Difficulté: {{difficulty}}
    • {{/if}} + @@ -57,6 +58,11 @@ {{#if isReussiteCritique}}
  • Réussite critique ! 1 XP gagné en {{carac.name}}.
    • {{/if}} + + {{#if arme}} +
  • Attaque réussie ! Faites une opposition avec la défense de la cible ou appliquez directement les dégats.
    • + {{/if}} + {{else}}
  • Echec !
    • {{#if isEchecCritique}} @@ -71,9 +77,19 @@ {{/if}}
    - + + + {{#if arme}} + {{#if isSuccess}} + + + + {{/if}} + {{/if}} + +