From 0487893f4764f45ad626a6287dc9a706ea3bc5cd Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Sat, 27 Apr 2024 09:33:22 +0200 Subject: [PATCH] Fix v12 issue + remove warnings --- modules/actors/ecryme-actor.js | 1 + modules/common/ecryme-config.js | 39 +++++++++--------- modules/common/ecryme-utility.js | 8 ++-- modules/dialogs/ecryme-confront-dialog.js | 14 +++---- modules/dialogs/ecryme-roll-dialog.js | 1 + packs/equipment/{000161.log => 000165.log} | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 14 +++---- packs/equipment/LOG.old | 21 ++++------ .../{MANIFEST-000159 => MANIFEST-000163} | Bin 178 -> 178 bytes packs/help/{000098.log => 000102.log} | 0 packs/help/CURRENT | 2 +- packs/help/LOG | 16 +++---- packs/help/LOG.old | 23 ++++------- .../help/{MANIFEST-000096 => MANIFEST-000100} | Bin 220 -> 220 bytes packs/maneuvers/{000161.log => 000165.log} | 0 packs/maneuvers/CURRENT | 2 +- packs/maneuvers/LOG | 14 +++---- packs/maneuvers/LOG.old | 21 ++++------ .../{MANIFEST-000159 => MANIFEST-000163} | Bin 173 -> 173 bytes packs/scenes/{000045.log => 000049.log} | 0 packs/scenes/CURRENT | 2 +- packs/scenes/LOG | 16 +++---- packs/scenes/LOG.old | 23 ++++------- .../{MANIFEST-000043 => MANIFEST-000047} | Bin 171 -> 171 bytes .../specialisation/{000161.log => 000165.log} | 0 packs/specialisation/CURRENT | 2 +- packs/specialisation/LOG | 14 +++---- packs/specialisation/LOG.old | 21 ++++------ .../{MANIFEST-000159 => MANIFEST-000163} | Bin 177 -> 177 bytes packs/traits/{000161.log => 000165.log} | 0 packs/traits/CURRENT | 2 +- packs/traits/LOG | 14 +++---- packs/traits/LOG.old | 21 ++++------ .../{MANIFEST-000159 => MANIFEST-000163} | Bin 175 -> 175 bytes system.json | 4 +- templates/dialogs/confront-dialog.hbs | 4 +- .../dialogs/partial-common-roll-dialog.hbs | 4 +- templates/dialogs/roll-dialog-generic.hbs | 4 +- templates/items/item-specialization-sheet.hbs | 2 +- templates/items/item-trait-sheet.hbs | 4 +- templates/items/partial-item-equipment.hbs | 2 +- 42 files changed, 138 insertions(+), 179 deletions(-) rename packs/equipment/{000161.log => 000165.log} (100%) rename packs/equipment/{MANIFEST-000159 => MANIFEST-000163} (71%) rename packs/help/{000098.log => 000102.log} (100%) rename packs/help/{MANIFEST-000096 => MANIFEST-000100} (58%) rename packs/maneuvers/{000161.log => 000165.log} (100%) rename packs/maneuvers/{MANIFEST-000159 => MANIFEST-000163} (73%) rename packs/scenes/{000045.log => 000049.log} (100%) rename packs/scenes/{MANIFEST-000043 => MANIFEST-000047} (74%) rename packs/specialisation/{000161.log => 000165.log} (100%) rename packs/specialisation/{MANIFEST-000159 => MANIFEST-000163} (72%) rename packs/traits/{000161.log => 000165.log} (100%) rename packs/traits/{MANIFEST-000159 => MANIFEST-000163} (73%) diff --git a/modules/actors/ecryme-actor.js b/modules/actors/ecryme-actor.js index dc6cb9e..c57697c 100644 --- a/modules/actors/ecryme-actor.js +++ b/modules/actors/ecryme-actor.js @@ -449,6 +449,7 @@ export class EcrymeActor extends Actor { rollData.applyTranscendence = "execution" rollData.traitsBonus = foundry.utils.duplicate(rollData.traits) rollData.traitsMalus = foundry.utils.duplicate(rollData.traits) + console.log("ROLLDATA", rollData) let confrontStartDialog = await EcrymeConfrontStartDialog.create(this, rollData) confrontStartDialog.render(true) } diff --git a/modules/common/ecryme-config.js b/modules/common/ecryme-config.js index 8fa9b1b..f8d780c 100644 --- a/modules/common/ecryme-config.js +++ b/modules/common/ecryme-config.js @@ -10,14 +10,14 @@ export const ECRYME_CONFIG = { "melee": "ECRY.ui.melee", "ranged": "ECRY.ui.ranged" }, - traitLevel: [ - {value: -3, text: "-3"}, - {value: -2, text: "-2"}, - {value: -1, text: "-1"}, - {value: +1, text: "+1"}, - {value: +2, text: "+2"}, - {value: +3, text: "+3"} - ], + traitLevel: { + "-3":{value: "-3", text: "-3"}, + "-2":{value: "-2", text: "-2"}, + "-1":{value: "-1", text: "-1"}, + "+1":{value: "+1", text: "+1"}, + "+2":{value: "+2", text: "+2"}, + "+3":{value: "+3", text: "+3"} + }, impactTypes: { physical: "ECRY.ui.physical", mental: "ECRY.ui.mental", @@ -30,7 +30,7 @@ export const ECRYME_CONFIG = { major: "ECRY.ui.major" }, difficulty: { - "-1": {difficulty: "ECRY.ui.none", frequency: "ECRY.ui.none", value: "-"}, + "-1": {difficulty: "ECRY.ui.none", frequency: "ECRY.ui.none", value: "-1"}, "8": { difficulty: "ECRY.ui.troublesome", frequency: "ECRY.ui.occasional", value: 8 }, "10": { difficulty: "ECRY.ui.difficult", frequency: "ECRY.ui.uncommon", value: 10 }, "12": { difficulty: "ECRY.ui.verydifficult", frequency: "ECRY.ui.rare", value: 12 }, @@ -60,17 +60,16 @@ export const ECRYME_CONFIG = { }, transcendanceOptions: { "execution": "ECRY.ui.execution", - "preservation": "EC,RY.ui.preservation" + "preservation": "ECRY.ui.preservation" }, - bonusMalusPersoOptions: [ - {value: "-3", label: "-3"}, - {value: "-2", label: "-2"}, - {value: "-1", label: "-1"}, - {value: "0", label: "0"}, - {value: "+1", label: "+1"}, - {value: "+2", label: "+2"}, - {value: "+3", label: "+3"} - ] - + bonusMalusPersoOptions: { + "-3": {value: "-3", label: "-3"}, + "-2": {value: "-2", label: "-2"}, + "-1": {value: "-1", label: "-1"}, + "0": {value: "0", label: "0"}, + "+1": {value: "1", label: "+1"}, + "+2": {value: "2", label: "+2"}, + "+3": {value: "3", label: "+3"} + } } \ No newline at end of file diff --git a/modules/common/ecryme-utility.js b/modules/common/ecryme-utility.js index 76e4c2f..0d1865f 100644 --- a/modules/common/ecryme-utility.js +++ b/modules/common/ecryme-utility.js @@ -216,7 +216,7 @@ export class EcrymeUtility { confront.impactPreservation = this.getImpactFromEffect(Math.abs(confront.effectPreservation)) } if (confront.marginPreservation > 0) { - confront.bonus1 = -confront.marginPreservation + confront.bonus1 = confront.marginPreservation } let msg = await this.createChatWithRollMode(this.confrontData1.alias, { @@ -558,7 +558,7 @@ export class EcrymeUtility { let actor = game.actors.get(rollData.actorId) // Fix difficulty - if (!rollData.difficulty || rollData.difficulty == "-") { + if (!rollData.difficulty || rollData.difficulty == "-1") { rollData.difficulty = 0 } rollData.difficulty = Number(rollData.difficulty) @@ -685,14 +685,14 @@ export class EcrymeUtility { let rollData = { rollId: foundry.utils.randomID(16), type: "roll-data", - bonusMalusPerso: 0, + bonusMalusPerso: "0", bonusMalusSituation: 0, bonusMalusDef: 0, annencyBonus: 0, bonusMalusPortee: 0, skillTranscendence: 0, rollMode: game.settings.get("core", "rollMode"), - difficulty: "-", + difficulty: "-1", useSpleen: false, useIdeal: false, impactMalus: 0, diff --git a/modules/dialogs/ecryme-confront-dialog.js b/modules/dialogs/ecryme-confront-dialog.js index 0c09e28..72d8953 100644 --- a/modules/dialogs/ecryme-confront-dialog.js +++ b/modules/dialogs/ecryme-confront-dialog.js @@ -163,9 +163,9 @@ export class EcrymeConfrontDialog extends Dialog { // Apply Transcend if needed if (this.rollData.skillTranscendence > 0) { if (this.rollData.applyTranscendence == "execution") { - this.rollData.executionTotal += this.rollData.skillTranscendence + this.rollData.executionTotal += Number(this.rollData.skillTranscendence) } else { - this.rollData.preservationTotal += this.rollData.skillTranscendence + this.rollData.preservationTotal += Number(this.rollData.skillTranscendence) } } } @@ -212,19 +212,19 @@ export class EcrymeConfrontDialog extends Dialog { for (let id of rollData.traitsBonusSelected) { let trait = rollData.traitsBonus.find(t => t._id == id) trait.activated = true - rollData.bonusMalusTraits += trait.system.level + rollData.bonusMalusTraits += Number(trait.system.level) } } if (rollData.traitsMalusSelected && rollData.traitsMalusSelected.length > 0) { for (let id of rollData.traitsMalusSelected) { let trait = rollData.traitsMalus.find(t => t._id == id) trait.activated = true - rollData.bonusMalusTraits -= trait.system.level + rollData.bonusMalusTraits -= Number(trait.system.level) } } - rollData.executionTotal += rollData.bonusMalusTraits + rollData.bonusMalusPerso - rollData.preservationTotal += rollData.bonusMalusTraits + rollData.bonusMalusPerso + rollData.executionTotal += Number(rollData.bonusMalusTraits) + Number(rollData.bonusMalusPerso) + rollData.preservationTotal += Number(rollData.bonusMalusTraits) + Number(rollData.bonusMalusPerso) this.refreshDialog() } @@ -234,7 +234,7 @@ export class EcrymeConfrontDialog extends Dialog { super.activateListeners(html); html.find('#bonusMalusPerso').change((event) => { - this.rollData.bonusMalusPerso = Number(event.currentTarget.value) + this.rollData.bonusMalusPerso = event.currentTarget.value this.computeTotals() }) html.find('#roll-specialization').change((event) => { diff --git a/modules/dialogs/ecryme-roll-dialog.js b/modules/dialogs/ecryme-roll-dialog.js index 2fa4833..f57e761 100644 --- a/modules/dialogs/ecryme-roll-dialog.js +++ b/modules/dialogs/ecryme-roll-dialog.js @@ -58,6 +58,7 @@ export class EcrymeRollDialog extends Dialog { $(function () { onLoad(); }); html.find('#bonusMalusPerso').change((event) => { + console.log("DIFF", event.currentTarget.value) this.rollData.bonusMalusPerso = Number(event.currentTarget.value) }) html.find('#roll-difficulty').change((event) => { diff --git a/packs/equipment/000161.log b/packs/equipment/000165.log similarity index 100% rename from packs/equipment/000161.log rename to packs/equipment/000165.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index eda0873..abf5eb3 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000159 +MANIFEST-000163 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index cbc9d4d..3944a25 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,7 +1,7 @@ -2024/04/26-19:22:08.707793 7f89060006c0 Recovering log #156 -2024/04/26-19:22:08.718085 7f89060006c0 Delete type=3 #154 -2024/04/26-19:22:08.718160 7f89060006c0 Delete type=0 #156 -2024/04/26-19:25:18.674002 7f88ffe006c0 Level-0 table #162: started -2024/04/26-19:25:18.674046 7f88ffe006c0 Level-0 table #162: 0 bytes OK -2024/04/26-19:25:18.715930 7f88ffe006c0 Delete type=0 #160 -2024/04/26-19:25:18.747436 7f88ffe006c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) +2024/04/27-08:47:55.410828 7fc5c4c006c0 Recovering log #161 +2024/04/27-08:47:55.422094 7fc5c4c006c0 Delete type=3 #159 +2024/04/27-08:47:55.422190 7fc5c4c006c0 Delete type=0 #161 +2024/04/27-09:26:42.196858 7fc5bfe006c0 Level-0 table #166: started +2024/04/27-09:26:42.196924 7fc5bfe006c0 Level-0 table #166: 0 bytes OK +2024/04/27-09:26:42.203539 7fc5bfe006c0 Delete type=0 #164 +2024/04/27-09:26:42.227249 7fc5bfe006c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/LOG.old b/packs/equipment/LOG.old index c378e2e..cbc9d4d 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,14 +1,7 @@ -2024/04/26-18:42:26.253704 7f89060006c0 Recovering log #152 -2024/04/26-18:42:26.264507 7f89060006c0 Delete type=3 #150 -2024/04/26-18:42:26.264666 7f89060006c0 Delete type=0 #152 -2024/04/26-19:22:04.326808 7f88ffe006c0 Level-0 table #157: started -2024/04/26-19:22:04.330698 7f88ffe006c0 Level-0 table #157: 26343 bytes OK -2024/04/26-19:22:04.337326 7f88ffe006c0 Delete type=0 #155 -2024/04/26-19:22:04.358386 7f88ffe006c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at '!items!zs7krgXhDRndtqbl' @ 338 : 1 -2024/04/26-19:22:04.358402 7f88ffe006c0 Compacting 1@0 + 1@1 files -2024/04/26-19:22:04.362396 7f88ffe006c0 Generated table #158@0: 174 keys, 27263 bytes -2024/04/26-19:22:04.362426 7f88ffe006c0 Compacted 1@0 + 1@1 files => 27263 bytes -2024/04/26-19:22:04.368459 7f88ffe006c0 compacted to: files[ 0 1 0 0 0 0 0 ] -2024/04/26-19:22:04.368664 7f88ffe006c0 Delete type=2 #9 -2024/04/26-19:22:04.368919 7f88ffe006c0 Delete type=2 #157 -2024/04/26-19:22:04.400712 7f88ffe006c0 Manual compaction at level-0 from '!items!zs7krgXhDRndtqbl' @ 338 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) +2024/04/26-19:22:08.707793 7f89060006c0 Recovering log #156 +2024/04/26-19:22:08.718085 7f89060006c0 Delete type=3 #154 +2024/04/26-19:22:08.718160 7f89060006c0 Delete type=0 #156 +2024/04/26-19:25:18.674002 7f88ffe006c0 Level-0 table #162: started +2024/04/26-19:25:18.674046 7f88ffe006c0 Level-0 table #162: 0 bytes OK +2024/04/26-19:25:18.715930 7f88ffe006c0 Delete type=0 #160 +2024/04/26-19:25:18.747436 7f88ffe006c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/MANIFEST-000159 b/packs/equipment/MANIFEST-000163 similarity index 71% rename from packs/equipment/MANIFEST-000159 rename to packs/equipment/MANIFEST-000163 index fef8c5cf9ab4ed66d6afb38776a8d8be7df07204..a87caa5a1ed400717173450b97b6aeef83fadecb 100644 GIT binary patch delta 43 scmdnQxQTH>pGtypUTE#)z7#Y7?~C@axyS4WMsL-#4)374M=1mNMtcc1OO_03%~#X diff --git a/packs/help/000098.log b/packs/help/000102.log similarity index 100% rename from packs/help/000098.log rename to packs/help/000102.log diff --git a/packs/help/CURRENT b/packs/help/CURRENT index 6274e55..d7ae20e 100644 --- a/packs/help/CURRENT +++ b/packs/help/CURRENT @@ -1 +1 @@ -MANIFEST-000096 +MANIFEST-000100 diff --git a/packs/help/LOG b/packs/help/LOG index 6a58b78..50b8904 100644 --- a/packs/help/LOG +++ b/packs/help/LOG @@ -1,8 +1,8 @@ -2024/04/26-19:22:08.762783 7f89074006c0 Recovering log #93 -2024/04/26-19:22:08.773921 7f89074006c0 Delete type=3 #91 -2024/04/26-19:22:08.774007 7f89074006c0 Delete type=0 #93 -2024/04/26-19:25:18.785678 7f88ffe006c0 Level-0 table #99: started -2024/04/26-19:25:18.785720 7f88ffe006c0 Level-0 table #99: 0 bytes OK -2024/04/26-19:25:18.821605 7f88ffe006c0 Delete type=0 #97 -2024/04/26-19:25:18.901806 7f88ffe006c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) -2024/04/26-19:25:18.901870 7f88ffe006c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) +2024/04/27-08:47:55.474153 7fc5c56006c0 Recovering log #98 +2024/04/27-08:47:55.484458 7fc5c56006c0 Delete type=3 #96 +2024/04/27-08:47:55.484547 7fc5c56006c0 Delete type=0 #98 +2024/04/27-09:26:42.227493 7fc5bfe006c0 Level-0 table #103: started +2024/04/27-09:26:42.227557 7fc5bfe006c0 Level-0 table #103: 0 bytes OK +2024/04/27-09:26:42.234320 7fc5bfe006c0 Delete type=0 #101 +2024/04/27-09:26:42.234536 7fc5bfe006c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) +2024/04/27-09:26:42.234577 7fc5bfe006c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) diff --git a/packs/help/LOG.old b/packs/help/LOG.old index b17c58d..6a58b78 100644 --- a/packs/help/LOG.old +++ b/packs/help/LOG.old @@ -1,15 +1,8 @@ -2024/04/26-18:42:26.318647 7f8906a006c0 Recovering log #89 -2024/04/26-18:42:26.329907 7f8906a006c0 Delete type=3 #87 -2024/04/26-18:42:26.329974 7f8906a006c0 Delete type=0 #89 -2024/04/26-19:22:04.427916 7f88ffe006c0 Level-0 table #94: started -2024/04/26-19:22:04.431410 7f88ffe006c0 Level-0 table #94: 2184 bytes OK -2024/04/26-19:22:04.438566 7f88ffe006c0 Delete type=0 #92 -2024/04/26-19:22:04.449035 7f88ffe006c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) -2024/04/26-19:22:04.449082 7f88ffe006c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 14 : 1 -2024/04/26-19:22:04.449091 7f88ffe006c0 Compacting 1@1 + 1@2 files -2024/04/26-19:22:04.452506 7f88ffe006c0 Generated table #95@1: 4 keys, 2184 bytes -2024/04/26-19:22:04.452542 7f88ffe006c0 Compacted 1@1 + 1@2 files => 2184 bytes -2024/04/26-19:22:04.458702 7f88ffe006c0 compacted to: files[ 0 0 1 0 0 0 0 ] -2024/04/26-19:22:04.458800 7f88ffe006c0 Delete type=2 #74 -2024/04/26-19:22:04.458954 7f88ffe006c0 Delete type=2 #94 -2024/04/26-19:22:04.482775 7f88ffe006c0 Manual compaction at level-1 from '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 14 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) +2024/04/26-19:22:08.762783 7f89074006c0 Recovering log #93 +2024/04/26-19:22:08.773921 7f89074006c0 Delete type=3 #91 +2024/04/26-19:22:08.774007 7f89074006c0 Delete type=0 #93 +2024/04/26-19:25:18.785678 7f88ffe006c0 Level-0 table #99: started +2024/04/26-19:25:18.785720 7f88ffe006c0 Level-0 table #99: 0 bytes OK +2024/04/26-19:25:18.821605 7f88ffe006c0 Delete type=0 #97 +2024/04/26-19:25:18.901806 7f88ffe006c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) +2024/04/26-19:25:18.901870 7f88ffe006c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) diff --git a/packs/help/MANIFEST-000096 b/packs/help/MANIFEST-000100 similarity index 58% rename from packs/help/MANIFEST-000096 rename to packs/help/MANIFEST-000100 index f53b8ce60f032339d43595b35cbbcfa45f25aa2d..acfbd73925a972812a16ac90902a704e82ffdf96 100644 GIT binary patch delta 37 pcmcb^c!zPqKDmoRcPDW$FfyfbGBBsH2yo?J)CF 6648 bytes -2024/04/26-19:22:04.448645 7f88ffe006c0 compacted to: files[ 0 1 0 0 0 0 0 ] -2024/04/26-19:22:04.448777 7f88ffe006c0 Delete type=2 #9 -2024/04/26-19:22:04.448921 7f88ffe006c0 Delete type=2 #157 -2024/04/26-19:22:04.449050 7f88ffe006c0 Manual compaction at level-0 from '!items!oSutlbe9wyBZccmf' @ 45 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) +2024/04/26-19:22:08.749669 7f8906a006c0 Recovering log #156 +2024/04/26-19:22:08.759716 7f8906a006c0 Delete type=3 #154 +2024/04/26-19:22:08.759885 7f8906a006c0 Delete type=0 #156 +2024/04/26-19:25:18.747562 7f88ffe006c0 Level-0 table #162: started +2024/04/26-19:25:18.747596 7f88ffe006c0 Level-0 table #162: 0 bytes OK +2024/04/26-19:25:18.785476 7f88ffe006c0 Delete type=0 #160 +2024/04/26-19:25:18.901779 7f88ffe006c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/MANIFEST-000159 b/packs/maneuvers/MANIFEST-000163 similarity index 73% rename from packs/maneuvers/MANIFEST-000159 rename to packs/maneuvers/MANIFEST-000163 index a50eff713edcb1dd9ee22c6eb4c5b3a0e3ef143d..85a8d848a7a4b6d318dff15cd5bf519aa353e7e2 100644 GIT binary patch delta 41 rcmZ3>xR!B3w^C6{wG|fwBhwN_P6pxR!B3x02-EKSEp#j7$p{IT@H2GP3BN($BL42`mH&ECvby0O%?SKmY&$ diff --git a/packs/scenes/000045.log b/packs/scenes/000049.log similarity index 100% rename from packs/scenes/000045.log rename to packs/scenes/000049.log diff --git a/packs/scenes/CURRENT b/packs/scenes/CURRENT index 4b2848f..1afa5d4 100644 --- a/packs/scenes/CURRENT +++ b/packs/scenes/CURRENT @@ -1 +1 @@ -MANIFEST-000043 +MANIFEST-000047 diff --git a/packs/scenes/LOG b/packs/scenes/LOG index 03c0918..2fead29 100644 --- a/packs/scenes/LOG +++ b/packs/scenes/LOG @@ -1,8 +1,8 @@ -2024/04/26-19:22:08.735377 7f89074006c0 Recovering log #40 -2024/04/26-19:22:08.745776 7f89074006c0 Delete type=3 #38 -2024/04/26-19:22:08.745887 7f89074006c0 Delete type=0 #40 -2024/04/26-19:25:18.595904 7f88ffe006c0 Level-0 table #46: started -2024/04/26-19:25:18.595980 7f88ffe006c0 Level-0 table #46: 0 bytes OK -2024/04/26-19:25:18.630930 7f88ffe006c0 Delete type=0 #44 -2024/04/26-19:25:18.747411 7f88ffe006c0 Manual compaction at level-0 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end) -2024/04/26-19:25:18.747487 7f88ffe006c0 Manual compaction at level-1 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end) +2024/04/27-08:47:55.443420 7fc5c4c006c0 Recovering log #45 +2024/04/27-08:47:55.454090 7fc5c4c006c0 Delete type=3 #43 +2024/04/27-08:47:55.454232 7fc5c4c006c0 Delete type=0 #45 +2024/04/27-09:26:42.203748 7fc5bfe006c0 Level-0 table #50: started +2024/04/27-09:26:42.203807 7fc5bfe006c0 Level-0 table #50: 0 bytes OK +2024/04/27-09:26:42.211166 7fc5bfe006c0 Delete type=0 #48 +2024/04/27-09:26:42.227275 7fc5bfe006c0 Manual compaction at level-0 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end) +2024/04/27-09:26:42.227330 7fc5bfe006c0 Manual compaction at level-1 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/LOG.old b/packs/scenes/LOG.old index c41368b..03c0918 100644 --- a/packs/scenes/LOG.old +++ b/packs/scenes/LOG.old @@ -1,15 +1,8 @@ -2024/04/26-18:42:26.291319 7f8906a006c0 Recovering log #36 -2024/04/26-18:42:26.301937 7f8906a006c0 Delete type=3 #34 -2024/04/26-18:42:26.302002 7f8906a006c0 Delete type=0 #36 -2024/04/26-19:22:04.316977 7f88ffe006c0 Level-0 table #41: started -2024/04/26-19:22:04.320512 7f88ffe006c0 Level-0 table #41: 1610 bytes OK -2024/04/26-19:22:04.326671 7f88ffe006c0 Delete type=0 #39 -2024/04/26-19:22:04.358352 7f88ffe006c0 Manual compaction at level-0 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end) -2024/04/26-19:22:04.389705 7f88ffe006c0 Manual compaction at level-1 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at '!scenes!wJJTdzEVyJpkUXaM' @ 4 : 1 -2024/04/26-19:22:04.389720 7f88ffe006c0 Compacting 1@1 + 1@2 files -2024/04/26-19:22:04.392996 7f88ffe006c0 Generated table #42@1: 2 keys, 1610 bytes -2024/04/26-19:22:04.393035 7f88ffe006c0 Compacted 1@1 + 1@2 files => 1610 bytes -2024/04/26-19:22:04.400428 7f88ffe006c0 compacted to: files[ 0 0 1 0 0 0 0 ] -2024/04/26-19:22:04.400531 7f88ffe006c0 Delete type=2 #5 -2024/04/26-19:22:04.400646 7f88ffe006c0 Delete type=2 #41 -2024/04/26-19:22:04.400749 7f88ffe006c0 Manual compaction at level-1 from '!scenes!wJJTdzEVyJpkUXaM' @ 4 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end) +2024/04/26-19:22:08.735377 7f89074006c0 Recovering log #40 +2024/04/26-19:22:08.745776 7f89074006c0 Delete type=3 #38 +2024/04/26-19:22:08.745887 7f89074006c0 Delete type=0 #40 +2024/04/26-19:25:18.595904 7f88ffe006c0 Level-0 table #46: started +2024/04/26-19:25:18.595980 7f88ffe006c0 Level-0 table #46: 0 bytes OK +2024/04/26-19:25:18.630930 7f88ffe006c0 Delete type=0 #44 +2024/04/26-19:25:18.747411 7f88ffe006c0 Manual compaction at level-0 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end) +2024/04/26-19:25:18.747487 7f88ffe006c0 Manual compaction at level-1 from '!scenes!YYBr138LR7ntGFdo' @ 72057594037927935 : 1 .. '!scenes!wJJTdzEVyJpkUXaM' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/MANIFEST-000043 b/packs/scenes/MANIFEST-000047 similarity index 74% rename from packs/scenes/MANIFEST-000043 rename to packs/scenes/MANIFEST-000047 index 59b5a32e186d5b1b95b801f7fde5574eaad871b9..447f0536a2a0c3731ec614055de9405362cf1e1d 100644 GIT binary patch delta 37 pcmZ3@xSDZ7uiOo%<8L__7?}(>8JG=OST-;QMuND8K&~+h3joJj2fzRT delta 37 pcmZ3@xSDZ7ubdy7))Ec|MkXCj24-CrmNthC^FUl(AXlG-1puGM2E70P diff --git a/packs/specialisation/000161.log b/packs/specialisation/000165.log similarity index 100% rename from packs/specialisation/000161.log rename to packs/specialisation/000165.log diff --git a/packs/specialisation/CURRENT b/packs/specialisation/CURRENT index eda0873..abf5eb3 100644 --- a/packs/specialisation/CURRENT +++ b/packs/specialisation/CURRENT @@ -1 +1 @@ -MANIFEST-000159 +MANIFEST-000163 diff --git a/packs/specialisation/LOG b/packs/specialisation/LOG index a66247b..02da1cf 100644 --- a/packs/specialisation/LOG +++ b/packs/specialisation/LOG @@ -1,7 +1,7 @@ -2024/04/26-19:22:08.694940 7f89056006c0 Recovering log #156 -2024/04/26-19:22:08.705096 7f89056006c0 Delete type=3 #154 -2024/04/26-19:22:08.705158 7f89056006c0 Delete type=0 #156 -2024/04/26-19:25:18.631092 7f88ffe006c0 Level-0 table #162: started -2024/04/26-19:25:18.631157 7f88ffe006c0 Level-0 table #162: 0 bytes OK -2024/04/26-19:25:18.673806 7f88ffe006c0 Delete type=0 #160 -2024/04/26-19:25:18.747426 7f88ffe006c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) +2024/04/27-08:47:55.395447 7fc5c56006c0 Recovering log #161 +2024/04/27-08:47:55.406766 7fc5c56006c0 Delete type=3 #159 +2024/04/27-08:47:55.406871 7fc5c56006c0 Delete type=0 #161 +2024/04/27-09:26:42.188991 7fc5bfe006c0 Level-0 table #166: started +2024/04/27-09:26:42.189072 7fc5bfe006c0 Level-0 table #166: 0 bytes OK +2024/04/27-09:26:42.196426 7fc5bfe006c0 Delete type=0 #164 +2024/04/27-09:26:42.196728 7fc5bfe006c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) diff --git a/packs/specialisation/LOG.old b/packs/specialisation/LOG.old index 96f1228..a66247b 100644 --- a/packs/specialisation/LOG.old +++ b/packs/specialisation/LOG.old @@ -1,14 +1,7 @@ -2024/04/26-18:42:26.237456 7f89074006c0 Recovering log #152 -2024/04/26-18:42:26.248857 7f89074006c0 Delete type=3 #150 -2024/04/26-18:42:26.249007 7f89074006c0 Delete type=0 #152 -2024/04/26-19:22:04.337456 7f88ffe006c0 Level-0 table #157: started -2024/04/26-19:22:04.340711 7f88ffe006c0 Level-0 table #157: 14514 bytes OK -2024/04/26-19:22:04.346950 7f88ffe006c0 Delete type=0 #155 -2024/04/26-19:22:04.369097 7f88ffe006c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at '!items!yozTUjNuc2rEGjFK' @ 208 : 1 -2024/04/26-19:22:04.369120 7f88ffe006c0 Compacting 1@0 + 1@1 files -2024/04/26-19:22:04.373318 7f88ffe006c0 Generated table #158@0: 113 keys, 16306 bytes -2024/04/26-19:22:04.373343 7f88ffe006c0 Compacted 1@0 + 1@1 files => 16306 bytes -2024/04/26-19:22:04.379990 7f88ffe006c0 compacted to: files[ 0 1 0 0 0 0 0 ] -2024/04/26-19:22:04.380097 7f88ffe006c0 Delete type=2 #9 -2024/04/26-19:22:04.380204 7f88ffe006c0 Delete type=2 #157 -2024/04/26-19:22:04.400725 7f88ffe006c0 Manual compaction at level-0 from '!items!yozTUjNuc2rEGjFK' @ 208 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) +2024/04/26-19:22:08.694940 7f89056006c0 Recovering log #156 +2024/04/26-19:22:08.705096 7f89056006c0 Delete type=3 #154 +2024/04/26-19:22:08.705158 7f89056006c0 Delete type=0 #156 +2024/04/26-19:25:18.631092 7f88ffe006c0 Level-0 table #162: started +2024/04/26-19:25:18.631157 7f88ffe006c0 Level-0 table #162: 0 bytes OK +2024/04/26-19:25:18.673806 7f88ffe006c0 Delete type=0 #160 +2024/04/26-19:25:18.747426 7f88ffe006c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) diff --git a/packs/specialisation/MANIFEST-000159 b/packs/specialisation/MANIFEST-000163 similarity index 72% rename from packs/specialisation/MANIFEST-000159 rename to packs/specialisation/MANIFEST-000163 index f0bc38eacdbd600a2f26919d02cabe537796d6a3..d26ba83b6430ab1e030983c70f3adaf0c36b484f 100644 GIT binary patch delta 43 tcmdnUxRG%}uS&Io+Ba?nMy4f 4133 bytes -2024/04/26-19:22:04.389454 7f88ffe006c0 compacted to: files[ 0 1 0 0 0 0 0 ] -2024/04/26-19:22:04.389551 7f88ffe006c0 Delete type=2 #9 -2024/04/26-19:22:04.389636 7f88ffe006c0 Delete type=2 #157 -2024/04/26-19:22:04.400736 7f88ffe006c0 Manual compaction at level-0 from '!items!zgNI2haxhBxBDBdl' @ 98 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) +2024/04/26-19:22:08.721470 7f8906a006c0 Recovering log #156 +2024/04/26-19:22:08.732531 7f8906a006c0 Delete type=3 #154 +2024/04/26-19:22:08.732624 7f8906a006c0 Delete type=0 #156 +2024/04/26-19:25:18.716069 7f88ffe006c0 Level-0 table #162: started +2024/04/26-19:25:18.716099 7f88ffe006c0 Level-0 table #162: 0 bytes OK +2024/04/26-19:25:18.747273 7f88ffe006c0 Delete type=0 #160 +2024/04/26-19:25:18.747446 7f88ffe006c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) diff --git a/packs/traits/MANIFEST-000159 b/packs/traits/MANIFEST-000163 similarity index 73% rename from packs/traits/MANIFEST-000159 rename to packs/traits/MANIFEST-000163 index 0cf3772901c388225a4b9dcf3bf04af60a546168..0480fe9e998e8f4aca27423c92fa397f8b03afa9 100644 GIT binary patch delta 41 scmZ3_xSnxBuaeRv?{Y2%My4fZ02Pf3KL7v# diff --git a/system.json b/system.json index 1e4f808..e09a90b 100644 --- a/system.json +++ b/system.json @@ -123,7 +123,7 @@ }, "title": "Ecryme, le Jeu de Rôles", "url": "https://www.uberwald.me/gitea/public/fvtt-ecryme", - "version": "12.0.0", - "download": "https://www.uberwald.me/gitea/public/fvtt-ecryme/archive/fvtt-ecryme-v12.0.0.zip", + "version": "12.0.1", + "download": "https://www.uberwald.me/gitea/public/fvtt-ecryme/archive/fvtt-ecryme-v12.0.1.zip", "background": "systems/fvtt-ecryme/images/assets/ecryme_extract_panel_01.webp" } \ No newline at end of file diff --git a/templates/dialogs/confront-dialog.hbs b/templates/dialogs/confront-dialog.hbs index 10ed915..bcf699f 100644 --- a/templates/dialogs/confront-dialog.hbs +++ b/templates/dialogs/confront-dialog.hbs @@ -114,8 +114,8 @@
Bonus/Malus : - + {{selectOptions config.bonusMalusPersoOptions selected=bonusMalusPerso labelAttr="label"}}
diff --git a/templates/dialogs/partial-common-roll-dialog.hbs b/templates/dialogs/partial-common-roll-dialog.hbs index 436ad7d..c850a58 100644 --- a/templates/dialogs/partial-common-roll-dialog.hbs +++ b/templates/dialogs/partial-common-roll-dialog.hbs @@ -71,8 +71,8 @@
Bonus/Malus : - + {{selectOptions config.bonusMalusPersoOptions selected=bonusMalusPerso labelAttr="label"}}
diff --git a/templates/dialogs/roll-dialog-generic.hbs b/templates/dialogs/roll-dialog-generic.hbs index ab2f8d4..4cdd9a0 100644 --- a/templates/dialogs/roll-dialog-generic.hbs +++ b/templates/dialogs/roll-dialog-generic.hbs @@ -12,8 +12,8 @@
Difficulté : - + {{selectOptions config.difficulty selected=difficulty localize=true labelAttr="difficulty"}}
diff --git a/templates/items/item-specialization-sheet.hbs b/templates/items/item-specialization-sheet.hbs index 5f40127..337f137 100644 --- a/templates/items/item-specialization-sheet.hbs +++ b/templates/items/item-specialization-sheet.hbs @@ -22,7 +22,7 @@
    • diff --git a/templates/items/item-trait-sheet.hbs b/templates/items/item-trait-sheet.hbs index 6955c26..02312fd 100644 --- a/templates/items/item-trait-sheet.hbs +++ b/templates/items/item-trait-sheet.hbs @@ -28,8 +28,8 @@
  • - + {{selectOptions config.traitLevel selected=system.level labelAttr="text"}}
    • diff --git a/templates/items/partial-item-equipment.hbs b/templates/items/partial-item-equipment.hbs index 88edbd5..37cf9f2 100644 --- a/templates/items/partial-item-equipment.hbs +++ b/templates/items/partial-item-equipment.hbs @@ -8,7 +8,7 @@