From 4b2dd20d49408661296127f63968cff67e9628d9 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Wed, 29 Nov 2023 22:14:22 +0100 Subject: [PATCH] Add charmes/tours management --- modules/wasteland-actor.js | 7 ++++++- modules/wasteland-utility.js | 16 +++++++++++----- packs/armes/{000036.log => 000040.log} | 0 packs/armes/CURRENT | 2 +- packs/armes/LOG | 16 ++++++++-------- packs/armes/LOG.old | 16 ++++++++-------- packs/armes/MANIFEST-000034 | Bin 134 -> 0 bytes packs/armes/MANIFEST-000038 | Bin 0 -> 134 bytes packs/equipement/{000096.log => 000100.log} | 0 packs/equipement/CURRENT | 2 +- packs/equipement/LOG | 16 ++++++++-------- packs/equipement/LOG.old | 16 ++++++++-------- packs/equipement/MANIFEST-000094 | Bin 134 -> 0 bytes packs/equipement/MANIFEST-000098 | Bin 0 -> 134 bytes packs/heritages/{000060.log => 000064.log} | 0 packs/heritages/CURRENT | 2 +- packs/heritages/LOG | 16 ++++++++-------- packs/heritages/LOG.old | 16 ++++++++-------- .../{MANIFEST-000058 => MANIFEST-000062} | Bin 134 -> 134 bytes packs/metiers/{000060.log => 000064.log} | 0 packs/metiers/CURRENT | 2 +- packs/metiers/LOG | 16 ++++++++-------- packs/metiers/LOG.old | 16 ++++++++-------- .../{MANIFEST-000058 => MANIFEST-000062} | Bin 135 -> 135 bytes packs/origines/{000061.log => 000065.log} | 0 packs/origines/CURRENT | 2 +- packs/origines/LOG | 16 ++++++++-------- packs/origines/LOG.old | 16 ++++++++-------- .../{MANIFEST-000059 => MANIFEST-000063} | Bin 169 -> 169 bytes packs/protection/{000097.log => 000101.log} | 0 packs/protection/CURRENT | 2 +- packs/protection/LOG | 16 ++++++++-------- packs/protection/LOG.old | 16 ++++++++-------- .../{MANIFEST-000095 => MANIFEST-000099} | Bin 168 -> 168 bytes packs/scenes/{000036.log => 000040.log} | 0 packs/scenes/CURRENT | 2 +- packs/scenes/LOG | 14 +++++++------- packs/scenes/LOG.old | 14 +++++++------- packs/scenes/MANIFEST-000034 | Bin 65 -> 0 bytes packs/scenes/MANIFEST-000038 | Bin 0 -> 65 bytes packs/skills/{000097.log => 000101.log} | 0 packs/skills/CURRENT | 2 +- packs/skills/LOG | 16 ++++++++-------- packs/skills/LOG.old | 16 ++++++++-------- .../skills/{MANIFEST-000095 => MANIFEST-000099} | Bin 168 -> 168 bytes packs/tables/{000096.log => 000100.log} | 0 packs/tables/CURRENT | 2 +- packs/tables/LOG | 16 ++++++++-------- packs/tables/LOG.old | 16 ++++++++-------- .../tables/{MANIFEST-000094 => MANIFEST-000098} | Bin 161 -> 161 bytes packs/tourscharmes/{000004.log => 000008.log} | 0 packs/tourscharmes/CURRENT | 2 +- packs/tourscharmes/LOG | 13 ++++++++----- packs/tourscharmes/LOG.old | 5 +++++ packs/tourscharmes/MANIFEST-000002 | Bin 134 -> 0 bytes packs/tourscharmes/MANIFEST-000006 | Bin 0 -> 134 bytes templates/chat-generic-result.html | 8 ++++++-- 57 files changed, 188 insertions(+), 165 deletions(-) rename packs/armes/{000036.log => 000040.log} (100%) delete mode 100644 packs/armes/MANIFEST-000034 create mode 100644 packs/armes/MANIFEST-000038 rename packs/equipement/{000096.log => 000100.log} (100%) delete mode 100644 packs/equipement/MANIFEST-000094 create mode 100644 packs/equipement/MANIFEST-000098 rename packs/heritages/{000060.log => 000064.log} (100%) rename packs/heritages/{MANIFEST-000058 => MANIFEST-000062} (73%) rename packs/metiers/{000060.log => 000064.log} (100%) rename packs/metiers/{MANIFEST-000058 => MANIFEST-000062} (73%) rename packs/origines/{000061.log => 000065.log} (100%) rename packs/origines/{MANIFEST-000059 => MANIFEST-000063} (80%) rename packs/protection/{000097.log => 000101.log} (100%) rename packs/protection/{MANIFEST-000095 => MANIFEST-000099} (78%) rename packs/scenes/{000036.log => 000040.log} (100%) delete mode 100644 packs/scenes/MANIFEST-000034 create mode 100644 packs/scenes/MANIFEST-000038 rename packs/skills/{000097.log => 000101.log} (100%) rename packs/skills/{MANIFEST-000095 => MANIFEST-000099} (76%) rename packs/tables/{000096.log => 000100.log} (100%) rename packs/tables/{MANIFEST-000094 => MANIFEST-000098} (79%) rename packs/tourscharmes/{000004.log => 000008.log} (100%) create mode 100644 packs/tourscharmes/LOG.old delete mode 100644 packs/tourscharmes/MANIFEST-000002 create mode 100644 packs/tourscharmes/MANIFEST-000006 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 8f0f1047d0acc0d8824dda41f61f560a21ebf79c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmdn&`6D}#fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ^@OFoVrEHdZn2_4 zae1bzMYd^GTBv7XZbT`gFasFC!e0{~d{CPx4O diff --git a/packs/armes/MANIFEST-000038 b/packs/armes/MANIFEST-000038 new file mode 100644 index 0000000000000000000000000000000000000000..6366c57a5845120ecceb0503d8563f4893b2e2c4 GIT binary patch literal 134 zcmdn&`6D}#fss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ^@OFoVrEHdZn2_4 zae1bzMYd^GTBv7XZbT`gFasFC*q0mMxJa+6rh0WrHImH+?% diff --git a/packs/equipement/MANIFEST-000098 b/packs/equipement/MANIFEST-000098 new file mode 100644 index 0000000000000000000000000000000000000000..7b4df4de7884839533ee8bd3e2372718145d43c0 GIT binary patch literal 134 zcmbQbcmB6T21Z7yoYb<^oRlOzr^=Gl^338?=ltA)#G=HK{33QH*3Gu^ikT&;xy6cx z$x$gr895 literal 0 HcmV?d00001 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 e0678132a2d78ae9931d64008ce3ab4a11be050d..50e8baf2bd2d4b09c6dfd4df7576d45e8a74bfce 100644 GIT binary patch delta 37 pcmZo;Y-5~|A-6}{Uz3A@k;$Huf!TqDYtBxU7a*jG3a-CR&0gO2Y3IG5A delta 37 pcmZo?Y-gO1DYr*;_IeHmMkZ@c24));;gemHvp`%MAlHsX7y!2q2k-y@ 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 448b6985c2304530dd23e46c2308eff017392895..937b1c0ff190c87b7b9b99a20600364cbeef88ec 100644 GIT binary patch delta 37 pcmZ32K0bz>$3WavAUBL8JIO# R7_1a?_(5C^AXkfp0RZtq5)l9Z literal 0 HcmV?d00001 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 7334e6829c8ab14e2d9d9be3a0bf75e54a8056f2..2f2f65b22f84b76b467192a196a0944eb68d0f30 100644 GIT binary patch delta 37 pcmZ3%xPoy)mz;Lm)1Mp+j7%w<49ux4a>)wWz94QYkekjT2LQxR2s{7) delta 37 pcmZ3%xPoy)mmK?#GII_FMy3Q#2IfQ-x$}CAJRoi&kekdR2LP?<2RHx# 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 ce07f8e062599901e5770575e5b2b0a79b39cafb..cb14163937350ea9db81fb598ad011618602a12b 100644 GIT binary patch delta 37 pcmZ3;xR7x|v)lva+UFb$j7-U#49qDkqF>ueRY2SnAUBOg6adY=2;u+$ delta 37 pcmZ3;xR7x|vmAR(gAoS*M_`AS2}atq_gz{>ET#KffRGDaqde0!7cc@73fCU#B+ UW)2pCoim?r1#vlmTrL&?0BUw3;{X5v literal 0 HcmV?d00001 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}}