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 f4ba1d6..0000000 Binary files a/packs/armes/MANIFEST-000026 and /dev/null differ diff --git a/packs/armes/MANIFEST-000034 b/packs/armes/MANIFEST-000034 new file mode 100644 index 0000000..8f0f104 Binary files /dev/null and b/packs/armes/MANIFEST-000034 differ 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 c078eb1..0000000 Binary files a/packs/equipement/MANIFEST-000086 and /dev/null differ diff --git a/packs/equipement/MANIFEST-000094 b/packs/equipement/MANIFEST-000094 new file mode 100644 index 0000000..5065709 Binary files /dev/null and b/packs/equipement/MANIFEST-000094 differ 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 8187980..e067813 100644 Binary files a/packs/heritages/MANIFEST-000050 and b/packs/heritages/MANIFEST-000058 differ 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 8b353bb..9c68d3b 100644 Binary files a/packs/metiers/MANIFEST-000050 and b/packs/metiers/MANIFEST-000058 differ 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 5742273..448b698 100644 Binary files a/packs/origines/MANIFEST-000051 and b/packs/origines/MANIFEST-000059 differ diff --git a/packs/protection/000089.log b/packs/protection/000097.log similarity index 100% rename from packs/protection/000089.log rename to packs/protection/000097.log diff --git a/packs/protection/CURRENT b/packs/protection/CURRENT index d05b681..b993e6c 100644 --- a/packs/protection/CURRENT +++ b/packs/protection/CURRENT @@ -1 +1 @@ -MANIFEST-000087 +MANIFEST-000095 diff --git a/packs/protection/LOG b/packs/protection/LOG index 1301162..6e3ed77 100644 --- a/packs/protection/LOG +++ b/packs/protection/LOG @@ -1,8 +1,8 @@ -2023/11/28-22:25:39.816638 7ff1ed3ff6c0 Recovering log #85 -2023/11/28-22:25:39.826939 7ff1ed3ff6c0 Delete type=3 #83 -2023/11/28-22:25:39.826992 7ff1ed3ff6c0 Delete type=0 #85 -2023/11/28-22:26:02.073308 7fef56ffd6c0 Level-0 table #90: started -2023/11/28-22:26:02.073355 7fef56ffd6c0 Level-0 table #90: 0 bytes OK -2023/11/28-22:26:02.110214 7fef56ffd6c0 Delete type=0 #88 -2023/11/28-22:26:02.153733 7fef56ffd6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) -2023/11/28-22:26:02.153763 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/LOG.old b/packs/protection/LOG.old index 2215cb5..bd51622 100644 --- a/packs/protection/LOG.old +++ b/packs/protection/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-22:14:53.978702 7fef57fff6c0 Recovering log #81 -2023/11/28-22:14:53.988721 7fef57fff6c0 Delete type=3 #79 -2023/11/28-22:14:53.988779 7fef57fff6c0 Delete type=0 #81 -2023/11/28-22:25:36.187160 7fef56ffd6c0 Level-0 table #86: started -2023/11/28-22:25:36.187189 7fef56ffd6c0 Level-0 table #86: 0 bytes OK -2023/11/28-22:25:36.193995 7fef56ffd6c0 Delete type=0 #84 -2023/11/28-22:25:36.200924 7fef56ffd6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) -2023/11/28-22:25:36.200951 7fef56ffd6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +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) diff --git a/packs/protection/MANIFEST-000087 b/packs/protection/MANIFEST-000095 similarity index 78% rename from packs/protection/MANIFEST-000087 rename to packs/protection/MANIFEST-000095 index 73532ca..4da62c1 100644 Binary files a/packs/protection/MANIFEST-000087 and b/packs/protection/MANIFEST-000095 differ diff --git a/packs/scenes/000028.log b/packs/scenes/000036.log similarity index 100% rename from packs/scenes/000028.log rename to packs/scenes/000036.log diff --git a/packs/scenes/CURRENT b/packs/scenes/CURRENT index 8b15215..eea9b0f 100644 --- a/packs/scenes/CURRENT +++ b/packs/scenes/CURRENT @@ -1 +1 @@ -MANIFEST-000026 +MANIFEST-000034 diff --git a/packs/scenes/LOG b/packs/scenes/LOG index 963bbf2..38b6ef1 100644 --- a/packs/scenes/LOG +++ b/packs/scenes/LOG @@ -1,7 +1,7 @@ -2023/11/28-22:25:39.853649 7fef577fe6c0 Recovering log #24 -2023/11/28-22:25:39.863741 7fef577fe6c0 Delete type=3 #22 -2023/11/28-22:25:39.863801 7fef577fe6c0 Delete type=0 #24 -2023/11/28-22:26:02.031207 7fef56ffd6c0 Level-0 table #29: started -2023/11/28-22:26:02.031240 7fef56ffd6c0 Level-0 table #29: 0 bytes OK -2023/11/28-22:26:02.073160 7fef56ffd6c0 Delete type=0 #27 -2023/11/28-22:26:02.153714 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/LOG.old b/packs/scenes/LOG.old index 44a2da8..e408b10 100644 --- a/packs/scenes/LOG.old +++ b/packs/scenes/LOG.old @@ -1,7 +1,7 @@ -2023/11/28-22:14:54.017371 7ff1ed3ff6c0 Recovering log #20 -2023/11/28-22:14:54.027883 7ff1ed3ff6c0 Delete type=3 #18 -2023/11/28-22:14:54.027943 7ff1ed3ff6c0 Delete type=0 #20 -2023/11/28-22:25:36.180820 7fef56ffd6c0 Level-0 table #25: started -2023/11/28-22:25:36.180877 7fef56ffd6c0 Level-0 table #25: 0 bytes OK -2023/11/28-22:25:36.187032 7fef56ffd6c0 Delete type=0 #23 -2023/11/28-22:25:36.200911 7fef56ffd6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +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) diff --git a/packs/scenes/MANIFEST-000026 b/packs/scenes/MANIFEST-000026 deleted file mode 100644 index 07b73bf..0000000 Binary files a/packs/scenes/MANIFEST-000026 and /dev/null differ diff --git a/packs/scenes/MANIFEST-000034 b/packs/scenes/MANIFEST-000034 new file mode 100644 index 0000000..c19f06e Binary files /dev/null and b/packs/scenes/MANIFEST-000034 differ diff --git a/packs/skills/000089.log b/packs/skills/000097.log similarity index 100% rename from packs/skills/000089.log rename to packs/skills/000097.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index d05b681..b993e6c 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000087 +MANIFEST-000095 diff --git a/packs/skills/LOG b/packs/skills/LOG index 45bb1b4..8dd53d3 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,8 @@ -2023/11/28-22:25:39.755108 7fef577fe6c0 Recovering log #85 -2023/11/28-22:25:39.764999 7fef577fe6c0 Delete type=3 #83 -2023/11/28-22:25:39.765054 7fef577fe6c0 Delete type=0 #85 -2023/11/28-22:26:01.737555 7fef56ffd6c0 Level-0 table #90: started -2023/11/28-22:26:01.737598 7fef56ffd6c0 Level-0 table #90: 0 bytes OK -2023/11/28-22:26:01.779655 7fef56ffd6c0 Delete type=0 #88 -2023/11/28-22:26:01.780041 7fef56ffd6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/11/28-22:26:01.835335 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/LOG.old b/packs/skills/LOG.old index 62e023e..fba4f81 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-22:14:53.914347 7ff1ed3ff6c0 Recovering log #81 -2023/11/28-22:14:53.924342 7ff1ed3ff6c0 Delete type=3 #79 -2023/11/28-22:14:53.924395 7ff1ed3ff6c0 Delete type=0 #81 -2023/11/28-22:25:36.119696 7fef56ffd6c0 Level-0 table #86: started -2023/11/28-22:25:36.119755 7fef56ffd6c0 Level-0 table #86: 0 bytes OK -2023/11/28-22:25:36.127384 7fef56ffd6c0 Delete type=0 #84 -2023/11/28-22:25:36.137845 7fef56ffd6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/11/28-22:25:36.148441 7fef56ffd6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +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) diff --git a/packs/skills/MANIFEST-000087 b/packs/skills/MANIFEST-000095 similarity index 76% rename from packs/skills/MANIFEST-000087 rename to packs/skills/MANIFEST-000095 index c28aef7..7334e68 100644 Binary files a/packs/skills/MANIFEST-000087 and b/packs/skills/MANIFEST-000095 differ 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 a8e17cb..ce07f8e 100644 Binary files a/packs/tables/MANIFEST-000086 and b/packs/tables/MANIFEST-000094 differ diff --git a/packs/tourscharmes/000004.log b/packs/tourscharmes/000004.log new file mode 100644 index 0000000..e69de29 diff --git a/packs/tourscharmes/000005.ldb b/packs/tourscharmes/000005.ldb new file mode 100644 index 0000000..3e6f5eb Binary files /dev/null and b/packs/tourscharmes/000005.ldb differ 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 0000000..ed65fb6 Binary files /dev/null and b/packs/tourscharmes/MANIFEST-000002 differ diff --git a/system.json b/system.json index 3174c75..e88f3bf 100644 --- a/system.json +++ b/system.json @@ -1,7 +1,7 @@ { "id": "fvtt-wasteland", "description": "Wasteland RPG for FoundryVTT", - "version": "11.0.7", + "version": "11.0.8", "authors": [ { "name": "Uberwald/LeRatierBretonnien", @@ -23,7 +23,7 @@ "gridUnits": "m", "license": "LICENSE.txt", "manifest": "https://www.uberwald.me/gitea/public/fvtt-wasteland/raw/branch/main/system.json", - "download": "https://www.uberwald.me/gitea/public/fvtt-wasteland/archive/fvtt-wasteland-v11.0.7.zip", + "download": "https://www.uberwald.me/gitea/public/fvtt-wasteland/archive/fvtt-wasteland-v11.0.8.zip", "packs": [ { "type": "Item", @@ -61,6 +61,15 @@ "flags": {}, "private": false }, + { + "type": "Item", + "label": "Tours et Charmes", + "name": "tourscharmes", + "path": "packs/tourscharmes", + "system": "fvtt-wasteland", + "flags": {}, + "private": false + }, { "type": "Item", "label": "Armes & Boucliers", diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 2f6c5c7..b776a43 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -273,9 +273,6 @@

- - -
 
@@ -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é :