diff --git a/modules/wasteland-actor-sheet.js b/modules/wasteland-actor-sheet.js index 3de505c..b8e0662 100644 --- a/modules/wasteland-actor-sheet.js +++ b/modules/wasteland-actor-sheet.js @@ -54,9 +54,12 @@ export class WastelandActorSheet extends ActorSheet { metier: duplicate(this.actor.getMetier() || {}), combat: this.actor.getCombatValues(), config: duplicate(game.system.wasteland.config), + capacites: duplicate(this.actor.getCapacites()), equipements: duplicate(this.actor.getEquipments()), monnaies: duplicate(this.actor.getMonnaies()), description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}), + comportement: await TextEditor.enrichHTML(this.object.system.biodata.comportement, {async: true}), + habitat: await TextEditor.enrichHTML(this.object.system.biodata.habitat, {async: true}), options: this.options, owner: this.document.isOwner, editScore: this.options.editScore, diff --git a/modules/wasteland-actor.js b/modules/wasteland-actor.js index 2f32994..dee2755 100644 --- a/modules/wasteland-actor.js +++ b/modules/wasteland-actor.js @@ -37,11 +37,12 @@ export class WastelandActor extends Actor { return actor; } + const skills = await WastelandUtility.loadCompendium("fvtt-wasteland.skills") if (data.type == 'personnage') { - const skills = await WastelandUtility.loadCompendium("fvtt-wasteland.skills") data.items = skills.map(i => i.toObject()) } - if (data.type == 'pnj') { + if (data.type == 'creature') { + data.items = skills.filter(i=>i.name.toLowerCase().includes("mêlée")).map(i => i.toObject()) } return super.create(data, options); @@ -119,6 +120,9 @@ export class WastelandActor extends Actor { getArtifex() { return this.getItemSorted(["artifex"]) } + getCapacites() { + return this.getItemSorted(["capacite"]) + } getPouvoirs() { return this.getItemSorted(["pouvoir"]) } diff --git a/modules/wasteland-creature-sheet.js b/modules/wasteland-creature-sheet.js new file mode 100644 index 0000000..cc5c65f --- /dev/null +++ b/modules/wasteland-creature-sheet.js @@ -0,0 +1,26 @@ +/** + * Extend the basic ActorSheet with some very simple modifications + * @extends {ActorSheet} + */ + +import { WastelandUtility } from "./wasteland-utility.js"; +import { WastelandActorSheet } from "./wasteland-actor-sheet.js"; + +/* -------------------------------------------- */ +export class WastelandCreatureSheet extends WastelandActorSheet { + + /** @override */ + static get defaultOptions() { + + return mergeObject(super.defaultOptions, { + classes: ["fvtt-wasteland", "sheet", "creature"], + template: "systems/fvtt-wasteland/templates/creature-sheet.html", + width: 640, + height: 720, + tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "stats" }], + dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }], + editScore: false + }); + } + +} diff --git a/modules/wasteland-main.js b/modules/wasteland-main.js index 0f75396..74e4a39 100644 --- a/modules/wasteland-main.js +++ b/modules/wasteland-main.js @@ -11,7 +11,7 @@ import { WastelandActor } from "./wasteland-actor.js"; import { WastelandItemSheet } from "./wasteland-item-sheet.js"; import { WastelandActorSheet } from "./wasteland-actor-sheet.js"; -//import { WastelandNPCSheet } from "./wasteland-npc-sheet.js"; +import { WastelandCreatureSheet } from "./wasteland-creature-sheet.js"; import { WastelandUtility } from "./wasteland-utility.js"; import { WastelandCombat } from "./wasteland-combat.js"; import { WastelandItem } from "./wasteland-item.js"; @@ -54,7 +54,7 @@ Hooks.once("init", async function () { // Register sheet application classes Actors.unregisterSheet("core", ActorSheet); Actors.registerSheet("fvtt-wasteland", WastelandActorSheet, { types: ["personnage"], makeDefault: true }) - //Actors.registerSheet("fvtt-wasteland", WastelandNPCSheet, { types: ["npc"], makeDefault: false }); + Actors.registerSheet("fvtt-wasteland", WastelandCreatureSheet, { types: ["creature"], makeDefault: false }); Items.unregisterSheet("core", ItemSheet); Items.registerSheet("fvtt-wasteland", WastelandItemSheet, { makeDefault: true }) diff --git a/packs/armes/000088.log b/packs/armes/000096.log similarity index 100% rename from packs/armes/000088.log rename to packs/armes/000096.log diff --git a/packs/armes/CURRENT b/packs/armes/CURRENT index a43fb19..0ab25fa 100644 --- a/packs/armes/CURRENT +++ b/packs/armes/CURRENT @@ -1 +1 @@ -MANIFEST-000086 +MANIFEST-000094 diff --git a/packs/armes/LOG b/packs/armes/LOG index 95fe166..6ef3286 100644 --- a/packs/armes/LOG +++ b/packs/armes/LOG @@ -1,8 +1,8 @@ -2023/12/01-14:01:31.663762 7facd3fff6c0 Recovering log #84 -2023/12/01-14:01:31.673391 7facd3fff6c0 Delete type=3 #82 -2023/12/01-14:01:31.673441 7facd3fff6c0 Delete type=0 #84 -2023/12/01-14:02:58.886581 7faa52bff6c0 Level-0 table #89: started -2023/12/01-14:02:58.886605 7faa52bff6c0 Level-0 table #89: 0 bytes OK -2023/12/01-14:02:58.893826 7faa52bff6c0 Delete type=0 #87 -2023/12/01-14:02:58.906642 7faa52bff6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/12/01-14:02:58.906714 7faa52bff6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/02-08:51:29.900760 7f78c67fc6c0 Recovering log #92 +2023/12/02-08:51:29.958288 7f78c67fc6c0 Delete type=3 #90 +2023/12/02-08:51:29.958401 7f78c67fc6c0 Delete type=0 #92 +2023/12/02-09:03:37.930194 7f78c57fa6c0 Level-0 table #97: started +2023/12/02-09:03:37.930255 7f78c57fa6c0 Level-0 table #97: 0 bytes OK +2023/12/02-09:03:37.987334 7f78c57fa6c0 Delete type=0 #95 +2023/12/02-09:03:38.062545 7f78c57fa6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/02-09:03:38.062604 7f78c57fa6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) diff --git a/packs/armes/LOG.old b/packs/armes/LOG.old index 8c966a6..720da8d 100644 --- a/packs/armes/LOG.old +++ b/packs/armes/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-13:53:39.494309 7facd3fff6c0 Recovering log #80 -2023/12/01-13:53:39.504896 7facd3fff6c0 Delete type=3 #78 -2023/12/01-13:53:39.504998 7facd3fff6c0 Delete type=0 #80 -2023/12/01-13:59:53.167281 7faa52bff6c0 Level-0 table #85: started -2023/12/01-13:59:53.167307 7faa52bff6c0 Level-0 table #85: 0 bytes OK -2023/12/01-13:59:53.198187 7faa52bff6c0 Delete type=0 #83 -2023/12/01-13:59:53.317461 7faa52bff6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) -2023/12/01-13:59:53.317523 7faa52bff6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/02-08:42:44.386344 7f78c77fe6c0 Recovering log #88 +2023/12/02-08:42:44.397486 7f78c77fe6c0 Delete type=3 #86 +2023/12/02-08:42:44.397786 7f78c77fe6c0 Delete type=0 #88 +2023/12/02-08:51:17.782518 7f78c57fa6c0 Level-0 table #93: started +2023/12/02-08:51:17.782561 7f78c57fa6c0 Level-0 table #93: 0 bytes OK +2023/12/02-08:51:17.816144 7f78c57fa6c0 Delete type=0 #91 +2023/12/02-08:51:17.875724 7f78c57fa6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/12/02-08:51:17.875802 7f78c57fa6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) diff --git a/packs/armes/MANIFEST-000086 b/packs/armes/MANIFEST-000086 deleted file mode 100644 index 0897d66..0000000 Binary files a/packs/armes/MANIFEST-000086 and /dev/null differ diff --git a/packs/armes/MANIFEST-000094 b/packs/armes/MANIFEST-000094 new file mode 100644 index 0000000..676c2b0 Binary files /dev/null and b/packs/armes/MANIFEST-000094 differ diff --git a/packs/equipement/000042.log b/packs/equipement/000050.log similarity index 100% rename from packs/equipement/000042.log rename to packs/equipement/000050.log diff --git a/packs/equipement/CURRENT b/packs/equipement/CURRENT index e2c0c4b..a9ebced 100644 --- a/packs/equipement/CURRENT +++ b/packs/equipement/CURRENT @@ -1 +1 @@ -MANIFEST-000040 +MANIFEST-000048 diff --git a/packs/equipement/LOG b/packs/equipement/LOG index 6ce714d..f015c80 100644 --- a/packs/equipement/LOG +++ b/packs/equipement/LOG @@ -1,8 +1,8 @@ -2023/12/01-14:01:31.687335 7face89f96c0 Recovering log #38 -2023/12/01-14:01:31.697567 7face89f96c0 Delete type=3 #36 -2023/12/01-14:01:31.697683 7face89f96c0 Delete type=0 #38 -2023/12/01-14:02:58.893938 7faa52bff6c0 Level-0 table #43: started -2023/12/01-14:02:58.893962 7faa52bff6c0 Level-0 table #43: 0 bytes OK -2023/12/01-14:02:58.900266 7faa52bff6c0 Delete type=0 #41 -2023/12/01-14:02:58.906658 7faa52bff6c0 Manual compaction at level-0 from '!folders!JlP90zkPvPcJDq0q' @ 72057594037927935 : 1 .. '!items!zjMDuxKHKJ4vE5UV' @ 0 : 0; will stop at (end) -2023/12/01-14:02:58.906700 7faa52bff6c0 Manual compaction at level-1 from '!folders!JlP90zkPvPcJDq0q' @ 72057594037927935 : 1 .. '!items!zjMDuxKHKJ4vE5UV' @ 0 : 0; will stop at (end) +2023/12/02-08:51:30.032259 7f78c5ffb6c0 Recovering log #46 +2023/12/02-08:51:30.074066 7f78c5ffb6c0 Delete type=3 #44 +2023/12/02-08:51:30.074197 7f78c5ffb6c0 Delete type=0 #46 +2023/12/02-09:03:37.987661 7f78c57fa6c0 Level-0 table #51: started +2023/12/02-09:03:37.987715 7f78c57fa6c0 Level-0 table #51: 0 bytes OK +2023/12/02-09:03:38.062000 7f78c57fa6c0 Delete type=0 #49 +2023/12/02-09:03:38.062562 7f78c57fa6c0 Manual compaction at level-0 from '!folders!JlP90zkPvPcJDq0q' @ 72057594037927935 : 1 .. '!items!zjMDuxKHKJ4vE5UV' @ 0 : 0; will stop at (end) +2023/12/02-09:03:38.062618 7f78c57fa6c0 Manual compaction at level-1 from '!folders!JlP90zkPvPcJDq0q' @ 72057594037927935 : 1 .. '!items!zjMDuxKHKJ4vE5UV' @ 0 : 0; will stop at (end) diff --git a/packs/equipement/LOG.old b/packs/equipement/LOG.old index 30b8f81..c3e7e84 100644 --- a/packs/equipement/LOG.old +++ b/packs/equipement/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-13:53:39.520862 7facd37fe6c0 Recovering log #34 -2023/12/01-13:53:39.531517 7facd37fe6c0 Delete type=3 #32 -2023/12/01-13:53:39.531569 7facd37fe6c0 Delete type=0 #34 -2023/12/01-13:59:53.280355 7faa52bff6c0 Level-0 table #39: started -2023/12/01-13:59:53.280393 7faa52bff6c0 Level-0 table #39: 0 bytes OK -2023/12/01-13:59:53.317311 7faa52bff6c0 Delete type=0 #37 -2023/12/01-13:59:53.317504 7faa52bff6c0 Manual compaction at level-0 from '!folders!JlP90zkPvPcJDq0q' @ 72057594037927935 : 1 .. '!items!zjMDuxKHKJ4vE5UV' @ 0 : 0; will stop at (end) -2023/12/01-13:59:53.317532 7faa52bff6c0 Manual compaction at level-1 from '!folders!JlP90zkPvPcJDq0q' @ 72057594037927935 : 1 .. '!items!zjMDuxKHKJ4vE5UV' @ 0 : 0; will stop at (end) +2023/12/02-08:42:44.416036 7f78c67fc6c0 Recovering log #42 +2023/12/02-08:42:44.426686 7f78c67fc6c0 Delete type=3 #40 +2023/12/02-08:42:44.426819 7f78c67fc6c0 Delete type=0 #42 +2023/12/02-08:51:17.906775 7f78c57fa6c0 Level-0 table #47: started +2023/12/02-08:51:17.906841 7f78c57fa6c0 Level-0 table #47: 0 bytes OK +2023/12/02-08:51:17.947064 7f78c57fa6c0 Delete type=0 #45 +2023/12/02-08:51:17.969524 7f78c57fa6c0 Manual compaction at level-0 from '!folders!JlP90zkPvPcJDq0q' @ 72057594037927935 : 1 .. '!items!zjMDuxKHKJ4vE5UV' @ 0 : 0; will stop at (end) +2023/12/02-08:51:17.969562 7f78c57fa6c0 Manual compaction at level-1 from '!folders!JlP90zkPvPcJDq0q' @ 72057594037927935 : 1 .. '!items!zjMDuxKHKJ4vE5UV' @ 0 : 0; will stop at (end) diff --git a/packs/equipement/MANIFEST-000040 b/packs/equipement/MANIFEST-000048 similarity index 74% rename from packs/equipement/MANIFEST-000040 rename to packs/equipement/MANIFEST-000048 index 4a1ff52..60b3813 100644 Binary files a/packs/equipement/MANIFEST-000040 and b/packs/equipement/MANIFEST-000048 differ diff --git a/packs/heritages/000112.log b/packs/heritages/000120.log similarity index 100% rename from packs/heritages/000112.log rename to packs/heritages/000120.log diff --git a/packs/heritages/CURRENT b/packs/heritages/CURRENT index a451d53..7530019 100644 --- a/packs/heritages/CURRENT +++ b/packs/heritages/CURRENT @@ -1 +1 @@ -MANIFEST-000110 +MANIFEST-000118 diff --git a/packs/heritages/LOG b/packs/heritages/LOG index 7a355b2..9779818 100644 --- a/packs/heritages/LOG +++ b/packs/heritages/LOG @@ -1,8 +1,8 @@ -2023/12/01-14:01:31.626736 7face91fa6c0 Recovering log #108 -2023/12/01-14:01:31.637348 7face91fa6c0 Delete type=3 #106 -2023/12/01-14:01:31.637457 7face91fa6c0 Delete type=0 #108 -2023/12/01-14:02:58.867219 7faa52bff6c0 Level-0 table #113: started -2023/12/01-14:02:58.867259 7faa52bff6c0 Level-0 table #113: 0 bytes OK -2023/12/01-14:02:58.873501 7faa52bff6c0 Delete type=0 #111 -2023/12/01-14:02:58.880237 7faa52bff6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) -2023/12/01-14:02:58.880272 7faa52bff6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +2023/12/02-08:51:29.730107 7f78c77fe6c0 Recovering log #116 +2023/12/02-08:51:29.784863 7f78c77fe6c0 Delete type=3 #114 +2023/12/02-08:51:29.784945 7f78c77fe6c0 Delete type=0 #116 +2023/12/02-09:03:37.768298 7f78c57fa6c0 Level-0 table #121: started +2023/12/02-09:03:37.768372 7f78c57fa6c0 Level-0 table #121: 0 bytes OK +2023/12/02-09:03:37.811243 7f78c57fa6c0 Delete type=0 #119 +2023/12/02-09:03:37.849332 7f78c57fa6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +2023/12/02-09:03:37.849402 7f78c57fa6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) diff --git a/packs/heritages/LOG.old b/packs/heritages/LOG.old index 61ba0b8..c75357e 100644 --- a/packs/heritages/LOG.old +++ b/packs/heritages/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-13:53:39.455304 7face89f96c0 Recovering log #104 -2023/12/01-13:53:39.465228 7face89f96c0 Delete type=3 #102 -2023/12/01-13:53:39.465278 7face89f96c0 Delete type=0 #104 -2023/12/01-13:59:52.988050 7faa52bff6c0 Level-0 table #109: started -2023/12/01-13:59:52.988087 7faa52bff6c0 Level-0 table #109: 0 bytes OK -2023/12/01-13:59:53.032097 7faa52bff6c0 Delete type=0 #107 -2023/12/01-13:59:53.105940 7faa52bff6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) -2023/12/01-13:59:53.167051 7faa52bff6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +2023/12/02-08:42:44.342271 7f78c5ffb6c0 Recovering log #112 +2023/12/02-08:42:44.352667 7f78c5ffb6c0 Delete type=3 #110 +2023/12/02-08:42:44.352759 7f78c5ffb6c0 Delete type=0 #112 +2023/12/02-08:51:17.727952 7f78c57fa6c0 Level-0 table #117: started +2023/12/02-08:51:17.728001 7f78c57fa6c0 Level-0 table #117: 0 bytes OK +2023/12/02-08:51:17.752694 7f78c57fa6c0 Delete type=0 #115 +2023/12/02-08:51:17.752885 7f78c57fa6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +2023/12/02-08:51:17.752927 7f78c57fa6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) diff --git a/packs/heritages/MANIFEST-000110 b/packs/heritages/MANIFEST-000118 similarity index 73% rename from packs/heritages/MANIFEST-000110 rename to packs/heritages/MANIFEST-000118 index 3862989..4caa658 100644 Binary files a/packs/heritages/MANIFEST-000110 and b/packs/heritages/MANIFEST-000118 differ diff --git a/packs/metiers/000112.log b/packs/metiers/000120.log similarity index 100% rename from packs/metiers/000112.log rename to packs/metiers/000120.log diff --git a/packs/metiers/CURRENT b/packs/metiers/CURRENT index a451d53..7530019 100644 --- a/packs/metiers/CURRENT +++ b/packs/metiers/CURRENT @@ -1 +1 @@ -MANIFEST-000110 +MANIFEST-000118 diff --git a/packs/metiers/LOG b/packs/metiers/LOG index 9372822..ccfe4c6 100644 --- a/packs/metiers/LOG +++ b/packs/metiers/LOG @@ -1,8 +1,8 @@ -2023/12/01-14:01:31.639020 7face89f96c0 Recovering log #108 -2023/12/01-14:01:31.648871 7face89f96c0 Delete type=3 #106 -2023/12/01-14:01:31.648946 7face89f96c0 Delete type=0 #108 -2023/12/01-14:02:58.873626 7faa52bff6c0 Level-0 table #113: started -2023/12/01-14:02:58.873648 7faa52bff6c0 Level-0 table #113: 0 bytes OK -2023/12/01-14:02:58.880148 7faa52bff6c0 Delete type=0 #111 -2023/12/01-14:02:58.880265 7faa52bff6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) -2023/12/01-14:02:58.880278 7faa52bff6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +2023/12/02-08:51:29.787548 7f78c5ffb6c0 Recovering log #116 +2023/12/02-08:51:29.842272 7f78c5ffb6c0 Delete type=3 #114 +2023/12/02-08:51:29.842443 7f78c5ffb6c0 Delete type=0 #116 +2023/12/02-09:03:37.811443 7f78c57fa6c0 Level-0 table #121: started +2023/12/02-09:03:37.811506 7f78c57fa6c0 Level-0 table #121: 0 bytes OK +2023/12/02-09:03:37.849107 7f78c57fa6c0 Delete type=0 #119 +2023/12/02-09:03:37.849369 7f78c57fa6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +2023/12/02-09:03:37.849421 7f78c57fa6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) diff --git a/packs/metiers/LOG.old b/packs/metiers/LOG.old index d5927a0..64aa07f 100644 --- a/packs/metiers/LOG.old +++ b/packs/metiers/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-13:53:39.468222 7facd37fe6c0 Recovering log #104 -2023/12/01-13:53:39.478045 7facd37fe6c0 Delete type=3 #102 -2023/12/01-13:53:39.478100 7facd37fe6c0 Delete type=0 #104 -2023/12/01-13:59:53.074479 7faa52bff6c0 Level-0 table #109: started -2023/12/01-13:59:53.074531 7faa52bff6c0 Level-0 table #109: 0 bytes OK -2023/12/01-13:59:53.105798 7faa52bff6c0 Delete type=0 #107 -2023/12/01-13:59:53.105987 7faa52bff6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) -2023/12/01-13:59:53.167073 7faa52bff6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +2023/12/02-08:42:44.356097 7f78c67fc6c0 Recovering log #112 +2023/12/02-08:42:44.366888 7f78c67fc6c0 Delete type=3 #110 +2023/12/02-08:42:44.367238 7f78c67fc6c0 Delete type=0 #112 +2023/12/02-08:51:17.753036 7f78c57fa6c0 Level-0 table #117: started +2023/12/02-08:51:17.753102 7f78c57fa6c0 Level-0 table #117: 0 bytes OK +2023/12/02-08:51:17.782363 7f78c57fa6c0 Delete type=0 #115 +2023/12/02-08:51:17.875696 7f78c57fa6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +2023/12/02-08:51:17.875784 7f78c57fa6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) diff --git a/packs/metiers/MANIFEST-000110 b/packs/metiers/MANIFEST-000118 similarity index 73% rename from packs/metiers/MANIFEST-000110 rename to packs/metiers/MANIFEST-000118 index 119051e..faf0fcf 100644 Binary files a/packs/metiers/MANIFEST-000110 and b/packs/metiers/MANIFEST-000118 differ diff --git a/packs/origines/000113.log b/packs/origines/000121.log similarity index 100% rename from packs/origines/000113.log rename to packs/origines/000121.log diff --git a/packs/origines/CURRENT b/packs/origines/CURRENT index 0e66324..8880a30 100644 --- a/packs/origines/CURRENT +++ b/packs/origines/CURRENT @@ -1 +1 @@ -MANIFEST-000111 +MANIFEST-000119 diff --git a/packs/origines/LOG b/packs/origines/LOG index 133d941..e6f2054 100644 --- a/packs/origines/LOG +++ b/packs/origines/LOG @@ -1,8 +1,8 @@ -2023/12/01-14:01:31.614253 7facd3fff6c0 Recovering log #109 -2023/12/01-14:01:31.623933 7facd3fff6c0 Delete type=3 #107 -2023/12/01-14:01:31.624011 7facd3fff6c0 Delete type=0 #109 -2023/12/01-14:02:58.860374 7faa52bff6c0 Level-0 table #114: started -2023/12/01-14:02:58.860398 7faa52bff6c0 Level-0 table #114: 0 bytes OK -2023/12/01-14:02:58.867039 7faa52bff6c0 Delete type=0 #112 -2023/12/01-14:02:58.873616 7faa52bff6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) -2023/12/01-14:02:58.880257 7faa52bff6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/12/02-08:51:29.664329 7f78c6ffd6c0 Recovering log #117 +2023/12/02-08:51:29.726497 7f78c6ffd6c0 Delete type=3 #115 +2023/12/02-08:51:29.726587 7f78c6ffd6c0 Delete type=0 #117 +2023/12/02-09:03:37.724445 7f78c57fa6c0 Level-0 table #122: started +2023/12/02-09:03:37.724494 7f78c57fa6c0 Level-0 table #122: 0 bytes OK +2023/12/02-09:03:37.768076 7f78c57fa6c0 Delete type=0 #120 +2023/12/02-09:03:37.849309 7f78c57fa6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/12/02-09:03:37.849384 7f78c57fa6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) diff --git a/packs/origines/LOG.old b/packs/origines/LOG.old index 3db0a0f..653fedc 100644 --- a/packs/origines/LOG.old +++ b/packs/origines/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-13:53:39.441816 7facd3fff6c0 Recovering log #105 -2023/12/01-13:53:39.451617 7facd3fff6c0 Delete type=3 #103 -2023/12/01-13:53:39.451709 7facd3fff6c0 Delete type=0 #105 -2023/12/01-13:59:53.032302 7faa52bff6c0 Level-0 table #110: started -2023/12/01-13:59:53.032354 7faa52bff6c0 Level-0 table #110: 0 bytes OK -2023/12/01-13:59:53.074270 7faa52bff6c0 Delete type=0 #108 -2023/12/01-13:59:53.105970 7faa52bff6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) -2023/12/01-13:59:53.167064 7faa52bff6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/12/02-08:42:44.326574 7f78c77fe6c0 Recovering log #113 +2023/12/02-08:42:44.337267 7f78c77fe6c0 Delete type=3 #111 +2023/12/02-08:42:44.337357 7f78c77fe6c0 Delete type=0 #113 +2023/12/02-08:51:17.693658 7f78c57fa6c0 Level-0 table #118: started +2023/12/02-08:51:17.693712 7f78c57fa6c0 Level-0 table #118: 0 bytes OK +2023/12/02-08:51:17.727696 7f78c57fa6c0 Delete type=0 #116 +2023/12/02-08:51:17.752843 7f78c57fa6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/12/02-08:51:17.752897 7f78c57fa6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) diff --git a/packs/origines/MANIFEST-000111 b/packs/origines/MANIFEST-000119 similarity index 80% rename from packs/origines/MANIFEST-000111 rename to packs/origines/MANIFEST-000119 index 78ac515..2b26f07 100644 Binary files a/packs/origines/MANIFEST-000111 and b/packs/origines/MANIFEST-000119 differ diff --git a/packs/pouvoirs/000029.log b/packs/pouvoirs/000037.log similarity index 100% rename from packs/pouvoirs/000029.log rename to packs/pouvoirs/000037.log diff --git a/packs/pouvoirs/CURRENT b/packs/pouvoirs/CURRENT index 3bf5164..29a53d8 100644 --- a/packs/pouvoirs/CURRENT +++ b/packs/pouvoirs/CURRENT @@ -1 +1 @@ -MANIFEST-000027 +MANIFEST-000035 diff --git a/packs/pouvoirs/LOG b/packs/pouvoirs/LOG index 259123b..74c2797 100644 --- a/packs/pouvoirs/LOG +++ b/packs/pouvoirs/LOG @@ -1,8 +1,8 @@ -2023/12/01-14:01:31.602177 7facd37fe6c0 Recovering log #24 -2023/12/01-14:01:31.611466 7facd37fe6c0 Delete type=3 #22 -2023/12/01-14:01:31.611526 7facd37fe6c0 Delete type=0 #24 -2023/12/01-14:02:58.854147 7faa52bff6c0 Level-0 table #30: started -2023/12/01-14:02:58.854179 7faa52bff6c0 Level-0 table #30: 0 bytes OK -2023/12/01-14:02:58.860296 7faa52bff6c0 Delete type=0 #28 -2023/12/01-14:02:58.873604 7faa52bff6c0 Manual compaction at level-0 from '!folders!9W8gPB3T9u9dGfXl' @ 72057594037927935 : 1 .. '!items!zew9hPVdne6w1FFv' @ 0 : 0; will stop at (end) -2023/12/01-14:02:58.880248 7faa52bff6c0 Manual compaction at level-1 from '!folders!9W8gPB3T9u9dGfXl' @ 72057594037927935 : 1 .. '!items!zew9hPVdne6w1FFv' @ 0 : 0; will stop at (end) +2023/12/02-08:51:29.579667 7f78c67fc6c0 Recovering log #33 +2023/12/02-08:51:29.659353 7f78c67fc6c0 Delete type=3 #31 +2023/12/02-08:51:29.659487 7f78c67fc6c0 Delete type=0 #33 +2023/12/02-09:03:37.691401 7f78c57fa6c0 Level-0 table #38: started +2023/12/02-09:03:37.691476 7f78c57fa6c0 Level-0 table #38: 0 bytes OK +2023/12/02-09:03:37.723839 7f78c57fa6c0 Delete type=0 #36 +2023/12/02-09:03:37.811417 7f78c57fa6c0 Manual compaction at level-0 from '!folders!9W8gPB3T9u9dGfXl' @ 72057594037927935 : 1 .. '!items!zew9hPVdne6w1FFv' @ 0 : 0; will stop at (end) +2023/12/02-09:03:37.849353 7f78c57fa6c0 Manual compaction at level-1 from '!folders!9W8gPB3T9u9dGfXl' @ 72057594037927935 : 1 .. '!items!zew9hPVdne6w1FFv' @ 0 : 0; will stop at (end) diff --git a/packs/pouvoirs/LOG.old b/packs/pouvoirs/LOG.old index f299a6c..af7f8e3 100644 --- a/packs/pouvoirs/LOG.old +++ b/packs/pouvoirs/LOG.old @@ -1,15 +1,8 @@ -2023/12/01-13:53:39.428530 7face91fa6c0 Recovering log #20 -2023/12/01-13:53:39.438733 7face91fa6c0 Delete type=3 #18 -2023/12/01-13:53:39.438827 7face91fa6c0 Delete type=0 #20 -2023/12/01-13:59:52.933303 7faa52bff6c0 Level-0 table #25: started -2023/12/01-13:59:52.950915 7faa52bff6c0 Level-0 table #25: 80038 bytes OK -2023/12/01-13:59:52.987594 7faa52bff6c0 Delete type=0 #23 -2023/12/01-13:59:53.105920 7faa52bff6c0 Manual compaction at level-0 from '!folders!9W8gPB3T9u9dGfXl' @ 72057594037927935 : 1 .. '!items!zew9hPVdne6w1FFv' @ 0 : 0; will stop at (end) -2023/12/01-13:59:53.106005 7faa52bff6c0 Manual compaction at level-1 from '!folders!9W8gPB3T9u9dGfXl' @ 72057594037927935 : 1 .. '!items!zew9hPVdne6w1FFv' @ 0 : 0; will stop at '!items!zew9hPVdne6w1FFv' @ 128 : 1 -2023/12/01-13:59:53.106015 7faa52bff6c0 Compacting 1@1 + 1@2 files -2023/12/01-13:59:53.125156 7faa52bff6c0 Generated table #26@1: 109 keys, 80038 bytes -2023/12/01-13:59:53.125182 7faa52bff6c0 Compacted 1@1 + 1@2 files => 80038 bytes -2023/12/01-13:59:53.166759 7faa52bff6c0 compacted to: files[ 0 0 1 0 0 0 0 ] -2023/12/01-13:59:53.166870 7faa52bff6c0 Delete type=2 #5 -2023/12/01-13:59:53.166982 7faa52bff6c0 Delete type=2 #25 -2023/12/01-13:59:53.167081 7faa52bff6c0 Manual compaction at level-1 from '!items!zew9hPVdne6w1FFv' @ 128 : 1 .. '!items!zew9hPVdne6w1FFv' @ 0 : 0; will stop at (end) +2023/12/02-08:42:44.310445 7f78c6ffd6c0 Recovering log #29 +2023/12/02-08:42:44.321462 7f78c6ffd6c0 Delete type=3 #27 +2023/12/02-08:42:44.321559 7f78c6ffd6c0 Delete type=0 #29 +2023/12/02-08:51:17.673498 7f78c57fa6c0 Level-0 table #34: started +2023/12/02-08:51:17.673593 7f78c57fa6c0 Level-0 table #34: 0 bytes OK +2023/12/02-08:51:17.693433 7f78c57fa6c0 Delete type=0 #32 +2023/12/02-08:51:17.727930 7f78c57fa6c0 Manual compaction at level-0 from '!folders!9W8gPB3T9u9dGfXl' @ 72057594037927935 : 1 .. '!items!zew9hPVdne6w1FFv' @ 0 : 0; will stop at (end) +2023/12/02-08:51:17.752872 7f78c57fa6c0 Manual compaction at level-1 from '!folders!9W8gPB3T9u9dGfXl' @ 72057594037927935 : 1 .. '!items!zew9hPVdne6w1FFv' @ 0 : 0; will stop at (end) diff --git a/packs/pouvoirs/MANIFEST-000027 b/packs/pouvoirs/MANIFEST-000035 similarity index 73% rename from packs/pouvoirs/MANIFEST-000027 rename to packs/pouvoirs/MANIFEST-000035 index e6c8665..52c8726 100644 Binary files a/packs/pouvoirs/MANIFEST-000027 and b/packs/pouvoirs/MANIFEST-000035 differ diff --git a/packs/protection/000149.log b/packs/protection/000157.log similarity index 100% rename from packs/protection/000149.log rename to packs/protection/000157.log diff --git a/packs/protection/CURRENT b/packs/protection/CURRENT index 1021bdc..53dc731 100644 --- a/packs/protection/CURRENT +++ b/packs/protection/CURRENT @@ -1 +1 @@ -MANIFEST-000147 +MANIFEST-000155 diff --git a/packs/protection/LOG b/packs/protection/LOG index 1f8fadf..e95ad4b 100644 --- a/packs/protection/LOG +++ b/packs/protection/LOG @@ -1,8 +1,8 @@ -2023/12/01-14:01:31.675150 7face91fa6c0 Recovering log #145 -2023/12/01-14:01:31.685370 7face91fa6c0 Delete type=3 #143 -2023/12/01-14:01:31.685464 7face91fa6c0 Delete type=0 #145 -2023/12/01-14:02:58.880376 7faa52bff6c0 Level-0 table #150: started -2023/12/01-14:02:58.880453 7faa52bff6c0 Level-0 table #150: 0 bytes OK -2023/12/01-14:02:58.886483 7faa52bff6c0 Delete type=0 #148 -2023/12/01-14:02:58.906621 7faa52bff6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) -2023/12/01-14:02:58.906687 7faa52bff6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/12/02-08:51:29.962121 7f78c6ffd6c0 Recovering log #153 +2023/12/02-08:51:30.029029 7f78c6ffd6c0 Delete type=3 #151 +2023/12/02-08:51:30.029178 7f78c6ffd6c0 Delete type=0 #153 +2023/12/02-09:03:37.893808 7f78c57fa6c0 Level-0 table #158: started +2023/12/02-09:03:37.893864 7f78c57fa6c0 Level-0 table #158: 0 bytes OK +2023/12/02-09:03:37.929966 7f78c57fa6c0 Delete type=0 #156 +2023/12/02-09:03:38.062529 7f78c57fa6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/12/02-09:03:38.062592 7f78c57fa6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) diff --git a/packs/protection/LOG.old b/packs/protection/LOG.old index 7352e8f..e5759b6 100644 --- a/packs/protection/LOG.old +++ b/packs/protection/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-13:53:39.508151 7face89f96c0 Recovering log #141 -2023/12/01-13:53:39.518413 7face89f96c0 Delete type=3 #139 -2023/12/01-13:53:39.518484 7face89f96c0 Delete type=0 #141 -2023/12/01-13:59:53.237155 7faa52bff6c0 Level-0 table #146: started -2023/12/01-13:59:53.237188 7faa52bff6c0 Level-0 table #146: 0 bytes OK -2023/12/01-13:59:53.280148 7faa52bff6c0 Delete type=0 #144 -2023/12/01-13:59:53.317487 7faa52bff6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) -2023/12/01-13:59:53.317541 7faa52bff6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/12/02-08:42:44.401530 7f78c5ffb6c0 Recovering log #149 +2023/12/02-08:42:44.412735 7f78c5ffb6c0 Delete type=3 #147 +2023/12/02-08:42:44.412878 7f78c5ffb6c0 Delete type=0 #149 +2023/12/02-08:51:17.845739 7f78c57fa6c0 Level-0 table #154: started +2023/12/02-08:51:17.845793 7f78c57fa6c0 Level-0 table #154: 0 bytes OK +2023/12/02-08:51:17.875464 7f78c57fa6c0 Delete type=0 #152 +2023/12/02-08:51:17.875767 7f78c57fa6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/12/02-08:51:17.875851 7f78c57fa6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) diff --git a/packs/protection/MANIFEST-000147 b/packs/protection/MANIFEST-000155 similarity index 76% rename from packs/protection/MANIFEST-000147 rename to packs/protection/MANIFEST-000155 index c1e0578..c8fca92 100644 Binary files a/packs/protection/MANIFEST-000147 and b/packs/protection/MANIFEST-000155 differ diff --git a/packs/scenes/000088.log b/packs/scenes/000096.log similarity index 100% rename from packs/scenes/000088.log rename to packs/scenes/000096.log diff --git a/packs/scenes/CURRENT b/packs/scenes/CURRENT index a43fb19..0ab25fa 100644 --- a/packs/scenes/CURRENT +++ b/packs/scenes/CURRENT @@ -1 +1 @@ -MANIFEST-000086 +MANIFEST-000094 diff --git a/packs/scenes/LOG b/packs/scenes/LOG index bd0b577..ba7326f 100644 --- a/packs/scenes/LOG +++ b/packs/scenes/LOG @@ -1,7 +1,7 @@ -2023/12/01-14:01:31.712005 7facd3fff6c0 Recovering log #84 -2023/12/01-14:01:31.722434 7facd3fff6c0 Delete type=3 #82 -2023/12/01-14:01:31.722487 7facd3fff6c0 Delete type=0 #84 -2023/12/01-14:02:58.906829 7faa52bff6c0 Level-0 table #89: started -2023/12/01-14:02:58.906889 7faa52bff6c0 Level-0 table #89: 0 bytes OK -2023/12/01-14:02:58.914249 7faa52bff6c0 Delete type=0 #87 -2023/12/01-14:02:58.920445 7faa52bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/12/02-08:51:30.143235 7f78c67fc6c0 Recovering log #92 +2023/12/02-08:51:30.194801 7f78c67fc6c0 Delete type=3 #90 +2023/12/02-08:51:30.194953 7f78c67fc6c0 Delete type=0 #92 +2023/12/02-09:03:38.062740 7f78c57fa6c0 Level-0 table #97: started +2023/12/02-09:03:38.062788 7f78c57fa6c0 Level-0 table #97: 0 bytes OK +2023/12/02-09:03:38.124529 7f78c57fa6c0 Delete type=0 #95 +2023/12/02-09:03:38.613587 7f78c57fa6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/LOG.old b/packs/scenes/LOG.old index 7865746..15211a2 100644 --- a/packs/scenes/LOG.old +++ b/packs/scenes/LOG.old @@ -1,7 +1,7 @@ -2023/12/01-13:53:39.595199 7facd3fff6c0 Recovering log #80 -2023/12/01-13:53:39.604901 7facd3fff6c0 Delete type=3 #78 -2023/12/01-13:53:39.604956 7facd3fff6c0 Delete type=0 #80 -2023/12/01-13:59:53.354986 7faa52bff6c0 Level-0 table #85: started -2023/12/01-13:59:53.355010 7faa52bff6c0 Level-0 table #85: 0 bytes OK -2023/12/01-13:59:53.424142 7faa52bff6c0 Delete type=0 #83 -2023/12/01-13:59:53.424248 7faa52bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/12/02-08:42:44.446230 7f78c77fe6c0 Recovering log #88 +2023/12/02-08:42:44.457608 7f78c77fe6c0 Delete type=3 #86 +2023/12/02-08:42:44.457729 7f78c77fe6c0 Delete type=0 #88 +2023/12/02-08:51:17.947345 7f78c57fa6c0 Level-0 table #93: started +2023/12/02-08:51:17.947408 7f78c57fa6c0 Level-0 table #93: 0 bytes OK +2023/12/02-08:51:17.968940 7f78c57fa6c0 Delete type=0 #91 +2023/12/02-08:51:17.969544 7f78c57fa6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/MANIFEST-000086 b/packs/scenes/MANIFEST-000086 deleted file mode 100644 index 6ddee89..0000000 Binary files a/packs/scenes/MANIFEST-000086 and /dev/null differ diff --git a/packs/scenes/MANIFEST-000094 b/packs/scenes/MANIFEST-000094 new file mode 100644 index 0000000..d063e4c Binary files /dev/null and b/packs/scenes/MANIFEST-000094 differ diff --git a/packs/skills/000149.log b/packs/skills/000157.log similarity index 100% rename from packs/skills/000149.log rename to packs/skills/000157.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index 1021bdc..53dc731 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000147 +MANIFEST-000155 diff --git a/packs/skills/LOG b/packs/skills/LOG index 2d9bb4b..2b8c063 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,8 @@ -2023/12/01-14:01:31.589948 7face89f96c0 Recovering log #145 -2023/12/01-14:01:31.600115 7face89f96c0 Delete type=3 #143 -2023/12/01-14:01:31.600196 7face89f96c0 Delete type=0 #145 -2023/12/01-14:02:58.831814 7faa52bff6c0 Level-0 table #150: started -2023/12/01-14:02:58.831844 7faa52bff6c0 Level-0 table #150: 0 bytes OK -2023/12/01-14:02:58.837662 7faa52bff6c0 Delete type=0 #148 -2023/12/01-14:02:58.843878 7faa52bff6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/12/01-14:02:58.843906 7faa52bff6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/02-08:51:29.525902 7f78c5ffb6c0 Recovering log #153 +2023/12/02-08:51:29.575506 7f78c5ffb6c0 Delete type=3 #151 +2023/12/02-08:51:29.575594 7f78c5ffb6c0 Delete type=0 #153 +2023/12/02-09:03:37.590262 7f78c57fa6c0 Level-0 table #158: started +2023/12/02-09:03:37.590331 7f78c57fa6c0 Level-0 table #158: 0 bytes OK +2023/12/02-09:03:37.622631 7f78c57fa6c0 Delete type=0 #156 +2023/12/02-09:03:37.622884 7f78c57fa6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/02-09:03:37.691353 7f78c57fa6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) diff --git a/packs/skills/LOG.old b/packs/skills/LOG.old index 3a0f3b7..cc78e33 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-13:53:39.415677 7facd37fe6c0 Recovering log #141 -2023/12/01-13:53:39.425756 7facd37fe6c0 Delete type=3 #139 -2023/12/01-13:53:39.425846 7facd37fe6c0 Delete type=0 #141 -2023/12/01-13:59:52.777793 7faa52bff6c0 Level-0 table #146: started -2023/12/01-13:59:52.777856 7faa52bff6c0 Level-0 table #146: 0 bytes OK -2023/12/01-13:59:52.814639 7faa52bff6c0 Delete type=0 #144 -2023/12/01-13:59:52.933047 7faa52bff6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/12/01-13:59:52.933139 7faa52bff6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/02-08:42:44.296865 7f78c67fc6c0 Recovering log #149 +2023/12/02-08:42:44.307148 7f78c67fc6c0 Delete type=3 #147 +2023/12/02-08:42:44.307236 7f78c67fc6c0 Delete type=0 #149 +2023/12/02-08:51:17.633133 7f78c57fa6c0 Level-0 table #154: started +2023/12/02-08:51:17.633180 7f78c57fa6c0 Level-0 table #154: 0 bytes OK +2023/12/02-08:51:17.673194 7f78c57fa6c0 Delete type=0 #152 +2023/12/02-08:51:17.727906 7f78c57fa6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/12/02-08:51:17.752858 7f78c57fa6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) diff --git a/packs/skills/MANIFEST-000147 b/packs/skills/MANIFEST-000155 similarity index 74% rename from packs/skills/MANIFEST-000147 rename to packs/skills/MANIFEST-000155 index db18563..1eb8e04 100644 Binary files a/packs/skills/MANIFEST-000147 and b/packs/skills/MANIFEST-000155 differ diff --git a/packs/tables/000148.log b/packs/tables/000156.log similarity index 100% rename from packs/tables/000148.log rename to packs/tables/000156.log diff --git a/packs/tables/CURRENT b/packs/tables/CURRENT index ffd4a01..1ccaccd 100644 --- a/packs/tables/CURRENT +++ b/packs/tables/CURRENT @@ -1 +1 @@ -MANIFEST-000146 +MANIFEST-000154 diff --git a/packs/tables/LOG b/packs/tables/LOG index ef37095..06b0028 100644 --- a/packs/tables/LOG +++ b/packs/tables/LOG @@ -1,8 +1,8 @@ -2023/12/01-14:01:31.699537 7facd37fe6c0 Recovering log #144 -2023/12/01-14:01:31.709639 7facd37fe6c0 Delete type=3 #142 -2023/12/01-14:01:31.709701 7facd37fe6c0 Delete type=0 #144 -2023/12/01-14:02:58.914354 7faa52bff6c0 Level-0 table #149: started -2023/12/01-14:02:58.914378 7faa52bff6c0 Level-0 table #149: 0 bytes OK -2023/12/01-14:02:58.920351 7faa52bff6c0 Delete type=0 #147 -2023/12/01-14:02:58.920455 7faa52bff6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) -2023/12/01-14:02:58.920470 7faa52bff6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/12/02-08:51:30.078494 7f78c77fe6c0 Recovering log #152 +2023/12/02-08:51:30.138898 7f78c77fe6c0 Delete type=3 #150 +2023/12/02-08:51:30.139008 7f78c77fe6c0 Delete type=0 #152 +2023/12/02-09:03:38.124767 7f78c57fa6c0 Level-0 table #157: started +2023/12/02-09:03:38.124827 7f78c57fa6c0 Level-0 table #157: 0 bytes OK +2023/12/02-09:03:38.613128 7f78c57fa6c0 Delete type=0 #155 +2023/12/02-09:03:38.613630 7f78c57fa6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/12/02-09:03:38.613696 7f78c57fa6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) diff --git a/packs/tables/LOG.old b/packs/tables/LOG.old index 73011d2..1c2a816 100644 --- a/packs/tables/LOG.old +++ b/packs/tables/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-13:53:39.581116 7face91fa6c0 Recovering log #140 -2023/12/01-13:53:39.591862 7face91fa6c0 Delete type=3 #138 -2023/12/01-13:53:39.591949 7face91fa6c0 Delete type=0 #140 -2023/12/01-13:59:53.317612 7faa52bff6c0 Level-0 table #145: started -2023/12/01-13:59:53.317640 7faa52bff6c0 Level-0 table #145: 0 bytes OK -2023/12/01-13:59:53.354885 7faa52bff6c0 Delete type=0 #143 -2023/12/01-13:59:53.424238 7faa52bff6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) -2023/12/01-13:59:53.424262 7faa52bff6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/12/02-08:42:44.430802 7f78c6ffd6c0 Recovering log #148 +2023/12/02-08:42:44.441587 7f78c6ffd6c0 Delete type=3 #146 +2023/12/02-08:42:44.441707 7f78c6ffd6c0 Delete type=0 #148 +2023/12/02-08:51:17.875998 7f78c57fa6c0 Level-0 table #153: started +2023/12/02-08:51:17.876079 7f78c57fa6c0 Level-0 table #153: 0 bytes OK +2023/12/02-08:51:17.906582 7f78c57fa6c0 Delete type=0 #151 +2023/12/02-08:51:17.969498 7f78c57fa6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/12/02-08:51:17.969585 7f78c57fa6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) diff --git a/packs/tables/MANIFEST-000146 b/packs/tables/MANIFEST-000154 similarity index 77% rename from packs/tables/MANIFEST-000146 rename to packs/tables/MANIFEST-000154 index 65a3b0f..111ead5 100644 Binary files a/packs/tables/MANIFEST-000146 and b/packs/tables/MANIFEST-000154 differ diff --git a/packs/tourscharmes/000057.log b/packs/tourscharmes/000065.log similarity index 100% rename from packs/tourscharmes/000057.log rename to packs/tourscharmes/000065.log diff --git a/packs/tourscharmes/CURRENT b/packs/tourscharmes/CURRENT index 8355b42..e8c0266 100644 --- a/packs/tourscharmes/CURRENT +++ b/packs/tourscharmes/CURRENT @@ -1 +1 @@ -MANIFEST-000055 +MANIFEST-000063 diff --git a/packs/tourscharmes/LOG b/packs/tourscharmes/LOG index c0db1f0..0ec4942 100644 --- a/packs/tourscharmes/LOG +++ b/packs/tourscharmes/LOG @@ -1,8 +1,8 @@ -2023/12/01-14:01:31.650984 7facd37fe6c0 Recovering log #53 -2023/12/01-14:01:31.661531 7facd37fe6c0 Delete type=3 #51 -2023/12/01-14:01:31.661635 7facd37fe6c0 Delete type=0 #53 -2023/12/01-14:02:58.900371 7faa52bff6c0 Level-0 table #58: started -2023/12/01-14:02:58.900395 7faa52bff6c0 Level-0 table #58: 0 bytes OK -2023/12/01-14:02:58.906443 7faa52bff6c0 Delete type=0 #56 -2023/12/01-14:02:58.906674 7faa52bff6c0 Manual compaction at level-0 from '!folders!ZlJO2XdIsLX1cdS5' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) -2023/12/01-14:02:58.906730 7faa52bff6c0 Manual compaction at level-1 from '!folders!ZlJO2XdIsLX1cdS5' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) +2023/12/02-08:51:29.845813 7f78c77fe6c0 Recovering log #61 +2023/12/02-08:51:29.897886 7f78c77fe6c0 Delete type=3 #59 +2023/12/02-08:51:29.898047 7f78c77fe6c0 Delete type=0 #61 +2023/12/02-09:03:37.849611 7f78c57fa6c0 Level-0 table #66: started +2023/12/02-09:03:37.849656 7f78c57fa6c0 Level-0 table #66: 0 bytes OK +2023/12/02-09:03:37.893635 7f78c57fa6c0 Delete type=0 #64 +2023/12/02-09:03:38.062508 7f78c57fa6c0 Manual compaction at level-0 from '!folders!ZlJO2XdIsLX1cdS5' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) +2023/12/02-09:03:38.062577 7f78c57fa6c0 Manual compaction at level-1 from '!folders!ZlJO2XdIsLX1cdS5' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) diff --git a/packs/tourscharmes/LOG.old b/packs/tourscharmes/LOG.old index 597ad94..c8c0f10 100644 --- a/packs/tourscharmes/LOG.old +++ b/packs/tourscharmes/LOG.old @@ -1,8 +1,8 @@ -2023/12/01-13:53:39.480910 7face91fa6c0 Recovering log #49 -2023/12/01-13:53:39.490942 7face91fa6c0 Delete type=3 #47 -2023/12/01-13:53:39.491036 7face91fa6c0 Delete type=0 #49 -2023/12/01-13:59:53.198430 7faa52bff6c0 Level-0 table #54: started -2023/12/01-13:59:53.198486 7faa52bff6c0 Level-0 table #54: 0 bytes OK -2023/12/01-13:59:53.237011 7faa52bff6c0 Delete type=0 #52 -2023/12/01-13:59:53.317476 7faa52bff6c0 Manual compaction at level-0 from '!folders!ZlJO2XdIsLX1cdS5' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) -2023/12/01-13:59:53.317515 7faa52bff6c0 Manual compaction at level-1 from '!folders!ZlJO2XdIsLX1cdS5' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) +2023/12/02-08:42:44.371031 7f78c6ffd6c0 Recovering log #57 +2023/12/02-08:42:44.381725 7f78c6ffd6c0 Delete type=3 #55 +2023/12/02-08:42:44.381848 7f78c6ffd6c0 Delete type=0 #57 +2023/12/02-08:51:17.816310 7f78c57fa6c0 Level-0 table #62: started +2023/12/02-08:51:17.816350 7f78c57fa6c0 Level-0 table #62: 0 bytes OK +2023/12/02-08:51:17.845533 7f78c57fa6c0 Delete type=0 #60 +2023/12/02-08:51:17.875746 7f78c57fa6c0 Manual compaction at level-0 from '!folders!ZlJO2XdIsLX1cdS5' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) +2023/12/02-08:51:17.875819 7f78c57fa6c0 Manual compaction at level-1 from '!folders!ZlJO2XdIsLX1cdS5' @ 72057594037927935 : 1 .. '!items!y19w83YQyWRaabkv' @ 0 : 0; will stop at (end) diff --git a/packs/tourscharmes/MANIFEST-000055 b/packs/tourscharmes/MANIFEST-000063 similarity index 75% rename from packs/tourscharmes/MANIFEST-000055 rename to packs/tourscharmes/MANIFEST-000063 index b5de8f8..1cbb1b9 100644 Binary files a/packs/tourscharmes/MANIFEST-000055 and b/packs/tourscharmes/MANIFEST-000063 differ diff --git a/system.json b/system.json index 7e6c8f0..7c50e1e 100644 --- a/system.json +++ b/system.json @@ -1,7 +1,7 @@ { "id": "fvtt-wasteland", "description": "Wasteland RPG for FoundryVTT", - "version": "11.0.14", + "version": "11.0.15", "authors": [ { "name": "Uberwald/LeRatierBretonnien", @@ -23,7 +23,7 @@ "gridUnits": "m", "license": "LICENSE.txt", "manifest": "https://www.uberwald.me/gitea/public/fvtt-wasteland/raw/branch/main/system.json", - "download": "https://www.uberwald.me/gitea/public/fvtt-wasteland/archive/fvtt-wasteland-v11.0.14.zip", + "download": "https://www.uberwald.me/gitea/public/fvtt-wasteland/archive/fvtt-wasteland-v11.0.15.zip", "packs": [ { "type": "Item", diff --git a/template.json b/template.json index 479894a..796fa8d 100644 --- a/template.json +++ b/template.json @@ -1,7 +1,8 @@ { "Actor": { "types": [ - "personnage" + "personnage", + "creature" ], "templates": { "biodata": { @@ -15,6 +16,8 @@ "sexe": "", "yeux": "", "description": "", + "habitat": "", + "comportement": "", "psychemultiplier": 1, "notes": "", "gmnotes": "" @@ -95,9 +98,10 @@ "core" ] }, - "pnj": { + "creature": { "templates": [ - "npccore" + "biodata", + "core" ] } }, diff --git a/templates/creature-sheet.html b/templates/creature-sheet.html new file mode 100644 index 0000000..a1abbc5 --- /dev/null +++ b/templates/creature-sheet.html @@ -0,0 +1,288 @@ +
+ + {{!-- Sheet Header --}} +
+
+
+ +
+

+
+
+
+ + {{!-- Sheet Tab Navigation --}} + + + {{!-- Sheet Body --}} +
+ + {{!-- Main Tab --}} +
+ +
+ +
+
    + {{#each data.attributs as |attr key|}} +
  • + + {{attr.label}} + +
    • + {{/each}} +
+
+ +
+

Santé

+
    +
  • + + + + +
    • +
  • + + + + +
    • +
+ +

Combat

+
    +
  • + + + + +
    • +
  • + + + + +
    • +
  • + + + + +
    • +
  • + + + + +
    • +
+
+
+ +
+
    +
  • + +

    +     + + + + + + + + + +
     
    +
    + +
    +
    • + {{#each armes as |arme key|}} +
  • + + {{arme.name}} + + + {{#if arme.system.equipped}} + + {{else}} + + {{/if}} + + + {{#if arme.system.isdefense}} + + {{else}} + + {{/if}} + + + {{#if arme.system.equipped}} + + {{else}} + + {{/if}} + + +
     
    +
    + {{#if arme.system.equipped}}{{else}}{{/if}} + + +
    +
    • + {{/each}} +
+
+ +
+ +
+
    +
  • + +

    +     + + + +
     
    +
    • + {{#each skills as |skill key|}} +
  • + +
    + {{skill.name}} + + + + {{#each skill.system.predilections as |pred key|}} + {{pred.name}}, + {{/each}} + +
    + + + {{#if (ne skill.system.attribut1 "none")}} + + + + {{/if}} + {{#if (ne skill.system.attribut2 "none")}} + + + + {{/if}} + {{#if (ne skill.system.attribut3 "none")}} + + + + {{/if}} + +
     
    +
    + + +
    +
    • + {{/each}} +
+
+ +
+ +
+ + {{!-- Dons/Pactes Tab --}} +
+ +
+ +
+
    +
  • + +

    +     +
     
    +
    +
    +
    • + {{#each capacites as |capacite key|}} +
  • + + {{capacite.name}} +
     
    +
    + + +
    +
    • + {{/each}} +
+
+
+ +
+ + + {{!-- Biography Tab --}} +
+ + +

Description

+ +
+ {{editor description target="system.biodata.description" button=true owner=owner editable=editable}} +
+ + +

Habitat

+ +
+ {{editor habitat target="system.biodata.habitat" button=true owner=owner editable=editable}} +
+ + +

Comportement

+ +
+ {{editor comportement target="system.biodata.comportement" button=true owner=owner editable=editable}} +
+ +
+ +
+
\ No newline at end of file