diff --git a/modules/heritiers-actor-sheet.js b/modules/heritiers-actor-sheet.js index f038f2b..fb48d76 100644 --- a/modules/heritiers-actor-sheet.js +++ b/modules/heritiers-actor-sheet.js @@ -77,19 +77,42 @@ export class HeritiersActorSheet extends ActorSheet { } /* -------------------------------------------- */ - getCelluleTalents( ) { - let talents = [] - for(let cellule of game.actors) { - if (cellule.type == "cellule") { - let found = cellule.system.members.find( it => it.id == this.actor.id) - if (found) { - talents = talents.concat( cellule.getTalents() ) + dialogRecupUsage() { + new Dialog({ + title: "Récupération des Points d'Usage", + content: "

Combien de Points d'Usage souhaitez-vous récupérer ?

", + buttons: { + one: { + icon: '', + label: "1 Point", + callback: () => { + this.actor.recupUsage(1) + } + }, + two: { + icon: '', + label: "2 Points", + callback: () => { + this.actor.recupUsage(2) + } + }, + four: { + icon: '', + label: "4 Points", + callback: () => { + this.actor.recupUsage(4) + } + }, + all: { + icon: '', + label: "Tous les Points", + callback: () => { + this.actor.recupUsage(100) + } } } - } - return talents + }).render(true) } - /* -------------------------------------------- */ /** @override */ activateListeners(html) { @@ -180,7 +203,10 @@ export class HeritiersActorSheet extends ActorSheet { let pouvoirId = li.data("item-id") this.actor.rollPouvoir(pouvoirId) }) - + html.find('.dialog-recup-usage').click((event) => { + this.dialogRecupUsage() + }) + html.find('.item-add').click((event) => { const itemType = $(event.currentTarget).data("type") this.actor.createEmbeddedDocuments('Item', [{ name: `Nouveau ${itemType}`, type: itemType }], { renderSheet: true }) diff --git a/modules/heritiers-actor.js b/modules/heritiers-actor.js index c3c2c63..9836175 100644 --- a/modules/heritiers-actor.js +++ b/modules/heritiers-actor.js @@ -135,8 +135,18 @@ export class HeritiersActor extends Actor { return this.getItemSorted(["profil"]) } getPouvoirs() { - return this.getItemSorted(["pouvoir"]) + let pouvoirs = [] + for (let item of this.items) { + if (item.type == "pouvoir") { + let itemObj = duplicate(item) + itemObj.maxUsage = this.getPouvoirUsageMax(item) + pouvoirs.push(itemObj) + } + } + HeritiersUtility.sortArrayObjectsByName(pouvoirs) + return pouvoirs } + /* -------------------------------------------- */ getSkills() { let comp = [] @@ -538,6 +548,7 @@ export class HeritiersActor extends Actor { rollData.useTricherie = false rollData.useSpecialite = false rollData.useHeritage = false + rollData.pouvoirPointsUsage = 1 rollData.rulesMalus.push(this.getPvMalus()) if (compId) { @@ -703,6 +714,7 @@ export class HeritiersActor extends Actor { rollData.carac = duplicate(this.system.caracteristiques[pouvoir.system.carac]) rollData.caracKey = pouvoir.system.carac } + rollData.pouvoirMaxUsage = this.getPouvoirUsageMax(pouvoir) rollData.pouvoir = duplicate(pouvoir) rollData.mode = "pouvoir" let rollDialog = await HeritiersRollDialog.create(this, rollData) @@ -710,4 +722,41 @@ export class HeritiersActor extends Actor { } } + /* -------------------------------------------- */ + incDecPointsUsage(pouvoirId, value) { + let pouvoir = this.items.get(pouvoirId) + let newValue = pouvoir.system.pointsusagecourant + value + newValue = Math.max(newValue, 0) + newValue = Math.min(newValue, this.getPouvoirUsageMax(pouvoir)) + this.updateEmbeddedDocuments('Item', [{ _id: pouvoirId, 'system.pointsusagecourant': newValue }]) + } + + /* -------------------------------------------- */ + getPouvoirUsage(pouvoirId) { + let pouvoir = this.items.get(pouvoirId) + return pouvoir.system.pointsusagecourant + } + + /* -------------------------------------------- */ + getPouvoirUsageMax(pouvoir) { + if (pouvoir.system.masquetype == "masque") { + return this.system.rang.masque.value + } + return this.system.rang.feerie.value + } + /* -------------------------------------------- */ + recupUsage(value) { + let updates = [] + for (let pouvoir of this.items) { + if (pouvoir.type == "pouvoir") { + let newValue = pouvoir.system.pointsusagecourant + value + newValue = Math.max(newValue, 0) + newValue = Math.min(newValue, this.getPouvoirUsageMax(pouvoir)) + updates.push({ _id: pouvoir.id, 'system.pointsusagecourant': newValue }) + } + } + if (updates.length > 0) { + this.updateEmbeddedDocuments('Item', updates) + } + } } diff --git a/modules/heritiers-item-sheet.js b/modules/heritiers-item-sheet.js index 4afe221..a4cd2cd 100644 --- a/modules/heritiers-item-sheet.js +++ b/modules/heritiers-item-sheet.js @@ -61,11 +61,20 @@ export class HeritiersItemSheet extends ItemSheet { limited: this.object.limited, options: this.options, owner: this.document.isOwner, - config: game.system.lesheritiers.config, + config: game.system.lesheritiers.config, isArmeMelee: HeritiersUtility.isArmeMelee(this.object), description: await TextEditor.enrichHTML(this.object.system.description, {async: true}), mr: (this.object.type == 'specialisation'), - isGM: game.user.isGM + isGM: game.user.isGM, + usageMax: -1 + } + + // Items specific data + if (this.object.type == 'pouvoir' && this.document.isOwner && this.actor) { + formData.usageMax = this.actor.getPouvoirUsageMax(this.object) + if (this.object.system.pointsusagecourant == -1) { + this.object.system.pointsusagecourant = formData.usageMax + } } //this.options.editable = !(this.object.origin == "embeddedItem"); diff --git a/modules/heritiers-roll-dialog.js b/modules/heritiers-roll-dialog.js index a27c55e..ce9505a 100644 --- a/modules/heritiers-roll-dialog.js +++ b/modules/heritiers-roll-dialog.js @@ -129,6 +129,9 @@ export class HeritiersRollDialog extends Dialog { html.find('#useSpecialite').change((event) => { this.rollData.useSpecialite = event.currentTarget.checked }) + html.find('#pouvoirPointsUsage').change((event) => { + this.rollData.pouvoirPointsUsage = Number(event.currentTarget.value) + }) html.find('#attaqueDos').change((event) => { this.rollData.attaqueDos = event.currentTarget.checked }) diff --git a/modules/heritiers-utility.js b/modules/heritiers-utility.js index b20f007..f028faf 100644 --- a/modules/heritiers-utility.js +++ b/modules/heritiers-utility.js @@ -471,6 +471,11 @@ export class HeritiersUtility { let actor = this.getActorFromRollData(rollData) + if ( rollData.mode == "pouvoir" && actor.getPouvoirUsage(rollData.pouvoir._id) < rollData.pouvoirPointsUsage) { + ui.notifications.warn("Pas assez de points d'usage pour ce pouvoir.") + return + } + //rollData.actionImg = "systems/fvtt-les-heritiers/assets/icons/" + actor.system.attributs[rollData.attrKey].labelnorm + ".webp" rollData.carac = duplicate(actor.system.caracteristiques[rollData.caracKey]) @@ -542,6 +547,11 @@ export class HeritiersUtility { actor.setFlag("world", "last-initiative", rollData.finalResult) } + // Gestion pouvoir et points d'usage + if (rollData.mode == "pouvoir") { + actor.incDecPointsUsage(rollData.pouvoir._id, -rollData.pouvoirPointsUsage) + } + this.createChatWithRollMode(rollData.alias, { content: await renderTemplate(`systems/fvtt-les-heritiers/templates/chat-generic-result.html`, rollData) }, rollData) @@ -593,7 +603,7 @@ export class HeritiersUtility { /* -------------------------------------------- */ static isArmeMelee(arme) { - return (arme.type == "arme" && (arme.system.categorie == "lourde" || arme.system.categorie == "blanche" || arme.system.categorie == "improvise")) ? true : false + return (arme.type == "arme" && (arme.system.categorie == "lourde" || arme.system.categorie == "blanche" || arme.system.categorie == "improvise")) } /* -------------------------------------------- */ static getWhisperRecipients(rollMode, name) { diff --git a/packs/archetypes-fees/000044.log b/packs/archetypes-fees/000052.log similarity index 100% rename from packs/archetypes-fees/000044.log rename to packs/archetypes-fees/000052.log diff --git a/packs/archetypes-fees/CURRENT b/packs/archetypes-fees/CURRENT index 8e0a062..7570f19 100644 --- a/packs/archetypes-fees/CURRENT +++ b/packs/archetypes-fees/CURRENT @@ -1 +1 @@ -MANIFEST-000042 +MANIFEST-000050 diff --git a/packs/archetypes-fees/LOG b/packs/archetypes-fees/LOG index 76e6b5e..11f7559 100644 --- a/packs/archetypes-fees/LOG +++ b/packs/archetypes-fees/LOG @@ -1,8 +1,8 @@ -2024/03/06-18:59:13.196298 7f0ad3e006c0 Recovering log #40 -2024/03/06-18:59:13.207222 7f0ad3e006c0 Delete type=3 #38 -2024/03/06-18:59:13.207352 7f0ad3e006c0 Delete type=0 #40 -2024/03/06-18:59:54.852223 7f0ad20006c0 Level-0 table #45: started -2024/03/06-18:59:54.852282 7f0ad20006c0 Level-0 table #45: 0 bytes OK -2024/03/06-18:59:54.858458 7f0ad20006c0 Delete type=0 #43 -2024/03/06-18:59:54.858765 7f0ad20006c0 Manual compaction at level-0 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end) -2024/03/06-18:59:54.858791 7f0ad20006c0 Manual compaction at level-1 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end) +2024/03/23-10:48:02.571733 7fed73e006c0 Recovering log #48 +2024/03/23-10:48:02.582541 7fed73e006c0 Delete type=3 #46 +2024/03/23-10:48:02.582617 7fed73e006c0 Delete type=0 #48 +2024/03/23-11:37:00.840004 7fed720006c0 Level-0 table #53: started +2024/03/23-11:37:00.840024 7fed720006c0 Level-0 table #53: 0 bytes OK +2024/03/23-11:37:00.846784 7fed720006c0 Delete type=0 #51 +2024/03/23-11:37:00.846952 7fed720006c0 Manual compaction at level-0 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end) +2024/03/23-11:37:00.846980 7fed720006c0 Manual compaction at level-1 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end) diff --git a/packs/archetypes-fees/LOG.old b/packs/archetypes-fees/LOG.old index 689f953..306178d 100644 --- a/packs/archetypes-fees/LOG.old +++ b/packs/archetypes-fees/LOG.old @@ -1,8 +1,8 @@ -2024/03/06-18:44:25.568521 7f0ad34006c0 Recovering log #36 -2024/03/06-18:44:25.578793 7f0ad34006c0 Delete type=3 #34 -2024/03/06-18:44:25.578840 7f0ad34006c0 Delete type=0 #36 -2024/03/06-18:46:24.175017 7f0ad20006c0 Level-0 table #41: started -2024/03/06-18:46:24.175038 7f0ad20006c0 Level-0 table #41: 0 bytes OK -2024/03/06-18:46:24.182284 7f0ad20006c0 Delete type=0 #39 -2024/03/06-18:46:24.188691 7f0ad20006c0 Manual compaction at level-0 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end) -2024/03/06-18:46:24.195894 7f0ad20006c0 Manual compaction at level-1 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end) +2024/03/23-10:36:32.618548 7fed73e006c0 Recovering log #44 +2024/03/23-10:36:32.628885 7fed73e006c0 Delete type=3 #42 +2024/03/23-10:36:32.628941 7fed73e006c0 Delete type=0 #44 +2024/03/23-10:47:49.111695 7fed720006c0 Level-0 table #49: started +2024/03/23-10:47:49.111718 7fed720006c0 Level-0 table #49: 0 bytes OK +2024/03/23-10:47:49.117669 7fed720006c0 Delete type=0 #47 +2024/03/23-10:47:49.124617 7fed720006c0 Manual compaction at level-0 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end) +2024/03/23-10:47:49.124645 7fed720006c0 Manual compaction at level-1 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end) diff --git a/packs/archetypes-fees/MANIFEST-000042 b/packs/archetypes-fees/MANIFEST-000042 deleted file mode 100644 index 0de1b35..0000000 Binary files a/packs/archetypes-fees/MANIFEST-000042 and /dev/null differ diff --git a/packs/archetypes-fees/MANIFEST-000050 b/packs/archetypes-fees/MANIFEST-000050 new file mode 100644 index 0000000..f75a0f3 Binary files /dev/null and b/packs/archetypes-fees/MANIFEST-000050 differ diff --git a/packs/armes-et-protection/000044.log b/packs/armes-et-protection/000052.log similarity index 100% rename from packs/armes-et-protection/000044.log rename to packs/armes-et-protection/000052.log diff --git a/packs/armes-et-protection/CURRENT b/packs/armes-et-protection/CURRENT index 8e0a062..7570f19 100644 --- a/packs/armes-et-protection/CURRENT +++ b/packs/armes-et-protection/CURRENT @@ -1 +1 @@ -MANIFEST-000042 +MANIFEST-000050 diff --git a/packs/armes-et-protection/LOG b/packs/armes-et-protection/LOG index 373e435..135ade0 100644 --- a/packs/armes-et-protection/LOG +++ b/packs/armes-et-protection/LOG @@ -1,8 +1,8 @@ -2024/03/06-18:59:13.221694 7f0ad3e006c0 Recovering log #40 -2024/03/06-18:59:13.232417 7f0ad3e006c0 Delete type=3 #38 -2024/03/06-18:59:13.232531 7f0ad3e006c0 Delete type=0 #40 -2024/03/06-18:59:54.871381 7f0ad20006c0 Level-0 table #45: started -2024/03/06-18:59:54.871434 7f0ad20006c0 Level-0 table #45: 0 bytes OK -2024/03/06-18:59:54.880814 7f0ad20006c0 Delete type=0 #43 -2024/03/06-18:59:54.893588 7f0ad20006c0 Manual compaction at level-0 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end) -2024/03/06-18:59:54.893615 7f0ad20006c0 Manual compaction at level-1 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end) +2024/03/23-10:48:02.597243 7fed73e006c0 Recovering log #48 +2024/03/23-10:48:02.607708 7fed73e006c0 Delete type=3 #46 +2024/03/23-10:48:02.607775 7fed73e006c0 Delete type=0 #48 +2024/03/23-11:37:00.827007 7fed720006c0 Level-0 table #53: started +2024/03/23-11:37:00.827057 7fed720006c0 Level-0 table #53: 0 bytes OK +2024/03/23-11:37:00.833771 7fed720006c0 Delete type=0 #51 +2024/03/23-11:37:00.846910 7fed720006c0 Manual compaction at level-0 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end) +2024/03/23-11:37:00.846959 7fed720006c0 Manual compaction at level-1 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end) diff --git a/packs/armes-et-protection/LOG.old b/packs/armes-et-protection/LOG.old index 0a99862..9b25a09 100644 --- a/packs/armes-et-protection/LOG.old +++ b/packs/armes-et-protection/LOG.old @@ -1,8 +1,8 @@ -2024/03/06-18:44:25.594975 7f0ad34006c0 Recovering log #36 -2024/03/06-18:44:25.604899 7f0ad34006c0 Delete type=3 #34 -2024/03/06-18:44:25.605412 7f0ad34006c0 Delete type=0 #36 -2024/03/06-18:46:24.188713 7f0ad20006c0 Level-0 table #41: started -2024/03/06-18:46:24.188737 7f0ad20006c0 Level-0 table #41: 0 bytes OK -2024/03/06-18:46:24.195790 7f0ad20006c0 Delete type=0 #39 -2024/03/06-18:46:24.202331 7f0ad20006c0 Manual compaction at level-0 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end) -2024/03/06-18:46:24.209583 7f0ad20006c0 Manual compaction at level-1 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end) +2024/03/23-10:36:32.649726 7fed73e006c0 Recovering log #44 +2024/03/23-10:36:32.660737 7fed73e006c0 Delete type=3 #42 +2024/03/23-10:36:32.660854 7fed73e006c0 Delete type=0 #44 +2024/03/23-10:47:49.138231 7fed720006c0 Level-0 table #49: started +2024/03/23-10:47:49.138277 7fed720006c0 Level-0 table #49: 0 bytes OK +2024/03/23-10:47:49.144999 7fed720006c0 Delete type=0 #47 +2024/03/23-10:47:49.151672 7fed720006c0 Manual compaction at level-0 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end) +2024/03/23-10:47:49.151719 7fed720006c0 Manual compaction at level-1 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end) diff --git a/packs/armes-et-protection/MANIFEST-000042 b/packs/armes-et-protection/MANIFEST-000042 deleted file mode 100644 index 3b61b06..0000000 Binary files a/packs/armes-et-protection/MANIFEST-000042 and /dev/null differ diff --git a/packs/armes-et-protection/MANIFEST-000050 b/packs/armes-et-protection/MANIFEST-000050 new file mode 100644 index 0000000..1797667 Binary files /dev/null and b/packs/armes-et-protection/MANIFEST-000050 differ diff --git a/packs/atouts-feeriques/000044.log b/packs/atouts-feeriques/000052.log similarity index 100% rename from packs/atouts-feeriques/000044.log rename to packs/atouts-feeriques/000052.log diff --git a/packs/atouts-feeriques/CURRENT b/packs/atouts-feeriques/CURRENT index 8e0a062..7570f19 100644 --- a/packs/atouts-feeriques/CURRENT +++ b/packs/atouts-feeriques/CURRENT @@ -1 +1 @@ -MANIFEST-000042 +MANIFEST-000050 diff --git a/packs/atouts-feeriques/LOG b/packs/atouts-feeriques/LOG index 1db768f..ab569df 100644 --- a/packs/atouts-feeriques/LOG +++ b/packs/atouts-feeriques/LOG @@ -1,8 +1,8 @@ -2024/03/06-18:59:13.183873 7f0ad8a006c0 Recovering log #40 -2024/03/06-18:59:13.193539 7f0ad8a006c0 Delete type=3 #38 -2024/03/06-18:59:13.193588 7f0ad8a006c0 Delete type=0 #40 -2024/03/06-18:59:54.838571 7f0ad20006c0 Level-0 table #45: started -2024/03/06-18:59:54.838599 7f0ad20006c0 Level-0 table #45: 0 bytes OK -2024/03/06-18:59:54.844970 7f0ad20006c0 Delete type=0 #43 -2024/03/06-18:59:54.858747 7f0ad20006c0 Manual compaction at level-0 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end) -2024/03/06-18:59:54.858778 7f0ad20006c0 Manual compaction at level-1 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end) +2024/03/23-10:48:02.559259 7fed734006c0 Recovering log #48 +2024/03/23-10:48:02.569488 7fed734006c0 Delete type=3 #46 +2024/03/23-10:48:02.569553 7fed734006c0 Delete type=0 #48 +2024/03/23-11:37:00.820791 7fed720006c0 Level-0 table #53: started +2024/03/23-11:37:00.820819 7fed720006c0 Level-0 table #53: 0 bytes OK +2024/03/23-11:37:00.826839 7fed720006c0 Delete type=0 #51 +2024/03/23-11:37:00.846901 7fed720006c0 Manual compaction at level-0 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end) +2024/03/23-11:37:00.846946 7fed720006c0 Manual compaction at level-1 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end) diff --git a/packs/atouts-feeriques/LOG.old b/packs/atouts-feeriques/LOG.old index 7a13d01..42a0ca0 100644 --- a/packs/atouts-feeriques/LOG.old +++ b/packs/atouts-feeriques/LOG.old @@ -1,8 +1,8 @@ -2024/03/06-18:44:25.556505 7f0ad94006c0 Recovering log #36 -2024/03/06-18:44:25.565851 7f0ad94006c0 Delete type=3 #34 -2024/03/06-18:44:25.565906 7f0ad94006c0 Delete type=0 #36 -2024/03/06-18:46:24.168720 7f0ad20006c0 Level-0 table #41: started -2024/03/06-18:46:24.168740 7f0ad20006c0 Level-0 table #41: 0 bytes OK -2024/03/06-18:46:24.174891 7f0ad20006c0 Delete type=0 #39 -2024/03/06-18:46:24.182563 7f0ad20006c0 Manual compaction at level-0 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end) -2024/03/06-18:46:24.188703 7f0ad20006c0 Manual compaction at level-1 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end) +2024/03/23-10:36:32.605189 7fed78a006c0 Recovering log #44 +2024/03/23-10:36:32.615490 7fed78a006c0 Delete type=3 #42 +2024/03/23-10:36:32.615554 7fed78a006c0 Delete type=0 #44 +2024/03/23-10:47:49.098509 7fed720006c0 Level-0 table #49: started +2024/03/23-10:47:49.098542 7fed720006c0 Level-0 table #49: 0 bytes OK +2024/03/23-10:47:49.104751 7fed720006c0 Delete type=0 #47 +2024/03/23-10:47:49.124594 7fed720006c0 Manual compaction at level-0 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end) +2024/03/23-10:47:49.124632 7fed720006c0 Manual compaction at level-1 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end) diff --git a/packs/atouts-feeriques/MANIFEST-000042 b/packs/atouts-feeriques/MANIFEST-000042 deleted file mode 100644 index bc7b7a6..0000000 Binary files a/packs/atouts-feeriques/MANIFEST-000042 and /dev/null differ diff --git a/packs/atouts-feeriques/MANIFEST-000050 b/packs/atouts-feeriques/MANIFEST-000050 new file mode 100644 index 0000000..309df65 Binary files /dev/null and b/packs/atouts-feeriques/MANIFEST-000050 differ diff --git a/packs/avantages/000044.log b/packs/avantages/000052.log similarity index 100% rename from packs/avantages/000044.log rename to packs/avantages/000052.log diff --git a/packs/avantages/CURRENT b/packs/avantages/CURRENT index 8e0a062..7570f19 100644 --- a/packs/avantages/CURRENT +++ b/packs/avantages/CURRENT @@ -1 +1 @@ -MANIFEST-000042 +MANIFEST-000050 diff --git a/packs/avantages/LOG b/packs/avantages/LOG index be9cf23..22e4ad5 100644 --- a/packs/avantages/LOG +++ b/packs/avantages/LOG @@ -1,8 +1,8 @@ -2024/03/06-18:59:13.146641 7f0ad3e006c0 Recovering log #40 -2024/03/06-18:59:13.156095 7f0ad3e006c0 Delete type=3 #38 -2024/03/06-18:59:13.156156 7f0ad3e006c0 Delete type=0 #40 -2024/03/06-18:59:54.817526 7f0ad20006c0 Level-0 table #45: started -2024/03/06-18:59:54.817581 7f0ad20006c0 Level-0 table #45: 0 bytes OK -2024/03/06-18:59:54.823954 7f0ad20006c0 Delete type=0 #43 -2024/03/06-18:59:54.832163 7f0ad20006c0 Manual compaction at level-0 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end) -2024/03/06-18:59:54.832224 7f0ad20006c0 Manual compaction at level-1 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end) +2024/03/23-10:48:02.521231 7fed73e006c0 Recovering log #48 +2024/03/23-10:48:02.532005 7fed73e006c0 Delete type=3 #46 +2024/03/23-10:48:02.532101 7fed73e006c0 Delete type=0 #48 +2024/03/23-11:37:00.801358 7fed720006c0 Level-0 table #53: started +2024/03/23-11:37:00.801380 7fed720006c0 Level-0 table #53: 0 bytes OK +2024/03/23-11:37:00.807396 7fed720006c0 Delete type=0 #51 +2024/03/23-11:37:00.820567 7fed720006c0 Manual compaction at level-0 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end) +2024/03/23-11:37:00.820617 7fed720006c0 Manual compaction at level-1 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end) diff --git a/packs/avantages/LOG.old b/packs/avantages/LOG.old index a69fdde..5a52e52 100644 --- a/packs/avantages/LOG.old +++ b/packs/avantages/LOG.old @@ -1,8 +1,8 @@ -2024/03/06-18:44:25.520679 7f0ad34006c0 Recovering log #36 -2024/03/06-18:44:25.530573 7f0ad34006c0 Delete type=3 #34 -2024/03/06-18:44:25.530645 7f0ad34006c0 Delete type=0 #36 -2024/03/06-18:46:24.149265 7f0ad20006c0 Level-0 table #41: started -2024/03/06-18:46:24.149287 7f0ad20006c0 Level-0 table #41: 0 bytes OK -2024/03/06-18:46:24.155653 7f0ad20006c0 Delete type=0 #39 -2024/03/06-18:46:24.161941 7f0ad20006c0 Manual compaction at level-0 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end) -2024/03/06-18:46:24.168702 7f0ad20006c0 Manual compaction at level-1 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end) +2024/03/23-10:36:32.565243 7fed73e006c0 Recovering log #44 +2024/03/23-10:36:32.575390 7fed73e006c0 Delete type=3 #42 +2024/03/23-10:36:32.575442 7fed73e006c0 Delete type=0 #44 +2024/03/23-10:47:49.091958 7fed720006c0 Level-0 table #49: started +2024/03/23-10:47:49.092014 7fed720006c0 Level-0 table #49: 0 bytes OK +2024/03/23-10:47:49.098272 7fed720006c0 Delete type=0 #47 +2024/03/23-10:47:49.098402 7fed720006c0 Manual compaction at level-0 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end) +2024/03/23-10:47:49.098427 7fed720006c0 Manual compaction at level-1 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end) diff --git a/packs/avantages/MANIFEST-000042 b/packs/avantages/MANIFEST-000042 deleted file mode 100644 index 3858680..0000000 Binary files a/packs/avantages/MANIFEST-000042 and /dev/null differ diff --git a/packs/avantages/MANIFEST-000050 b/packs/avantages/MANIFEST-000050 new file mode 100644 index 0000000..fdd79a5 Binary files /dev/null and b/packs/avantages/MANIFEST-000050 differ diff --git a/packs/capacites/000044.log b/packs/capacites/000052.log similarity index 100% rename from packs/capacites/000044.log rename to packs/capacites/000052.log diff --git a/packs/capacites/CURRENT b/packs/capacites/CURRENT index 8e0a062..7570f19 100644 --- a/packs/capacites/CURRENT +++ b/packs/capacites/CURRENT @@ -1 +1 @@ -MANIFEST-000042 +MANIFEST-000050 diff --git a/packs/capacites/LOG b/packs/capacites/LOG index dee46c9..2586f9b 100644 --- a/packs/capacites/LOG +++ b/packs/capacites/LOG @@ -1,8 +1,8 @@ -2024/03/06-18:59:13.171182 7f0ad3e006c0 Recovering log #40 -2024/03/06-18:59:13.181656 7f0ad3e006c0 Delete type=3 #38 -2024/03/06-18:59:13.181712 7f0ad3e006c0 Delete type=0 #40 -2024/03/06-18:59:54.832282 7f0ad20006c0 Level-0 table #45: started -2024/03/06-18:59:54.832328 7f0ad20006c0 Level-0 table #45: 0 bytes OK -2024/03/06-18:59:54.838450 7f0ad20006c0 Delete type=0 #43 -2024/03/06-18:59:54.858561 7f0ad20006c0 Manual compaction at level-0 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end) -2024/03/06-18:59:54.858771 7f0ad20006c0 Manual compaction at level-1 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end) +2024/03/23-10:48:02.547542 7fed73e006c0 Recovering log #48 +2024/03/23-10:48:02.557329 7fed73e006c0 Delete type=3 #46 +2024/03/23-10:48:02.557386 7fed73e006c0 Delete type=0 #48 +2024/03/23-11:37:00.807508 7fed720006c0 Level-0 table #53: started +2024/03/23-11:37:00.807530 7fed720006c0 Level-0 table #53: 0 bytes OK +2024/03/23-11:37:00.813725 7fed720006c0 Delete type=0 #51 +2024/03/23-11:37:00.820593 7fed720006c0 Manual compaction at level-0 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end) +2024/03/23-11:37:00.820630 7fed720006c0 Manual compaction at level-1 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end) diff --git a/packs/capacites/LOG.old b/packs/capacites/LOG.old index f688066..ad860f3 100644 --- a/packs/capacites/LOG.old +++ b/packs/capacites/LOG.old @@ -1,8 +1,8 @@ -2024/03/06-18:44:25.544510 7f0ad34006c0 Recovering log #36 -2024/03/06-18:44:25.554577 7f0ad34006c0 Delete type=3 #34 -2024/03/06-18:44:25.554623 7f0ad34006c0 Delete type=0 #36 -2024/03/06-18:46:24.161959 7f0ad20006c0 Level-0 table #41: started -2024/03/06-18:46:24.161984 7f0ad20006c0 Level-0 table #41: 0 bytes OK -2024/03/06-18:46:24.168612 7f0ad20006c0 Delete type=0 #39 -2024/03/06-18:46:24.174998 7f0ad20006c0 Manual compaction at level-0 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end) -2024/03/06-18:46:24.182577 7f0ad20006c0 Manual compaction at level-1 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end) +2024/03/23-10:36:32.591905 7fed73e006c0 Recovering log #44 +2024/03/23-10:36:32.601706 7fed73e006c0 Delete type=3 #42 +2024/03/23-10:36:32.601822 7fed73e006c0 Delete type=0 #44 +2024/03/23-10:47:49.104862 7fed720006c0 Level-0 table #49: started +2024/03/23-10:47:49.104884 7fed720006c0 Level-0 table #49: 0 bytes OK +2024/03/23-10:47:49.111582 7fed720006c0 Delete type=0 #47 +2024/03/23-10:47:49.124607 7fed720006c0 Manual compaction at level-0 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end) +2024/03/23-10:47:49.124638 7fed720006c0 Manual compaction at level-1 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end) diff --git a/packs/capacites/MANIFEST-000042 b/packs/capacites/MANIFEST-000042 deleted file mode 100644 index 5162204..0000000 Binary files a/packs/capacites/MANIFEST-000042 and /dev/null differ diff --git a/packs/capacites/MANIFEST-000050 b/packs/capacites/MANIFEST-000050 new file mode 100644 index 0000000..db47f74 Binary files /dev/null and b/packs/capacites/MANIFEST-000050 differ diff --git a/packs/competences/000044.log b/packs/competences/000052.log similarity index 100% rename from packs/competences/000044.log rename to packs/competences/000052.log diff --git a/packs/competences/CURRENT b/packs/competences/CURRENT index 8e0a062..7570f19 100644 --- a/packs/competences/CURRENT +++ b/packs/competences/CURRENT @@ -1 +1 @@ -MANIFEST-000042 +MANIFEST-000050 diff --git a/packs/competences/LOG b/packs/competences/LOG index f050d04..e8882a0 100644 --- a/packs/competences/LOG +++ b/packs/competences/LOG @@ -1,8 +1,8 @@ -2024/03/06-18:59:13.134222 7f0ad8a006c0 Recovering log #40 -2024/03/06-18:59:13.144640 7f0ad8a006c0 Delete type=3 #38 -2024/03/06-18:59:13.144704 7f0ad8a006c0 Delete type=0 #40 -2024/03/06-18:59:54.810298 7f0ad20006c0 Level-0 table #45: started -2024/03/06-18:59:54.810361 7f0ad20006c0 Level-0 table #45: 0 bytes OK -2024/03/06-18:59:54.817371 7f0ad20006c0 Delete type=0 #43 -2024/03/06-18:59:54.832145 7f0ad20006c0 Manual compaction at level-0 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end) -2024/03/06-18:59:54.832211 7f0ad20006c0 Manual compaction at level-1 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end) +2024/03/23-10:48:02.509092 7fed734006c0 Recovering log #48 +2024/03/23-10:48:02.519097 7fed734006c0 Delete type=3 #46 +2024/03/23-10:48:02.519155 7fed734006c0 Delete type=0 #48 +2024/03/23-11:37:00.794140 7fed720006c0 Level-0 table #53: started +2024/03/23-11:37:00.794164 7fed720006c0 Level-0 table #53: 0 bytes OK +2024/03/23-11:37:00.801230 7fed720006c0 Delete type=0 #51 +2024/03/23-11:37:00.807497 7fed720006c0 Manual compaction at level-0 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end) +2024/03/23-11:37:00.820584 7fed720006c0 Manual compaction at level-1 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end) diff --git a/packs/competences/LOG.old b/packs/competences/LOG.old index aa767d4..59d6fdd 100644 --- a/packs/competences/LOG.old +++ b/packs/competences/LOG.old @@ -1,8 +1,8 @@ -2024/03/06-18:44:25.508577 7f0ad94006c0 Recovering log #36 -2024/03/06-18:44:25.518629 7f0ad94006c0 Delete type=3 #34 -2024/03/06-18:44:25.518679 7f0ad94006c0 Delete type=0 #36 -2024/03/06-18:46:24.142406 7f0ad20006c0 Level-0 table #41: started -2024/03/06-18:46:24.142437 7f0ad20006c0 Level-0 table #41: 0 bytes OK -2024/03/06-18:46:24.149137 7f0ad20006c0 Delete type=0 #39 -2024/03/06-18:46:24.155816 7f0ad20006c0 Manual compaction at level-0 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end) -2024/03/06-18:46:24.161951 7f0ad20006c0 Manual compaction at level-1 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end) +2024/03/23-10:36:32.552707 7fed78a006c0 Recovering log #44 +2024/03/23-10:36:32.562757 7fed78a006c0 Delete type=3 #42 +2024/03/23-10:36:32.562811 7fed78a006c0 Delete type=0 #44 +2024/03/23-10:47:49.078056 7fed720006c0 Level-0 table #49: started +2024/03/23-10:47:49.078086 7fed720006c0 Level-0 table #49: 0 bytes OK +2024/03/23-10:47:49.084141 7fed720006c0 Delete type=0 #47 +2024/03/23-10:47:49.098382 7fed720006c0 Manual compaction at level-0 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end) +2024/03/23-10:47:49.098433 7fed720006c0 Manual compaction at level-1 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end) diff --git a/packs/competences/MANIFEST-000042 b/packs/competences/MANIFEST-000042 deleted file mode 100644 index 2450c97..0000000 Binary files a/packs/competences/MANIFEST-000042 and /dev/null differ diff --git a/packs/competences/MANIFEST-000050 b/packs/competences/MANIFEST-000050 new file mode 100644 index 0000000..edeaace Binary files /dev/null and b/packs/competences/MANIFEST-000050 differ diff --git a/packs/desavantages/000044.log b/packs/desavantages/000052.log similarity index 100% rename from packs/desavantages/000044.log rename to packs/desavantages/000052.log diff --git a/packs/desavantages/CURRENT b/packs/desavantages/CURRENT index 8e0a062..7570f19 100644 --- a/packs/desavantages/CURRENT +++ b/packs/desavantages/CURRENT @@ -1 +1 @@ -MANIFEST-000042 +MANIFEST-000050 diff --git a/packs/desavantages/LOG b/packs/desavantages/LOG index d501b8e..db7c23d 100644 --- a/packs/desavantages/LOG +++ b/packs/desavantages/LOG @@ -1,8 +1,8 @@ -2024/03/06-18:59:13.158253 7f0ad8a006c0 Recovering log #40 -2024/03/06-18:59:13.169250 7f0ad8a006c0 Delete type=3 #38 -2024/03/06-18:59:13.169308 7f0ad8a006c0 Delete type=0 #40 -2024/03/06-18:59:54.824195 7f0ad20006c0 Level-0 table #45: started -2024/03/06-18:59:54.824253 7f0ad20006c0 Level-0 table #45: 0 bytes OK -2024/03/06-18:59:54.831973 7f0ad20006c0 Delete type=0 #43 -2024/03/06-18:59:54.832196 7f0ad20006c0 Manual compaction at level-0 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end) -2024/03/06-18:59:54.832239 7f0ad20006c0 Manual compaction at level-1 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end) +2024/03/23-10:48:02.534354 7fed734006c0 Recovering log #48 +2024/03/23-10:48:02.545488 7fed734006c0 Delete type=3 #46 +2024/03/23-10:48:02.545545 7fed734006c0 Delete type=0 #48 +2024/03/23-11:37:00.813815 7fed720006c0 Level-0 table #53: started +2024/03/23-11:37:00.813835 7fed720006c0 Level-0 table #53: 0 bytes OK +2024/03/23-11:37:00.820461 7fed720006c0 Delete type=0 #51 +2024/03/23-11:37:00.820601 7fed720006c0 Manual compaction at level-0 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end) +2024/03/23-11:37:00.820624 7fed720006c0 Manual compaction at level-1 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end) diff --git a/packs/desavantages/LOG.old b/packs/desavantages/LOG.old index 99d297f..0e6c0ad 100644 --- a/packs/desavantages/LOG.old +++ b/packs/desavantages/LOG.old @@ -1,8 +1,8 @@ -2024/03/06-18:44:25.532864 7f0ad94006c0 Recovering log #36 -2024/03/06-18:44:25.542781 7f0ad94006c0 Delete type=3 #34 -2024/03/06-18:44:25.542832 7f0ad94006c0 Delete type=0 #36 -2024/03/06-18:46:24.155844 7f0ad20006c0 Level-0 table #41: started -2024/03/06-18:46:24.155874 7f0ad20006c0 Level-0 table #41: 0 bytes OK -2024/03/06-18:46:24.161851 7f0ad20006c0 Delete type=0 #39 -2024/03/06-18:46:24.168712 7f0ad20006c0 Manual compaction at level-0 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end) -2024/03/06-18:46:24.175009 7f0ad20006c0 Manual compaction at level-1 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end) +2024/03/23-10:36:32.577869 7fed78a006c0 Recovering log #44 +2024/03/23-10:36:32.588845 7fed78a006c0 Delete type=3 #42 +2024/03/23-10:36:32.588930 7fed78a006c0 Delete type=0 #44 +2024/03/23-10:47:49.084257 7fed720006c0 Level-0 table #49: started +2024/03/23-10:47:49.084286 7fed720006c0 Level-0 table #49: 0 bytes OK +2024/03/23-10:47:49.091721 7fed720006c0 Delete type=0 #47 +2024/03/23-10:47:49.098393 7fed720006c0 Manual compaction at level-0 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end) +2024/03/23-10:47:49.098420 7fed720006c0 Manual compaction at level-1 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end) diff --git a/packs/desavantages/MANIFEST-000042 b/packs/desavantages/MANIFEST-000042 deleted file mode 100644 index 4b3af83..0000000 Binary files a/packs/desavantages/MANIFEST-000042 and /dev/null differ diff --git a/packs/desavantages/MANIFEST-000050 b/packs/desavantages/MANIFEST-000050 new file mode 100644 index 0000000..f51d60d Binary files /dev/null and b/packs/desavantages/MANIFEST-000050 differ diff --git a/packs/pouvoirs/000044.log b/packs/pouvoirs/000052.log similarity index 100% rename from packs/pouvoirs/000044.log rename to packs/pouvoirs/000052.log diff --git a/packs/pouvoirs/CURRENT b/packs/pouvoirs/CURRENT index 8e0a062..7570f19 100644 --- a/packs/pouvoirs/CURRENT +++ b/packs/pouvoirs/CURRENT @@ -1 +1 @@ -MANIFEST-000042 +MANIFEST-000050 diff --git a/packs/pouvoirs/LOG b/packs/pouvoirs/LOG index 578a47d..cc50f0a 100644 --- a/packs/pouvoirs/LOG +++ b/packs/pouvoirs/LOG @@ -1,8 +1,8 @@ -2024/03/06-18:59:13.209880 7f0ad8a006c0 Recovering log #40 -2024/03/06-18:59:13.219277 7f0ad8a006c0 Delete type=3 #38 -2024/03/06-18:59:13.219340 7f0ad8a006c0 Delete type=0 #40 -2024/03/06-18:59:54.845141 7f0ad20006c0 Level-0 table #45: started -2024/03/06-18:59:54.845181 7f0ad20006c0 Level-0 table #45: 0 bytes OK -2024/03/06-18:59:54.852067 7f0ad20006c0 Delete type=0 #43 -2024/03/06-18:59:54.858757 7f0ad20006c0 Manual compaction at level-0 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end) -2024/03/06-18:59:54.858784 7f0ad20006c0 Manual compaction at level-1 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end) +2024/03/23-10:48:02.584567 7fed734006c0 Recovering log #48 +2024/03/23-10:48:02.594353 7fed734006c0 Delete type=3 #46 +2024/03/23-10:48:02.594417 7fed734006c0 Delete type=0 #48 +2024/03/23-11:37:00.833866 7fed720006c0 Level-0 table #53: started +2024/03/23-11:37:00.833890 7fed720006c0 Level-0 table #53: 0 bytes OK +2024/03/23-11:37:00.839913 7fed720006c0 Delete type=0 #51 +2024/03/23-11:37:00.846918 7fed720006c0 Manual compaction at level-0 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end) +2024/03/23-11:37:00.846966 7fed720006c0 Manual compaction at level-1 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end) diff --git a/packs/pouvoirs/LOG.old b/packs/pouvoirs/LOG.old index abd6429..c1ec195 100644 --- a/packs/pouvoirs/LOG.old +++ b/packs/pouvoirs/LOG.old @@ -1,8 +1,8 @@ -2024/03/06-18:44:25.581915 7f0ad94006c0 Recovering log #36 -2024/03/06-18:44:25.592375 7f0ad94006c0 Delete type=3 #34 -2024/03/06-18:44:25.592428 7f0ad94006c0 Delete type=0 #36 -2024/03/06-18:46:24.182586 7f0ad20006c0 Level-0 table #41: started -2024/03/06-18:46:24.182611 7f0ad20006c0 Level-0 table #41: 0 bytes OK -2024/03/06-18:46:24.188586 7f0ad20006c0 Delete type=0 #39 -2024/03/06-18:46:24.195882 7f0ad20006c0 Manual compaction at level-0 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end) -2024/03/06-18:46:24.202340 7f0ad20006c0 Manual compaction at level-1 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end) +2024/03/23-10:36:32.634942 7fed78a006c0 Recovering log #44 +2024/03/23-10:36:32.645370 7fed78a006c0 Delete type=3 #42 +2024/03/23-10:36:32.645438 7fed78a006c0 Delete type=0 #44 +2024/03/23-10:47:49.117785 7fed720006c0 Level-0 table #49: started +2024/03/23-10:47:49.117808 7fed720006c0 Level-0 table #49: 0 bytes OK +2024/03/23-10:47:49.124476 7fed720006c0 Delete type=0 #47 +2024/03/23-10:47:49.124625 7fed720006c0 Manual compaction at level-0 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end) +2024/03/23-10:47:49.124651 7fed720006c0 Manual compaction at level-1 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end) diff --git a/packs/pouvoirs/MANIFEST-000042 b/packs/pouvoirs/MANIFEST-000042 deleted file mode 100644 index fb3421d..0000000 Binary files a/packs/pouvoirs/MANIFEST-000042 and /dev/null differ diff --git a/packs/pouvoirs/MANIFEST-000050 b/packs/pouvoirs/MANIFEST-000050 new file mode 100644 index 0000000..ce16bdd Binary files /dev/null and b/packs/pouvoirs/MANIFEST-000050 differ diff --git a/packs/profils/000044.log b/packs/profils/000052.log similarity index 100% rename from packs/profils/000044.log rename to packs/profils/000052.log diff --git a/packs/profils/CURRENT b/packs/profils/CURRENT index 8e0a062..7570f19 100644 --- a/packs/profils/CURRENT +++ b/packs/profils/CURRENT @@ -1 +1 @@ -MANIFEST-000042 +MANIFEST-000050 diff --git a/packs/profils/LOG b/packs/profils/LOG index 63f732f..ea10c9c 100644 --- a/packs/profils/LOG +++ b/packs/profils/LOG @@ -1,7 +1,7 @@ -2024/03/06-18:59:13.234663 7f0ad8a006c0 Recovering log #40 -2024/03/06-18:59:13.245554 7f0ad8a006c0 Delete type=3 #38 -2024/03/06-18:59:13.245629 7f0ad8a006c0 Delete type=0 #40 -2024/03/06-18:59:54.858867 7f0ad20006c0 Level-0 table #45: started -2024/03/06-18:59:54.858894 7f0ad20006c0 Level-0 table #45: 0 bytes OK -2024/03/06-18:59:54.871179 7f0ad20006c0 Delete type=0 #43 -2024/03/06-18:59:54.893571 7f0ad20006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/03/23-10:48:02.609984 7fed734006c0 Recovering log #48 +2024/03/23-10:48:02.619777 7fed734006c0 Delete type=3 #46 +2024/03/23-10:48:02.619840 7fed734006c0 Delete type=0 #48 +2024/03/23-11:37:00.847087 7fed720006c0 Level-0 table #53: started +2024/03/23-11:37:00.847153 7fed720006c0 Level-0 table #53: 0 bytes OK +2024/03/23-11:37:00.853979 7fed720006c0 Delete type=0 #51 +2024/03/23-11:37:00.867118 7fed720006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/profils/LOG.old b/packs/profils/LOG.old index 8858c16..2f886fb 100644 --- a/packs/profils/LOG.old +++ b/packs/profils/LOG.old @@ -1,7 +1,7 @@ -2024/03/06-18:44:25.607498 7f0ad94006c0 Recovering log #36 -2024/03/06-18:44:25.619089 7f0ad94006c0 Delete type=3 #34 -2024/03/06-18:44:25.619169 7f0ad94006c0 Delete type=0 #36 -2024/03/06-18:46:24.195903 7f0ad20006c0 Level-0 table #41: started -2024/03/06-18:46:24.195928 7f0ad20006c0 Level-0 table #41: 0 bytes OK -2024/03/06-18:46:24.202215 7f0ad20006c0 Delete type=0 #39 -2024/03/06-18:46:24.209558 7f0ad20006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/03/23-10:36:32.663217 7fed78a006c0 Recovering log #44 +2024/03/23-10:36:32.673264 7fed78a006c0 Delete type=3 #42 +2024/03/23-10:36:32.673319 7fed78a006c0 Delete type=0 #44 +2024/03/23-10:47:49.131076 7fed720006c0 Level-0 table #49: started +2024/03/23-10:47:49.131099 7fed720006c0 Level-0 table #49: 0 bytes OK +2024/03/23-10:47:49.137951 7fed720006c0 Delete type=0 #47 +2024/03/23-10:47:49.151656 7fed720006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/profils/MANIFEST-000042 b/packs/profils/MANIFEST-000042 deleted file mode 100644 index b5dbe9b..0000000 Binary files a/packs/profils/MANIFEST-000042 and /dev/null differ diff --git a/packs/profils/MANIFEST-000050 b/packs/profils/MANIFEST-000050 new file mode 100644 index 0000000..69b2d4c Binary files /dev/null and b/packs/profils/MANIFEST-000050 differ diff --git a/packs/scenes/000012.log b/packs/scenes/000020.log similarity index 100% rename from packs/scenes/000012.log rename to packs/scenes/000020.log diff --git a/packs/scenes/CURRENT b/packs/scenes/CURRENT index 3051f81..e417a51 100644 --- a/packs/scenes/CURRENT +++ b/packs/scenes/CURRENT @@ -1 +1 @@ -MANIFEST-000010 +MANIFEST-000018 diff --git a/packs/scenes/LOG b/packs/scenes/LOG index ffe3951..c0703d8 100644 --- a/packs/scenes/LOG +++ b/packs/scenes/LOG @@ -1,8 +1,8 @@ -2024/03/06-18:59:13.247253 7f0ad3e006c0 Recovering log #8 -2024/03/06-18:59:13.257389 7f0ad3e006c0 Delete type=3 #6 -2024/03/06-18:59:13.257446 7f0ad3e006c0 Delete type=0 #8 -2024/03/06-18:59:54.880924 7f0ad20006c0 Level-0 table #13: started -2024/03/06-18:59:54.880949 7f0ad20006c0 Level-0 table #13: 0 bytes OK -2024/03/06-18:59:54.887230 7f0ad20006c0 Delete type=0 #11 -2024/03/06-18:59:54.893597 7f0ad20006c0 Manual compaction at level-0 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end) -2024/03/06-18:59:54.893637 7f0ad20006c0 Manual compaction at level-1 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end) +2024/03/23-10:48:02.622403 7fed73e006c0 Recovering log #16 +2024/03/23-10:48:02.632700 7fed73e006c0 Delete type=3 #14 +2024/03/23-10:48:02.632756 7fed73e006c0 Delete type=0 #16 +2024/03/23-11:37:00.854073 7fed720006c0 Level-0 table #21: started +2024/03/23-11:37:00.854095 7fed720006c0 Level-0 table #21: 0 bytes OK +2024/03/23-11:37:00.860110 7fed720006c0 Delete type=0 #19 +2024/03/23-11:37:00.867128 7fed720006c0 Manual compaction at level-0 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end) +2024/03/23-11:37:00.867164 7fed720006c0 Manual compaction at level-1 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/LOG.old b/packs/scenes/LOG.old index 2ee7c5a..3fe86a9 100644 --- a/packs/scenes/LOG.old +++ b/packs/scenes/LOG.old @@ -1,8 +1,8 @@ -2024/03/06-18:44:25.621882 7f0ad34006c0 Recovering log #4 -2024/03/06-18:44:25.632172 7f0ad34006c0 Delete type=3 #2 -2024/03/06-18:44:25.632258 7f0ad34006c0 Delete type=0 #4 -2024/03/06-18:46:24.202350 7f0ad20006c0 Level-0 table #9: started -2024/03/06-18:46:24.202372 7f0ad20006c0 Level-0 table #9: 0 bytes OK -2024/03/06-18:46:24.209447 7f0ad20006c0 Delete type=0 #7 -2024/03/06-18:46:24.216156 7f0ad20006c0 Manual compaction at level-0 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end) -2024/03/06-18:46:24.216180 7f0ad20006c0 Manual compaction at level-1 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end) +2024/03/23-10:36:32.675856 7fed73e006c0 Recovering log #12 +2024/03/23-10:36:32.687073 7fed73e006c0 Delete type=3 #10 +2024/03/23-10:36:32.687168 7fed73e006c0 Delete type=0 #12 +2024/03/23-10:47:49.124780 7fed720006c0 Level-0 table #17: started +2024/03/23-10:47:49.124802 7fed720006c0 Level-0 table #17: 0 bytes OK +2024/03/23-10:47:49.130952 7fed720006c0 Delete type=0 #15 +2024/03/23-10:47:49.151626 7fed720006c0 Manual compaction at level-0 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end) +2024/03/23-10:47:49.151703 7fed720006c0 Manual compaction at level-1 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/MANIFEST-000010 b/packs/scenes/MANIFEST-000010 deleted file mode 100644 index 30b865d..0000000 Binary files a/packs/scenes/MANIFEST-000010 and /dev/null differ diff --git a/packs/scenes/MANIFEST-000018 b/packs/scenes/MANIFEST-000018 new file mode 100644 index 0000000..bbcb613 Binary files /dev/null and b/packs/scenes/MANIFEST-000018 differ diff --git a/system.json b/system.json index 5669969..a88d39f 100644 --- a/system.json +++ b/system.json @@ -1,7 +1,7 @@ { "id": "fvtt-les-heritiers", "description": "Les Héritiers pour FoundryVTT", - "version": "11.0.8", + "version": "11.0.9", "authors": [ { "name": "Uberwald/LeRatierBretonnien", @@ -19,7 +19,7 @@ "gridUnits": "m", "license": "LICENSE.txt", "manifest": "https://www.uberwald.me/gitea/public/fvtt-les-heritiers/raw/branch/master/system.json", - "download": "https://www.uberwald.me/gitea/public/fvtt-les-heritiers/archive/fvtt-les-heritiers-11.0.8.zip", + "download": "https://www.uberwald.me/gitea/public/fvtt-les-heritiers/archive/fvtt-les-heritiers-11.0.9.zip", "languages": [ { "lang": "fr", diff --git a/template.json b/template.json index 1b12e60..fca2d5d 100644 --- a/template.json +++ b/template.json @@ -322,6 +322,7 @@ "portee": "", "resistance": "", "resistanceautre":"", + "pointsusagecourant": -1, "isvirulence": false, "virulence":"", "description": "" diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 84c4a1e..b8221d0 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -292,10 +292,12 @@ - + + + @@ -389,6 +391,9 @@ + + +
 
@@ -404,6 +409,7 @@ {{upperFirst pouvoir.system.masquetype}} {{upperFirst pouvoir.system.pouvoirtype}} {{upperFirst pouvoir.system.niveau}} + {{pouvoir.system.pointsusagecourant}}/{{pouvoir.maxUsage}}
 
diff --git a/templates/chat-generic-result.html b/templates/chat-generic-result.html index 359b6be..f0085ba 100644 --- a/templates/chat-generic-result.html +++ b/templates/chat-generic-result.html @@ -41,6 +41,7 @@ {{#if pouvoir}}
  • Pouvoir : {{pouvoir.name}}
  • Effet : {{pouvoir.system.effet}}
  • +
  • Points d'usage consommés : {{pouvoirPointsUsage}}
  • {{/if}} {{#if forcedValue}} diff --git a/templates/item-pouvoir-sheet.html b/templates/item-pouvoir-sheet.html index fb3aa9a..f3cdb1a 100644 --- a/templates/item-pouvoir-sheet.html +++ b/templates/item-pouvoir-sheet.html @@ -94,6 +94,21 @@ {{/if}} +
  • + + {{#if (eq usageMax -1)}} + + {{else}} + + {{/if}} +
  • + +
  • + + +
  • +
  • {{pouvoirBase.value}}
  • {{/if}} - {{/if}} +
    + Points d'usage consommés : + +
    + {{/if}} {{#each rulesMalus as |malus key|}}