diff --git a/modules/wasteland-actor-sheet.js b/modules/wasteland-actor-sheet.js index c6fd12b..7e63044 100644 --- a/modules/wasteland-actor-sheet.js +++ b/modules/wasteland-actor-sheet.js @@ -47,6 +47,7 @@ export class WastelandActorSheet extends ActorSheet { heritage: duplicate(this.actor.getHeritage() || {}), metier: duplicate(this.actor.getMetier() || {}), combat: this.actor.getCombatValues(), + config: duplicate(game.system.wasteland.config), equipements: duplicate(this.actor.getEquipments()), monnaies: duplicate(this.actor.getMonnaies()), description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}), diff --git a/modules/wasteland-config.js b/modules/wasteland-config.js new file mode 100644 index 0000000..ae8ae00 --- /dev/null +++ b/modules/wasteland-config.js @@ -0,0 +1,11 @@ +export const WASTELAND_CONFIG = { + + cheminpouvoir : { + "force": "Chemin des Forces", + "forge": "Chemin des Forges", + "echo": "Chemin des Échos", + "reflet": "Chemin des Reflets", + "ame": "Chemin des Âmes", + "mort": "Chemin des Morts" + } +} diff --git a/modules/wasteland-item-sheet.js b/modules/wasteland-item-sheet.js index 52b9590..e3e367e 100644 --- a/modules/wasteland-item-sheet.js +++ b/modules/wasteland-item-sheet.js @@ -59,19 +59,16 @@ export class WastelandItemSheet extends ItemSheet { editable: this.isEditable, cssClass: this.isEditable ? "editable" : "locked", attributs: WastelandUtility.getAttributs(), + config: duplicate(game.system.wasteland.config), data: itemData.system, + system: itemData.system, limited: this.object.limited, options: this.options, owner: this.document.isOwner, description: await TextEditor.enrichHTML(this.object.system.description, {async: true}), - mr: (this.object.type == 'specialisation'), isGM: game.user.isGM } - if ( objectData.type == "don") { - formData.sacrifice = await TextEditor.enrichHTML(this.object.system.sacrifice, {async: true}) - } - //this.options.editable = !(this.object.origin == "embeddedItem"); console.log("ITEM DATA", formData, this); return formData; } diff --git a/modules/wasteland-main.js b/modules/wasteland-main.js index 0284be5..2a83c6e 100644 --- a/modules/wasteland-main.js +++ b/modules/wasteland-main.js @@ -15,6 +15,7 @@ import { WastelandActorSheet } from "./wasteland-actor-sheet.js"; import { WastelandUtility } from "./wasteland-utility.js"; import { WastelandCombat } from "./wasteland-combat.js"; import { WastelandItem } from "./wasteland-item.js"; +import { WASTELAND_CONFIG } from "./wasteland-config.js"; /* -------------------------------------------- */ /* Foundry VTT Initialization */ @@ -27,7 +28,7 @@ Hooks.once("init", async function () { /* -------------------------------------------- */ // preload handlebars templates WastelandUtility.preloadHandlebarsTemplates(); - + /* -------------------------------------------- */ // Set an initiative formula for the system CONFIG.Combat.initiative = { @@ -45,7 +46,9 @@ Hooks.once("init", async function () { CONFIG.Combat.documentClass = WastelandCombat CONFIG.Actor.documentClass = WastelandActor CONFIG.Item.documentClass = WastelandItem - game.system.wasteland = { } + game.system.wasteland = { + config: WASTELAND_CONFIG + } /* -------------------------------------------- */ // Register sheet application classes diff --git a/packs/armes/000004.log b/packs/armes/000012.log similarity index 100% rename from packs/armes/000004.log rename to packs/armes/000012.log diff --git a/packs/armes/CURRENT b/packs/armes/CURRENT index 1a84852..3051f81 100644 --- a/packs/armes/CURRENT +++ b/packs/armes/CURRENT @@ -1 +1 @@ -MANIFEST-000002 +MANIFEST-000010 diff --git a/packs/armes/LOG b/packs/armes/LOG index 2acd2b1..9be7971 100644 --- a/packs/armes/LOG +++ b/packs/armes/LOG @@ -1,5 +1,8 @@ -2023/11/28-20:39:47.162893 7fef57fff6c0 Delete type=3 #1 -2023/11/28-20:44:56.323628 7fef56ffd6c0 Level-0 table #5: started -2023/11/28-20:44:56.327500 7fef56ffd6c0 Level-0 table #5: 7368 bytes OK -2023/11/28-20:44:56.334760 7fef56ffd6c0 Delete type=0 #3 -2023/11/28-20:44:56.341959 7fef56ffd6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/11/28-21:10:45.936814 7fef577fe6c0 Recovering log #8 +2023/11/28-21:10:45.999576 7fef577fe6c0 Delete type=3 #6 +2023/11/28-21:10:45.999713 7fef577fe6c0 Delete type=0 #8 +2023/11/28-21:42:12.890060 7fef56ffd6c0 Level-0 table #13: started +2023/11/28-21:42:12.890138 7fef56ffd6c0 Level-0 table #13: 0 bytes OK +2023/11/28-21:42:12.896649 7fef56ffd6c0 Delete type=0 #11 +2023/11/28-21:42:12.896958 7fef56ffd6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/11/28-21:42:12.896986 7fef56ffd6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) diff --git a/packs/armes/LOG.old b/packs/armes/LOG.old new file mode 100644 index 0000000..07ec71a --- /dev/null +++ b/packs/armes/LOG.old @@ -0,0 +1,8 @@ +2023/11/28-21:00:12.498801 7fef57fff6c0 Recovering log #4 +2023/11/28-21:00:12.509763 7fef57fff6c0 Delete type=3 #2 +2023/11/28-21:00:12.509888 7fef57fff6c0 Delete type=0 #4 +2023/11/28-21:10:40.936880 7fef56ffd6c0 Level-0 table #9: started +2023/11/28-21:10:40.936944 7fef56ffd6c0 Level-0 table #9: 0 bytes OK +2023/11/28-21:10:40.985508 7fef56ffd6c0 Delete type=0 #7 +2023/11/28-21:10:41.022162 7fef56ffd6c0 Manual compaction at level-0 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) +2023/11/28-21:10:41.022261 7fef56ffd6c0 Manual compaction at level-1 from '!items!0swiE8k5zfUIqmXu' @ 72057594037927935 : 1 .. '!items!wv5EiePmPTpqFutt' @ 0 : 0; will stop at (end) diff --git a/packs/armes/MANIFEST-000002 b/packs/armes/MANIFEST-000002 deleted file mode 100644 index bf80b88..0000000 Binary files a/packs/armes/MANIFEST-000002 and /dev/null differ diff --git a/packs/armes/MANIFEST-000010 b/packs/armes/MANIFEST-000010 new file mode 100644 index 0000000..c78bf10 Binary files /dev/null and b/packs/armes/MANIFEST-000010 differ diff --git a/packs/equipement/000064.log b/packs/equipement/000072.log similarity index 100% rename from packs/equipement/000064.log rename to packs/equipement/000072.log diff --git a/packs/equipement/CURRENT b/packs/equipement/CURRENT index 5ca571d..bcf1079 100644 --- a/packs/equipement/CURRENT +++ b/packs/equipement/CURRENT @@ -1 +1 @@ -MANIFEST-000062 +MANIFEST-000070 diff --git a/packs/equipement/LOG b/packs/equipement/LOG index caec161..f89d289 100644 --- a/packs/equipement/LOG +++ b/packs/equipement/LOG @@ -1,8 +1,8 @@ -2023/11/28-20:39:47.179721 7fef577fe6c0 Recovering log #60 -2023/11/28-20:39:47.190040 7fef577fe6c0 Delete type=3 #58 -2023/11/28-20:39:47.190196 7fef577fe6c0 Delete type=0 #60 -2023/11/28-20:44:56.342152 7fef56ffd6c0 Level-0 table #65: started -2023/11/28-20:44:56.342234 7fef56ffd6c0 Level-0 table #65: 0 bytes OK -2023/11/28-20:44:56.348651 7fef56ffd6c0 Delete type=0 #63 -2023/11/28-20:44:56.373930 7fef56ffd6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) -2023/11/28-20:44:56.374009 7fef56ffd6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/11/28-21:10:46.058402 7ff1ed3ff6c0 Recovering log #68 +2023/11/28-21:10:46.111323 7ff1ed3ff6c0 Delete type=3 #66 +2023/11/28-21:10:46.111419 7ff1ed3ff6c0 Delete type=0 #68 +2023/11/28-21:42:12.917832 7fef56ffd6c0 Level-0 table #73: started +2023/11/28-21:42:12.917864 7fef56ffd6c0 Level-0 table #73: 0 bytes OK +2023/11/28-21:42:12.924966 7fef56ffd6c0 Delete type=0 #71 +2023/11/28-21:42:12.925268 7fef56ffd6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/11/28-21:42:12.925315 7fef56ffd6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) diff --git a/packs/equipement/LOG.old b/packs/equipement/LOG.old index 9d74044..440285b 100644 --- a/packs/equipement/LOG.old +++ b/packs/equipement/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-07:15:12.876497 7fef577fe6c0 Recovering log #56 -2023/11/28-07:15:12.887664 7fef577fe6c0 Delete type=3 #54 -2023/11/28-07:15:12.887762 7fef577fe6c0 Delete type=0 #56 -2023/11/28-20:39:25.894820 7fef56ffd6c0 Level-0 table #61: started -2023/11/28-20:39:25.894893 7fef56ffd6c0 Level-0 table #61: 0 bytes OK -2023/11/28-20:39:25.901450 7fef56ffd6c0 Delete type=0 #59 -2023/11/28-20:39:25.908694 7fef56ffd6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) -2023/11/28-20:39:25.908762 7fef56ffd6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/11/28-21:00:12.528084 7ff1ed3ff6c0 Recovering log #64 +2023/11/28-21:00:12.538576 7ff1ed3ff6c0 Delete type=3 #62 +2023/11/28-21:00:12.538671 7ff1ed3ff6c0 Delete type=0 #64 +2023/11/28-21:10:41.022463 7fef56ffd6c0 Level-0 table #69: started +2023/11/28-21:10:41.022554 7fef56ffd6c0 Level-0 table #69: 0 bytes OK +2023/11/28-21:10:41.067253 7fef56ffd6c0 Delete type=0 #67 +2023/11/28-21:10:41.195905 7fef56ffd6c0 Manual compaction at level-0 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) +2023/11/28-21:10:41.196008 7fef56ffd6c0 Manual compaction at level-1 from '!items!1cZd2hlTV9tykDED' @ 72057594037927935 : 1 .. '!items!y47dBO3Mf5Pn7tOd' @ 0 : 0; will stop at (end) diff --git a/packs/equipement/MANIFEST-000062 b/packs/equipement/MANIFEST-000062 deleted file mode 100644 index e2eb59b..0000000 Binary files a/packs/equipement/MANIFEST-000062 and /dev/null differ diff --git a/packs/equipement/MANIFEST-000070 b/packs/equipement/MANIFEST-000070 new file mode 100644 index 0000000..b00c0c3 Binary files /dev/null and b/packs/equipement/MANIFEST-000070 differ diff --git a/packs/heritages/000028.log b/packs/heritages/000036.log similarity index 100% rename from packs/heritages/000028.log rename to packs/heritages/000036.log diff --git a/packs/heritages/CURRENT b/packs/heritages/CURRENT index 8b15215..eea9b0f 100644 --- a/packs/heritages/CURRENT +++ b/packs/heritages/CURRENT @@ -1 +1 @@ -MANIFEST-000026 +MANIFEST-000034 diff --git a/packs/heritages/LOG b/packs/heritages/LOG index 974ad50..027673d 100644 --- a/packs/heritages/LOG +++ b/packs/heritages/LOG @@ -1,8 +1,8 @@ -2023/11/28-20:39:47.117834 7fef577fe6c0 Recovering log #24 -2023/11/28-20:39:47.129810 7fef577fe6c0 Delete type=3 #22 -2023/11/28-20:39:47.129988 7fef577fe6c0 Delete type=0 #24 -2023/11/28-20:44:56.316585 7fef56ffd6c0 Level-0 table #29: started -2023/11/28-20:44:56.316623 7fef56ffd6c0 Level-0 table #29: 0 bytes OK -2023/11/28-20:44:56.323468 7fef56ffd6c0 Delete type=0 #27 -2023/11/28-20:44:56.334960 7fef56ffd6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) -2023/11/28-20:44:56.341983 7fef56ffd6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +2023/11/28-21:10:45.818129 7ff1ed3ff6c0 Recovering log #32 +2023/11/28-21:10:45.876594 7ff1ed3ff6c0 Delete type=3 #30 +2023/11/28-21:10:45.876699 7ff1ed3ff6c0 Delete type=0 #32 +2023/11/28-21:42:12.869213 7fef56ffd6c0 Level-0 table #37: started +2023/11/28-21:42:12.869236 7fef56ffd6c0 Level-0 table #37: 0 bytes OK +2023/11/28-21:42:12.875326 7fef56ffd6c0 Delete type=0 #35 +2023/11/28-21:42:12.896758 7fef56ffd6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +2023/11/28-21:42:12.896965 7fef56ffd6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) diff --git a/packs/heritages/LOG.old b/packs/heritages/LOG.old index aa702e5..3dbb849 100644 --- a/packs/heritages/LOG.old +++ b/packs/heritages/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-07:15:12.817776 7fef577fe6c0 Recovering log #20 -2023/11/28-07:15:12.829998 7fef577fe6c0 Delete type=3 #18 -2023/11/28-07:15:12.830086 7fef577fe6c0 Delete type=0 #20 -2023/11/28-20:39:25.873380 7fef56ffd6c0 Level-0 table #25: started -2023/11/28-20:39:25.873446 7fef56ffd6c0 Level-0 table #25: 0 bytes OK -2023/11/28-20:39:25.879728 7fef56ffd6c0 Delete type=0 #23 -2023/11/28-20:39:25.887095 7fef56ffd6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) -2023/11/28-20:39:25.887190 7fef56ffd6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +2023/11/28-21:00:12.469089 7ff1ed3ff6c0 Recovering log #28 +2023/11/28-21:00:12.481019 7ff1ed3ff6c0 Delete type=3 #26 +2023/11/28-21:00:12.481137 7ff1ed3ff6c0 Delete type=0 #28 +2023/11/28-21:10:40.899330 7fef56ffd6c0 Level-0 table #33: started +2023/11/28-21:10:40.899404 7fef56ffd6c0 Level-0 table #33: 0 bytes OK +2023/11/28-21:10:40.936638 7fef56ffd6c0 Delete type=0 #31 +2023/11/28-21:10:41.022137 7fef56ffd6c0 Manual compaction at level-0 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) +2023/11/28-21:10:41.022238 7fef56ffd6c0 Manual compaction at level-1 from '!items!276PAK1VR5LK4rbE' @ 72057594037927935 : 1 .. '!items!nYYX7rtSMGFO4xVY' @ 0 : 0; will stop at (end) diff --git a/packs/heritages/MANIFEST-000026 b/packs/heritages/MANIFEST-000034 similarity index 73% rename from packs/heritages/MANIFEST-000026 rename to packs/heritages/MANIFEST-000034 index c1ec185..f4d7bae 100644 Binary files a/packs/heritages/MANIFEST-000026 and b/packs/heritages/MANIFEST-000034 differ diff --git a/packs/metiers/000028.log b/packs/metiers/000036.log similarity index 100% rename from packs/metiers/000028.log rename to packs/metiers/000036.log diff --git a/packs/metiers/CURRENT b/packs/metiers/CURRENT index 8b15215..eea9b0f 100644 --- a/packs/metiers/CURRENT +++ b/packs/metiers/CURRENT @@ -1 +1 @@ -MANIFEST-000026 +MANIFEST-000034 diff --git a/packs/metiers/LOG b/packs/metiers/LOG index 18cb1e5..c596ca3 100644 --- a/packs/metiers/LOG +++ b/packs/metiers/LOG @@ -1,8 +1,8 @@ -2023/11/28-20:39:47.133116 7ff1ed3ff6c0 Recovering log #24 -2023/11/28-20:39:47.143337 7ff1ed3ff6c0 Delete type=3 #22 -2023/11/28-20:39:47.143433 7ff1ed3ff6c0 Delete type=0 #24 -2023/11/28-20:44:56.334976 7fef56ffd6c0 Level-0 table #29: started -2023/11/28-20:44:56.335022 7fef56ffd6c0 Level-0 table #29: 0 bytes OK -2023/11/28-20:44:56.341700 7fef56ffd6c0 Delete type=0 #27 -2023/11/28-20:44:56.342021 7fef56ffd6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) -2023/11/28-20:44:56.342090 7fef56ffd6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +2023/11/28-21:10:45.880299 7ff1ecbfe6c0 Recovering log #32 +2023/11/28-21:10:45.933133 7ff1ecbfe6c0 Delete type=3 #30 +2023/11/28-21:10:45.933349 7ff1ecbfe6c0 Delete type=0 #32 +2023/11/28-21:42:12.882403 7fef56ffd6c0 Level-0 table #37: started +2023/11/28-21:42:12.882485 7fef56ffd6c0 Level-0 table #37: 0 bytes OK +2023/11/28-21:42:12.889833 7fef56ffd6c0 Delete type=0 #35 +2023/11/28-21:42:12.896948 7fef56ffd6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +2023/11/28-21:42:12.896978 7fef56ffd6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) diff --git a/packs/metiers/LOG.old b/packs/metiers/LOG.old index 3bd62f9..aff024e 100644 --- a/packs/metiers/LOG.old +++ b/packs/metiers/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-07:15:12.833006 7ff1ecbfe6c0 Recovering log #20 -2023/11/28-07:15:12.843816 7ff1ecbfe6c0 Delete type=3 #18 -2023/11/28-07:15:12.843901 7ff1ecbfe6c0 Delete type=0 #20 -2023/11/28-20:39:25.858607 7fef56ffd6c0 Level-0 table #25: started -2023/11/28-20:39:25.858705 7fef56ffd6c0 Level-0 table #25: 0 bytes OK -2023/11/28-20:39:25.865393 7fef56ffd6c0 Delete type=0 #23 -2023/11/28-20:39:25.887034 7fef56ffd6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) -2023/11/28-20:39:25.887138 7fef56ffd6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +2023/11/28-21:00:12.484287 7ff1ecbfe6c0 Recovering log #28 +2023/11/28-21:00:12.494659 7ff1ecbfe6c0 Delete type=3 #26 +2023/11/28-21:00:12.494799 7ff1ecbfe6c0 Delete type=0 #28 +2023/11/28-21:10:40.986191 7fef56ffd6c0 Level-0 table #33: started +2023/11/28-21:10:40.986253 7fef56ffd6c0 Level-0 table #33: 0 bytes OK +2023/11/28-21:10:41.021844 7fef56ffd6c0 Delete type=0 #31 +2023/11/28-21:10:41.022187 7fef56ffd6c0 Manual compaction at level-0 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) +2023/11/28-21:10:41.022284 7fef56ffd6c0 Manual compaction at level-1 from '!items!1zbNJIOmrsThaKFU' @ 72057594037927935 : 1 .. '!items!y0G0VMyygxIj4Y7F' @ 0 : 0; will stop at (end) diff --git a/packs/metiers/MANIFEST-000026 b/packs/metiers/MANIFEST-000034 similarity index 73% rename from packs/metiers/MANIFEST-000026 rename to packs/metiers/MANIFEST-000034 index e17b50b..7848090 100644 Binary files a/packs/metiers/MANIFEST-000026 and b/packs/metiers/MANIFEST-000034 differ diff --git a/packs/origines/000029.log b/packs/origines/000037.log similarity index 100% rename from packs/origines/000029.log rename to packs/origines/000037.log diff --git a/packs/origines/CURRENT b/packs/origines/CURRENT index 3bf5164..29a53d8 100644 --- a/packs/origines/CURRENT +++ b/packs/origines/CURRENT @@ -1 +1 @@ -MANIFEST-000027 +MANIFEST-000035 diff --git a/packs/origines/LOG b/packs/origines/LOG index b82a119..1fb4c1e 100644 --- a/packs/origines/LOG +++ b/packs/origines/LOG @@ -1,8 +1,8 @@ -2023/11/28-20:39:47.103624 7ff1ecbfe6c0 Recovering log #25 -2023/11/28-20:39:47.114639 7ff1ecbfe6c0 Delete type=3 #23 -2023/11/28-20:39:47.114725 7ff1ecbfe6c0 Delete type=0 #25 -2023/11/28-20:44:56.309731 7fef56ffd6c0 Level-0 table #30: started -2023/11/28-20:44:56.309794 7fef56ffd6c0 Level-0 table #30: 0 bytes OK -2023/11/28-20:44:56.316448 7fef56ffd6c0 Delete type=0 #28 -2023/11/28-20:44:56.334941 7fef56ffd6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) -2023/11/28-20:44:56.341930 7fef56ffd6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/11/28-21:10:45.758372 7fef57fff6c0 Recovering log #33 +2023/11/28-21:10:45.814699 7fef57fff6c0 Delete type=3 #31 +2023/11/28-21:10:45.814832 7fef57fff6c0 Delete type=0 #33 +2023/11/28-21:42:12.875434 7fef56ffd6c0 Level-0 table #38: started +2023/11/28-21:42:12.875457 7fef56ffd6c0 Level-0 table #38: 0 bytes OK +2023/11/28-21:42:12.882108 7fef56ffd6c0 Delete type=0 #36 +2023/11/28-21:42:12.896938 7fef56ffd6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/11/28-21:42:12.896971 7fef56ffd6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) diff --git a/packs/origines/LOG.old b/packs/origines/LOG.old index aadf0ba..1fb0394 100644 --- a/packs/origines/LOG.old +++ b/packs/origines/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-07:15:12.803710 7fef57fff6c0 Recovering log #21 -2023/11/28-07:15:12.814219 7fef57fff6c0 Delete type=3 #19 -2023/11/28-07:15:12.814329 7fef57fff6c0 Delete type=0 #21 -2023/11/28-20:39:25.879873 7fef56ffd6c0 Level-0 table #26: started -2023/11/28-20:39:25.879919 7fef56ffd6c0 Level-0 table #26: 0 bytes OK -2023/11/28-20:39:25.886813 7fef56ffd6c0 Delete type=0 #24 -2023/11/28-20:39:25.887116 7fef56ffd6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) -2023/11/28-20:39:25.887217 7fef56ffd6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/11/28-21:00:12.454515 7fef577fe6c0 Recovering log #29 +2023/11/28-21:00:12.465532 7fef577fe6c0 Delete type=3 #27 +2023/11/28-21:00:12.465668 7fef577fe6c0 Delete type=0 #29 +2023/11/28-21:10:40.857528 7fef56ffd6c0 Level-0 table #34: started +2023/11/28-21:10:40.857593 7fef56ffd6c0 Level-0 table #34: 0 bytes OK +2023/11/28-21:10:40.899028 7fef56ffd6c0 Delete type=0 #32 +2023/11/28-21:10:41.022100 7fef56ffd6c0 Manual compaction at level-0 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) +2023/11/28-21:10:41.022211 7fef56ffd6c0 Manual compaction at level-1 from '!items!0xdQs67JPsVrUyvp' @ 72057594037927935 : 1 .. '!items!xox7R7Uuuz0eGL0p' @ 0 : 0; will stop at (end) diff --git a/packs/origines/MANIFEST-000027 b/packs/origines/MANIFEST-000035 similarity index 80% rename from packs/origines/MANIFEST-000027 rename to packs/origines/MANIFEST-000035 index 2d39f36..188bc5d 100644 Binary files a/packs/origines/MANIFEST-000027 and b/packs/origines/MANIFEST-000035 differ diff --git a/packs/protection/000064.log b/packs/protection/000073.log similarity index 100% rename from packs/protection/000064.log rename to packs/protection/000073.log diff --git a/packs/protection/CURRENT b/packs/protection/CURRENT index 5ca571d..be93edb 100644 --- a/packs/protection/CURRENT +++ b/packs/protection/CURRENT @@ -1 +1 @@ -MANIFEST-000062 +MANIFEST-000071 diff --git a/packs/protection/LOG b/packs/protection/LOG index b6e284c..cab967f 100644 --- a/packs/protection/LOG +++ b/packs/protection/LOG @@ -1,15 +1,8 @@ -2023/11/28-20:39:47.165564 7ff1ecbfe6c0 Recovering log #60 -2023/11/28-20:39:47.176753 7ff1ecbfe6c0 Delete type=3 #58 -2023/11/28-20:39:47.176846 7ff1ecbfe6c0 Delete type=0 #60 -2023/11/28-20:44:56.348925 7fef56ffd6c0 Level-0 table #65: started -2023/11/28-20:44:56.353149 7fef56ffd6c0 Level-0 table #65: 1064 bytes OK -2023/11/28-20:44:56.359589 7fef56ffd6c0 Delete type=0 #63 -2023/11/28-20:44:56.373949 7fef56ffd6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) -2023/11/28-20:44:56.374034 7fef56ffd6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at '!items!veoS6Gtzj6Dq087V' @ 12 : 1 -2023/11/28-20:44:56.374047 7fef56ffd6c0 Compacting 1@1 + 1@2 files -2023/11/28-20:44:56.377692 7fef56ffd6c0 Generated table #66@1: 5 keys, 1014 bytes -2023/11/28-20:44:56.377727 7fef56ffd6c0 Compacted 1@1 + 1@2 files => 1014 bytes -2023/11/28-20:44:56.383811 7fef56ffd6c0 compacted to: files[ 0 0 1 0 0 0 0 ] -2023/11/28-20:44:56.383927 7fef56ffd6c0 Delete type=2 #5 -2023/11/28-20:44:56.384094 7fef56ffd6c0 Delete type=2 #65 -2023/11/28-20:44:56.384246 7fef56ffd6c0 Manual compaction at level-1 from '!items!veoS6Gtzj6Dq087V' @ 12 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/11/28-21:10:46.003090 7fef57fff6c0 Recovering log #69 +2023/11/28-21:10:46.055644 7fef57fff6c0 Delete type=3 #67 +2023/11/28-21:10:46.055774 7fef57fff6c0 Delete type=0 #69 +2023/11/28-21:42:12.897082 7fef56ffd6c0 Level-0 table #74: started +2023/11/28-21:42:12.897106 7fef56ffd6c0 Level-0 table #74: 0 bytes OK +2023/11/28-21:42:12.904764 7fef56ffd6c0 Delete type=0 #72 +2023/11/28-21:42:12.925187 7fef56ffd6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/11/28-21:42:12.925283 7fef56ffd6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) diff --git a/packs/protection/LOG.old b/packs/protection/LOG.old index ab8d715..a358d90 100644 --- a/packs/protection/LOG.old +++ b/packs/protection/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-07:15:12.861772 7fef57fff6c0 Recovering log #56 -2023/11/28-07:15:12.873703 7fef57fff6c0 Delete type=3 #54 -2023/11/28-07:15:12.873814 7fef57fff6c0 Delete type=0 #56 -2023/11/28-20:39:25.887361 7fef56ffd6c0 Level-0 table #61: started -2023/11/28-20:39:25.887451 7fef56ffd6c0 Level-0 table #61: 0 bytes OK -2023/11/28-20:39:25.894653 7fef56ffd6c0 Delete type=0 #59 -2023/11/28-20:39:25.908676 7fef56ffd6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) -2023/11/28-20:39:25.908736 7fef56ffd6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/11/28-21:00:12.513087 7fef577fe6c0 Recovering log #64 +2023/11/28-21:00:12.525182 7fef577fe6c0 Delete type=3 #62 +2023/11/28-21:00:12.525274 7fef577fe6c0 Delete type=0 #64 +2023/11/28-21:10:41.067506 7fef56ffd6c0 Level-0 table #70: started +2023/11/28-21:10:41.067577 7fef56ffd6c0 Level-0 table #70: 0 bytes OK +2023/11/28-21:10:41.109348 7fef56ffd6c0 Delete type=0 #68 +2023/11/28-21:10:41.195934 7fef56ffd6c0 Manual compaction at level-0 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) +2023/11/28-21:10:41.196029 7fef56ffd6c0 Manual compaction at level-1 from '!items!2hD1DQVeCIQIXFU7' @ 72057594037927935 : 1 .. '!items!veoS6Gtzj6Dq087V' @ 0 : 0; will stop at (end) diff --git a/packs/protection/MANIFEST-000062 b/packs/protection/MANIFEST-000062 deleted file mode 100644 index 91306f9..0000000 Binary files a/packs/protection/MANIFEST-000062 and /dev/null differ diff --git a/packs/protection/MANIFEST-000071 b/packs/protection/MANIFEST-000071 new file mode 100644 index 0000000..f0209f8 Binary files /dev/null and b/packs/protection/MANIFEST-000071 differ diff --git a/packs/scenes/000004.log b/packs/scenes/000012.log similarity index 100% rename from packs/scenes/000004.log rename to packs/scenes/000012.log diff --git a/packs/scenes/CURRENT b/packs/scenes/CURRENT index 1a84852..3051f81 100644 --- a/packs/scenes/CURRENT +++ b/packs/scenes/CURRENT @@ -1 +1 @@ -MANIFEST-000002 +MANIFEST-000010 diff --git a/packs/scenes/LOG b/packs/scenes/LOG index 94f167a..4bb918a 100644 --- a/packs/scenes/LOG +++ b/packs/scenes/LOG @@ -1,5 +1,7 @@ -2023/11/28-20:39:47.224216 7fef57fff6c0 Delete type=3 #1 -2023/11/28-20:44:56.366715 7fef56ffd6c0 Level-0 table #5: started -2023/11/28-20:44:56.366755 7fef56ffd6c0 Level-0 table #5: 0 bytes OK -2023/11/28-20:44:56.373788 7fef56ffd6c0 Delete type=0 #3 -2023/11/28-20:44:56.373982 7fef56ffd6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/11/28-21:10:46.185146 7fef577fe6c0 Recovering log #8 +2023/11/28-21:10:46.240193 7fef577fe6c0 Delete type=3 #6 +2023/11/28-21:10:46.240809 7fef577fe6c0 Delete type=0 #8 +2023/11/28-21:42:12.911147 7fef56ffd6c0 Level-0 table #13: started +2023/11/28-21:42:12.911173 7fef56ffd6c0 Level-0 table #13: 0 bytes OK +2023/11/28-21:42:12.917689 7fef56ffd6c0 Delete type=0 #11 +2023/11/28-21:42:12.925250 7fef56ffd6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/LOG.old b/packs/scenes/LOG.old new file mode 100644 index 0000000..fdbf505 --- /dev/null +++ b/packs/scenes/LOG.old @@ -0,0 +1,7 @@ +2023/11/28-21:00:12.558685 7fef57fff6c0 Recovering log #4 +2023/11/28-21:00:12.569329 7fef57fff6c0 Delete type=3 #2 +2023/11/28-21:00:12.569430 7fef57fff6c0 Delete type=0 #4 +2023/11/28-21:10:41.153724 7fef56ffd6c0 Level-0 table #9: started +2023/11/28-21:10:41.153782 7fef56ffd6c0 Level-0 table #9: 0 bytes OK +2023/11/28-21:10:41.195685 7fef56ffd6c0 Delete type=0 #7 +2023/11/28-21:10:41.195989 7fef56ffd6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/MANIFEST-000002 b/packs/scenes/MANIFEST-000002 deleted file mode 100644 index 84678b8..0000000 Binary files a/packs/scenes/MANIFEST-000002 and /dev/null differ diff --git a/packs/scenes/MANIFEST-000010 b/packs/scenes/MANIFEST-000010 new file mode 100644 index 0000000..6a72d77 Binary files /dev/null and b/packs/scenes/MANIFEST-000010 differ diff --git a/packs/skills/000065.log b/packs/skills/000073.log similarity index 100% rename from packs/skills/000065.log rename to packs/skills/000073.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index e8c0266..be93edb 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000063 +MANIFEST-000071 diff --git a/packs/skills/LOG b/packs/skills/LOG index 891dcb4..89233a9 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,8 @@ -2023/11/28-20:39:47.090489 7fef57fff6c0 Recovering log #61 -2023/11/28-20:39:47.100928 7fef57fff6c0 Delete type=3 #59 -2023/11/28-20:39:47.101096 7fef57fff6c0 Delete type=0 #61 -2023/11/28-20:44:56.291389 7fef56ffd6c0 Level-0 table #66: started -2023/11/28-20:44:56.291482 7fef56ffd6c0 Level-0 table #66: 0 bytes OK -2023/11/28-20:44:56.297940 7fef56ffd6c0 Delete type=0 #64 -2023/11/28-20:44:56.298150 7fef56ffd6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/11/28-20:44:56.309697 7fef56ffd6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/11/28-21:10:45.695496 7fef577fe6c0 Recovering log #69 +2023/11/28-21:10:45.755106 7fef577fe6c0 Delete type=3 #67 +2023/11/28-21:10:45.755198 7fef577fe6c0 Delete type=0 #69 +2023/11/28-21:42:12.852210 7fef56ffd6c0 Level-0 table #74: started +2023/11/28-21:42:12.852268 7fef56ffd6c0 Level-0 table #74: 0 bytes OK +2023/11/28-21:42:12.858430 7fef56ffd6c0 Delete type=0 #72 +2023/11/28-21:42:12.858569 7fef56ffd6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/11/28-21:42:12.869087 7fef56ffd6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) diff --git a/packs/skills/LOG.old b/packs/skills/LOG.old index 2d7bf68..55aa0db 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-07:15:12.787992 7ff1ed3ff6c0 Recovering log #57 -2023/11/28-07:15:12.800390 7ff1ed3ff6c0 Delete type=3 #55 -2023/11/28-07:15:12.800514 7ff1ed3ff6c0 Delete type=0 #57 -2023/11/28-20:39:25.840415 7fef56ffd6c0 Level-0 table #62: started -2023/11/28-20:39:25.840473 7fef56ffd6c0 Level-0 table #62: 0 bytes OK -2023/11/28-20:39:25.846688 7fef56ffd6c0 Delete type=0 #60 -2023/11/28-20:39:25.847079 7fef56ffd6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) -2023/11/28-20:39:25.858334 7fef56ffd6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/11/28-21:00:12.439812 7fef57fff6c0 Recovering log #65 +2023/11/28-21:00:12.450501 7fef57fff6c0 Delete type=3 #63 +2023/11/28-21:00:12.450602 7fef57fff6c0 Delete type=0 #65 +2023/11/28-21:10:40.752930 7fef56ffd6c0 Level-0 table #70: started +2023/11/28-21:10:40.752995 7fef56ffd6c0 Level-0 table #70: 0 bytes OK +2023/11/28-21:10:40.793770 7fef56ffd6c0 Delete type=0 #68 +2023/11/28-21:10:40.857320 7fef56ffd6c0 Manual compaction at level-0 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) +2023/11/28-21:10:40.857386 7fef56ffd6c0 Manual compaction at level-1 from '!items!0LlzDyCurJedqeyG' @ 72057594037927935 : 1 .. '!items!tq6mEgXog7h4VyWk' @ 0 : 0; will stop at (end) diff --git a/packs/skills/MANIFEST-000063 b/packs/skills/MANIFEST-000071 similarity index 76% rename from packs/skills/MANIFEST-000063 rename to packs/skills/MANIFEST-000071 index 7502a0b..c655f6e 100644 Binary files a/packs/skills/MANIFEST-000063 and b/packs/skills/MANIFEST-000071 differ diff --git a/packs/tables/000064.log b/packs/tables/000072.log similarity index 100% rename from packs/tables/000064.log rename to packs/tables/000072.log diff --git a/packs/tables/CURRENT b/packs/tables/CURRENT index 5ca571d..bcf1079 100644 --- a/packs/tables/CURRENT +++ b/packs/tables/CURRENT @@ -1 +1 @@ -MANIFEST-000062 +MANIFEST-000070 diff --git a/packs/tables/LOG b/packs/tables/LOG index e096407..554fd5d 100644 --- a/packs/tables/LOG +++ b/packs/tables/LOG @@ -1,8 +1,8 @@ -2023/11/28-20:39:47.193415 7ff1ed3ff6c0 Recovering log #60 -2023/11/28-20:39:47.204489 7ff1ed3ff6c0 Delete type=3 #58 -2023/11/28-20:39:47.204605 7ff1ed3ff6c0 Delete type=0 #60 -2023/11/28-20:44:56.359833 7fef56ffd6c0 Level-0 table #65: started -2023/11/28-20:44:56.359919 7fef56ffd6c0 Level-0 table #65: 0 bytes OK -2023/11/28-20:44:56.366347 7fef56ffd6c0 Delete type=0 #63 -2023/11/28-20:44:56.373966 7fef56ffd6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) -2023/11/28-20:44:56.384195 7fef56ffd6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/11/28-21:10:46.114679 7ff1ecbfe6c0 Recovering log #68 +2023/11/28-21:10:46.181412 7ff1ecbfe6c0 Delete type=3 #66 +2023/11/28-21:10:46.181497 7ff1ecbfe6c0 Delete type=0 #68 +2023/11/28-21:42:12.904868 7fef56ffd6c0 Level-0 table #73: started +2023/11/28-21:42:12.904895 7fef56ffd6c0 Level-0 table #73: 0 bytes OK +2023/11/28-21:42:12.911019 7fef56ffd6c0 Delete type=0 #71 +2023/11/28-21:42:12.925227 7fef56ffd6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/11/28-21:42:12.925299 7fef56ffd6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) diff --git a/packs/tables/LOG.old b/packs/tables/LOG.old index 341c76a..d2daa5f 100644 --- a/packs/tables/LOG.old +++ b/packs/tables/LOG.old @@ -1,8 +1,8 @@ -2023/11/28-07:15:12.890829 7ff1ecbfe6c0 Recovering log #56 -2023/11/28-07:15:12.901194 7ff1ecbfe6c0 Delete type=3 #54 -2023/11/28-07:15:12.901301 7ff1ecbfe6c0 Delete type=0 #56 -2023/11/28-20:39:25.901607 7fef56ffd6c0 Level-0 table #61: started -2023/11/28-20:39:25.901653 7fef56ffd6c0 Level-0 table #61: 0 bytes OK -2023/11/28-20:39:25.908535 7fef56ffd6c0 Delete type=0 #59 -2023/11/28-20:39:25.908709 7fef56ffd6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) -2023/11/28-20:39:25.908749 7fef56ffd6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/11/28-21:00:12.542948 7ff1ecbfe6c0 Recovering log #64 +2023/11/28-21:00:12.554265 7ff1ecbfe6c0 Delete type=3 #62 +2023/11/28-21:00:12.554422 7ff1ecbfe6c0 Delete type=0 #64 +2023/11/28-21:10:41.109588 7fef56ffd6c0 Level-0 table #69: started +2023/11/28-21:10:41.109652 7fef56ffd6c0 Level-0 table #69: 0 bytes OK +2023/11/28-21:10:41.153510 7fef56ffd6c0 Delete type=0 #67 +2023/11/28-21:10:41.195963 7fef56ffd6c0 Manual compaction at level-0 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) +2023/11/28-21:10:41.196054 7fef56ffd6c0 Manual compaction at level-1 from '!tables!zV2oJy8JZE0nngRY' @ 72057594037927935 : 1 .. '!tables.results!zV2oJy8JZE0nngRY.wTMX1TbxljHmHImp' @ 0 : 0; will stop at (end) diff --git a/packs/tables/MANIFEST-000062 b/packs/tables/MANIFEST-000070 similarity index 79% rename from packs/tables/MANIFEST-000062 rename to packs/tables/MANIFEST-000070 index 027455d..21ee7fb 100644 Binary files a/packs/tables/MANIFEST-000062 and b/packs/tables/MANIFEST-000070 differ diff --git a/styles/wasteland.css b/styles/wasteland.css index 12cffda..e44d2a5 100644 --- a/styles/wasteland.css +++ b/styles/wasteland.css @@ -302,7 +302,15 @@ table {border: 1px solid #7a7971;} font-size: 0.8rem; } +.editor-container { + height: 100%; + min-height: 100%; + font-size: 0.8rem; +} + .editor { + min-height: 400px; + height: 100%; border: 2; padding: 0 3px; } diff --git a/system.json b/system.json index 9ab1f3e..6e04a6a 100644 --- a/system.json +++ b/system.json @@ -1,7 +1,7 @@ { "id": "fvtt-wasteland", "description": "Wasteland RPG for FoundryVTT", - "version": "11.0.4", + "version": "11.0.6", "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.4.zip", + "download": "https://www.uberwald.me/gitea/public/fvtt-wasteland/archive/fvtt-wasteland-v11.0.6.zip", "packs": [ { "type": "Item", diff --git a/template.json b/template.json index dc19f81..232748f 100644 --- a/template.json +++ b/template.json @@ -125,12 +125,12 @@ "peuple" ], "pouvoir": { + "chemin": "force", + "seuil": 0, "coutpsyche": 0, "complexite": 0, "cible": "", "duree": "", - "effetsimple": "", - "effetetendu": "", "templates": [ "base" ] @@ -252,29 +252,6 @@ "templates": [ "base" ] - }, - "don": { - "allegeance": "", - "prerequis": "", - "sacrifice": "", - "templates": [ - "base" - ] - }, - "tendance": { - "allegeance": "", - "templates": [ - "base" - ] - }, - "rune": { - "formule": "", - "seuil": 0, - "prononcee": "", - "tracee": "", - "templates": [ - "base" - ] } } } \ No newline at end of file diff --git a/templates/item-pouvoir-sheet.html b/templates/item-pouvoir-sheet.html index 3ffd00b..fd2caf4 100644 --- a/templates/item-pouvoir-sheet.html +++ b/templates/item-pouvoir-sheet.html @@ -8,32 +8,38 @@ {{!-- Sheet Body --}}
- +
- - + {{#select system.chemin}} + {{#each config.cheminpouvoir as |label key|}} + + {{/each}} {{/select}} + - - + + - -

Sacrifices

+ + + + + + + + + + + + + - -
- {{editor sacrifice target="system.sacrifice" button=true owner=owner editable=editable}} -
{{> systems/fvtt-wasteland/templates/partial-item-description.html}} diff --git a/templates/partial-item-description.html b/templates/partial-item-description.html index 75186a7..1e2dfec 100644 --- a/templates/partial-item-description.html +++ b/templates/partial-item-description.html @@ -1,6 +1,8 @@ - -

Description

-
-
+ +

Description

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