From 31517030f6dd2cc2d51af90e64717e8276481c81 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Tue, 11 Mar 2025 20:10:06 +0100 Subject: [PATCH] Gestion opposition en combat melee --- images/icons/appliquer-degats.webp | Bin 0 -> 31942 bytes modules/common/tedeum-utility.js | 61 +++++++++++------- packs/aides/{000075.log => 000079.log} | 0 packs/aides/CURRENT | 2 +- packs/aides/LOG | 14 ++-- packs/aides/LOG.old | 19 ++---- .../{MANIFEST-000073 => MANIFEST-000077} | Bin 220 -> 220 bytes packs/armes/{000177.log => 000181.log} | 0 packs/armes/CURRENT | 2 +- packs/armes/LOG | 14 ++-- packs/armes/LOG.old | 19 ++---- .../{MANIFEST-000175 => MANIFEST-000179} | Bin 176 -> 176 bytes packs/armures/{000177.log => 000181.log} | 0 packs/armures/CURRENT | 2 +- packs/armures/LOG | 14 ++-- packs/armures/LOG.old | 19 ++---- .../{MANIFEST-000175 => MANIFEST-000179} | Bin 175 -> 175 bytes packs/competences/{000174.log => 000178.log} | 0 packs/competences/CURRENT | 2 +- packs/competences/LOG | 14 ++-- packs/competences/LOG.old | 19 ++---- .../{MANIFEST-000172 => MANIFEST-000176} | Bin 178 -> 178 bytes packs/education/{000184.log => 000189.log} | 0 packs/education/CURRENT | 2 +- packs/education/LOG | 21 ++---- packs/education/LOG.old | 26 ++++---- packs/education/MANIFEST-000182 | Bin 384 -> 0 bytes packs/education/MANIFEST-000187 | Bin 0 -> 178 bytes packs/graces/{000176.log => 000180.log} | 0 packs/graces/CURRENT | 2 +- packs/graces/LOG | 14 ++-- packs/graces/LOG.old | 19 ++---- .../{MANIFEST-000174 => MANIFEST-000178} | Bin 174 -> 174 bytes packs/maladies/{000176.log => 000180.log} | 0 packs/maladies/CURRENT | 2 +- packs/maladies/LOG | 14 ++-- packs/maladies/LOG.old | 19 ++---- .../{MANIFEST-000174 => MANIFEST-000178} | Bin 173 -> 173 bytes packs/scenes/{000114.log => 000118.log} | 0 packs/scenes/CURRENT | 2 +- packs/scenes/LOG | 14 ++-- packs/scenes/LOG.old | 20 ++---- .../{MANIFEST-000112 => MANIFEST-000116} | Bin 171 -> 171 bytes packs/simples/{000176.log => 000180.log} | 0 packs/simples/CURRENT | 2 +- packs/simples/LOG | 14 ++-- packs/simples/LOG.old | 19 ++---- .../{MANIFEST-000174 => MANIFEST-000178} | Bin 174 -> 174 bytes templates/chat/chat-generic-result.hbs | 18 +++++- 49 files changed, 196 insertions(+), 213 deletions(-) create mode 100644 images/icons/appliquer-degats.webp rename packs/aides/{000075.log => 000079.log} (100%) rename packs/aides/{MANIFEST-000073 => MANIFEST-000077} (58%) rename packs/armes/{000177.log => 000181.log} (100%) rename packs/armes/{MANIFEST-000175 => MANIFEST-000179} (72%) rename packs/armures/{000177.log => 000181.log} (100%) rename packs/armures/{MANIFEST-000175 => MANIFEST-000179} (77%) rename packs/competences/{000174.log => 000178.log} (100%) rename packs/competences/{MANIFEST-000172 => MANIFEST-000176} (71%) rename packs/education/{000184.log => 000189.log} (100%) delete mode 100644 packs/education/MANIFEST-000182 create mode 100644 packs/education/MANIFEST-000187 rename packs/graces/{000176.log => 000180.log} (100%) rename packs/graces/{MANIFEST-000174 => MANIFEST-000178} (73%) rename packs/maladies/{000176.log => 000180.log} (100%) rename packs/maladies/{MANIFEST-000174 => MANIFEST-000178} (73%) rename packs/scenes/{000114.log => 000118.log} (100%) rename packs/scenes/{MANIFEST-000112 => MANIFEST-000116} (81%) rename packs/simples/{000176.log => 000180.log} (100%) rename packs/simples/{MANIFEST-000174 => MANIFEST-000178} (73%) diff --git a/images/icons/appliquer-degats.webp b/images/icons/appliquer-degats.webp new file mode 100644 index 0000000000000000000000000000000000000000..afb73a458a5c0f989a144fa3e21274ebebdd8f42 GIT binary patch literal 31942 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 V)B&G^&8vR{9N;& 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 4d0fa57946fa10b1cbaa8904b856207ac6927137..539a1c8ef55add3be1013323b4c1d18b6983a611 100644 GIT binary patch delta 37 pcmcb^c!zPqKDjgRt+hB97@7Py8JPW9#QZNxhl9BOKyDz57y#3I2zUSh delta 37 pcmcb^c!zPqKDmV0P0u(O7@52{8JN9U#E!lZngZf_1G&B|VgTVJ31R>M 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 c2e14d00d5fa1ec1ddcc4e1c40f990f3637f014b..abc69b452701f8892d90e87e7004ef2a2a425848 100644 GIT binary patch delta 41 rcmdnMxPfs(pHf8P1r;s^My4%{oD9rc8Clf1Pbcw!1h#?%wgUwK;FSpV delta 41 scmdnMxPfs(pOUeLKL-~BBhv;(P6p 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 ed5d3da5f2bc981ca15ac5a05514cb3f7a6667a7..0511aadb528c2570a35f1579ae5f95796dd0ace1 100644 GIT binary patch delta 41 scmZ3_xSnxBuhQ=eR-Rl8j7(b?IT@I@GP1~JM6Y-c64(k7*bWo`00ia=mjD0& delta 41 scmZ3_xSnxBuhNAXJ0Ei~Ffwgm 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 9920a635ca598a3916b220b2f71d44a32cf2d9bd..14e058ddd574a820da6c3c294d37152f233211c2 100644 GIT binary patch delta 43 scmdnQxQTH>pGucZ?Kf@)My8F7oD9sH7+D$^HG5{UfkZZeM7DrL00v|VA^-pY delta 43 tcmdnQxQTH>pGyCN?Y!I!j7)18IT@JOF|sr;ZkzK!3na1*B(eb{0ss>|3iAK} 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 1c01a3e75df400fbbb129a7f3cd5f6e7ecf683c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 384 zcmdPe7`(Qffss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfDVUNN&IHMdx?$~`Bj zB*45XI4?V^w6rvpQInAY1lSq3G9GH-S5!>P&q+xwDps@%2+TD0DKj-GDoCzKEX!x~ z0IMTt&?Sj=_qiDunYJ@>GBEF8WckFDa+*^;1SqltB(jT 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 c02340490a3f533f0e0e52d8bf7e21d3e890c5e6..9d5d1e0b08d5bf6b46e5b008656b19e5ea58ed57 100644 GIT binary patch delta 41 scmZ3-xQ=l`j}nhm*BUMcMyAb-oD9rc7+DO3Pi-j%32XrgYy%1a0N;=aZU6uP delta 41 scmZ3-xQ=l`kJ9%Svo3NmFfy%Y 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 02723b7ae88074b2f2e58abfa203bf4507b0700c..6c31691949ec4431ffa59f35873998422fae51ae 100644 GIT binary patch delta 41 rcmZ3>xR!B3w~~6K-7YQ$MyAb-oD9rc7+C}*ItB7U0$V@=+kgT9(-a6} delta 41 scmZ3>xR!B3x01~&y{lXdj7;kpIT@HYFtP|1ALu^|64(F|*aQ>+0QR&BGXMYp 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 c87c65092ae77dbdf680548a62065dd72ddda117..72e6f1c8056e8bc09155ef6109b5e90236457ebb 100644 GIT binary patch delta 37 pcmZ3@xSDZ7uUwQ(DkBF2BU33S19KS*i{jnN6CiFGkXymR0syS32j&0( delta 37 pcmZ3@xSDZ7uiQ1E@Ae!Fj7)``49rC=Ecy3y?LgcjAh(2t1pvvz2(kbG 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 eb849d04b453cf00c71849bbe3cf80bf5291bd16..139f54a68c2dd10d5e0c9d55502e242e5acfd648 100644 GIT binary patch delta 41 rcmZ3-xQ=l`kCL;0ia!?vBhzL^P6p;Jj4UcP^-)qFfh{0`Z9oA4(4Gir delta 41 scmZ3-xQ=l`kCMcK5*;oEMyB+0OhC&r~m)} 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}} + +