From 3e394734cec64233103592652961702fb1bb23d4 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Wed, 29 Nov 2023 22:04:17 +0100 Subject: [PATCH] Add charmes/tours management --- modules/wasteland-actor-sheet.js | 6 + modules/wasteland-actor.js | 11 ++ modules/wasteland-config.js | 10 +- modules/wasteland-roll-dialog.js | 82 ++++++++------ modules/wasteland-utility.js | 103 +++++++++++------- packs/armes/{000028.log => 000036.log} | 0 packs/armes/CURRENT | 2 +- packs/armes/LOG | 16 +-- packs/armes/LOG.old | 16 +-- packs/armes/MANIFEST-000026 | Bin 134 -> 0 bytes packs/armes/MANIFEST-000034 | Bin 0 -> 134 bytes packs/equipement/{000088.log => 000096.log} | 0 packs/equipement/CURRENT | 2 +- packs/equipement/LOG | 16 +-- packs/equipement/LOG.old | 16 +-- packs/equipement/MANIFEST-000086 | Bin 134 -> 0 bytes packs/equipement/MANIFEST-000094 | Bin 0 -> 134 bytes packs/heritages/{000052.log => 000060.log} | 0 packs/heritages/CURRENT | 2 +- packs/heritages/LOG | 16 +-- packs/heritages/LOG.old | 16 +-- .../{MANIFEST-000050 => MANIFEST-000058} | Bin 134 -> 134 bytes packs/metiers/{000052.log => 000060.log} | 0 packs/metiers/CURRENT | 2 +- packs/metiers/LOG | 16 +-- packs/metiers/LOG.old | 16 +-- .../{MANIFEST-000050 => MANIFEST-000058} | Bin 135 -> 135 bytes packs/origines/{000053.log => 000061.log} | 0 packs/origines/CURRENT | 2 +- packs/origines/LOG | 16 +-- packs/origines/LOG.old | 16 +-- .../{MANIFEST-000051 => MANIFEST-000059} | Bin 169 -> 169 bytes packs/protection/{000089.log => 000097.log} | 0 packs/protection/CURRENT | 2 +- packs/protection/LOG | 16 +-- packs/protection/LOG.old | 16 +-- .../{MANIFEST-000087 => MANIFEST-000095} | Bin 168 -> 168 bytes packs/scenes/{000028.log => 000036.log} | 0 packs/scenes/CURRENT | 2 +- packs/scenes/LOG | 14 +-- packs/scenes/LOG.old | 14 +-- packs/scenes/MANIFEST-000026 | Bin 65 -> 0 bytes packs/scenes/MANIFEST-000034 | Bin 0 -> 65 bytes packs/skills/{000089.log => 000097.log} | 0 packs/skills/CURRENT | 2 +- packs/skills/LOG | 16 +-- packs/skills/LOG.old | 16 +-- .../{MANIFEST-000087 => MANIFEST-000095} | Bin 168 -> 168 bytes packs/tables/{000088.log => 000096.log} | 0 packs/tables/CURRENT | 2 +- packs/tables/LOG | 16 +-- packs/tables/LOG.old | 16 +-- .../{MANIFEST-000086 => MANIFEST-000094} | Bin 161 -> 161 bytes packs/tourscharmes/000004.log | 0 packs/tourscharmes/000005.ldb | Bin 0 -> 8731 bytes packs/tourscharmes/CURRENT | 1 + packs/tourscharmes/LOCK | 0 packs/tourscharmes/LOG | 5 + packs/tourscharmes/MANIFEST-000002 | Bin 0 -> 134 bytes system.json | 13 ++- templates/actor-sheet.html | 7 +- templates/chat-generic-result.html | 13 +++ templates/roll-dialog-generic.html | 33 +++--- 63 files changed, 334 insertions(+), 252 deletions(-) rename packs/armes/{000028.log => 000036.log} (100%) delete mode 100644 packs/armes/MANIFEST-000026 create mode 100644 packs/armes/MANIFEST-000034 rename packs/equipement/{000088.log => 000096.log} (100%) delete mode 100644 packs/equipement/MANIFEST-000086 create mode 100644 packs/equipement/MANIFEST-000094 rename packs/heritages/{000052.log => 000060.log} (100%) rename packs/heritages/{MANIFEST-000050 => MANIFEST-000058} (73%) rename packs/metiers/{000052.log => 000060.log} (100%) rename packs/metiers/{MANIFEST-000050 => MANIFEST-000058} (73%) rename packs/origines/{000053.log => 000061.log} (100%) rename packs/origines/{MANIFEST-000051 => MANIFEST-000059} (80%) rename packs/protection/{000089.log => 000097.log} (100%) rename packs/protection/{MANIFEST-000087 => MANIFEST-000095} (78%) rename packs/scenes/{000028.log => 000036.log} (100%) delete mode 100644 packs/scenes/MANIFEST-000026 create mode 100644 packs/scenes/MANIFEST-000034 rename packs/skills/{000089.log => 000097.log} (100%) rename packs/skills/{MANIFEST-000087 => MANIFEST-000095} (76%) rename packs/tables/{000088.log => 000096.log} (100%) rename packs/tables/{MANIFEST-000086 => MANIFEST-000094} (79%) create mode 100644 packs/tourscharmes/000004.log create mode 100644 packs/tourscharmes/000005.ldb create mode 100644 packs/tourscharmes/CURRENT create mode 100644 packs/tourscharmes/LOCK create mode 100644 packs/tourscharmes/LOG create mode 100644 packs/tourscharmes/MANIFEST-000002 diff --git a/modules/wasteland-actor-sheet.js b/modules/wasteland-actor-sheet.js index da7385d..14495a0 100644 --- a/modules/wasteland-actor-sheet.js +++ b/modules/wasteland-actor-sheet.js @@ -115,6 +115,12 @@ export class WastelandActorSheet extends ActorSheet { let compId = li.data("item-id") this.actor.rollCompetence(attrKey, compId) }) + html.find('.roll-charme').click((event) => { + const li = $(event.currentTarget).parents(".item") + let charmeId = li.data("item-id") + this.actor.rollCharme(charmeId) + }) + html.find('.roll-pouvoir').click((event) => { const li = $(event.currentTarget).parents(".item") let pouvoirId = li.data("item-id") diff --git a/modules/wasteland-actor.js b/modules/wasteland-actor.js index 6d96c72..2d2fa2b 100644 --- a/modules/wasteland-actor.js +++ b/modules/wasteland-actor.js @@ -393,6 +393,7 @@ export class WastelandActor extends Actor { rollData.canEclatDoubleD20 = true // Always true in Wastelan rollData.doubleD20 = false rollData.attributs = WastelandUtility.getAttributs() + rollData.config = duplicate(game.system.wasteland.config) if (attrKey) { rollData.attrKey = attrKey @@ -427,6 +428,16 @@ export class WastelandActor extends Actor { rollDialog.render(true) } + /* -------------------------------------------- */ + async rollCharme(charmeId) { + let rollData = this.getCommonRollData("cla") + rollData.charme = duplicate(this.items.get(charmeId) || {}) + rollData.charmeDice = "1d4" + console.log("RollDatra", rollData) + let rollDialog = await WastelandRollDialog.create(this, rollData) + rollDialog.render(true) + } + /* -------------------------------------------- */ async rollPouvoir(pouvoirId) { let comp = this.items.find(comp => comp.type == "competence" && comp.name.toLowerCase() == "savoir : runes") diff --git a/modules/wasteland-config.js b/modules/wasteland-config.js index 5b93d56..3de9c4c 100644 --- a/modules/wasteland-config.js +++ b/modules/wasteland-config.js @@ -11,5 +11,13 @@ export const WASTELAND_CONFIG = { charmetype: { tour: "Tour", charme: "Charme", - } + }, + dices: { + "1d4": "1d4", + "1d6": "1d6", + "1d8": "1d8", + "1d10": "1d10", + "1d12": "1d12", + "1d20": "1d20", + }, } diff --git a/modules/wasteland-roll-dialog.js b/modules/wasteland-roll-dialog.js index 6d873d8..ec514c6 100644 --- a/modules/wasteland-roll-dialog.js +++ b/modules/wasteland-roll-dialog.js @@ -3,35 +3,51 @@ import { WastelandUtility } from "./wasteland-utility.js"; export class WastelandRollDialog extends Dialog { /* -------------------------------------------- */ - static async create(actor, rollData ) { + static async create(actor, rollData) { let options = { classes: ["WastelandDialog"], width: 340, height: 'fit-content', 'z-index': 99999 }; let html = await renderTemplate('systems/fvtt-wasteland/templates/roll-dialog-generic.html', rollData); - return new WastelandRollDialog(actor, rollData, html, options ); + return new WastelandRollDialog(actor, rollData, html, options); } /* -------------------------------------------- */ constructor(actor, rollData, html, options, close = undefined) { + let buttons = { + rolld10: { + icon: '', + label: "Lancer 1d10", + callback: () => { this.roll("1d10") } + }, + rolld20: { + icon: '', + label: "Lancer 1d20", + callback: () => { this.roll("1d20") } + }, + cancel: { + icon: '', + label: "Annuler", + callback: () => { this.close() } + } + } + if (rollData.charme) { + buttons = { + roll: { + icon: '', + label: "Lancer", + callback: () => { this.roll() } + }, + cancel: { + icon: '', + label: "Annuler", + callback: () => { this.close() } + } + } + } let conf = { title: "Test de Capacité", content: html, - buttons: { - rolld10: { - icon: '', - label: "Lancer 1d10", - callback: () => { this.roll("1d10") } - }, - rolld20: { - icon: '', - label: "Lancer 1d20", - callback: () => { this.roll("1d20") } - }, - cancel: { - icon: '', - label: "Annuler", - callback: () => { this.close() } - } }, + buttons: buttons, close: close } @@ -42,9 +58,9 @@ export class WastelandRollDialog extends Dialog { } /* -------------------------------------------- */ - roll ( dice) { + roll(dice) { this.rollData.mainDice = dice - WastelandUtility.rollWasteland( this.rollData ) + WastelandUtility.rollWasteland(this.rollData) } @@ -56,24 +72,28 @@ export class WastelandRollDialog extends Dialog { function onLoad() { } $(function () { onLoad(); }); - - html.find('#modificateur').change(async (event) => { + + html.find('#modificateur').change(async (event) => { this.rollData.modificateur = Number(event.currentTarget.value) }) - html.find('#difficulte').change(async (event) => { + html.find('#difficulte').change(async (event) => { this.rollData.difficulte = Number(event.currentTarget.value) }) - html.find('#attrKey').change(async (event) => { + html.find('#attrKey').change(async (event) => { this.rollData.attrKey = String(event.currentTarget.value) - }) - html.find('#runemode').change(async (event) => { + }) + html.find('#runemode').change(async (event) => { this.rollData.runemode = String(event.currentTarget.value) - }) - html.find('#runeame').change(async (event) => { + }) + html.find('#runeame').change(async (event) => { this.rollData.runeame = Number(event.currentTarget.value) - }) - html.find('#doubleD20').change(async (event) => { + }) + html.find('#doubleD20').change(async (event) => { this.rollData.doubleD20 = event.currentTarget.checked - }) + }) + html.find('#charmeDice').change(async (event) => { + this.rollData.charmeDice = String(event.currentTarget.value) + }) + } } \ No newline at end of file diff --git a/modules/wasteland-utility.js b/modules/wasteland-utility.js index 53c0ef4..e28d34f 100644 --- a/modules/wasteland-utility.js +++ b/modules/wasteland-utility.js @@ -2,6 +2,20 @@ import { WastelandCombat } from "./wasteland-combat.js"; import { WastelandCommands } from "./wasteland-commands.js"; +/* -------------------------------------------- */ +const __contrecouptCharme = { + 1 : {name: "Effet chromatique", description: "" }, + 3 : {name: "Enivrement Kobold", description: "" }, + 5 : {name: "Mutisme superstitieux", description: "" }, + 7 : {name: "Agité!", description: "" }, + 9 : {name: "Somnolence", description: "" }, + 11 : {name: "Manie incontrôlable", description: "" }, + 13 : {name: "Malédiction des Ternes", description: "" }, + 15 : {name: "La petite Mort", description: "" }, + 17 : {name: "Angoisse cauchemardesque", description: "" }, + 19 : {name: "Anémie Kobold", description: "" } +} + /* -------------------------------------------- */ export class WastelandUtility { @@ -279,25 +293,44 @@ export class WastelandUtility { /* -------------------------------------------- */ static computeResult(rollData) { - if (rollData.mainDice == "1d20") { - let diceValue = rollData.roll.terms[0].results[0].result - diceValue *= (rollData.doubleD20) ? 2 : 1 - //console.log("PAIR/IMP", diceValue) - if (diceValue % 2 == 1) { - //console.log("PAIR/IMP2", diceValue) - rollData.finalResult -= rollData.roll.terms[0].results[0].result // Substract value - if (diceValue == 1 || diceValue == 11) { - rollData.isDramatique = true - rollData.isSuccess = false + if (rollData.charme) { + let resultIndex = false + let resTab = duplicate(rollData.charme.system.resultats) + for(let id in resTab) { + let res = resTab[id] + if (!resultIndex && rollData.finalResult >= res.value) { + resultIndex = id; } } - } - - //console.log("Result : ", rollData) - if (rollData.difficulte > 0 && !rollData.isDramatique) { - rollData.isSuccess = (rollData.finalResult >= rollData.difficulte) - rollData.isHeroique = ((rollData.finalResult - rollData.difficulte) >= 10) - rollData.isDramatique = ((rollData.finalResult - rollData.difficulte) <= -10) + if (resultIndex) { + 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] + } + } else { + if (rollData.mainDice == "1d20") { + let diceValue = rollData.roll.terms[0].results[0].result + diceValue *= (rollData.doubleD20) ? 2 : 1 + //console.log("PAIR/IMP", diceValue) + if (diceValue % 2 == 1) { + //console.log("PAIR/IMP2", diceValue) + rollData.finalResult -= rollData.roll.terms[0].results[0].result // Substract value + if (diceValue == 1 || diceValue == 11) { + rollData.isDramatique = true + rollData.isSuccess = false + } + } + } + + //console.log("Result : ", rollData) + if (rollData.difficulte > 0 && !rollData.isDramatique) { + rollData.isSuccess = (rollData.finalResult >= rollData.difficulte) + rollData.isHeroique = ((rollData.finalResult - rollData.difficulte) >= 10) + rollData.isDramatique = ((rollData.finalResult - rollData.difficulte) <= -10) + } } } @@ -313,13 +346,18 @@ export class WastelandUtility { rollData.attr = duplicate(actor.system.attributs[rollData.attrKey]) } - rollData.diceFormula = rollData.mainDice - if (rollData.doubleD20) { // Multiply result ! - rollData.diceFormula += "*2" - if (!rollData.isReroll) { - actor.changeEclat(-1) - } + if (rollData.charme) { + rollData.diceFormula = rollData.charmeDice + } else { + rollData.diceFormula = rollData.mainDice + if (rollData.doubleD20) { // Multiply result ! + rollData.diceFormula += "*2" + if (!rollData.isReroll) { + actor.changeEclat(-1) + } + } } + //console.log("BEFORE COMP", rollData) if (rollData.competence) { rollData.predilections = duplicate(rollData.competence.system.predilections.filter(pred => !pred.used) || []) @@ -328,21 +366,10 @@ export class WastelandUtility { } else { rollData.diceFormula += `+${rollData.attr.value}*2+${rollData.modificateur}` } - if (rollData.arme && rollData.arme.type == "arme") { rollData.diceFormula += `+${rollData.arme.system.bonusmaniementoff}` } - if (rollData.rune) { - rollData.runeduree = Math.ceil((rollData.runeame + 3) / 3) - if (rollData.runemode == "inscrire") { - rollData.runeduree *= 2 - } - if (rollData.runemode == "prononcer") { - rollData.runeduree = 1 - } - } - let myRoll = new Roll(rollData.diceFormula).roll({ async: false }) await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode")) rollData.roll = duplicate(myRoll) @@ -352,14 +379,6 @@ export class WastelandUtility { rollData.finalResult = myRoll.total this.computeResult(rollData) - if (rollData.rune) { - let subAme = rollData.runeame - if (rollData.isEchec && !rollData.isDramatique) { - subAme = Math.ceil((subAme + 1) / 2) - } - actor.subPointsAme(rollData.runemode, subAme) - } - this.createChatWithRollMode(rollData.alias, { content: await renderTemplate(`systems/fvtt-wasteland/templates/chat-generic-result.html`, rollData) }, rollData) diff --git a/packs/armes/000028.log b/packs/armes/000036.log similarity index 100% rename from packs/armes/000028.log rename to packs/armes/000036.log diff --git a/packs/armes/CURRENT b/packs/armes/CURRENT index 8b15215..eea9b0f 100644 --- a/packs/armes/CURRENT +++ b/packs/armes/CURRENT @@ -1 +1 @@ -MANIFEST-000026 +MANIFEST-000034 diff --git a/packs/armes/LOG b/packs/armes/LOG index 26cd559..6ee6eec 100644 --- a/packs/armes/LOG +++ b/packs/armes/LOG @@ -1,8 +1,8 @@ -2023/11/28-22:25:39.804205 7fef577fe6c0 Recovering log #24 -2023/11/28-22:25:39.814540 7fef577fe6c0 Delete type=3 #22 -2023/11/28-22:25:39.814668 7fef577fe6c0 Delete type=0 #24 -2023/11/28-22:26:01.957988 7fef56ffd6c0 Level-0 table #29: started -2023/11/28-22:26:01.958049 7fef56ffd6c0 Level-0 table #29: 0 bytes OK -2023/11/28-22:26:01.993914 7fef56ffd6c0 Delete type=0 #27 -2023/11/28-22:26:01.994099 7fef56ffd6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/11/28-22:26:01.994115 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/LOG.old b/packs/armes/LOG.old index 355d15c..1abe331 100644 --- a/packs/armes/LOG.old +++ b/packs/armes/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-22:14:53.966749 7ff1ed3ff6c0 Recovering log #20 -2023/11/28-22:14:53.976936 7ff1ed3ff6c0 Delete type=3 #18 -2023/11/28-22:14:53.977013 7ff1ed3ff6c0 Delete type=0 #20 -2023/11/28-22:25:36.167685 7fef56ffd6c0 Level-0 table #25: started -2023/11/28-22:25:36.167712 7fef56ffd6c0 Level-0 table #25: 0 bytes OK -2023/11/28-22:25:36.174198 7fef56ffd6c0 Delete type=0 #23 -2023/11/28-22:25:36.174324 7fef56ffd6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/11/28-22:25:36.174347 7fef56ffd6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +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) diff --git a/packs/armes/MANIFEST-000026 b/packs/armes/MANIFEST-000026 deleted file mode 100644 index f4ba1d6e0e940110a41b2c281684e0d90cb3f50d..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 literal 0 HcmV?d00001 diff --git a/packs/equipement/000088.log b/packs/equipement/000096.log similarity index 100% rename from packs/equipement/000088.log rename to packs/equipement/000096.log diff --git a/packs/equipement/CURRENT b/packs/equipement/CURRENT index a43fb19..0ab25fa 100644 --- a/packs/equipement/CURRENT +++ b/packs/equipement/CURRENT @@ -1 +1 @@ -MANIFEST-000086 +MANIFEST-000094 diff --git a/packs/equipement/LOG b/packs/equipement/LOG index df1490a..137b178 100644 --- a/packs/equipement/LOG +++ b/packs/equipement/LOG @@ -1,8 +1,8 @@ -2023/11/28-22:25:39.829581 7fef57fff6c0 Recovering log #84 -2023/11/28-22:25:39.840009 7fef57fff6c0 Delete type=3 #82 -2023/11/28-22:25:39.840073 7fef57fff6c0 Delete type=0 #84 -2023/11/28-22:26:01.994226 7fef56ffd6c0 Level-0 table #89: started -2023/11/28-22:26:01.994256 7fef56ffd6c0 Level-0 table #89: 0 bytes OK -2023/11/28-22:26:02.031072 7fef56ffd6c0 Delete type=0 #87 -2023/11/28-22:26:02.153695 7fef56ffd6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) -2023/11/28-22:26:02.153755 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/LOG.old b/packs/equipement/LOG.old index 98918c3..3756aaa 100644 --- a/packs/equipement/LOG.old +++ b/packs/equipement/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-22:14:53.990204 7fef577fe6c0 Recovering log #80 -2023/11/28-22:14:54.000869 7fef577fe6c0 Delete type=3 #78 -2023/11/28-22:14:54.001047 7fef577fe6c0 Delete type=0 #80 -2023/11/28-22:25:36.194226 7fef56ffd6c0 Level-0 table #85: started -2023/11/28-22:25:36.194293 7fef56ffd6c0 Level-0 table #85: 0 bytes OK -2023/11/28-22:25:36.200734 7fef56ffd6c0 Delete type=0 #83 -2023/11/28-22:25:36.200935 7fef56ffd6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) -2023/11/28-22:25:36.200959 7fef56ffd6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +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) diff --git a/packs/equipement/MANIFEST-000086 b/packs/equipement/MANIFEST-000086 deleted file mode 100644 index c078eb14909f3193f73dbdbe80608271a4dde921..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmbQbcmB6T21Z7yoYb<^oRlOzr^=Gl^338?=ltA)#G=HK{33QH*3Gu^ikT&;xy6cx z$x$gr8953zMktv*$ VfjNT3+~E9_3=lU0$c*q0mMxJa+6rh0WrHImH+?% literal 0 HcmV?d00001 diff --git a/packs/heritages/000052.log b/packs/heritages/000060.log similarity index 100% rename from packs/heritages/000052.log rename to packs/heritages/000060.log diff --git a/packs/heritages/CURRENT b/packs/heritages/CURRENT index 7570f19..717cf9a 100644 --- a/packs/heritages/CURRENT +++ b/packs/heritages/CURRENT @@ -1 +1 @@ -MANIFEST-000050 +MANIFEST-000058 diff --git a/packs/heritages/LOG b/packs/heritages/LOG index fb1e8ef..b6c4e60 100644 --- a/packs/heritages/LOG +++ b/packs/heritages/LOG @@ -1,8 +1,8 @@ -2023/11/28-22:25:39.779436 7fef57fff6c0 Recovering log #48 -2023/11/28-22:25:39.789921 7fef57fff6c0 Delete type=3 #46 -2023/11/28-22:25:39.789983 7fef57fff6c0 Delete type=0 #48 -2023/11/28-22:26:01.878136 7fef56ffd6c0 Level-0 table #53: started -2023/11/28-22:26:01.878192 7fef56ffd6c0 Level-0 table #53: 0 bytes OK -2023/11/28-22:26:01.914960 7fef56ffd6c0 Delete type=0 #51 -2023/11/28-22:26:01.957954 7fef56ffd6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) -2023/11/28-22:26:01.994087 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/LOG.old b/packs/heritages/LOG.old index 676afe2..df9539f 100644 --- a/packs/heritages/LOG.old +++ b/packs/heritages/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-22:14:53.939948 7fef577fe6c0 Recovering log #44 -2023/11/28-22:14:53.949765 7fef577fe6c0 Delete type=3 #42 -2023/11/28-22:14:53.949833 7fef577fe6c0 Delete type=0 #44 -2023/11/28-22:25:36.155114 7fef56ffd6c0 Level-0 table #49: started -2023/11/28-22:25:36.155139 7fef56ffd6c0 Level-0 table #49: 0 bytes OK -2023/11/28-22:25:36.161385 7fef56ffd6c0 Delete type=0 #47 -2023/11/28-22:25:36.174294 7fef56ffd6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) -2023/11/28-22:25:36.174332 7fef56ffd6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +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) diff --git a/packs/heritages/MANIFEST-000050 b/packs/heritages/MANIFEST-000058 similarity index 73% rename from packs/heritages/MANIFEST-000050 rename to packs/heritages/MANIFEST-000058 index 8187980e0c0ad50604ec9bd2a1b4a4fe3a55fbdc..e0678132a2d78ae9931d64008ce3ab4a11be050d 100644 GIT binary patch delta 37 pcmZo;Y-5~|At!R};WZ8hMkZ@c24));E=J3nlR;b?AlHtC3jnu-2d4l4 delta 37 pcmZo;Y-5~|AvgEamrxD{MkZrU24)i$t`)t1B|uygAlHnA3joL%2x0&L diff --git a/packs/metiers/000052.log b/packs/metiers/000060.log similarity index 100% rename from packs/metiers/000052.log rename to packs/metiers/000060.log diff --git a/packs/metiers/CURRENT b/packs/metiers/CURRENT index 7570f19..717cf9a 100644 --- a/packs/metiers/CURRENT +++ b/packs/metiers/CURRENT @@ -1 +1 @@ -MANIFEST-000050 +MANIFEST-000058 diff --git a/packs/metiers/LOG b/packs/metiers/LOG index 7186919..6c76880 100644 --- a/packs/metiers/LOG +++ b/packs/metiers/LOG @@ -1,8 +1,8 @@ -2023/11/28-22:25:39.791819 7ff1ecbfe6c0 Recovering log #48 -2023/11/28-22:25:39.801806 7ff1ecbfe6c0 Delete type=3 #46 -2023/11/28-22:25:39.801862 7ff1ecbfe6c0 Delete type=0 #48 -2023/11/28-22:26:01.915107 7fef56ffd6c0 Level-0 table #53: started -2023/11/28-22:26:01.915141 7fef56ffd6c0 Level-0 table #53: 0 bytes OK -2023/11/28-22:26:01.957280 7fef56ffd6c0 Delete type=0 #51 -2023/11/28-22:26:01.994058 7fef56ffd6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) -2023/11/28-22:26:01.994107 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/LOG.old b/packs/metiers/LOG.old index 38ee0c2..833de1d 100644 --- a/packs/metiers/LOG.old +++ b/packs/metiers/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-22:14:53.953114 7ff1ecbfe6c0 Recovering log #44 -2023/11/28-22:14:53.963864 7ff1ecbfe6c0 Delete type=3 #42 -2023/11/28-22:14:53.963919 7ff1ecbfe6c0 Delete type=0 #44 -2023/11/28-22:25:36.161493 7fef56ffd6c0 Level-0 table #49: started -2023/11/28-22:25:36.161519 7fef56ffd6c0 Level-0 table #49: 0 bytes OK -2023/11/28-22:25:36.167584 7fef56ffd6c0 Delete type=0 #47 -2023/11/28-22:25:36.174305 7fef56ffd6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) -2023/11/28-22:25:36.174339 7fef56ffd6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +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) diff --git a/packs/metiers/MANIFEST-000050 b/packs/metiers/MANIFEST-000058 similarity index 73% rename from packs/metiers/MANIFEST-000050 rename to packs/metiers/MANIFEST-000058 index 8b353bb92cd221713e99b847e11e3841ee51ccd6..9c68d3b9b12152922fc15f32855f90f7dbc73d53 100644 GIT binary patch delta 37 pcmZo?Y-gO1DYr*;_IeHmMkZ@c24));;gemHvp`%MAlHsX7y!2q2k-y@ delta 37 pcmZo?Y-gO1Dfjijb{!4|MkZrU24)i$;Rmt%KZ3X>K&}~!FaXMK2-*Mu diff --git a/packs/origines/000053.log b/packs/origines/000061.log similarity index 100% rename from packs/origines/000053.log rename to packs/origines/000061.log diff --git a/packs/origines/CURRENT b/packs/origines/CURRENT index 29ffc22..e4c5073 100644 --- a/packs/origines/CURRENT +++ b/packs/origines/CURRENT @@ -1 +1 @@ -MANIFEST-000051 +MANIFEST-000059 diff --git a/packs/origines/LOG b/packs/origines/LOG index 4f2def1..2ef875b 100644 --- a/packs/origines/LOG +++ b/packs/origines/LOG @@ -1,8 +1,8 @@ -2023/11/28-22:25:39.766917 7ff1ed3ff6c0 Recovering log #49 -2023/11/28-22:25:39.776639 7ff1ed3ff6c0 Delete type=3 #47 -2023/11/28-22:25:39.776769 7ff1ed3ff6c0 Delete type=0 #49 -2023/11/28-22:26:01.835351 7fef56ffd6c0 Level-0 table #54: started -2023/11/28-22:26:01.835379 7fef56ffd6c0 Level-0 table #54: 0 bytes OK -2023/11/28-22:26:01.877912 7fef56ffd6c0 Delete type=0 #52 -2023/11/28-22:26:01.957422 7fef56ffd6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) -2023/11/28-22:26:01.994075 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/LOG.old b/packs/origines/LOG.old index 9009ed1..5b76b81 100644 --- a/packs/origines/LOG.old +++ b/packs/origines/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-22:14:53.927159 7fef57fff6c0 Recovering log #45 -2023/11/28-22:14:53.938168 7fef57fff6c0 Delete type=3 #43 -2023/11/28-22:14:53.938269 7fef57fff6c0 Delete type=0 #45 -2023/11/28-22:25:36.148472 7fef56ffd6c0 Level-0 table #50: started -2023/11/28-22:25:36.148556 7fef56ffd6c0 Level-0 table #50: 0 bytes OK -2023/11/28-22:25:36.154989 7fef56ffd6c0 Delete type=0 #48 -2023/11/28-22:25:36.167674 7fef56ffd6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) -2023/11/28-22:25:36.174315 7fef56ffd6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +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) diff --git a/packs/origines/MANIFEST-000051 b/packs/origines/MANIFEST-000059 similarity index 80% rename from packs/origines/MANIFEST-000051 rename to packs/origines/MANIFEST-000059 index 5742273e03fb904b2cc06d7d1df9bbd3c440507e..448b6985c2304530dd23e46c2308eff017392895 100644 GIT binary patch delta 37 pcmZ3x!F5!Zw7HAf!t^oIRMoQ355Uv diff --git a/packs/tables/000088.log b/packs/tables/000096.log similarity index 100% rename from packs/tables/000088.log rename to packs/tables/000096.log diff --git a/packs/tables/CURRENT b/packs/tables/CURRENT index a43fb19..0ab25fa 100644 --- a/packs/tables/CURRENT +++ b/packs/tables/CURRENT @@ -1 +1 @@ -MANIFEST-000086 +MANIFEST-000094 diff --git a/packs/tables/LOG b/packs/tables/LOG index eba75bc..ff3ecda 100644 --- a/packs/tables/LOG +++ b/packs/tables/LOG @@ -1,8 +1,8 @@ -2023/11/28-22:25:39.841825 7ff1ecbfe6c0 Recovering log #84 -2023/11/28-22:25:39.851624 7ff1ecbfe6c0 Delete type=3 #82 -2023/11/28-22:25:39.851681 7ff1ecbfe6c0 Delete type=0 #84 -2023/11/28-22:26:02.110352 7fef56ffd6c0 Level-0 table #89: started -2023/11/28-22:26:02.110380 7fef56ffd6c0 Level-0 table #89: 0 bytes OK -2023/11/28-22:26:02.153538 7fef56ffd6c0 Delete type=0 #87 -2023/11/28-22:26:02.153745 7fef56ffd6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) -2023/11/28-22:26:02.153771 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/LOG.old b/packs/tables/LOG.old index b75b345..35a47d3 100644 --- a/packs/tables/LOG.old +++ b/packs/tables/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-22:14:54.003336 7ff1ecbfe6c0 Recovering log #80 -2023/11/28-22:14:54.014281 7ff1ecbfe6c0 Delete type=3 #78 -2023/11/28-22:14:54.014518 7ff1ecbfe6c0 Delete type=0 #80 -2023/11/28-22:25:36.174449 7fef56ffd6c0 Level-0 table #85: started -2023/11/28-22:25:36.174476 7fef56ffd6c0 Level-0 table #85: 0 bytes OK -2023/11/28-22:25:36.180710 7fef56ffd6c0 Delete type=0 #83 -2023/11/28-22:25:36.200896 7fef56ffd6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) -2023/11/28-22:25:36.200943 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: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) diff --git a/packs/tables/MANIFEST-000086 b/packs/tables/MANIFEST-000094 similarity index 79% rename from packs/tables/MANIFEST-000086 rename to packs/tables/MANIFEST-000094 index a8e17cb09c329ea994b247de6e599670b1cf6871..ce07f8e062599901e5770575e5b2b0a79b39cafb 100644 GIT binary patch delta 37 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 literal 0 HcmV?d00001 diff --git a/packs/tourscharmes/CURRENT b/packs/tourscharmes/CURRENT new file mode 100644 index 0000000..1a84852 --- /dev/null +++ b/packs/tourscharmes/CURRENT @@ -0,0 +1 @@ +MANIFEST-000002 diff --git a/packs/tourscharmes/LOCK b/packs/tourscharmes/LOCK new file mode 100644 index 0000000..e69de29 diff --git a/packs/tourscharmes/LOG b/packs/tourscharmes/LOG new file mode 100644 index 0000000..8143a23 --- /dev/null +++ b/packs/tourscharmes/LOG @@ -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 new file mode 100644 index 0000000000000000000000000000000000000000..ed65fb65b8e1c1ef97a72967f1e53d11f132901f GIT binary patch literal 134 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAe$kRS-TOEg7@3$k8JJmE z7$)35qwEXhvH-bkECTFItg~I@6*EgxbBh(t^GcJ=B7+KyLy|p%OOn$Vc^JR|CSPf2 WS#Dt*8CV$}l$e;5UB<`+kp}>*M

- - -
 
@@ -283,8 +280,8 @@ {{#each tours as |tour key|}}
  • - {{tour.name}} - {{tour.system.allegeance}} + + {{tour.name}}
     
    diff --git a/templates/chat-generic-result.html b/templates/chat-generic-result.html index cc21247..0d3f832 100644 --- a/templates/chat-generic-result.html +++ b/templates/chat-generic-result.html @@ -49,6 +49,19 @@
  • Total : {{finalResult}}
    • + {{#if charme}} + {{#if charmeDuree}} +
  • Réussi ! +
  • Durée : {{charmeDuree}}
    • + {{else}} +
  • Le Tour/Charme a échoué !
    • + {{/if}} +
  • Contrecoup : {{contrecoupResult}}
    • + {{#if contrecoup}} +
  • {{contrecoup.name}}
    • + {{/if}} + {{/if}} + {{#if difficulte}} {{#if isSuccess}}
  • Succés!!!
    • diff --git a/templates/roll-dialog-generic.html b/templates/roll-dialog-generic.html index 7a7280f..9668351 100644 --- a/templates/roll-dialog-generic.html +++ b/templates/roll-dialog-generic.html @@ -31,31 +31,21 @@ {{/if}} - {{#if rune}} + {{#if charme}}
    - {{rune.name}} - {{rune.system.formule}} + {{charme.name}}
    - Lancement - + {{#select charmeDice}} + {{#each config.dices as |dice dicekey|}} + + {{/each}} {{/select}} - -
    -
    - Points d'Ame - -
    + + {{/if}}
    @@ -74,6 +64,8 @@ {{difficulte}}
    {{else}} + {{#if charme}} + {{else}}
    Difficulté :