diff --git a/modules/wasteland-actor.js b/modules/wasteland-actor.js index 2d2fa2b..fb5c2f0 100644 --- a/modules/wasteland-actor.js +++ b/modules/wasteland-actor.js @@ -217,7 +217,12 @@ export class WastelandActor extends Actor { super._preUpdate(changed, options, user); } - + /* -------------------------------------------- */ + incDecSante(value) { + let sante = duplicate(this.system.sante) + sante.letaux += value + this.update({ 'system.sante': sante }) + } /* -------------------------------------------- */ getItemById(id) { let item = this.items.find(item => item.id == id); diff --git a/modules/wasteland-utility.js b/modules/wasteland-utility.js index e28d34f..32d1415 100644 --- a/modules/wasteland-utility.js +++ b/modules/wasteland-utility.js @@ -292,7 +292,7 @@ export class WastelandUtility { } /* -------------------------------------------- */ - static computeResult(rollData) { + static computeResult(rollData, actor) { if (rollData.charme) { let resultIndex = false let resTab = duplicate(rollData.charme.system.resultats) @@ -306,9 +306,15 @@ export class WastelandUtility { rollData.charmeDuree = rollData.charme.system.resultats[resultIndex].description } let effectRoll = new Roll(rollData.charmeDice).roll({ async: false }) - rollData.contrecoupResult = effectRoll.total - if (rollData.contrecoupResult % 2 == 1) { - rollData.contrecoup = __contrecouptCharme[rollData.contrecoupResult] + if (rollData.charme.system.charmetype == "tour") { + rollData.contrecoupResult = effectRoll.total + if (rollData.contrecoupResult % 2 == 1) { + rollData.contrecoup = __contrecouptCharme[rollData.contrecoupResult] + } + } + if (rollData.charme.system.charmetype == "charme") { + rollData.charmeSante = effectRoll.total + actor.incDecSante(rollData.charmeSante) } } else { if (rollData.mainDice == "1d20") { @@ -377,7 +383,7 @@ export class WastelandUtility { console.log(">>>> ", myRoll) rollData.finalResult = myRoll.total - this.computeResult(rollData) + this.computeResult(rollData, actor) this.createChatWithRollMode(rollData.alias, { content: await renderTemplate(`systems/fvtt-wasteland/templates/chat-generic-result.html`, rollData) diff --git a/packs/armes/000036.log b/packs/armes/000040.log similarity index 100% rename from packs/armes/000036.log rename to packs/armes/000040.log diff --git a/packs/armes/CURRENT b/packs/armes/CURRENT index eea9b0f..59611b0 100644 --- a/packs/armes/CURRENT +++ b/packs/armes/CURRENT @@ -1 +1 @@ -MANIFEST-000034 +MANIFEST-000038 diff --git a/packs/armes/LOG b/packs/armes/LOG index 6ee6eec..6461521 100644 --- a/packs/armes/LOG +++ b/packs/armes/LOG @@ -1,8 +1,8 @@ -2023/11/29-20:50:20.610722 7ff1ecbfe6c0 Recovering log #32 -2023/11/29-20:50:20.620538 7ff1ecbfe6c0 Delete type=3 #30 -2023/11/29-20:50:20.620594 7ff1ecbfe6c0 Delete type=0 #32 -2023/11/29-22:03:29.595804 7fef56ffd6c0 Level-0 table #37: started -2023/11/29-22:03:29.595831 7fef56ffd6c0 Level-0 table #37: 0 bytes OK -2023/11/29-22:03:29.601970 7fef56ffd6c0 Delete type=0 #35 -2023/11/29-22:03:29.602116 7fef56ffd6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/11/29-22:03:29.602150 7fef56ffd6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/11/29-22:11:25.434763 7fef57fff6c0 Recovering log #36 +2023/11/29-22:11:25.445038 7fef57fff6c0 Delete type=3 #34 +2023/11/29-22:11:25.445125 7fef57fff6c0 Delete type=0 #36 +2023/11/29-22:14:16.953175 7fef56ffd6c0 Level-0 table #41: started +2023/11/29-22:14:16.953201 7fef56ffd6c0 Level-0 table #41: 0 bytes OK +2023/11/29-22:14:16.991886 7fef56ffd6c0 Delete type=0 #39 +2023/11/29-22:14:17.106517 7fef56ffd6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/11/29-22:14:17.106560 7fef56ffd6c0 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 1abe331..6ee6eec 100644 --- a/packs/armes/LOG.old +++ b/packs/armes/LOG.old @@ -1,8 +1,8 @@ -2023/11/29-20:25:32.744065 7fef57fff6c0 Recovering log #28 -2023/11/29-20:25:32.754791 7fef57fff6c0 Delete type=3 #26 -2023/11/29-20:25:32.754891 7fef57fff6c0 Delete type=0 #28 -2023/11/29-20:49:13.095281 7fef56ffd6c0 Level-0 table #33: started -2023/11/29-20:49:13.095318 7fef56ffd6c0 Level-0 table #33: 0 bytes OK -2023/11/29-20:49:13.101902 7fef56ffd6c0 Delete type=0 #31 -2023/11/29-20:49:13.102220 7fef56ffd6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/11/29-20:49:13.102247 7fef56ffd6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/11/29-20:50:20.610722 7ff1ecbfe6c0 Recovering log #32 +2023/11/29-20:50:20.620538 7ff1ecbfe6c0 Delete type=3 #30 +2023/11/29-20:50:20.620594 7ff1ecbfe6c0 Delete type=0 #32 +2023/11/29-22:03:29.595804 7fef56ffd6c0 Level-0 table #37: started +2023/11/29-22:03:29.595831 7fef56ffd6c0 Level-0 table #37: 0 bytes OK +2023/11/29-22:03:29.601970 7fef56ffd6c0 Delete type=0 #35 +2023/11/29-22:03:29.602116 7fef56ffd6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/11/29-22:03:29.602150 7fef56ffd6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) diff --git a/packs/armes/MANIFEST-000034 b/packs/armes/MANIFEST-000034 deleted file mode 100644 index 8f0f104..0000000 Binary files a/packs/armes/MANIFEST-000034 and /dev/null differ diff --git a/packs/armes/MANIFEST-000038 b/packs/armes/MANIFEST-000038 new file mode 100644 index 0000000..6366c57 Binary files /dev/null and b/packs/armes/MANIFEST-000038 differ diff --git a/packs/equipement/000096.log b/packs/equipement/000100.log similarity index 100% rename from packs/equipement/000096.log rename to packs/equipement/000100.log diff --git a/packs/equipement/CURRENT b/packs/equipement/CURRENT index 0ab25fa..95395b2 100644 --- a/packs/equipement/CURRENT +++ b/packs/equipement/CURRENT @@ -1 +1 @@ -MANIFEST-000094 +MANIFEST-000098 diff --git a/packs/equipement/LOG b/packs/equipement/LOG index 137b178..bacb497 100644 --- a/packs/equipement/LOG +++ b/packs/equipement/LOG @@ -1,8 +1,8 @@ -2023/11/29-20:50:20.635956 7ff1ed3ff6c0 Recovering log #92 -2023/11/29-20:50:20.646539 7ff1ed3ff6c0 Delete type=3 #90 -2023/11/29-20:50:20.646595 7ff1ed3ff6c0 Delete type=0 #92 -2023/11/29-22:03:29.622718 7fef56ffd6c0 Level-0 table #97: started -2023/11/29-22:03:29.622756 7fef56ffd6c0 Level-0 table #97: 0 bytes OK -2023/11/29-22:03:29.630708 7fef56ffd6c0 Delete type=0 #95 -2023/11/29-22:03:29.630884 7fef56ffd6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) -2023/11/29-22:03:29.630919 7fef56ffd6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/11/29-22:11:25.461453 7ff1ecbfe6c0 Recovering log #96 +2023/11/29-22:11:25.472590 7ff1ecbfe6c0 Delete type=3 #94 +2023/11/29-22:11:25.472658 7ff1ecbfe6c0 Delete type=0 #96 +2023/11/29-22:14:17.029859 7fef56ffd6c0 Level-0 table #101: started +2023/11/29-22:14:17.029891 7fef56ffd6c0 Level-0 table #101: 0 bytes OK +2023/11/29-22:14:17.067628 7fef56ffd6c0 Delete type=0 #99 +2023/11/29-22:14:17.106540 7fef56ffd6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/11/29-22:14:17.106574 7fef56ffd6c0 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 3756aaa..137b178 100644 --- a/packs/equipement/LOG.old +++ b/packs/equipement/LOG.old @@ -1,8 +1,8 @@ -2023/11/29-20:25:32.775236 7ff1ecbfe6c0 Recovering log #88 -2023/11/29-20:25:32.786996 7ff1ecbfe6c0 Delete type=3 #86 -2023/11/29-20:25:32.787114 7ff1ecbfe6c0 Delete type=0 #88 -2023/11/29-20:49:13.115047 7fef56ffd6c0 Level-0 table #93: started -2023/11/29-20:49:13.115075 7fef56ffd6c0 Level-0 table #93: 0 bytes OK -2023/11/29-20:49:13.122784 7fef56ffd6c0 Delete type=0 #91 -2023/11/29-20:49:13.129333 7fef56ffd6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) -2023/11/29-20:49:13.129446 7fef56ffd6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/11/29-20:50:20.635956 7ff1ed3ff6c0 Recovering log #92 +2023/11/29-20:50:20.646539 7ff1ed3ff6c0 Delete type=3 #90 +2023/11/29-20:50:20.646595 7ff1ed3ff6c0 Delete type=0 #92 +2023/11/29-22:03:29.622718 7fef56ffd6c0 Level-0 table #97: started +2023/11/29-22:03:29.622756 7fef56ffd6c0 Level-0 table #97: 0 bytes OK +2023/11/29-22:03:29.630708 7fef56ffd6c0 Delete type=0 #95 +2023/11/29-22:03:29.630884 7fef56ffd6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/11/29-22:03:29.630919 7fef56ffd6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) diff --git a/packs/equipement/MANIFEST-000094 b/packs/equipement/MANIFEST-000094 deleted file mode 100644 index 5065709..0000000 Binary files a/packs/equipement/MANIFEST-000094 and /dev/null differ diff --git a/packs/equipement/MANIFEST-000098 b/packs/equipement/MANIFEST-000098 new file mode 100644 index 0000000..7b4df4d Binary files /dev/null and b/packs/equipement/MANIFEST-000098 differ diff --git a/packs/heritages/000060.log b/packs/heritages/000064.log similarity index 100% rename from packs/heritages/000060.log rename to packs/heritages/000064.log diff --git a/packs/heritages/CURRENT b/packs/heritages/CURRENT index 717cf9a..5ca571d 100644 --- a/packs/heritages/CURRENT +++ b/packs/heritages/CURRENT @@ -1 +1 @@ -MANIFEST-000058 +MANIFEST-000062 diff --git a/packs/heritages/LOG b/packs/heritages/LOG index b6c4e60..1909010 100644 --- a/packs/heritages/LOG +++ b/packs/heritages/LOG @@ -1,8 +1,8 @@ -2023/11/29-20:50:20.569702 7fef577fe6c0 Recovering log #56 -2023/11/29-20:50:20.579868 7fef577fe6c0 Delete type=3 #54 -2023/11/29-20:50:20.579933 7fef577fe6c0 Delete type=0 #56 -2023/11/29-22:03:29.569369 7fef56ffd6c0 Level-0 table #61: started -2023/11/29-22:03:29.569409 7fef56ffd6c0 Level-0 table #61: 0 bytes OK -2023/11/29-22:03:29.577270 7fef56ffd6c0 Delete type=0 #59 -2023/11/29-22:03:29.595791 7fef56ffd6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) -2023/11/29-22:03:29.602105 7fef56ffd6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +2023/11/29-22:11:25.395108 7fef577fe6c0 Recovering log #60 +2023/11/29-22:11:25.405396 7fef577fe6c0 Delete type=3 #58 +2023/11/29-22:11:25.405484 7fef577fe6c0 Delete type=0 #60 +2023/11/29-22:14:16.809567 7fef56ffd6c0 Level-0 table #65: started +2023/11/29-22:14:16.809597 7fef56ffd6c0 Level-0 table #65: 0 bytes OK +2023/11/29-22:14:16.843768 7fef56ffd6c0 Delete type=0 #63 +2023/11/29-22:14:16.952987 7fef56ffd6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +2023/11/29-22:14:16.953032 7fef56ffd6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) diff --git a/packs/heritages/LOG.old b/packs/heritages/LOG.old index df9539f..b6c4e60 100644 --- a/packs/heritages/LOG.old +++ b/packs/heritages/LOG.old @@ -1,8 +1,8 @@ -2023/11/29-20:25:32.713498 7ff1ecbfe6c0 Recovering log #52 -2023/11/29-20:25:32.724055 7ff1ecbfe6c0 Delete type=3 #50 -2023/11/29-20:25:32.724139 7ff1ecbfe6c0 Delete type=0 #52 -2023/11/29-20:49:13.088840 7fef56ffd6c0 Level-0 table #57: started -2023/11/29-20:49:13.088883 7fef56ffd6c0 Level-0 table #57: 0 bytes OK -2023/11/29-20:49:13.095120 7fef56ffd6c0 Delete type=0 #55 -2023/11/29-20:49:13.102186 7fef56ffd6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) -2023/11/29-20:49:13.102238 7fef56ffd6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +2023/11/29-20:50:20.569702 7fef577fe6c0 Recovering log #56 +2023/11/29-20:50:20.579868 7fef577fe6c0 Delete type=3 #54 +2023/11/29-20:50:20.579933 7fef577fe6c0 Delete type=0 #56 +2023/11/29-22:03:29.569369 7fef56ffd6c0 Level-0 table #61: started +2023/11/29-22:03:29.569409 7fef56ffd6c0 Level-0 table #61: 0 bytes OK +2023/11/29-22:03:29.577270 7fef56ffd6c0 Delete type=0 #59 +2023/11/29-22:03:29.595791 7fef56ffd6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +2023/11/29-22:03:29.602105 7fef56ffd6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) diff --git a/packs/heritages/MANIFEST-000058 b/packs/heritages/MANIFEST-000062 similarity index 73% rename from packs/heritages/MANIFEST-000058 rename to packs/heritages/MANIFEST-000062 index e067813..50e8baf 100644 Binary files a/packs/heritages/MANIFEST-000058 and b/packs/heritages/MANIFEST-000062 differ diff --git a/packs/metiers/000060.log b/packs/metiers/000064.log similarity index 100% rename from packs/metiers/000060.log rename to packs/metiers/000064.log diff --git a/packs/metiers/CURRENT b/packs/metiers/CURRENT index 717cf9a..5ca571d 100644 --- a/packs/metiers/CURRENT +++ b/packs/metiers/CURRENT @@ -1 +1 @@ -MANIFEST-000058 +MANIFEST-000062 diff --git a/packs/metiers/LOG b/packs/metiers/LOG index 6c76880..6406a22 100644 --- a/packs/metiers/LOG +++ b/packs/metiers/LOG @@ -1,8 +1,8 @@ -2023/11/29-20:50:20.582005 7ff1ed3ff6c0 Recovering log #56 -2023/11/29-20:50:20.593394 7ff1ed3ff6c0 Delete type=3 #54 -2023/11/29-20:50:20.593446 7ff1ed3ff6c0 Delete type=0 #56 -2023/11/29-22:03:29.577397 7fef56ffd6c0 Level-0 table #61: started -2023/11/29-22:03:29.577421 7fef56ffd6c0 Level-0 table #61: 0 bytes OK -2023/11/29-22:03:29.583760 7fef56ffd6c0 Delete type=0 #59 -2023/11/29-22:03:29.602081 7fef56ffd6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) -2023/11/29-22:03:29.602123 7fef56ffd6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +2023/11/29-22:11:25.407678 7ff1ecbfe6c0 Recovering log #60 +2023/11/29-22:11:25.418261 7ff1ecbfe6c0 Delete type=3 #58 +2023/11/29-22:11:25.418378 7ff1ecbfe6c0 Delete type=0 #60 +2023/11/29-22:14:16.923054 7fef56ffd6c0 Level-0 table #65: started +2023/11/29-22:14:16.923087 7fef56ffd6c0 Level-0 table #65: 0 bytes OK +2023/11/29-22:14:16.952832 7fef56ffd6c0 Delete type=0 #63 +2023/11/29-22:14:16.953024 7fef56ffd6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +2023/11/29-22:14:16.953057 7fef56ffd6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) diff --git a/packs/metiers/LOG.old b/packs/metiers/LOG.old index 833de1d..6c76880 100644 --- a/packs/metiers/LOG.old +++ b/packs/metiers/LOG.old @@ -1,8 +1,8 @@ -2023/11/29-20:25:32.727762 7fef577fe6c0 Recovering log #52 -2023/11/29-20:25:32.739240 7fef577fe6c0 Delete type=3 #50 -2023/11/29-20:25:32.739338 7fef577fe6c0 Delete type=0 #52 -2023/11/29-20:49:13.102362 7fef56ffd6c0 Level-0 table #57: started -2023/11/29-20:49:13.102390 7fef56ffd6c0 Level-0 table #57: 0 bytes OK -2023/11/29-20:49:13.108592 7fef56ffd6c0 Delete type=0 #55 -2023/11/29-20:49:13.129273 7fef56ffd6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) -2023/11/29-20:49:13.129401 7fef56ffd6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +2023/11/29-20:50:20.582005 7ff1ed3ff6c0 Recovering log #56 +2023/11/29-20:50:20.593394 7ff1ed3ff6c0 Delete type=3 #54 +2023/11/29-20:50:20.593446 7ff1ed3ff6c0 Delete type=0 #56 +2023/11/29-22:03:29.577397 7fef56ffd6c0 Level-0 table #61: started +2023/11/29-22:03:29.577421 7fef56ffd6c0 Level-0 table #61: 0 bytes OK +2023/11/29-22:03:29.583760 7fef56ffd6c0 Delete type=0 #59 +2023/11/29-22:03:29.602081 7fef56ffd6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +2023/11/29-22:03:29.602123 7fef56ffd6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) diff --git a/packs/metiers/MANIFEST-000058 b/packs/metiers/MANIFEST-000062 similarity index 73% rename from packs/metiers/MANIFEST-000058 rename to packs/metiers/MANIFEST-000062 index 9c68d3b..0392d0f 100644 Binary files a/packs/metiers/MANIFEST-000058 and b/packs/metiers/MANIFEST-000062 differ diff --git a/packs/origines/000061.log b/packs/origines/000065.log similarity index 100% rename from packs/origines/000061.log rename to packs/origines/000065.log diff --git a/packs/origines/CURRENT b/packs/origines/CURRENT index e4c5073..e8c0266 100644 --- a/packs/origines/CURRENT +++ b/packs/origines/CURRENT @@ -1 +1 @@ -MANIFEST-000059 +MANIFEST-000063 diff --git a/packs/origines/LOG b/packs/origines/LOG index 2ef875b..3f04e09 100644 --- a/packs/origines/LOG +++ b/packs/origines/LOG @@ -1,8 +1,8 @@ -2023/11/29-20:50:20.557438 7ff1ecbfe6c0 Recovering log #57 -2023/11/29-20:50:20.567859 7ff1ecbfe6c0 Delete type=3 #55 -2023/11/29-20:50:20.567928 7ff1ecbfe6c0 Delete type=0 #57 -2023/11/29-22:03:29.552686 7fef56ffd6c0 Level-0 table #62: started -2023/11/29-22:03:29.552886 7fef56ffd6c0 Level-0 table #62: 0 bytes OK -2023/11/29-22:03:29.559417 7fef56ffd6c0 Delete type=0 #60 -2023/11/29-22:03:29.559640 7fef56ffd6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) -2023/11/29-22:03:29.569352 7fef56ffd6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/11/29-22:11:25.381917 7fef57fff6c0 Recovering log #61 +2023/11/29-22:11:25.392824 7fef57fff6c0 Delete type=3 #59 +2023/11/29-22:11:25.392930 7fef57fff6c0 Delete type=0 #61 +2023/11/29-22:14:16.844154 7fef56ffd6c0 Level-0 table #66: started +2023/11/29-22:14:16.844182 7fef56ffd6c0 Level-0 table #66: 0 bytes OK +2023/11/29-22:14:16.881638 7fef56ffd6c0 Delete type=0 #64 +2023/11/29-22:14:16.953004 7fef56ffd6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/11/29-22:14:16.953040 7fef56ffd6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) diff --git a/packs/origines/LOG.old b/packs/origines/LOG.old index 5b76b81..2ef875b 100644 --- a/packs/origines/LOG.old +++ b/packs/origines/LOG.old @@ -1,8 +1,8 @@ -2023/11/29-20:25:32.699335 7ff1ed3ff6c0 Recovering log #53 -2023/11/29-20:25:32.710139 7ff1ed3ff6c0 Delete type=3 #51 -2023/11/29-20:25:32.710239 7ff1ed3ff6c0 Delete type=0 #53 -2023/11/29-20:49:13.081287 7fef56ffd6c0 Level-0 table #58: started -2023/11/29-20:49:13.081356 7fef56ffd6c0 Level-0 table #58: 0 bytes OK -2023/11/29-20:49:13.088692 7fef56ffd6c0 Delete type=0 #56 -2023/11/29-20:49:13.102161 7fef56ffd6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) -2023/11/29-20:49:13.102229 7fef56ffd6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/11/29-20:50:20.557438 7ff1ecbfe6c0 Recovering log #57 +2023/11/29-20:50:20.567859 7ff1ecbfe6c0 Delete type=3 #55 +2023/11/29-20:50:20.567928 7ff1ecbfe6c0 Delete type=0 #57 +2023/11/29-22:03:29.552686 7fef56ffd6c0 Level-0 table #62: started +2023/11/29-22:03:29.552886 7fef56ffd6c0 Level-0 table #62: 0 bytes OK +2023/11/29-22:03:29.559417 7fef56ffd6c0 Delete type=0 #60 +2023/11/29-22:03:29.559640 7fef56ffd6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/11/29-22:03:29.569352 7fef56ffd6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) diff --git a/packs/origines/MANIFEST-000059 b/packs/origines/MANIFEST-000063 similarity index 80% rename from packs/origines/MANIFEST-000059 rename to packs/origines/MANIFEST-000063 index 448b698..937b1c0 100644 Binary files a/packs/origines/MANIFEST-000059 and b/packs/origines/MANIFEST-000063 differ diff --git a/packs/protection/000097.log b/packs/protection/000101.log similarity index 100% rename from packs/protection/000097.log rename to packs/protection/000101.log diff --git a/packs/protection/CURRENT b/packs/protection/CURRENT index b993e6c..b86155c 100644 --- a/packs/protection/CURRENT +++ b/packs/protection/CURRENT @@ -1 +1 @@ -MANIFEST-000095 +MANIFEST-000099 diff --git a/packs/protection/LOG b/packs/protection/LOG index 6e3ed77..3a87b99 100644 --- a/packs/protection/LOG +++ b/packs/protection/LOG @@ -1,8 +1,8 @@ -2023/11/29-20:50:20.622329 7fef577fe6c0 Recovering log #93 -2023/11/29-20:50:20.633202 7fef577fe6c0 Delete type=3 #91 -2023/11/29-20:50:20.633594 7fef577fe6c0 Delete type=0 #93 -2023/11/29-22:03:29.608950 7fef56ffd6c0 Level-0 table #98: started -2023/11/29-22:03:29.608986 7fef56ffd6c0 Level-0 table #98: 0 bytes OK -2023/11/29-22:03:29.615830 7fef56ffd6c0 Delete type=0 #96 -2023/11/29-22:03:29.630857 7fef56ffd6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) -2023/11/29-22:03:29.630929 7fef56ffd6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/11/29-22:11:25.447730 7fef577fe6c0 Recovering log #97 +2023/11/29-22:11:25.459010 7fef577fe6c0 Delete type=3 #95 +2023/11/29-22:11:25.459081 7fef577fe6c0 Delete type=0 #97 +2023/11/29-22:14:16.992084 7fef56ffd6c0 Level-0 table #102: started +2023/11/29-22:14:16.992124 7fef56ffd6c0 Level-0 table #102: 0 bytes OK +2023/11/29-22:14:17.029679 7fef56ffd6c0 Delete type=0 #100 +2023/11/29-22:14:17.106530 7fef56ffd6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/11/29-22:14:17.106567 7fef56ffd6c0 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 bd51622..6e3ed77 100644 --- a/packs/protection/LOG.old +++ b/packs/protection/LOG.old @@ -1,8 +1,8 @@ -2023/11/29-20:25:32.758453 7ff1ed3ff6c0 Recovering log #89 -2023/11/29-20:25:32.768643 7ff1ed3ff6c0 Delete type=3 #87 -2023/11/29-20:25:32.768728 7ff1ed3ff6c0 Delete type=0 #89 -2023/11/29-20:49:13.122910 7fef56ffd6c0 Level-0 table #94: started -2023/11/29-20:49:13.122934 7fef56ffd6c0 Level-0 table #94: 0 bytes OK -2023/11/29-20:49:13.129090 7fef56ffd6c0 Delete type=0 #92 -2023/11/29-20:49:13.129380 7fef56ffd6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) -2023/11/29-20:49:13.129468 7fef56ffd6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/11/29-20:50:20.622329 7fef577fe6c0 Recovering log #93 +2023/11/29-20:50:20.633202 7fef577fe6c0 Delete type=3 #91 +2023/11/29-20:50:20.633594 7fef577fe6c0 Delete type=0 #93 +2023/11/29-22:03:29.608950 7fef56ffd6c0 Level-0 table #98: started +2023/11/29-22:03:29.608986 7fef56ffd6c0 Level-0 table #98: 0 bytes OK +2023/11/29-22:03:29.615830 7fef56ffd6c0 Delete type=0 #96 +2023/11/29-22:03:29.630857 7fef56ffd6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/11/29-22:03:29.630929 7fef56ffd6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) diff --git a/packs/protection/MANIFEST-000095 b/packs/protection/MANIFEST-000099 similarity index 78% rename from packs/protection/MANIFEST-000095 rename to packs/protection/MANIFEST-000099 index 4da62c1..fd22978 100644 Binary files a/packs/protection/MANIFEST-000095 and b/packs/protection/MANIFEST-000099 differ diff --git a/packs/scenes/000036.log b/packs/scenes/000040.log similarity index 100% rename from packs/scenes/000036.log rename to packs/scenes/000040.log diff --git a/packs/scenes/CURRENT b/packs/scenes/CURRENT index eea9b0f..59611b0 100644 --- a/packs/scenes/CURRENT +++ b/packs/scenes/CURRENT @@ -1 +1 @@ -MANIFEST-000034 +MANIFEST-000038 diff --git a/packs/scenes/LOG b/packs/scenes/LOG index 38b6ef1..41e809b 100644 --- a/packs/scenes/LOG +++ b/packs/scenes/LOG @@ -1,7 +1,7 @@ -2023/11/29-20:50:20.661714 7ff1ecbfe6c0 Recovering log #32 -2023/11/29-20:50:20.673082 7ff1ecbfe6c0 Delete type=3 #30 -2023/11/29-20:50:20.673161 7ff1ecbfe6c0 Delete type=0 #32 -2023/11/29-22:03:29.616030 7fef56ffd6c0 Level-0 table #37: started -2023/11/29-22:03:29.616080 7fef56ffd6c0 Level-0 table #37: 0 bytes OK -2023/11/29-22:03:29.622527 7fef56ffd6c0 Delete type=0 #35 -2023/11/29-22:03:29.630873 7fef56ffd6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/11/29-22:11:25.487637 7fef57fff6c0 Recovering log #36 +2023/11/29-22:11:25.498531 7fef57fff6c0 Delete type=3 #34 +2023/11/29-22:11:25.498596 7fef57fff6c0 Delete type=0 #36 +2023/11/29-22:14:17.106705 7fef56ffd6c0 Level-0 table #41: started +2023/11/29-22:14:17.106747 7fef56ffd6c0 Level-0 table #41: 0 bytes OK +2023/11/29-22:14:17.142430 7fef56ffd6c0 Delete type=0 #39 +2023/11/29-22:14:17.142686 7fef56ffd6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/LOG.old b/packs/scenes/LOG.old index e408b10..38b6ef1 100644 --- a/packs/scenes/LOG.old +++ b/packs/scenes/LOG.old @@ -1,7 +1,7 @@ -2023/11/29-20:25:32.810529 7fef57fff6c0 Recovering log #28 -2023/11/29-20:25:32.824867 7fef57fff6c0 Delete type=3 #26 -2023/11/29-20:25:32.824967 7fef57fff6c0 Delete type=0 #28 -2023/11/29-20:49:13.129608 7fef56ffd6c0 Level-0 table #33: started -2023/11/29-20:49:13.129687 7fef56ffd6c0 Level-0 table #33: 0 bytes OK -2023/11/29-20:49:13.136736 7fef56ffd6c0 Delete type=0 #31 -2023/11/29-20:49:13.136897 7fef56ffd6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/11/29-20:50:20.661714 7ff1ecbfe6c0 Recovering log #32 +2023/11/29-20:50:20.673082 7ff1ecbfe6c0 Delete type=3 #30 +2023/11/29-20:50:20.673161 7ff1ecbfe6c0 Delete type=0 #32 +2023/11/29-22:03:29.616030 7fef56ffd6c0 Level-0 table #37: started +2023/11/29-22:03:29.616080 7fef56ffd6c0 Level-0 table #37: 0 bytes OK +2023/11/29-22:03:29.622527 7fef56ffd6c0 Delete type=0 #35 +2023/11/29-22:03:29.630873 7fef56ffd6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/MANIFEST-000034 b/packs/scenes/MANIFEST-000034 deleted file mode 100644 index c19f06e..0000000 Binary files a/packs/scenes/MANIFEST-000034 and /dev/null differ diff --git a/packs/scenes/MANIFEST-000038 b/packs/scenes/MANIFEST-000038 new file mode 100644 index 0000000..b8d6ce3 Binary files /dev/null and b/packs/scenes/MANIFEST-000038 differ diff --git a/packs/skills/000097.log b/packs/skills/000101.log similarity index 100% rename from packs/skills/000097.log rename to packs/skills/000101.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index b993e6c..b86155c 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000095 +MANIFEST-000099 diff --git a/packs/skills/LOG b/packs/skills/LOG index 8dd53d3..78370ec 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,8 @@ -2023/11/29-20:50:20.543983 7fef57fff6c0 Recovering log #93 -2023/11/29-20:50:20.555186 7fef57fff6c0 Delete type=3 #91 -2023/11/29-20:50:20.555286 7fef57fff6c0 Delete type=0 #93 -2023/11/29-22:03:29.546363 7fef56ffd6c0 Level-0 table #98: started -2023/11/29-22:03:29.546396 7fef56ffd6c0 Level-0 table #98: 0 bytes OK -2023/11/29-22:03:29.552569 7fef56ffd6c0 Delete type=0 #96 -2023/11/29-22:03:29.559625 7fef56ffd6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/11/29-22:03:29.569329 7fef56ffd6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/11/29-22:11:25.369430 7ff1ed3ff6c0 Recovering log #97 +2023/11/29-22:11:25.380094 7ff1ed3ff6c0 Delete type=3 #95 +2023/11/29-22:11:25.380151 7ff1ed3ff6c0 Delete type=0 #97 +2023/11/29-22:14:16.701314 7fef56ffd6c0 Level-0 table #102: started +2023/11/29-22:14:16.701368 7fef56ffd6c0 Level-0 table #102: 0 bytes OK +2023/11/29-22:14:16.737917 7fef56ffd6c0 Delete type=0 #100 +2023/11/29-22:14:16.809406 7fef56ffd6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/11/29-22:14:16.809437 7fef56ffd6c0 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 fba4f81..8dd53d3 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/11/29-20:25:32.684922 7fef57fff6c0 Recovering log #89 -2023/11/29-20:25:32.695497 7fef57fff6c0 Delete type=3 #87 -2023/11/29-20:25:32.695576 7fef57fff6c0 Delete type=0 #89 -2023/11/29-20:49:13.074351 7fef56ffd6c0 Level-0 table #94: started -2023/11/29-20:49:13.074391 7fef56ffd6c0 Level-0 table #94: 0 bytes OK -2023/11/29-20:49:13.080816 7fef56ffd6c0 Delete type=0 #92 -2023/11/29-20:49:13.095263 7fef56ffd6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/11/29-20:49:13.102205 7fef56ffd6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/11/29-20:50:20.543983 7fef57fff6c0 Recovering log #93 +2023/11/29-20:50:20.555186 7fef57fff6c0 Delete type=3 #91 +2023/11/29-20:50:20.555286 7fef57fff6c0 Delete type=0 #93 +2023/11/29-22:03:29.546363 7fef56ffd6c0 Level-0 table #98: started +2023/11/29-22:03:29.546396 7fef56ffd6c0 Level-0 table #98: 0 bytes OK +2023/11/29-22:03:29.552569 7fef56ffd6c0 Delete type=0 #96 +2023/11/29-22:03:29.559625 7fef56ffd6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/11/29-22:03:29.569329 7fef56ffd6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) diff --git a/packs/skills/MANIFEST-000095 b/packs/skills/MANIFEST-000099 similarity index 76% rename from packs/skills/MANIFEST-000095 rename to packs/skills/MANIFEST-000099 index 7334e68..2f2f65b 100644 Binary files a/packs/skills/MANIFEST-000095 and b/packs/skills/MANIFEST-000099 differ diff --git a/packs/tables/000096.log b/packs/tables/000100.log similarity index 100% rename from packs/tables/000096.log rename to packs/tables/000100.log diff --git a/packs/tables/CURRENT b/packs/tables/CURRENT index 0ab25fa..95395b2 100644 --- a/packs/tables/CURRENT +++ b/packs/tables/CURRENT @@ -1 +1 @@ -MANIFEST-000094 +MANIFEST-000098 diff --git a/packs/tables/LOG b/packs/tables/LOG index ff3ecda..6a67bf0 100644 --- a/packs/tables/LOG +++ b/packs/tables/LOG @@ -1,8 +1,8 @@ -2023/11/29-20:50:20.648578 7fef57fff6c0 Recovering log #92 -2023/11/29-20:50:20.658414 7fef57fff6c0 Delete type=3 #90 -2023/11/29-20:50:20.658489 7fef57fff6c0 Delete type=0 #92 -2023/11/29-22:03:29.602267 7fef56ffd6c0 Level-0 table #97: started -2023/11/29-22:03:29.602291 7fef56ffd6c0 Level-0 table #97: 0 bytes OK -2023/11/29-22:03:29.608736 7fef56ffd6c0 Delete type=0 #95 -2023/11/29-22:03:29.630840 7fef56ffd6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) -2023/11/29-22:03:29.630894 7fef56ffd6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/11/29-22:11:25.474898 7ff1ed3ff6c0 Recovering log #96 +2023/11/29-22:11:25.485393 7ff1ed3ff6c0 Delete type=3 #94 +2023/11/29-22:11:25.485495 7ff1ed3ff6c0 Delete type=0 #96 +2023/11/29-22:14:17.067736 7fef56ffd6c0 Level-0 table #101: started +2023/11/29-22:14:17.067761 7fef56ffd6c0 Level-0 table #101: 0 bytes OK +2023/11/29-22:14:17.106397 7fef56ffd6c0 Delete type=0 #99 +2023/11/29-22:14:17.106552 7fef56ffd6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/11/29-22:14:17.106584 7fef56ffd6c0 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 35a47d3..ff3ecda 100644 --- a/packs/tables/LOG.old +++ b/packs/tables/LOG.old @@ -1,8 +1,8 @@ -2023/11/29-20:25:32.795334 7fef577fe6c0 Recovering log #88 -2023/11/29-20:25:32.806302 7fef577fe6c0 Delete type=3 #86 -2023/11/29-20:25:32.806390 7fef577fe6c0 Delete type=0 #88 -2023/11/29-20:49:13.108713 7fef56ffd6c0 Level-0 table #93: started -2023/11/29-20:49:13.108744 7fef56ffd6c0 Level-0 table #93: 0 bytes OK -2023/11/29-20:49:13.114911 7fef56ffd6c0 Delete type=0 #91 -2023/11/29-20:49:13.129305 7fef56ffd6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) -2023/11/29-20:49:13.129428 7fef56ffd6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/11/29-20:50:20.648578 7fef57fff6c0 Recovering log #92 +2023/11/29-20:50:20.658414 7fef57fff6c0 Delete type=3 #90 +2023/11/29-20:50:20.658489 7fef57fff6c0 Delete type=0 #92 +2023/11/29-22:03:29.602267 7fef56ffd6c0 Level-0 table #97: started +2023/11/29-22:03:29.602291 7fef56ffd6c0 Level-0 table #97: 0 bytes OK +2023/11/29-22:03:29.608736 7fef56ffd6c0 Delete type=0 #95 +2023/11/29-22:03:29.630840 7fef56ffd6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/11/29-22:03:29.630894 7fef56ffd6c0 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-000094 b/packs/tables/MANIFEST-000098 similarity index 79% rename from packs/tables/MANIFEST-000094 rename to packs/tables/MANIFEST-000098 index ce07f8e..cb14163 100644 Binary files a/packs/tables/MANIFEST-000094 and b/packs/tables/MANIFEST-000098 differ diff --git a/packs/tourscharmes/000004.log b/packs/tourscharmes/000008.log similarity index 100% rename from packs/tourscharmes/000004.log rename to packs/tourscharmes/000008.log diff --git a/packs/tourscharmes/CURRENT b/packs/tourscharmes/CURRENT index 1a84852..f7753e2 100644 --- a/packs/tourscharmes/CURRENT +++ b/packs/tourscharmes/CURRENT @@ -1 +1 @@ -MANIFEST-000002 +MANIFEST-000006 diff --git a/packs/tourscharmes/LOG b/packs/tourscharmes/LOG index 8143a23..dd18341 100644 --- a/packs/tourscharmes/LOG +++ b/packs/tourscharmes/LOG @@ -1,5 +1,8 @@ -2023/11/29-20:50:20.608813 7fef57fff6c0 Delete type=3 #1 -2023/11/29-22:03:29.584039 7fef56ffd6c0 Level-0 table #5: started -2023/11/29-22:03:29.587799 7fef56ffd6c0 Level-0 table #5: 8731 bytes OK -2023/11/29-22:03:29.595662 7fef56ffd6c0 Delete type=0 #3 -2023/11/29-22:03:29.602094 7fef56ffd6c0 Manual compaction at level-0 from '!items!7nuc6YRp3TcIStcf' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) +2023/11/29-22:11:25.420612 7ff1ed3ff6c0 Recovering log #4 +2023/11/29-22:11:25.432102 7ff1ed3ff6c0 Delete type=3 #2 +2023/11/29-22:11:25.432214 7ff1ed3ff6c0 Delete type=0 #4 +2023/11/29-22:14:16.881757 7fef56ffd6c0 Level-0 table #9: started +2023/11/29-22:14:16.882067 7fef56ffd6c0 Level-0 table #9: 0 bytes OK +2023/11/29-22:14:16.922920 7fef56ffd6c0 Delete type=0 #7 +2023/11/29-22:14:16.953015 7fef56ffd6c0 Manual compaction at level-0 from '!items!7nuc6YRp3TcIStcf' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) +2023/11/29-22:14:16.953047 7fef56ffd6c0 Manual compaction at level-1 from '!items!7nuc6YRp3TcIStcf' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) diff --git a/packs/tourscharmes/LOG.old b/packs/tourscharmes/LOG.old new file mode 100644 index 0000000..8143a23 --- /dev/null +++ b/packs/tourscharmes/LOG.old @@ -0,0 +1,5 @@ +2023/11/29-20:50:20.608813 7fef57fff6c0 Delete type=3 #1 +2023/11/29-22:03:29.584039 7fef56ffd6c0 Level-0 table #5: started +2023/11/29-22:03:29.587799 7fef56ffd6c0 Level-0 table #5: 8731 bytes OK +2023/11/29-22:03:29.595662 7fef56ffd6c0 Delete type=0 #3 +2023/11/29-22:03:29.602094 7fef56ffd6c0 Manual compaction at level-0 from '!items!7nuc6YRp3TcIStcf' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) diff --git a/packs/tourscharmes/MANIFEST-000002 b/packs/tourscharmes/MANIFEST-000002 deleted file mode 100644 index ed65fb6..0000000 Binary files a/packs/tourscharmes/MANIFEST-000002 and /dev/null differ diff --git a/packs/tourscharmes/MANIFEST-000006 b/packs/tourscharmes/MANIFEST-000006 new file mode 100644 index 0000000..adbb1c8 Binary files /dev/null and b/packs/tourscharmes/MANIFEST-000006 differ diff --git a/templates/chat-generic-result.html b/templates/chat-generic-result.html index 0d3f832..d130931 100644 --- a/templates/chat-generic-result.html +++ b/templates/chat-generic-result.html @@ -56,10 +56,14 @@ {{else}}
  • Le Tour/Charme a échoué !
    • {{/if}} -
  • Contrecoup : {{contrecoupResult}}
    • - {{#if contrecoup}} + + {{#if contrecoupResult}} +
  • Contrecoup : {{contrecoupResult}}
  • {{contrecoup.name}}
    • {{/if}} + {{#if charmeSante}} +
  • Santé perdue: {{charmeSante}}
    • + {{/if}} {{/if}} {{#if difficulte}}