diff --git a/assets/icons/sort.webp b/assets/icons/sort.webp new file mode 100644 index 0000000..c2fe698 Binary files /dev/null and b/assets/icons/sort.webp differ diff --git a/lang/fr.json b/lang/fr.json index 4edc286..2865f52 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -17,7 +17,8 @@ "fee": "Fée", "pouvoir": "Pouvoir", "profil": "Profil", - "protection": "Protection" + "protection": "Protection", + "sort": "Sort" } } } \ No newline at end of file diff --git a/modules/heritiers-actor-sheet.js b/modules/heritiers-actor-sheet.js index 9c1b7ad..25bc79d 100644 --- a/modules/heritiers-actor-sheet.js +++ b/modules/heritiers-actor-sheet.js @@ -63,6 +63,7 @@ export class HeritiersActorSheet extends ActorSheet { questions: await TextEditor.enrichHTML(this.object.system.biodata.questions, {async: true}), habitat: await TextEditor.enrichHTML(this.object.system.biodata.habitat, {async: true}), playernotes: await TextEditor.enrichHTML(this.object.system.biodata.playernotes, {async: true}), + magieList: this.actor.prepareMagie(), options: this.options, owner: this.document.isOwner, editScore: this.options.editScore, @@ -177,6 +178,11 @@ export class HeritiersActorSheet extends ActorSheet { let compId = li.data("item-id") this.actor.rollCompetence(compId) }) + html.find('.roll-sort').click((event) => { + const li = $(event.currentTarget).parents(".item") + let sortId = li.data("item-id") + this.actor.rollSort(sortId) + }) html.find('.roll-attaque-arme').click((event) => { const li = $(event.currentTarget).parents(".item") let armeId = li.data("item-id") diff --git a/modules/heritiers-actor.js b/modules/heritiers-actor.js index 993b005..f7809a8 100644 --- a/modules/heritiers-actor.js +++ b/modules/heritiers-actor.js @@ -41,7 +41,7 @@ export class HeritiersActor extends Actor { const skills = await HeritiersUtility.loadCompendium("fvtt-les-heritiers.competences") data.items = [] for (let skill of skills) { - if (skill.system.categorie == "utile") { + if (skill.system.categorie == "utile" && skill.system.profil != "magie") { data.items.push(skill.toObject()) } } @@ -146,6 +146,38 @@ export class HeritiersActor extends Actor { HeritiersUtility.sortArrayObjectsByName(pouvoirs) return pouvoirs } + getSorts() { + return this.getItemSorted(["sort"]) + } + getCompetencesMagie() { + let comp = [] + for (let item of this.items) { + if (item.type == "competence" && item.system.profil == "magie") { + let itemObj = foundry.utils.duplicate(item) + comp.push(itemObj) + } + } + HeritiersUtility.sortArrayObjectsByName(comp) + return comp + } + prepareMagie() { + let magieList = [] + for (let item of this.items) { + if (item.type == "competence" && item.system.profil == "magie") { + let magie = {} + magie.name = item.name + magie.competence = foundry.utils.duplicate(item) + magie.sorts = [] + for (let sort of this.items) { + if (sort.type == "sort" && sort.system.competence == item.name) { + magie.sorts.push(sort) + } + } + magieList.push(magie) + } + } + return magieList + } /* -------------------------------------------- */ getSkills() { @@ -258,12 +290,37 @@ export class HeritiersActor extends Actor { /* -------------------------------------------- */ async prepareData() { - super.prepareData(); let pvMax = (this.system.caracteristiques.con.rang * 3) + 9 + this.system.pv.mod if (this.system.pv.max != pvMax) { this.update({ 'system.pv.max': pvMax }) } + if (this.system.biodata.magie || this.type == "pnj") { + let pointsAmes = this.system.caracteristiques.esp.rang + this.system.caracteristiques.san.rang + this.getMaxRangMagie() + if (this.system.magie.pointsame.max != pointsAmes) { + this.update({ 'system.magie.pointsame.max': pointsAmes }) + } + } + + super.prepareData(); + } + + /* -------------------------------------------- */ + getMaxRangMagie() { + let niv = 0 + let bestMagie + for (let comp of this.items) { + if (comp.type == "competence" && comp.system.profil == "magie") { + if (comp.system.niveau > niv) { + bestMagie = comp + niv = comp.system.niveau + } + } + } + if (bestMagie) { + return Math.round(bestMagie.system.niveau / 2) + } + return 0 } /* -------------------------------------------- */ @@ -627,6 +684,26 @@ export class HeritiersActor extends Actor { rollDialog.render(true) } + /* -------------------------------------------- */ + async rollSort(sortId) { + let sort = this.items.get(sortId) + let comp = this.items.find(it => it.type =="competence" && it.name.toLowerCase() == sort.system.competence.toLowerCase()) + if (!comp) { + ui.notifications.warn("Compétence de magie associée non trouvée !") + return + } + + let rollData = this.getCommonRollData(comp.id) + rollData.mode = "sort" + rollData.sort = foundry.utils.duplicate(sort) + rollData.sdValue = HeritiersUtility.getSDSortValue(sort.system.niveau) + rollData.sortPointsAme = sort.system.niveau + rollData.caracKey = sort.system.carac + console.log("RollData", rollData) + let rollDialog = await HeritiersRollDialog.create(this, rollData) + rollDialog.render(true) + } + /* -------------------------------------------- */ async rollAttaqueArme(armeId) { let arme = this.items.get(armeId) @@ -727,7 +804,7 @@ export class HeritiersActor extends Actor { callback: () => { rollData.pouvoirPointsUsage = 1; HeritiersUtility.rollHeritiers(rollData); - } + } }, two: { icon: '', @@ -735,7 +812,7 @@ export class HeritiersActor extends Actor { callback: () => { rollData.pouvoirPointsUsage = 2; HeritiersUtility.rollHeritiers(rollData); - } + } }, three: { icon: '', @@ -743,7 +820,7 @@ export class HeritiersActor extends Actor { callback: () => { rollData.pouvoirPointsUsage = 3; HeritiersUtility.rollHeritiers(rollData); - } + } }, four: { icon: '', @@ -751,13 +828,13 @@ export class HeritiersActor extends Actor { callback: () => { rollData.pouvoirPointsUsage = 4; HeritiersUtility.rollHeritiers(rollData); - } + } }, close: { icon: '', label: "Annuler", callback: () => { - } + } } }, default: "one", @@ -766,7 +843,7 @@ export class HeritiersActor extends Actor { }); d.render(true); } - + /* -------------------------------------------- */ async rollPouvoir(pouvoirId) { let pouvoir = this.items.get(pouvoirId) @@ -788,7 +865,7 @@ export class HeritiersActor extends Actor { if (pouvoir.system.istest && !pouvoir.system.carac) { ui.notifications.warn("Le pouvoir actif " + pouvoir.name + " n'a pas de caractéristique associée") } - if ( pouvoir.system.istest) { + if (pouvoir.system.istest) { rollData.carac = foundry.utils.duplicate(this.system.caracteristiques[pouvoir.system.carac]) rollData.caracKey = pouvoir.system.carac } else { diff --git a/modules/heritiers-config.js b/modules/heritiers-config.js index 9874f76..f88a520 100644 --- a/modules/heritiers-config.js +++ b/modules/heritiers-config.js @@ -30,7 +30,8 @@ export const HERITIERS_CONFIG = { "combattant": {kind: "physical",name:"Combattant"}, "erudit": {kind: "mental",name:"Erudit"}, "savant": {kind: "mental",name:"Savant"}, - "gentleman": {kind: "mental",name:"Gentleman"} + "gentleman": {kind: "mental",name:"Gentleman"}, + "magie": {kind: "magical", name: "Magie"}, }, baseTestPouvoir: { "feerie": "Féerie", @@ -193,6 +194,12 @@ export const HERITIERS_CONFIG = { {value: "5", label: "+5"}, {value: "6", label: "+6"} ], + listNiveauSort: { + "1" : "1", + "2" : "2", + "3" : "3", + "4" : "4" + }, listNiveau: { "0": "0", "1": "1", diff --git a/modules/heritiers-item-sheet.js b/modules/heritiers-item-sheet.js index d410577..7a73893 100644 --- a/modules/heritiers-item-sheet.js +++ b/modules/heritiers-item-sheet.js @@ -76,6 +76,10 @@ export class HeritiersItemSheet extends ItemSheet { this.object.system.pointsusagecourant = formData.usageMax } } + if (this.object.type == 'sort' ) { + formData.competencesMagie = HeritiersUtility.getCompetencesMagie() + } + //this.options.editable = !(this.object.origin == "embeddedItem"); console.log("ITEM DATA", formData, this); diff --git a/modules/heritiers-item.js b/modules/heritiers-item.js index 210b00a..463292a 100644 --- a/modules/heritiers-item.js +++ b/modules/heritiers-item.js @@ -18,6 +18,7 @@ export const defaultItemImg = { fee: "systems/fvtt-les-heritiers/assets/icons/faery_type.webp", profil: "systems/fvtt-les-heritiers/assets/icons/profil.webp", equipement: "systems/fvtt-les-heritiers/assets/icons/equipement.webp", + sort: "systems/fvtt-les-heritiers/assets/icons/sort.webp", } /** diff --git a/modules/heritiers-utility.js b/modules/heritiers-utility.js index 47fcf93..51a4c11 100644 --- a/modules/heritiers-utility.js +++ b/modules/heritiers-utility.js @@ -104,6 +104,8 @@ export class HeritiersUtility { const skills = await HeritiersUtility.loadCompendium("fvtt-les-heritiers.competences") this.skills = skills.map(i => i.toObject()) + this.competencesMagie = this.skills.filter(s => s.system.profil == "magie") + game.settings.register("fvtt-les-heritiers", "heritiers-heritage", { name: "Points d'héritage", hint: "Points d'héritage du groupe", @@ -114,6 +116,19 @@ export class HeritiersUtility { }) } + /* -------------------------------------------- */ + static getSDSortValue(niveau) { + if (niveau <= 2) return 12; + if (niveau <= 4) return 14; + if (niveau <= 6) return 16; + return 18; + } + + /* -------------------------------------------- */ + static getCompetencesMagie() { + return this.competencesMagie + } + /* -------------------------------------------- */ static async loadCompendiumData(compendium) { const pack = game.packs.get(compendium); diff --git a/packs/archetypes-fees/000149.log b/packs/archetypes-fees/000169.log similarity index 100% rename from packs/archetypes-fees/000149.log rename to packs/archetypes-fees/000169.log diff --git a/packs/archetypes-fees/CURRENT b/packs/archetypes-fees/CURRENT index 1021bdc..c5ea6dc 100644 --- a/packs/archetypes-fees/CURRENT +++ b/packs/archetypes-fees/CURRENT @@ -1 +1 @@ -MANIFEST-000147 +MANIFEST-000167 diff --git a/packs/archetypes-fees/LOG b/packs/archetypes-fees/LOG index 7939817..2377561 100644 --- a/packs/archetypes-fees/LOG +++ b/packs/archetypes-fees/LOG @@ -1,8 +1,8 @@ -2024/08/11-14:35:37.830180 7f47842006c0 Recovering log #145 -2024/08/11-14:35:37.841219 7f47842006c0 Delete type=3 #143 -2024/08/11-14:35:37.841349 7f47842006c0 Delete type=0 #145 -2024/08/11-14:39:33.791107 7f4782e006c0 Level-0 table #150: started -2024/08/11-14:39:33.791244 7f4782e006c0 Level-0 table #150: 0 bytes OK -2024/08/11-14:39:33.797592 7f4782e006c0 Delete type=0 #148 -2024/08/11-14:39:33.818175 7f4782e006c0 Manual compaction at level-0 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end) -2024/08/11-14:39:33.818252 7f4782e006c0 Manual compaction at level-1 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end) +2024/11/17-20:47:41.966228 7f1d08bf96c0 Recovering log #165 +2024/11/17-20:47:41.976910 7f1d08bf96c0 Delete type=3 #163 +2024/11/17-20:47:41.976994 7f1d08bf96c0 Delete type=0 #165 +2024/11/17-20:55:29.667200 7f1d027ff6c0 Level-0 table #170: started +2024/11/17-20:55:29.667241 7f1d027ff6c0 Level-0 table #170: 0 bytes OK +2024/11/17-20:55:29.695843 7f1d027ff6c0 Delete type=0 #168 +2024/11/17-20:55:29.814123 7f1d027ff6c0 Manual compaction at level-0 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end) +2024/11/17-20:55:29.814179 7f1d027ff6c0 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 8ca9735..24d7dc5 100644 --- a/packs/archetypes-fees/LOG.old +++ b/packs/archetypes-fees/LOG.old @@ -1,8 +1,8 @@ -2024/08/06-21:52:34.084831 7fbe516006c0 Recovering log #141 -2024/08/06-21:52:34.094922 7fbe516006c0 Delete type=3 #139 -2024/08/06-21:52:34.095027 7fbe516006c0 Delete type=0 #141 -2024/08/06-23:00:31.976722 7fbe50c006c0 Level-0 table #146: started -2024/08/06-23:00:31.976743 7fbe50c006c0 Level-0 table #146: 0 bytes OK -2024/08/06-23:00:32.009094 7fbe50c006c0 Delete type=0 #144 -2024/08/06-23:00:32.009385 7fbe50c006c0 Manual compaction at level-0 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end) -2024/08/06-23:00:32.009440 7fbe50c006c0 Manual compaction at level-1 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end) +2024/11/17-19:16:31.322926 7f1d093fa6c0 Recovering log #161 +2024/11/17-19:16:31.332853 7f1d093fa6c0 Delete type=3 #159 +2024/11/17-19:16:31.332928 7f1d093fa6c0 Delete type=0 #161 +2024/11/17-20:47:32.626275 7f1d027ff6c0 Level-0 table #166: started +2024/11/17-20:47:32.626301 7f1d027ff6c0 Level-0 table #166: 0 bytes OK +2024/11/17-20:47:32.657840 7f1d027ff6c0 Delete type=0 #164 +2024/11/17-20:47:32.759216 7f1d027ff6c0 Manual compaction at level-0 from '!items!1NhJH4IJpxsGmLB8' @ 72057594037927935 : 1 .. '!items!y1yOenfAJTsb3r6e' @ 0 : 0; will stop at (end) +2024/11/17-20:47:32.759268 7f1d027ff6c0 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-000147 b/packs/archetypes-fees/MANIFEST-000167 similarity index 73% rename from packs/archetypes-fees/MANIFEST-000147 rename to packs/archetypes-fees/MANIFEST-000167 index b0dcafe..0efa353 100644 Binary files a/packs/archetypes-fees/MANIFEST-000147 and b/packs/archetypes-fees/MANIFEST-000167 differ diff --git a/packs/armes-et-protection/000149.log b/packs/armes-et-protection/000169.log similarity index 100% rename from packs/armes-et-protection/000149.log rename to packs/armes-et-protection/000169.log diff --git a/packs/armes-et-protection/CURRENT b/packs/armes-et-protection/CURRENT index 1021bdc..c5ea6dc 100644 --- a/packs/armes-et-protection/CURRENT +++ b/packs/armes-et-protection/CURRENT @@ -1 +1 @@ -MANIFEST-000147 +MANIFEST-000167 diff --git a/packs/armes-et-protection/LOG b/packs/armes-et-protection/LOG index a995de7..0a3bd71 100644 --- a/packs/armes-et-protection/LOG +++ b/packs/armes-et-protection/LOG @@ -1,8 +1,8 @@ -2024/08/11-14:35:37.866313 7f4784c006c0 Recovering log #145 -2024/08/11-14:35:37.876628 7f4784c006c0 Delete type=3 #143 -2024/08/11-14:35:37.876748 7f4784c006c0 Delete type=0 #145 -2024/08/11-14:39:33.811252 7f4782e006c0 Level-0 table #150: started -2024/08/11-14:39:33.811312 7f4782e006c0 Level-0 table #150: 0 bytes OK -2024/08/11-14:39:33.818015 7f4782e006c0 Delete type=0 #148 -2024/08/11-14:39:33.818222 7f4782e006c0 Manual compaction at level-0 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end) -2024/08/11-14:39:33.818265 7f4782e006c0 Manual compaction at level-1 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end) +2024/11/17-20:47:41.991855 7f1d03fff6c0 Recovering log #165 +2024/11/17-20:47:42.001751 7f1d03fff6c0 Delete type=3 #163 +2024/11/17-20:47:42.001836 7f1d03fff6c0 Delete type=0 #165 +2024/11/17-20:55:29.814290 7f1d027ff6c0 Level-0 table #170: started +2024/11/17-20:55:29.814335 7f1d027ff6c0 Level-0 table #170: 0 bytes OK +2024/11/17-20:55:29.851112 7f1d027ff6c0 Delete type=0 #168 +2024/11/17-20:55:29.988613 7f1d027ff6c0 Manual compaction at level-0 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end) +2024/11/17-20:55:29.988660 7f1d027ff6c0 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 0eed655..fa8364b 100644 --- a/packs/armes-et-protection/LOG.old +++ b/packs/armes-et-protection/LOG.old @@ -1,8 +1,8 @@ -2024/08/06-21:52:34.116385 7fbe534006c0 Recovering log #141 -2024/08/06-21:52:34.126061 7fbe534006c0 Delete type=3 #139 -2024/08/06-21:52:34.126143 7fbe534006c0 Delete type=0 #141 -2024/08/06-23:00:31.939443 7fbe50c006c0 Level-0 table #146: started -2024/08/06-23:00:31.939481 7fbe50c006c0 Level-0 table #146: 0 bytes OK -2024/08/06-23:00:31.976609 7fbe50c006c0 Delete type=0 #144 -2024/08/06-23:00:32.009370 7fbe50c006c0 Manual compaction at level-0 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end) -2024/08/06-23:00:32.009427 7fbe50c006c0 Manual compaction at level-1 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end) +2024/11/17-19:16:31.349130 7f1d03fff6c0 Recovering log #161 +2024/11/17-19:16:31.359002 7f1d03fff6c0 Delete type=3 #159 +2024/11/17-19:16:31.359058 7f1d03fff6c0 Delete type=0 #161 +2024/11/17-20:47:32.693837 7f1d027ff6c0 Level-0 table #166: started +2024/11/17-20:47:32.693864 7f1d027ff6c0 Level-0 table #166: 0 bytes OK +2024/11/17-20:47:32.727625 7f1d027ff6c0 Delete type=0 #164 +2024/11/17-20:47:32.759243 7f1d027ff6c0 Manual compaction at level-0 from '!items!1ETVaPBtjDtzelK1' @ 72057594037927935 : 1 .. '!items!zbsVCsWxRzkzzG1N' @ 0 : 0; will stop at (end) +2024/11/17-20:47:32.759293 7f1d027ff6c0 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-000147 b/packs/armes-et-protection/MANIFEST-000167 similarity index 73% rename from packs/armes-et-protection/MANIFEST-000147 rename to packs/armes-et-protection/MANIFEST-000167 index d85bdf3..4cf72b3 100644 Binary files a/packs/armes-et-protection/MANIFEST-000147 and b/packs/armes-et-protection/MANIFEST-000167 differ diff --git a/packs/atouts-feeriques/000149.log b/packs/atouts-feeriques/000169.log similarity index 100% rename from packs/atouts-feeriques/000149.log rename to packs/atouts-feeriques/000169.log diff --git a/packs/atouts-feeriques/CURRENT b/packs/atouts-feeriques/CURRENT index 1021bdc..c5ea6dc 100644 --- a/packs/atouts-feeriques/CURRENT +++ b/packs/atouts-feeriques/CURRENT @@ -1 +1 @@ -MANIFEST-000147 +MANIFEST-000167 diff --git a/packs/atouts-feeriques/LOG b/packs/atouts-feeriques/LOG index e83da57..c3fb316 100644 --- a/packs/atouts-feeriques/LOG +++ b/packs/atouts-feeriques/LOG @@ -1,8 +1,8 @@ -2024/08/11-14:35:37.810719 7f47856006c0 Recovering log #145 -2024/08/11-14:35:37.822942 7f47856006c0 Delete type=3 #143 -2024/08/11-14:35:37.823030 7f47856006c0 Delete type=0 #145 -2024/08/11-14:39:33.797833 7f4782e006c0 Level-0 table #150: started -2024/08/11-14:39:33.797891 7f4782e006c0 Level-0 table #150: 0 bytes OK -2024/08/11-14:39:33.804238 7f4782e006c0 Delete type=0 #148 -2024/08/11-14:39:33.818194 7f4782e006c0 Manual compaction at level-0 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end) -2024/08/11-14:39:33.818278 7f4782e006c0 Manual compaction at level-1 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end) +2024/11/17-20:47:41.953072 7f1d037fe6c0 Recovering log #165 +2024/11/17-20:47:41.963084 7f1d037fe6c0 Delete type=3 #163 +2024/11/17-20:47:41.963158 7f1d037fe6c0 Delete type=0 #165 +2024/11/17-20:55:29.696001 7f1d027ff6c0 Level-0 table #170: started +2024/11/17-20:55:29.696033 7f1d027ff6c0 Level-0 table #170: 0 bytes OK +2024/11/17-20:55:29.736230 7f1d027ff6c0 Delete type=0 #168 +2024/11/17-20:55:29.814140 7f1d027ff6c0 Manual compaction at level-0 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end) +2024/11/17-20:55:29.814191 7f1d027ff6c0 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 578c104..d17d9a5 100644 --- a/packs/atouts-feeriques/LOG.old +++ b/packs/atouts-feeriques/LOG.old @@ -1,8 +1,8 @@ -2024/08/06-21:52:34.069717 7fbe52a006c0 Recovering log #141 -2024/08/06-21:52:34.079875 7fbe52a006c0 Delete type=3 #139 -2024/08/06-21:52:34.079931 7fbe52a006c0 Delete type=0 #141 -2024/08/06-23:00:31.870139 7fbe50c006c0 Level-0 table #146: started -2024/08/06-23:00:31.870173 7fbe50c006c0 Level-0 table #146: 0 bytes OK -2024/08/06-23:00:31.904478 7fbe50c006c0 Delete type=0 #144 -2024/08/06-23:00:32.009329 7fbe50c006c0 Manual compaction at level-0 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end) -2024/08/06-23:00:32.009400 7fbe50c006c0 Manual compaction at level-1 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end) +2024/11/17-19:16:31.310339 7f1d08bf96c0 Recovering log #161 +2024/11/17-19:16:31.319876 7f1d08bf96c0 Delete type=3 #159 +2024/11/17-19:16:31.319986 7f1d08bf96c0 Delete type=0 #161 +2024/11/17-20:47:32.658010 7f1d027ff6c0 Level-0 table #166: started +2024/11/17-20:47:32.658044 7f1d027ff6c0 Level-0 table #166: 0 bytes OK +2024/11/17-20:47:32.693699 7f1d027ff6c0 Delete type=0 #164 +2024/11/17-20:47:32.759230 7f1d027ff6c0 Manual compaction at level-0 from '!items!0fPXtA5LkLgG8uDj' @ 72057594037927935 : 1 .. '!items!zvtBlG6KCIn0oCVk' @ 0 : 0; will stop at (end) +2024/11/17-20:47:32.759275 7f1d027ff6c0 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-000147 b/packs/atouts-feeriques/MANIFEST-000167 similarity index 73% rename from packs/atouts-feeriques/MANIFEST-000147 rename to packs/atouts-feeriques/MANIFEST-000167 index def2c8a..41728b3 100644 Binary files a/packs/atouts-feeriques/MANIFEST-000147 and b/packs/atouts-feeriques/MANIFEST-000167 differ diff --git a/packs/avantages/000149.log b/packs/avantages/000169.log similarity index 100% rename from packs/avantages/000149.log rename to packs/avantages/000169.log diff --git a/packs/avantages/CURRENT b/packs/avantages/CURRENT index 1021bdc..c5ea6dc 100644 --- a/packs/avantages/CURRENT +++ b/packs/avantages/CURRENT @@ -1 +1 @@ -MANIFEST-000147 +MANIFEST-000167 diff --git a/packs/avantages/LOG b/packs/avantages/LOG index 0fa71e9..bc6f442 100644 --- a/packs/avantages/LOG +++ b/packs/avantages/LOG @@ -1,8 +1,8 @@ -2024/08/11-14:35:37.752147 7f47842006c0 Recovering log #145 -2024/08/11-14:35:37.763231 7f47842006c0 Delete type=3 #143 -2024/08/11-14:35:37.763321 7f47842006c0 Delete type=0 #145 -2024/08/11-14:39:33.762051 7f4782e006c0 Level-0 table #150: started -2024/08/11-14:39:33.762167 7f4782e006c0 Level-0 table #150: 0 bytes OK -2024/08/11-14:39:33.768978 7f4782e006c0 Delete type=0 #148 -2024/08/11-14:39:33.790765 7f4782e006c0 Manual compaction at level-0 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end) -2024/08/11-14:39:33.790869 7f4782e006c0 Manual compaction at level-1 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end) +2024/11/17-20:47:41.915911 7f1d08bf96c0 Recovering log #165 +2024/11/17-20:47:41.926300 7f1d08bf96c0 Delete type=3 #163 +2024/11/17-20:47:41.926363 7f1d08bf96c0 Delete type=0 #165 +2024/11/17-20:55:29.595033 7f1d027ff6c0 Level-0 table #170: started +2024/11/17-20:55:29.595055 7f1d027ff6c0 Level-0 table #170: 0 bytes OK +2024/11/17-20:55:29.634810 7f1d027ff6c0 Delete type=0 #168 +2024/11/17-20:55:29.667026 7f1d027ff6c0 Manual compaction at level-0 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end) +2024/11/17-20:55:29.667075 7f1d027ff6c0 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 bc77cef..d91d887 100644 --- a/packs/avantages/LOG.old +++ b/packs/avantages/LOG.old @@ -1,8 +1,8 @@ -2024/08/06-21:52:34.016780 7fbe516006c0 Recovering log #141 -2024/08/06-21:52:34.027353 7fbe516006c0 Delete type=3 #139 -2024/08/06-21:52:34.027446 7fbe516006c0 Delete type=0 #141 -2024/08/06-23:00:31.729942 7fbe50c006c0 Level-0 table #146: started -2024/08/06-23:00:31.730003 7fbe50c006c0 Level-0 table #146: 0 bytes OK -2024/08/06-23:00:31.768395 7fbe50c006c0 Delete type=0 #144 -2024/08/06-23:00:31.869947 7fbe50c006c0 Manual compaction at level-0 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end) -2024/08/06-23:00:31.870007 7fbe50c006c0 Manual compaction at level-1 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end) +2024/11/17-19:16:31.272923 7f1d093fa6c0 Recovering log #161 +2024/11/17-19:16:31.282628 7f1d093fa6c0 Delete type=3 #159 +2024/11/17-19:16:31.282691 7f1d093fa6c0 Delete type=0 #161 +2024/11/17-20:47:32.572143 7f1d027ff6c0 Level-0 table #166: started +2024/11/17-20:47:32.572175 7f1d027ff6c0 Level-0 table #166: 0 bytes OK +2024/11/17-20:47:32.625976 7f1d027ff6c0 Delete type=0 #164 +2024/11/17-20:47:32.626160 7f1d027ff6c0 Manual compaction at level-0 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end) +2024/11/17-20:47:32.626196 7f1d027ff6c0 Manual compaction at level-1 from '!items!0EAAt0qSzcD9VRBH' @ 72057594037927935 : 1 .. '!items!zfpjROW9LDAlXUkN' @ 0 : 0; will stop at (end) diff --git a/packs/avantages/MANIFEST-000147 b/packs/avantages/MANIFEST-000167 similarity index 73% rename from packs/avantages/MANIFEST-000147 rename to packs/avantages/MANIFEST-000167 index 9485023..ca73a70 100644 Binary files a/packs/avantages/MANIFEST-000147 and b/packs/avantages/MANIFEST-000167 differ diff --git a/packs/capacites/000149.log b/packs/capacites/000169.log similarity index 100% rename from packs/capacites/000149.log rename to packs/capacites/000169.log diff --git a/packs/capacites/CURRENT b/packs/capacites/CURRENT index 1021bdc..c5ea6dc 100644 --- a/packs/capacites/CURRENT +++ b/packs/capacites/CURRENT @@ -1 +1 @@ -MANIFEST-000147 +MANIFEST-000167 diff --git a/packs/capacites/LOG b/packs/capacites/LOG index 78d263a..dc259db 100644 --- a/packs/capacites/LOG +++ b/packs/capacites/LOG @@ -1,8 +1,8 @@ -2024/08/11-14:35:37.792985 7f4784c006c0 Recovering log #145 -2024/08/11-14:35:37.804663 7f4784c006c0 Delete type=3 #143 -2024/08/11-14:35:37.804793 7f4784c006c0 Delete type=0 #145 -2024/08/11-14:39:33.769225 7f4782e006c0 Level-0 table #150: started -2024/08/11-14:39:33.769288 7f4782e006c0 Level-0 table #150: 0 bytes OK -2024/08/11-14:39:33.776053 7f4782e006c0 Delete type=0 #148 -2024/08/11-14:39:33.790785 7f4782e006c0 Manual compaction at level-0 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end) -2024/08/11-14:39:33.790919 7f4782e006c0 Manual compaction at level-1 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end) +2024/11/17-20:47:41.941224 7f1d03fff6c0 Recovering log #165 +2024/11/17-20:47:41.950797 7f1d03fff6c0 Delete type=3 #163 +2024/11/17-20:47:41.950873 7f1d03fff6c0 Delete type=0 #165 +2024/11/17-20:55:29.528760 7f1d027ff6c0 Level-0 table #170: started +2024/11/17-20:55:29.528801 7f1d027ff6c0 Level-0 table #170: 0 bytes OK +2024/11/17-20:55:29.560031 7f1d027ff6c0 Delete type=0 #168 +2024/11/17-20:55:29.666990 7f1d027ff6c0 Manual compaction at level-0 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end) +2024/11/17-20:55:29.667050 7f1d027ff6c0 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 81ee490..f742091 100644 --- a/packs/capacites/LOG.old +++ b/packs/capacites/LOG.old @@ -1,8 +1,8 @@ -2024/08/06-21:52:34.054034 7fbe534006c0 Recovering log #141 -2024/08/06-21:52:34.065082 7fbe534006c0 Delete type=3 #139 -2024/08/06-21:52:34.065180 7fbe534006c0 Delete type=0 #141 -2024/08/06-23:00:31.802367 7fbe50c006c0 Level-0 table #146: started -2024/08/06-23:00:31.802389 7fbe50c006c0 Level-0 table #146: 0 bytes OK -2024/08/06-23:00:31.832600 7fbe50c006c0 Delete type=0 #144 -2024/08/06-23:00:31.869974 7fbe50c006c0 Manual compaction at level-0 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end) -2024/08/06-23:00:31.869999 7fbe50c006c0 Manual compaction at level-1 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end) +2024/11/17-19:16:31.297314 7f1d03fff6c0 Recovering log #161 +2024/11/17-19:16:31.308272 7f1d03fff6c0 Delete type=3 #159 +2024/11/17-19:16:31.308340 7f1d03fff6c0 Delete type=0 #161 +2024/11/17-20:47:32.448494 7f1d027ff6c0 Level-0 table #166: started +2024/11/17-20:47:32.448544 7f1d027ff6c0 Level-0 table #166: 0 bytes OK +2024/11/17-20:47:32.501661 7f1d027ff6c0 Delete type=0 #164 +2024/11/17-20:47:32.626129 7f1d027ff6c0 Manual compaction at level-0 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end) +2024/11/17-20:47:32.626179 7f1d027ff6c0 Manual compaction at level-1 from '!items!0cNSRJVPk3GbvxfD' @ 72057594037927935 : 1 .. '!items!yWDg2KlXEz33TSmZ' @ 0 : 0; will stop at (end) diff --git a/packs/capacites/MANIFEST-000147 b/packs/capacites/MANIFEST-000167 similarity index 73% rename from packs/capacites/MANIFEST-000147 rename to packs/capacites/MANIFEST-000167 index 61e8f1e..b5741e6 100644 Binary files a/packs/capacites/MANIFEST-000147 and b/packs/capacites/MANIFEST-000167 differ diff --git a/packs/competences/000106.ldb b/packs/competences/000106.ldb deleted file mode 100644 index 3ca2bed..0000000 Binary files a/packs/competences/000106.ldb and /dev/null differ diff --git a/packs/competences/000159.ldb b/packs/competences/000159.ldb new file mode 100644 index 0000000..1385577 Binary files /dev/null and b/packs/competences/000159.ldb differ diff --git a/packs/competences/000149.log b/packs/competences/000170.log similarity index 100% rename from packs/competences/000149.log rename to packs/competences/000170.log diff --git a/packs/competences/CURRENT b/packs/competences/CURRENT index 1021bdc..57112f5 100644 --- a/packs/competences/CURRENT +++ b/packs/competences/CURRENT @@ -1 +1 @@ -MANIFEST-000147 +MANIFEST-000168 diff --git a/packs/competences/LOG b/packs/competences/LOG index eb46c5d..cf711ce 100644 --- a/packs/competences/LOG +++ b/packs/competences/LOG @@ -1,8 +1,8 @@ -2024/08/11-14:35:37.734005 7f47856006c0 Recovering log #145 -2024/08/11-14:35:37.745943 7f47856006c0 Delete type=3 #143 -2024/08/11-14:35:37.746038 7f47856006c0 Delete type=0 #145 -2024/08/11-14:39:33.776285 7f4782e006c0 Level-0 table #150: started -2024/08/11-14:39:33.776344 7f4782e006c0 Level-0 table #150: 0 bytes OK -2024/08/11-14:39:33.783086 7f4782e006c0 Delete type=0 #148 -2024/08/11-14:39:33.790801 7f4782e006c0 Manual compaction at level-0 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end) -2024/08/11-14:39:33.790907 7f4782e006c0 Manual compaction at level-1 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end) +2024/11/17-20:47:41.902247 7f1d037fe6c0 Recovering log #166 +2024/11/17-20:47:41.912542 7f1d037fe6c0 Delete type=3 #164 +2024/11/17-20:47:41.912623 7f1d037fe6c0 Delete type=0 #166 +2024/11/17-20:55:29.560168 7f1d027ff6c0 Level-0 table #171: started +2024/11/17-20:55:29.560198 7f1d027ff6c0 Level-0 table #171: 0 bytes OK +2024/11/17-20:55:29.594914 7f1d027ff6c0 Delete type=0 #169 +2024/11/17-20:55:29.667010 7f1d027ff6c0 Manual compaction at level-0 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end) +2024/11/17-20:55:29.667062 7f1d027ff6c0 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 24ded17..2f8fd36 100644 --- a/packs/competences/LOG.old +++ b/packs/competences/LOG.old @@ -1,8 +1,8 @@ -2024/08/06-21:52:34.001824 7fbe52a006c0 Recovering log #141 -2024/08/06-21:52:34.012892 7fbe52a006c0 Delete type=3 #139 -2024/08/06-21:52:34.012951 7fbe52a006c0 Delete type=0 #141 -2024/08/06-23:00:31.832758 7fbe50c006c0 Level-0 table #146: started -2024/08/06-23:00:31.832813 7fbe50c006c0 Level-0 table #146: 0 bytes OK -2024/08/06-23:00:31.869708 7fbe50c006c0 Delete type=0 #144 -2024/08/06-23:00:31.869983 7fbe50c006c0 Manual compaction at level-0 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end) -2024/08/06-23:00:31.870021 7fbe50c006c0 Manual compaction at level-1 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end) +2024/11/17-19:16:31.259795 7f1d08bf96c0 Recovering log #162 +2024/11/17-19:16:31.270586 7f1d08bf96c0 Delete type=3 #160 +2024/11/17-19:16:31.270657 7f1d08bf96c0 Delete type=0 #162 +2024/11/17-20:47:32.416148 7f1d027ff6c0 Level-0 table #167: started +2024/11/17-20:47:32.416193 7f1d027ff6c0 Level-0 table #167: 0 bytes OK +2024/11/17-20:47:32.448325 7f1d027ff6c0 Delete type=0 #165 +2024/11/17-20:47:32.626111 7f1d027ff6c0 Manual compaction at level-0 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end) +2024/11/17-20:47:32.626172 7f1d027ff6c0 Manual compaction at level-1 from '!items!0V86n4TU8NegrR2B' @ 72057594037927935 : 1 .. '!items!zEl2NQsnCpELVWzh' @ 0 : 0; will stop at (end) diff --git a/packs/competences/MANIFEST-000147 b/packs/competences/MANIFEST-000147 deleted file mode 100644 index 70e6d9a..0000000 Binary files a/packs/competences/MANIFEST-000147 and /dev/null differ diff --git a/packs/competences/MANIFEST-000168 b/packs/competences/MANIFEST-000168 new file mode 100644 index 0000000..598d75b Binary files /dev/null and b/packs/competences/MANIFEST-000168 differ diff --git a/packs/desavantages/000149.log b/packs/desavantages/000169.log similarity index 100% rename from packs/desavantages/000149.log rename to packs/desavantages/000169.log diff --git a/packs/desavantages/CURRENT b/packs/desavantages/CURRENT index 1021bdc..c5ea6dc 100644 --- a/packs/desavantages/CURRENT +++ b/packs/desavantages/CURRENT @@ -1 +1 @@ -MANIFEST-000147 +MANIFEST-000167 diff --git a/packs/desavantages/LOG b/packs/desavantages/LOG index 249d100..ee8714a 100644 --- a/packs/desavantages/LOG +++ b/packs/desavantages/LOG @@ -1,8 +1,8 @@ -2024/08/11-14:35:37.768123 7f47838006c0 Recovering log #145 -2024/08/11-14:35:37.780266 7f47838006c0 Delete type=3 #143 -2024/08/11-14:35:37.780376 7f47838006c0 Delete type=0 #145 -2024/08/11-14:39:33.783340 7f4782e006c0 Level-0 table #150: started -2024/08/11-14:39:33.783403 7f4782e006c0 Level-0 table #150: 0 bytes OK -2024/08/11-14:39:33.790567 7f4782e006c0 Delete type=0 #148 -2024/08/11-14:39:33.790815 7f4782e006c0 Manual compaction at level-0 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end) -2024/08/11-14:39:33.790893 7f4782e006c0 Manual compaction at level-1 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end) +2024/11/17-20:47:41.928516 7f1d093fa6c0 Recovering log #165 +2024/11/17-20:47:41.938715 7f1d093fa6c0 Delete type=3 #163 +2024/11/17-20:47:41.938787 7f1d093fa6c0 Delete type=0 #165 +2024/11/17-20:55:29.634990 7f1d027ff6c0 Level-0 table #170: started +2024/11/17-20:55:29.635028 7f1d027ff6c0 Level-0 table #170: 0 bytes OK +2024/11/17-20:55:29.666837 7f1d027ff6c0 Delete type=0 #168 +2024/11/17-20:55:29.667040 7f1d027ff6c0 Manual compaction at level-0 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end) +2024/11/17-20:55:29.667088 7f1d027ff6c0 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 2b81c54..4c4644a 100644 --- a/packs/desavantages/LOG.old +++ b/packs/desavantages/LOG.old @@ -1,8 +1,8 @@ -2024/08/06-21:52:34.031942 7fbe520006c0 Recovering log #141 -2024/08/06-21:52:34.041612 7fbe520006c0 Delete type=3 #139 -2024/08/06-21:52:34.041667 7fbe520006c0 Delete type=0 #141 -2024/08/06-23:00:31.768505 7fbe50c006c0 Level-0 table #146: started -2024/08/06-23:00:31.768526 7fbe50c006c0 Level-0 table #146: 0 bytes OK -2024/08/06-23:00:31.802256 7fbe50c006c0 Delete type=0 #144 -2024/08/06-23:00:31.869963 7fbe50c006c0 Manual compaction at level-0 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end) -2024/08/06-23:00:31.870013 7fbe50c006c0 Manual compaction at level-1 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end) +2024/11/17-19:16:31.284731 7f1d037fe6c0 Recovering log #161 +2024/11/17-19:16:31.294840 7f1d037fe6c0 Delete type=3 #159 +2024/11/17-19:16:31.294933 7f1d037fe6c0 Delete type=0 #161 +2024/11/17-20:47:32.501776 7f1d027ff6c0 Level-0 table #166: started +2024/11/17-20:47:32.501803 7f1d027ff6c0 Level-0 table #166: 0 bytes OK +2024/11/17-20:47:32.572001 7f1d027ff6c0 Delete type=0 #164 +2024/11/17-20:47:32.626142 7f1d027ff6c0 Manual compaction at level-0 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end) +2024/11/17-20:47:32.626186 7f1d027ff6c0 Manual compaction at level-1 from '!items!2QqvtClSVnh5ejXu' @ 72057594037927935 : 1 .. '!items!xzRJ6JP1HqoqxLdj' @ 0 : 0; will stop at (end) diff --git a/packs/desavantages/MANIFEST-000147 b/packs/desavantages/MANIFEST-000167 similarity index 73% rename from packs/desavantages/MANIFEST-000147 rename to packs/desavantages/MANIFEST-000167 index 76283f5..ad4ef2a 100644 Binary files a/packs/desavantages/MANIFEST-000147 and b/packs/desavantages/MANIFEST-000167 differ diff --git a/packs/pouvoirs/000150.log b/packs/pouvoirs/000170.log similarity index 100% rename from packs/pouvoirs/000150.log rename to packs/pouvoirs/000170.log diff --git a/packs/pouvoirs/CURRENT b/packs/pouvoirs/CURRENT index 89e2564..57112f5 100644 --- a/packs/pouvoirs/CURRENT +++ b/packs/pouvoirs/CURRENT @@ -1 +1 @@ -MANIFEST-000148 +MANIFEST-000168 diff --git a/packs/pouvoirs/LOG b/packs/pouvoirs/LOG index af2e96c..528391a 100644 --- a/packs/pouvoirs/LOG +++ b/packs/pouvoirs/LOG @@ -1,8 +1,8 @@ -2024/08/11-14:35:37.846774 7f47838006c0 Recovering log #146 -2024/08/11-14:35:37.859344 7f47838006c0 Delete type=3 #144 -2024/08/11-14:35:37.859473 7f47838006c0 Delete type=0 #146 -2024/08/11-14:39:33.804398 7f4782e006c0 Level-0 table #151: started -2024/08/11-14:39:33.804435 7f4782e006c0 Level-0 table #151: 0 bytes OK -2024/08/11-14:39:33.811039 7f4782e006c0 Delete type=0 #149 -2024/08/11-14:39:33.818208 7f4782e006c0 Manual compaction at level-0 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end) -2024/08/11-14:39:33.818290 7f4782e006c0 Manual compaction at level-1 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end) +2024/11/17-20:47:41.979353 7f1d093fa6c0 Recovering log #166 +2024/11/17-20:47:41.988865 7f1d093fa6c0 Delete type=3 #164 +2024/11/17-20:47:41.988953 7f1d093fa6c0 Delete type=0 #166 +2024/11/17-20:55:29.771397 7f1d027ff6c0 Level-0 table #171: started +2024/11/17-20:55:29.771431 7f1d027ff6c0 Level-0 table #171: 0 bytes OK +2024/11/17-20:55:29.813952 7f1d027ff6c0 Delete type=0 #169 +2024/11/17-20:55:29.814167 7f1d027ff6c0 Manual compaction at level-0 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end) +2024/11/17-20:55:29.814200 7f1d027ff6c0 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 a5a24f5..d8cadbb 100644 --- a/packs/pouvoirs/LOG.old +++ b/packs/pouvoirs/LOG.old @@ -1,8 +1,8 @@ -2024/08/06-21:52:34.099478 7fbe520006c0 Recovering log #142 -2024/08/06-21:52:34.110385 7fbe520006c0 Delete type=3 #140 -2024/08/06-21:52:34.110514 7fbe520006c0 Delete type=0 #142 -2024/08/06-23:00:31.904657 7fbe50c006c0 Level-0 table #147: started -2024/08/06-23:00:31.904695 7fbe50c006c0 Level-0 table #147: 0 bytes OK -2024/08/06-23:00:31.939251 7fbe50c006c0 Delete type=0 #145 -2024/08/06-23:00:32.009353 7fbe50c006c0 Manual compaction at level-0 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end) -2024/08/06-23:00:32.009413 7fbe50c006c0 Manual compaction at level-1 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end) +2024/11/17-19:16:31.335127 7f1d037fe6c0 Recovering log #162 +2024/11/17-19:16:31.346078 7f1d037fe6c0 Delete type=3 #160 +2024/11/17-19:16:31.346156 7f1d037fe6c0 Delete type=0 #162 +2024/11/17-20:47:32.727805 7f1d027ff6c0 Level-0 table #167: started +2024/11/17-20:47:32.727843 7f1d027ff6c0 Level-0 table #167: 0 bytes OK +2024/11/17-20:47:32.759083 7f1d027ff6c0 Delete type=0 #165 +2024/11/17-20:47:32.759259 7f1d027ff6c0 Manual compaction at level-0 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end) +2024/11/17-20:47:32.759283 7f1d027ff6c0 Manual compaction at level-1 from '!items!19r9ijZUyvnlIqgm' @ 72057594037927935 : 1 .. '!items!zON0h5SjFyANjPnA' @ 0 : 0; will stop at (end) diff --git a/packs/pouvoirs/MANIFEST-000148 b/packs/pouvoirs/MANIFEST-000168 similarity index 72% rename from packs/pouvoirs/MANIFEST-000148 rename to packs/pouvoirs/MANIFEST-000168 index 2f6ca5b..98d7a61 100644 Binary files a/packs/pouvoirs/MANIFEST-000148 and b/packs/pouvoirs/MANIFEST-000168 differ diff --git a/packs/profils/000148.log b/packs/profils/000168.log similarity index 100% rename from packs/profils/000148.log rename to packs/profils/000168.log diff --git a/packs/profils/CURRENT b/packs/profils/CURRENT index ffd4a01..830373b 100644 --- a/packs/profils/CURRENT +++ b/packs/profils/CURRENT @@ -1 +1 @@ -MANIFEST-000146 +MANIFEST-000166 diff --git a/packs/profils/LOG b/packs/profils/LOG index 87d26e8..8b661ce 100644 --- a/packs/profils/LOG +++ b/packs/profils/LOG @@ -1,7 +1,7 @@ -2024/08/11-14:35:37.883245 7f47856006c0 Recovering log #144 -2024/08/11-14:35:37.895329 7f47856006c0 Delete type=3 #142 -2024/08/11-14:35:37.895444 7f47856006c0 Delete type=0 #144 -2024/08/11-14:39:33.836949 7f4782e006c0 Level-0 table #149: started -2024/08/11-14:39:33.837017 7f4782e006c0 Level-0 table #149: 0 bytes OK -2024/08/11-14:39:33.844766 7f4782e006c0 Delete type=0 #147 -2024/08/11-14:39:33.851315 7f4782e006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/11/17-20:47:42.004094 7f1d037fe6c0 Recovering log #164 +2024/11/17-20:47:42.014786 7f1d037fe6c0 Delete type=3 #162 +2024/11/17-20:47:42.014871 7f1d037fe6c0 Delete type=0 #164 +2024/11/17-20:55:29.736353 7f1d027ff6c0 Level-0 table #169: started +2024/11/17-20:55:29.736382 7f1d027ff6c0 Level-0 table #169: 0 bytes OK +2024/11/17-20:55:29.771248 7f1d027ff6c0 Delete type=0 #167 +2024/11/17-20:55:29.814153 7f1d027ff6c0 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 dbeff01..840d669 100644 --- a/packs/profils/LOG.old +++ b/packs/profils/LOG.old @@ -1,7 +1,7 @@ -2024/08/06-21:52:34.132281 7fbe52a006c0 Recovering log #140 -2024/08/06-21:52:34.142883 7fbe52a006c0 Delete type=3 #138 -2024/08/06-21:52:34.142989 7fbe52a006c0 Delete type=0 #140 -2024/08/06-23:00:32.009525 7fbe50c006c0 Level-0 table #145: started -2024/08/06-23:00:32.009564 7fbe50c006c0 Level-0 table #145: 0 bytes OK -2024/08/06-23:00:32.046125 7fbe50c006c0 Delete type=0 #143 -2024/08/06-23:00:32.165305 7fbe50c006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2024/11/17-19:16:31.360847 7f1d08bf96c0 Recovering log #160 +2024/11/17-19:16:31.371569 7f1d08bf96c0 Delete type=3 #158 +2024/11/17-19:16:31.371638 7f1d08bf96c0 Delete type=0 #160 +2024/11/17-20:47:32.759358 7f1d027ff6c0 Level-0 table #165: started +2024/11/17-20:47:32.759390 7f1d027ff6c0 Level-0 table #165: 0 bytes OK +2024/11/17-20:47:32.795162 7f1d027ff6c0 Delete type=0 #163 +2024/11/17-20:47:32.931748 7f1d027ff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/profils/MANIFEST-000146 b/packs/profils/MANIFEST-000146 deleted file mode 100644 index 1a06934..0000000 Binary files a/packs/profils/MANIFEST-000146 and /dev/null differ diff --git a/packs/profils/MANIFEST-000166 b/packs/profils/MANIFEST-000166 new file mode 100644 index 0000000..67b6770 Binary files /dev/null and b/packs/profils/MANIFEST-000166 differ diff --git a/packs/scenes/000118.log b/packs/scenes/000138.log similarity index 100% rename from packs/scenes/000118.log rename to packs/scenes/000138.log diff --git a/packs/scenes/CURRENT b/packs/scenes/CURRENT index 2b6390e..0eb07d3 100644 --- a/packs/scenes/CURRENT +++ b/packs/scenes/CURRENT @@ -1 +1 @@ -MANIFEST-000116 +MANIFEST-000136 diff --git a/packs/scenes/LOG b/packs/scenes/LOG index 6b4c31a..e0d8a31 100644 --- a/packs/scenes/LOG +++ b/packs/scenes/LOG @@ -1,8 +1,8 @@ -2024/08/11-14:35:37.899642 7f47842006c0 Recovering log #114 -2024/08/11-14:35:37.910975 7f47842006c0 Delete type=3 #112 -2024/08/11-14:35:37.911099 7f47842006c0 Delete type=0 #114 -2024/08/11-14:39:33.844932 7f4782e006c0 Level-0 table #119: started -2024/08/11-14:39:33.844982 7f4782e006c0 Level-0 table #119: 0 bytes OK -2024/08/11-14:39:33.851094 7f4782e006c0 Delete type=0 #117 -2024/08/11-14:39:33.851332 7f4782e006c0 Manual compaction at level-0 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end) -2024/08/11-14:39:33.863651 7f4782e006c0 Manual compaction at level-1 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end) +2024/11/17-20:47:42.017285 7f1d08bf96c0 Recovering log #134 +2024/11/17-20:47:42.027032 7f1d08bf96c0 Delete type=3 #132 +2024/11/17-20:47:42.027111 7f1d08bf96c0 Delete type=0 #134 +2024/11/17-20:55:29.950168 7f1d027ff6c0 Level-0 table #139: started +2024/11/17-20:55:29.950201 7f1d027ff6c0 Level-0 table #139: 0 bytes OK +2024/11/17-20:55:29.988480 7f1d027ff6c0 Delete type=0 #137 +2024/11/17-20:55:29.988652 7f1d027ff6c0 Manual compaction at level-0 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end) +2024/11/17-20:55:30.050927 7f1d027ff6c0 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 be237d0..b5b9bbe 100644 --- a/packs/scenes/LOG.old +++ b/packs/scenes/LOG.old @@ -1,8 +1,8 @@ -2024/08/06-21:52:34.146274 7fbe516006c0 Recovering log #110 -2024/08/06-21:52:34.157668 7fbe516006c0 Delete type=3 #108 -2024/08/06-21:52:34.157768 7fbe516006c0 Delete type=0 #110 -2024/08/06-23:00:32.098671 7fbe50c006c0 Level-0 table #115: started -2024/08/06-23:00:32.098750 7fbe50c006c0 Level-0 table #115: 0 bytes OK -2024/08/06-23:00:32.127456 7fbe50c006c0 Delete type=0 #113 -2024/08/06-23:00:32.165357 7fbe50c006c0 Manual compaction at level-0 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end) -2024/08/06-23:00:32.212632 7fbe50c006c0 Manual compaction at level-1 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end) +2024/11/17-19:16:31.373782 7f1d093fa6c0 Recovering log #130 +2024/11/17-19:16:31.384144 7f1d093fa6c0 Delete type=3 #128 +2024/11/17-19:16:31.384217 7f1d093fa6c0 Delete type=0 #130 +2024/11/17-20:47:32.894670 7f1d027ff6c0 Level-0 table #135: started +2024/11/17-20:47:32.894721 7f1d027ff6c0 Level-0 table #135: 0 bytes OK +2024/11/17-20:47:32.931619 7f1d027ff6c0 Delete type=0 #133 +2024/11/17-20:47:32.931783 7f1d027ff6c0 Manual compaction at level-0 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end) +2024/11/17-20:47:32.983298 7f1d027ff6c0 Manual compaction at level-1 from '!scenes!8DjkNeeujp2qff1N' @ 72057594037927935 : 1 .. '!scenes!ypDutqjqZcr7lx6I' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/MANIFEST-000116 b/packs/scenes/MANIFEST-000136 similarity index 73% rename from packs/scenes/MANIFEST-000116 rename to packs/scenes/MANIFEST-000136 index cadfc9d..1010752 100644 Binary files a/packs/scenes/MANIFEST-000116 and b/packs/scenes/MANIFEST-000136 differ diff --git a/system.json b/system.json index 7867a6a..3020cdb 100644 --- a/system.json +++ b/system.json @@ -1,7 +1,7 @@ { "id": "fvtt-les-heritiers", "description": "Les Héritiers pour FoundryVTT", - "version": "12.0.4", + "version": "12.1.1", "authors": [ { "name": "Uberwald/LeRatierBretonnien", @@ -21,7 +21,7 @@ }, "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-12.0.4.zip", + "download": "https://www.uberwald.me/gitea/public/fvtt-les-heritiers/archive/fvtt-les-heritiers-12.1.1.zip", "languages": [ { "lang": "fr", diff --git a/template.json b/template.json index d0d8a41..5605495 100644 --- a/template.json +++ b/template.json @@ -37,7 +37,8 @@ "notes": "", "statut": "", "playernotes":"", - "gmnotes": "" + "gmnotes": "", + "magie": false } }, "core": { @@ -183,6 +184,12 @@ "pp": 0 } }, + "magie": { + "pointsame": { + "value": 0, + "max": 0 + } + }, "experience": { "value": 0, "pourtricher": 0 @@ -267,7 +274,8 @@ "fee", "pouvoir", "profil", - "protection" + "protection", + "sort" ], "profil": { "profiltype": "majeur", @@ -337,6 +345,7 @@ "niveau": 0, "predilection": false, "specialites": [], + "ismagie": false, "description": "" }, "equipement": { @@ -345,6 +354,19 @@ "basequip" ] }, + "sort": { + "niveau": "novice", + "competence": "Druidisme", + "carac": "esp", + "duree": "", + "portee": "", + "concentration": "", + "critique": "", + "ingredients": "", + "resistance": "", + "coutactivation": "", + "description": "" + }, "arme": { "categorie": "", "armetype": "", diff --git a/templates/actor-pnj-sheet.html b/templates/actor-pnj-sheet.html index f0f0809..32ec727 100644 --- a/templates/actor-pnj-sheet.html +++ b/templates/actor-pnj-sheet.html @@ -96,7 +96,7 @@ - +
+ +
  • +

    Magie

    +
  • + +
    + +
    + + {{#each magieList as |magie idx|}} +
  • +

    +
    + + +
    +

    +
  • + +
    + +
    + {{/each}} + + diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 5e5ec87..f22bb0d 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -77,6 +77,9 @@