From bc09b5050dae19f7a9d03a43faadbc422b6e893e Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Fri, 17 Oct 2025 00:32:42 +0200 Subject: [PATCH] Correction sur application tokens acteurs --- modules/actors/ecryme-actor-sheet.js | 2 +- modules/common/ecryme-utility.js | 24 ++++++++++++------ .../dialogs/ecryme-confront-start-dialog.js | 3 +++ packs/equipment/{000223.log => 000227.log} | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 14 +++++----- packs/equipment/LOG.old | 14 +++++----- .../{MANIFEST-000221 => MANIFEST-000225} | Bin 178 -> 178 bytes packs/help/{000160.log => 000164.log} | 0 packs/help/CURRENT | 2 +- packs/help/LOG | 16 ++++++------ packs/help/LOG.old | 16 ++++++------ .../help/{MANIFEST-000158 => MANIFEST-000162} | Bin 225 -> 225 bytes packs/maneuvers/{000223.log => 000227.log} | 0 packs/maneuvers/CURRENT | 2 +- packs/maneuvers/LOG | 14 +++++----- packs/maneuvers/LOG.old | 14 +++++----- .../{MANIFEST-000221 => MANIFEST-000225} | Bin 173 -> 173 bytes packs/scenes/{000109.log => 000113.log} | 0 packs/scenes/CURRENT | 2 +- packs/scenes/LOG | 16 ++++++------ packs/scenes/LOG.old | 16 ++++++------ .../{MANIFEST-000107 => MANIFEST-000111} | Bin 206 -> 206 bytes .../specialisation/{000223.log => 000227.log} | 0 packs/specialisation/CURRENT | 2 +- packs/specialisation/LOG | 14 +++++----- packs/specialisation/LOG.old | 14 +++++----- .../{MANIFEST-000221 => MANIFEST-000225} | Bin 178 -> 178 bytes packs/traits/{000223.log => 000227.log} | 0 packs/traits/CURRENT | 2 +- packs/traits/LOG | 14 +++++----- packs/traits/LOG.old | 14 +++++----- .../{MANIFEST-000221 => MANIFEST-000225} | Bin 177 -> 177 bytes templates/chat/chat-confrontation-result.hbs | 12 ++++----- 34 files changed, 120 insertions(+), 109 deletions(-) rename packs/equipment/{000223.log => 000227.log} (100%) rename packs/equipment/{MANIFEST-000221 => MANIFEST-000225} (71%) rename packs/help/{000160.log => 000164.log} (100%) rename packs/help/{MANIFEST-000158 => MANIFEST-000162} (56%) rename packs/maneuvers/{000223.log => 000227.log} (100%) rename packs/maneuvers/{MANIFEST-000221 => MANIFEST-000225} (73%) rename packs/scenes/{000109.log => 000113.log} (100%) rename packs/scenes/{MANIFEST-000107 => MANIFEST-000111} (62%) rename packs/specialisation/{000223.log => 000227.log} (100%) rename packs/specialisation/{MANIFEST-000221 => MANIFEST-000225} (71%) rename packs/traits/{000223.log => 000227.log} (100%) rename packs/traits/{MANIFEST-000221 => MANIFEST-000225} (72%) diff --git a/modules/actors/ecryme-actor-sheet.js b/modules/actors/ecryme-actor-sheet.js index cc0a2b8..4942053 100644 --- a/modules/actors/ecryme-actor-sheet.js +++ b/modules/actors/ecryme-actor-sheet.js @@ -63,7 +63,7 @@ export class EcrymeActorSheet extends foundry.appv1.sheets.ActorSheet { } this.formData = formData; - console.log("PC : ", formData, this.object); + //console.log("PC : ", formData, this.object); return formData; } diff --git a/modules/common/ecryme-utility.js b/modules/common/ecryme-utility.js index 114aedd..642a714 100644 --- a/modules/common/ecryme-utility.js +++ b/modules/common/ecryme-utility.js @@ -155,8 +155,8 @@ export class EcrymeUtility { /* -------------------------------------------- */ static getActorFromRollData(rollData) { let actor = game.actors.get(rollData.actorId) - if (rollData.tokenId) { - let token = canvas.tokens.placeables.find(t => t.id == rollData.tokenId) + if (rollData.defenderTokenId) { + let token = canvas.tokens.placeables.find(t => t.id == rollData.defenderTokenId) if (token) { actor = token.actor } @@ -298,7 +298,7 @@ export class EcrymeUtility { let messageId = EcrymeUtility.findChatMessageId(event.currentTarget) let message = game.messages.get(messageId) let rollData = message.getFlag("world", "ecryme-rolldata") - ui.notifications.info( game.i18n.localize("ECRY.chat.confrontselect")) + ui.notifications.info(game.i18n.localize("ECRY.chat.confrontselect")) EcrymeUtility.manageConfrontation(rollData) }) $(html).on("click", '.button-apply-cephaly-difficulty', event => { @@ -311,7 +311,15 @@ export class EcrymeUtility { $(html).on("click", '.button-apply-impact', event => { let messageId = EcrymeUtility.findChatMessageId(event.currentTarget) let message = game.messages.get(messageId) - let actor = game.actors.get($(event.currentTarget).data("actor-id")) + let tokenId = $(event.currentTarget).data("token-id") + let actor + if (!tokenId) { + actorId = $(event.currentTarget).data("actor-id") + actor = game.actors.get(actorId) + } else { + let token = canvas.tokens.placeables.find(t => t.id == tokenId) + actor = token?.actor + } actor.modifyImpact($(event.currentTarget).data("impact-type"), $(event.currentTarget).data("impact"), 1) }) $(html).on("click", '.button-apply-bonus', event => { @@ -411,7 +419,7 @@ export class EcrymeUtility { console.log("SOCKET MESSAGE", msg) if (msg.name == "msg_gm_chat_message") { let rollData = msg.data.rollData - if ( game.user.isGM ) { + if (game.user.isGM) { let chatMsg = await this.createChatMessage(rollData.alias, "blindroll", { content: await renderTemplate(msg.data.template, rollData), whisper: game.user.id @@ -715,11 +723,11 @@ export class EcrymeUtility { /* -------------------------------------------- */ static async confirmDelete(actorSheet, li) { let itemId = li.data("item-id"); - let msgTxt = "

Are you sure to remove this Item ?"; + let msgTxt = "

Etes vous certain de souhaiter envoyer cet item dans les limbes ?"; let buttons = { delete: { icon: '', - label: "Yes, remove it", + label: "Oui, retirez-le", callback: () => { actorSheet.actor.deleteEmbeddedDocuments("Item", [itemId]); li.slideUp(200, () => actorSheet.render(false)); @@ -727,7 +735,7 @@ export class EcrymeUtility { }, cancel: { icon: '', - label: "Cancel" + label: "Annuler" } } msgTxt += "

"; diff --git a/modules/dialogs/ecryme-confront-start-dialog.js b/modules/dialogs/ecryme-confront-start-dialog.js index 3d2f7ee..6a20f63 100644 --- a/modules/dialogs/ecryme-confront-start-dialog.js +++ b/modules/dialogs/ecryme-confront-start-dialog.js @@ -5,7 +5,10 @@ export class EcrymeConfrontStartDialog extends Dialog { /* -------------------------------------------- */ static async create(actor, rollData) { + if (!actor) throw new Error("Ecryme | No actor provided for confront dialog"); + if (!rollData) throw new Error("Ecryme | No roll data provided for confront dialog"); + if (actor?.token) rollData.tokenId = actor.token.id; let options = { classes: ["fvtt-ecryme ecryme-confront-dialog"], width: 540, height: 'fit-content', 'z-index': 99999 } let html = await foundry.applications.handlebars.renderTemplate('systems/fvtt-ecryme/templates/dialogs/confront-start-dialog.hbs', rollData); return new EcrymeConfrontStartDialog(actor, rollData, html, options); diff --git a/packs/equipment/000223.log b/packs/equipment/000227.log similarity index 100% rename from packs/equipment/000223.log rename to packs/equipment/000227.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index 2582555..0fb0168 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000221 +MANIFEST-000225 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index f51241a..d5989e3 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,7 +1,7 @@ -2025/10/02-22:42:43.315581 7ff26f7fe6c0 Recovering log #219 -2025/10/02-22:42:43.325193 7ff26f7fe6c0 Delete type=3 #217 -2025/10/02-22:42:43.325254 7ff26f7fe6c0 Delete type=0 #219 -2025/10/02-22:46:10.718055 7ff26ebff6c0 Level-0 table #224: started -2025/10/02-22:46:10.718108 7ff26ebff6c0 Level-0 table #224: 0 bytes OK -2025/10/02-22:46:10.724165 7ff26ebff6c0 Delete type=0 #222 -2025/10/02-22:46:10.737951 7ff26ebff6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) +2025/10/16-23:04:27.935378 7f189effd6c0 Recovering log #223 +2025/10/16-23:04:27.944998 7f189effd6c0 Delete type=3 #221 +2025/10/16-23:04:27.945071 7f189effd6c0 Delete type=0 #223 +2025/10/17-00:31:02.431129 7f189e7fc6c0 Level-0 table #228: started +2025/10/17-00:31:02.431165 7f189e7fc6c0 Level-0 table #228: 0 bytes OK +2025/10/17-00:31:02.437211 7f189e7fc6c0 Delete type=0 #226 +2025/10/17-00:31:02.444512 7f189e7fc6c0 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 afd8bc2..f51241a 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,7 +1,7 @@ -2025/06/16-23:09:47.292043 7fd8d27fc6c0 Recovering log #215 -2025/06/16-23:09:47.302177 7fd8d27fc6c0 Delete type=3 #213 -2025/06/16-23:09:47.302224 7fd8d27fc6c0 Delete type=0 #215 -2025/06/16-23:10:06.097208 7fd633fff6c0 Level-0 table #220: started -2025/06/16-23:10:06.097226 7fd633fff6c0 Level-0 table #220: 0 bytes OK -2025/06/16-23:10:06.103274 7fd633fff6c0 Delete type=0 #218 -2025/06/16-23:10:06.109982 7fd633fff6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) +2025/10/02-22:42:43.315581 7ff26f7fe6c0 Recovering log #219 +2025/10/02-22:42:43.325193 7ff26f7fe6c0 Delete type=3 #217 +2025/10/02-22:42:43.325254 7ff26f7fe6c0 Delete type=0 #219 +2025/10/02-22:46:10.718055 7ff26ebff6c0 Level-0 table #224: started +2025/10/02-22:46:10.718108 7ff26ebff6c0 Level-0 table #224: 0 bytes OK +2025/10/02-22:46:10.724165 7ff26ebff6c0 Delete type=0 #222 +2025/10/02-22:46:10.737951 7ff26ebff6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/MANIFEST-000221 b/packs/equipment/MANIFEST-000225 similarity index 71% rename from packs/equipment/MANIFEST-000221 rename to packs/equipment/MANIFEST-000225 index 647de00c375eac8b6c22701bd7354b56dee6b423..014d038af6580bba7669435359f93da52503561d 100644 GIT binary patch delta 43 tcmdnQxQTH>p9+_MwkkIRBhw>BP6p=3j4ZQQHTHgu0Es*Xi97{~008>b3eNxl delta 43 tcmdnQxQTH>pNiwvx$N8wj7;|!IT@JmGqTKLUGYkH5=i7eNaP_%1OOS53$FkG diff --git a/packs/help/000160.log b/packs/help/000164.log similarity index 100% rename from packs/help/000160.log rename to packs/help/000164.log diff --git a/packs/help/CURRENT b/packs/help/CURRENT index 9bad6d5..f405c4b 100644 --- a/packs/help/CURRENT +++ b/packs/help/CURRENT @@ -1 +1 @@ -MANIFEST-000158 +MANIFEST-000162 diff --git a/packs/help/LOG b/packs/help/LOG index f153c84..a54cc40 100644 --- a/packs/help/LOG +++ b/packs/help/LOG @@ -1,8 +1,8 @@ -2025/10/02-22:42:43.369243 7ff26ffff6c0 Recovering log #156 -2025/10/02-22:42:43.379551 7ff26ffff6c0 Delete type=3 #154 -2025/10/02-22:42:43.379614 7ff26ffff6c0 Delete type=0 #156 -2025/10/02-22:46:10.762665 7ff26ebff6c0 Level-0 table #161: started -2025/10/02-22:46:10.762700 7ff26ebff6c0 Level-0 table #161: 0 bytes OK -2025/10/02-22:46:10.769189 7ff26ebff6c0 Delete type=0 #159 -2025/10/02-22:46:10.769383 7ff26ebff6c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) -2025/10/02-22:46:10.779762 7ff26ebff6c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) +2025/10/16-23:04:27.987583 7f189f7fe6c0 Recovering log #160 +2025/10/16-23:04:27.998975 7f189f7fe6c0 Delete type=3 #158 +2025/10/16-23:04:27.999065 7f189f7fe6c0 Delete type=0 #160 +2025/10/17-00:31:02.437340 7f189e7fc6c0 Level-0 table #165: started +2025/10/17-00:31:02.437367 7f189e7fc6c0 Level-0 table #165: 0 bytes OK +2025/10/17-00:31:02.444287 7f189e7fc6c0 Delete type=0 #163 +2025/10/17-00:31:02.444526 7f189e7fc6c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) +2025/10/17-00:31:02.454473 7f189e7fc6c0 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 6dce0a2..f153c84 100644 --- a/packs/help/LOG.old +++ b/packs/help/LOG.old @@ -1,8 +1,8 @@ -2025/06/16-23:09:47.347699 7fd8d17fa6c0 Recovering log #152 -2025/06/16-23:09:47.357498 7fd8d17fa6c0 Delete type=3 #150 -2025/06/16-23:09:47.357565 7fd8d17fa6c0 Delete type=0 #152 -2025/06/16-23:10:06.110087 7fd633fff6c0 Level-0 table #157: started -2025/06/16-23:10:06.110111 7fd633fff6c0 Level-0 table #157: 0 bytes OK -2025/06/16-23:10:06.116396 7fd633fff6c0 Delete type=0 #155 -2025/06/16-23:10:06.136268 7fd633fff6c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) -2025/06/16-23:10:06.136315 7fd633fff6c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) +2025/10/02-22:42:43.369243 7ff26ffff6c0 Recovering log #156 +2025/10/02-22:42:43.379551 7ff26ffff6c0 Delete type=3 #154 +2025/10/02-22:42:43.379614 7ff26ffff6c0 Delete type=0 #156 +2025/10/02-22:46:10.762665 7ff26ebff6c0 Level-0 table #161: started +2025/10/02-22:46:10.762700 7ff26ebff6c0 Level-0 table #161: 0 bytes OK +2025/10/02-22:46:10.769189 7ff26ebff6c0 Delete type=0 #159 +2025/10/02-22:46:10.769383 7ff26ebff6c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) +2025/10/02-22:46:10.779762 7ff26ebff6c0 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-000158 b/packs/help/MANIFEST-000162 similarity index 56% rename from packs/help/MANIFEST-000158 rename to packs/help/MANIFEST-000162 index bed51ab38f53bbfc754607d12a65b4465cd8cd8e..b7372072674b25dbf1fc07910b285ad95f1c1f1e 100644 GIT binary patch delta 41 scmaFJ_>ghJex);$GCQ~!7?~C`axyS4VPuiG>=gVEB(MY|unZ^w02VO{%>V!Z delta 41 scmaFJ_>ghJex;MWd`4Uhj7;+xIT@H2FtSMeV7pQc5?BBdSOgRR0RIgN2mk;8 diff --git a/packs/maneuvers/000223.log b/packs/maneuvers/000227.log similarity index 100% rename from packs/maneuvers/000223.log rename to packs/maneuvers/000227.log diff --git a/packs/maneuvers/CURRENT b/packs/maneuvers/CURRENT index 2582555..0fb0168 100644 --- a/packs/maneuvers/CURRENT +++ b/packs/maneuvers/CURRENT @@ -1 +1 @@ -MANIFEST-000221 +MANIFEST-000225 diff --git a/packs/maneuvers/LOG b/packs/maneuvers/LOG index 908c5d8..77d4f25 100644 --- a/packs/maneuvers/LOG +++ b/packs/maneuvers/LOG @@ -1,7 +1,7 @@ -2025/10/02-22:42:43.357117 7ff2749f96c0 Recovering log #219 -2025/10/02-22:42:43.366815 7ff2749f96c0 Delete type=3 #217 -2025/10/02-22:42:43.366872 7ff2749f96c0 Delete type=0 #219 -2025/10/02-22:46:10.756135 7ff26ebff6c0 Level-0 table #224: started -2025/10/02-22:46:10.756193 7ff26ebff6c0 Level-0 table #224: 0 bytes OK -2025/10/02-22:46:10.762494 7ff26ebff6c0 Delete type=0 #222 -2025/10/02-22:46:10.769374 7ff26ebff6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) +2025/10/16-23:04:27.975607 7f18a4ffa6c0 Recovering log #223 +2025/10/16-23:04:27.985618 7f18a4ffa6c0 Delete type=3 #221 +2025/10/16-23:04:27.985677 7f18a4ffa6c0 Delete type=0 #223 +2025/10/17-00:31:02.386862 7f189e7fc6c0 Level-0 table #228: started +2025/10/17-00:31:02.386912 7f189e7fc6c0 Level-0 table #228: 0 bytes OK +2025/10/17-00:31:02.393931 7f189e7fc6c0 Delete type=0 #226 +2025/10/17-00:31:02.413626 7f189e7fc6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/LOG.old b/packs/maneuvers/LOG.old index dacd2e1..908c5d8 100644 --- a/packs/maneuvers/LOG.old +++ b/packs/maneuvers/LOG.old @@ -1,7 +1,7 @@ -2025/06/16-23:09:47.333897 7fd8d1ffb6c0 Recovering log #215 -2025/06/16-23:09:47.344025 7fd8d1ffb6c0 Delete type=3 #213 -2025/06/16-23:09:47.344095 7fd8d1ffb6c0 Delete type=0 #215 -2025/06/16-23:10:06.129980 7fd633fff6c0 Level-0 table #220: started -2025/06/16-23:10:06.130009 7fd633fff6c0 Level-0 table #220: 0 bytes OK -2025/06/16-23:10:06.136124 7fd633fff6c0 Delete type=0 #218 -2025/06/16-23:10:06.136302 7fd633fff6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) +2025/10/02-22:42:43.357117 7ff2749f96c0 Recovering log #219 +2025/10/02-22:42:43.366815 7ff2749f96c0 Delete type=3 #217 +2025/10/02-22:42:43.366872 7ff2749f96c0 Delete type=0 #219 +2025/10/02-22:46:10.756135 7ff26ebff6c0 Level-0 table #224: started +2025/10/02-22:46:10.756193 7ff26ebff6c0 Level-0 table #224: 0 bytes OK +2025/10/02-22:46:10.762494 7ff26ebff6c0 Delete type=0 #222 +2025/10/02-22:46:10.769374 7ff26ebff6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/MANIFEST-000221 b/packs/maneuvers/MANIFEST-000225 similarity index 73% rename from packs/maneuvers/MANIFEST-000221 rename to packs/maneuvers/MANIFEST-000225 index 42f7aac0f3b2708bac6c965a6d6f6ce8be0898f6..9b5fd80a689897feee400907a5f311fe5de92149 100644 GIT binary patch delta 41 scmZ3>xR!B3w^GxO-yU2Hj7*OhIT@HAGqQM_MohQ>5_k*}cnTB%02qf0r2qf` delta 41 scmZ3>xR!B3w^B{B#bYi8My7j=oD9tO8Ckpyf*(Hv3ET$>JOl~=00)N)Q2+n{ diff --git a/packs/scenes/000109.log b/packs/scenes/000113.log similarity index 100% rename from packs/scenes/000109.log rename to packs/scenes/000113.log diff --git a/packs/scenes/CURRENT b/packs/scenes/CURRENT index aecd689..0e66324 100644 --- a/packs/scenes/CURRENT +++ b/packs/scenes/CURRENT @@ -1 +1 @@ -MANIFEST-000107 +MANIFEST-000111 diff --git a/packs/scenes/LOG b/packs/scenes/LOG index 41b9cb7..964c936 100644 --- a/packs/scenes/LOG +++ b/packs/scenes/LOG @@ -1,8 +1,8 @@ -2025/10/02-22:42:43.343031 7ff26ffff6c0 Recovering log #105 -2025/10/02-22:42:43.353479 7ff26ffff6c0 Delete type=3 #103 -2025/10/02-22:42:43.353550 7ff26ffff6c0 Delete type=0 #105 -2025/10/02-22:46:10.730732 7ff26ebff6c0 Level-0 table #110: started -2025/10/02-22:46:10.730767 7ff26ebff6c0 Level-0 table #110: 0 bytes OK -2025/10/02-22:46:10.737713 7ff26ebff6c0 Delete type=0 #108 -2025/10/02-22:46:10.737975 7ff26ebff6c0 Manual compaction at level-0 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes!zvY1RwBhTfwdZIBa' @ 0 : 0; will stop at (end) -2025/10/02-22:46:10.738002 7ff26ebff6c0 Manual compaction at level-1 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes!zvY1RwBhTfwdZIBa' @ 0 : 0; will stop at (end) +2025/10/16-23:04:27.962699 7f189f7fe6c0 Recovering log #109 +2025/10/16-23:04:27.972819 7f189f7fe6c0 Delete type=3 #107 +2025/10/16-23:04:27.972872 7f189f7fe6c0 Delete type=0 #109 +2025/10/17-00:31:02.407461 7f189e7fc6c0 Level-0 table #114: started +2025/10/17-00:31:02.407488 7f189e7fc6c0 Level-0 table #114: 0 bytes OK +2025/10/17-00:31:02.413518 7f189e7fc6c0 Delete type=0 #112 +2025/10/17-00:31:02.413653 7f189e7fc6c0 Manual compaction at level-0 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes!zvY1RwBhTfwdZIBa' @ 0 : 0; will stop at (end) +2025/10/17-00:31:02.413685 7f189e7fc6c0 Manual compaction at level-1 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes!zvY1RwBhTfwdZIBa' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/LOG.old b/packs/scenes/LOG.old index e5119c6..41b9cb7 100644 --- a/packs/scenes/LOG.old +++ b/packs/scenes/LOG.old @@ -1,8 +1,8 @@ -2025/06/16-23:09:47.319459 7fd8d17fa6c0 Recovering log #101 -2025/06/16-23:09:47.330217 7fd8d17fa6c0 Delete type=3 #99 -2025/06/16-23:09:47.330266 7fd8d17fa6c0 Delete type=0 #101 -2025/06/16-23:10:06.091049 7fd633fff6c0 Level-0 table #106: started -2025/06/16-23:10:06.091074 7fd633fff6c0 Level-0 table #106: 0 bytes OK -2025/06/16-23:10:06.097124 7fd633fff6c0 Delete type=0 #104 -2025/06/16-23:10:06.109973 7fd633fff6c0 Manual compaction at level-0 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes!zvY1RwBhTfwdZIBa' @ 0 : 0; will stop at (end) -2025/06/16-23:10:06.109999 7fd633fff6c0 Manual compaction at level-1 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes!zvY1RwBhTfwdZIBa' @ 0 : 0; will stop at (end) +2025/10/02-22:42:43.343031 7ff26ffff6c0 Recovering log #105 +2025/10/02-22:42:43.353479 7ff26ffff6c0 Delete type=3 #103 +2025/10/02-22:42:43.353550 7ff26ffff6c0 Delete type=0 #105 +2025/10/02-22:46:10.730732 7ff26ebff6c0 Level-0 table #110: started +2025/10/02-22:46:10.730767 7ff26ebff6c0 Level-0 table #110: 0 bytes OK +2025/10/02-22:46:10.737713 7ff26ebff6c0 Delete type=0 #108 +2025/10/02-22:46:10.737975 7ff26ebff6c0 Manual compaction at level-0 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes!zvY1RwBhTfwdZIBa' @ 0 : 0; will stop at (end) +2025/10/02-22:46:10.738002 7ff26ebff6c0 Manual compaction at level-1 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes!zvY1RwBhTfwdZIBa' @ 0 : 0; will stop at (end) diff --git a/packs/scenes/MANIFEST-000107 b/packs/scenes/MANIFEST-000111 similarity index 62% rename from packs/scenes/MANIFEST-000107 rename to packs/scenes/MANIFEST-000111 index 229074c5d452d7ecc5555c8c11bfcbcf968711e5..89e46a14ab7cd86e4d07d27b080aedbc5dcac192 100644 GIT binary patch delta 37 pcmX@dc#d(x203HP3ClSc7?}z<8JG)MgrZ+_&IWM{f!tyiApppL2&n)7 delta 37 pcmX@dc#d(x207Lr1)n$=7@2Z78JKffgwEpUSaqtODE&j7*OhIT@HAGqUtCr)13j4H9__5_t*|0RR+t3yS~% delta 43 tcmdnQxQTH>pGvR6XB}<^My7j=oD9tO8Cm+6pIA9B28rAUi97^}000-83upiU diff --git a/packs/traits/000223.log b/packs/traits/000227.log similarity index 100% rename from packs/traits/000223.log rename to packs/traits/000227.log diff --git a/packs/traits/CURRENT b/packs/traits/CURRENT index 2582555..0fb0168 100644 --- a/packs/traits/CURRENT +++ b/packs/traits/CURRENT @@ -1 +1 @@ -MANIFEST-000221 +MANIFEST-000225 diff --git a/packs/traits/LOG b/packs/traits/LOG index a4fb0e2..e6903e5 100644 --- a/packs/traits/LOG +++ b/packs/traits/LOG @@ -1,7 +1,7 @@ -2025/10/02-22:42:43.327925 7ff2749f96c0 Recovering log #219 -2025/10/02-22:42:43.339012 7ff2749f96c0 Delete type=3 #217 -2025/10/02-22:42:43.339080 7ff2749f96c0 Delete type=0 #219 -2025/10/02-22:46:10.724277 7ff26ebff6c0 Level-0 table #224: started -2025/10/02-22:46:10.724304 7ff26ebff6c0 Level-0 table #224: 0 bytes OK -2025/10/02-22:46:10.730560 7ff26ebff6c0 Delete type=0 #222 -2025/10/02-22:46:10.737964 7ff26ebff6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) +2025/10/16-23:04:27.948519 7f189ffff6c0 Recovering log #223 +2025/10/16-23:04:27.959741 7f189ffff6c0 Delete type=3 #221 +2025/10/16-23:04:27.959811 7f189ffff6c0 Delete type=0 #223 +2025/10/17-00:31:02.400771 7f189e7fc6c0 Level-0 table #228: started +2025/10/17-00:31:02.400802 7f189e7fc6c0 Level-0 table #228: 0 bytes OK +2025/10/17-00:31:02.407358 7f189e7fc6c0 Delete type=0 #226 +2025/10/17-00:31:02.413646 7f189e7fc6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) diff --git a/packs/traits/LOG.old b/packs/traits/LOG.old index 0a1cc64..a4fb0e2 100644 --- a/packs/traits/LOG.old +++ b/packs/traits/LOG.old @@ -1,7 +1,7 @@ -2025/06/16-23:09:47.306863 7fd8d0ff96c0 Recovering log #215 -2025/06/16-23:09:47.316443 7fd8d0ff96c0 Delete type=3 #213 -2025/06/16-23:09:47.316496 7fd8d0ff96c0 Delete type=0 #215 -2025/06/16-23:10:06.103419 7fd633fff6c0 Level-0 table #220: started -2025/06/16-23:10:06.103438 7fd633fff6c0 Level-0 table #220: 0 bytes OK -2025/06/16-23:10:06.109827 7fd633fff6c0 Delete type=0 #218 -2025/06/16-23:10:06.109991 7fd633fff6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) +2025/10/02-22:42:43.327925 7ff2749f96c0 Recovering log #219 +2025/10/02-22:42:43.339012 7ff2749f96c0 Delete type=3 #217 +2025/10/02-22:42:43.339080 7ff2749f96c0 Delete type=0 #219 +2025/10/02-22:46:10.724277 7ff26ebff6c0 Level-0 table #224: started +2025/10/02-22:46:10.724304 7ff26ebff6c0 Level-0 table #224: 0 bytes OK +2025/10/02-22:46:10.730560 7ff26ebff6c0 Delete type=0 #222 +2025/10/02-22:46:10.737964 7ff26ebff6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) diff --git a/packs/traits/MANIFEST-000221 b/packs/traits/MANIFEST-000225 similarity index 72% rename from packs/traits/MANIFEST-000221 rename to packs/traits/MANIFEST-000225 index 9f345d09707568a70a3c7e36d4d1d0e2c0eb6a85..136dcb92eec6afb4c4482860e95a33bdd21fdafd 100644 GIT binary patch delta 43 tcmdnUxRG%}uL|29&2!ugj7*OhIT@HAGqOx#R0-OD5G3*#B=Qs_0ss&x3rGL} delta 43 tcmdnUxRG%}uZpkN^*n9{My7j=oD9tO8CfPVE-_7i2@<&v5_t#`0RR{-3yuH) diff --git a/templates/chat/chat-confrontation-result.hbs b/templates/chat/chat-confrontation-result.hbs index 144d6ef..a55258e 100644 --- a/templates/chat/chat-confrontation-result.hbs +++ b/templates/chat/chat-confrontation-result.hbs @@ -15,7 +15,7 @@
    -
  • Confrontation : {{rollData1.alias}} vs {{rollData2.alias}}
    • +
  • Confrontation : {{rollData1.alias}} vs {{rollData2.alias}}
  • {{localize rollData1.skill.name}} ({{rollData1.skill.value}}) vs {{localize rollData2.skill.name}} ({{rollData2.skill.value}})
  • {{rollData1.executionTotal}} vs {{rollData2.preservationTotal}} : {{marginExecution}}
  • {{rollData1.preservationTotal}} vs {{rollData2.executionTotal}} : {{marginPreservation}}
    • @@ -32,21 +32,21 @@
  • {{localize "ECRY.ui.effect"}} {{localize "ECRY.ui.execution"}} : {{effectExecution}}
    • {{#if impactExecution}}
  • Impact {{rollData2.alias}} : 1 {{localize (concat "ECRY.ui." impactExecution)}}
    • - + {{/if}} {{#if bonus2}}
  • Bonus {{rollData2.alias}} : {{bonus2}}
    • - + {{/if}} - +
  • {{localize "ECRY.ui.effect"}} {{localize "ECRY.ui.preservation"}} : {{effectPreservation}}
    • {{#if impactPreservation}}
  • Impact {{rollData1.alias}} : 1 {{localize (concat "ECRY.ui." impactPreservation)}}
    • - + {{/if}} {{#if bonus1}}
  • Bonus {{rollData1.alias}} : {{bonus1}}
    • - + {{/if}}