From ec6e6be2311b549f7a3af2b23556f0de990abe6a Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Thu, 12 Oct 2023 08:28:30 +0200 Subject: [PATCH] Fix confrontation with players --- README.md | 2 ++ lang/en.json | 4 ++- lang/fr.json | 4 ++- modules/common/ecryme-utility.js | 32 +++++++++--------- modules/dialogs/ecryme-confront-dialog.js | 16 +++++++-- packs/equipment/{000108.log => 000112.log} | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 14 ++++---- packs/equipment/LOG.old | 14 ++++---- .../{MANIFEST-000106 => MANIFEST-000110} | Bin 173 -> 173 bytes packs/help/{000044.log => 000048.log} | 0 packs/help/CURRENT | 2 +- packs/help/LOG | 16 ++++----- packs/help/LOG.old | 16 ++++----- .../help/{MANIFEST-000042 => MANIFEST-000046} | Bin 161 -> 161 bytes packs/maneuvers/{000108.log => 000112.log} | 0 packs/maneuvers/CURRENT | 2 +- packs/maneuvers/LOG | 14 ++++---- packs/maneuvers/LOG.old | 14 ++++---- .../{MANIFEST-000106 => MANIFEST-000110} | Bin 168 -> 168 bytes .../specialisation/{000108.log => 000112.log} | 0 packs/specialisation/CURRENT | 2 +- packs/specialisation/LOG | 14 ++++---- packs/specialisation/LOG.old | 14 ++++---- .../{MANIFEST-000106 => MANIFEST-000110} | Bin 170 -> 170 bytes packs/traits/{000108.log => 000112.log} | 0 packs/traits/CURRENT | 2 +- packs/traits/LOG | 14 ++++---- packs/traits/LOG.old | 14 ++++---- .../{MANIFEST-000106 => MANIFEST-000110} | Bin 170 -> 170 bytes system.json | 4 +-- templates/chat/chat-confrontation-pending.hbs | 11 ++++++ 32 files changed, 128 insertions(+), 99 deletions(-) rename packs/equipment/{000108.log => 000112.log} (100%) rename packs/equipment/{MANIFEST-000106 => MANIFEST-000110} (73%) rename packs/help/{000044.log => 000048.log} (100%) rename packs/help/{MANIFEST-000042 => MANIFEST-000046} (79%) rename packs/maneuvers/{000108.log => 000112.log} (100%) rename packs/maneuvers/{MANIFEST-000106 => MANIFEST-000110} (76%) rename packs/specialisation/{000108.log => 000112.log} (100%) rename packs/specialisation/{MANIFEST-000106 => MANIFEST-000110} (75%) rename packs/traits/{000108.log => 000112.log} (100%) rename packs/traits/{MANIFEST-000106 => MANIFEST-000110} (75%) diff --git a/README.md b/README.md index e3acb18..811f0bd 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ # Ecryme v2 system for FoundryVTT (French RPG, Open Sesam Games, Official) + This is a base game system with functionnal character sheets for the game Ecryme, powered by the Engrenage system. You can join the kickstarter and obtain the base books here : https://www.kickstarter.com/projects/osg-us/ecryme # System overview + The game system in Foundry offers the following features : - PC/NPC sheet - Skill rolls diff --git a/lang/en.json b/lang/en.json index ca52b75..a6448a0 100644 --- a/lang/en.json +++ b/lang/en.json @@ -33,7 +33,9 @@ "traitbonus": "Bonus trait", "traitmalus": "Malus trait", "bonusmalustraits": "Traits Bonus/Malus", - "spectranscend": "Self-Transcend : " + "spectranscend": "Self-Transcend : ", + "confrontselect": "Selected for confrontation", + "sentogm": "Confrontation has been sent to GM" }, "rule": { "cephaly-success-2": "Duration : 1 scene - Impact : Superficial - Bonus : 1 - Elegy : 1", diff --git a/lang/fr.json b/lang/fr.json index 51af19c..9691f70 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -33,7 +33,9 @@ "traitbonus": "Trait bonus", "traitmalus": "Trait malus", "bonusmalustraits": "Bonus/Malus des Traits", - "spectranscend": "Dépassement de soi : " + "spectranscend": "Dépassement de soi : ", + "confrontselected": "Confrontation selectionnée", + "sentogm": "La confrontation a été envoyée au MJ" }, "rule": { "cephaly-success-12": "Durée : 1 scène - Impact : Superficiel - Bonus : 1 - Elegie : 1", diff --git a/modules/common/ecryme-utility.js b/modules/common/ecryme-utility.js index ddd298f..faf440f 100644 --- a/modules/common/ecryme-utility.js +++ b/modules/common/ecryme-utility.js @@ -300,6 +300,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")) EcrymeUtility.manageConfrontation(rollData) }) html.on("click", '.button-apply-cephaly-difficulty', event => { @@ -409,10 +410,15 @@ export class EcrymeUtility { /* -------------------------------------------- */ static async onSocketMesssage(msg) { - console.log("SOCKET MESSAGE", msg.name) - if (msg.name == "msg-draw-card") { - if (game.user.isGM && game.system.ecryme.currentTirage) { - game.system.ecryme.currentTirage.addCard(msg.data.msgId) + console.log("SOCKET MESSAGE", msg) + if (msg.name == "msg_gm_chat_message") { + let rollData = msg.data.rollData + if ( game.user.isGM ) { + let chatMsg = await this.createChatMessage(rollData.alias, "blindroll", { + content: await renderTemplate(msg.data.template, rollData), + whisper: game.user.id + }) + chatMsg.setFlag("world", "ecryme-rolldata", rollData) } } } @@ -631,12 +637,10 @@ export class EcrymeUtility { } /* -------------------------------------------- */ - static blindMessageToGM(chatOptions) { - let chatGM = duplicate(chatOptions); - chatGM.whisper = this.getUsers(user => user.isGM); - chatGM.content = "Blinde message of " + game.user.name + "
" + chatOptions.content; - console.log("blindMessageToGM", chatGM); - game.socket.emit("system.fvtt-ecryme", { msg: "msg_gm_chat_message", data: chatGM }); + static blindMessageToGM(chatData) { + chatData.whisper = this.getUsers(user => user.isGM); + console.log("blindMessageToGM", chatData); + game.socket.emit("system.fvtt-ecryme", { name: "msg_gm_chat_message", data: chatData }); } @@ -656,18 +660,14 @@ export class EcrymeUtility { } return array; } - + /* -------------------------------------------- */ static async createChatMessage(name, rollMode, chatOptions) { switch (rollMode) { case "blindroll": // GM only if (!game.user.isGM) { - this.blindMessageToGM(chatOptions); - chatOptions.whisper = [game.user.id]; - chatOptions.content = "Message only to the GM"; - } - else { + } else { chatOptions.whisper = this.getUsers(user => user.isGM); } break; diff --git a/modules/dialogs/ecryme-confront-dialog.js b/modules/dialogs/ecryme-confront-dialog.js index 5d98492..2a36368 100644 --- a/modules/dialogs/ecryme-confront-dialog.js +++ b/modules/dialogs/ecryme-confront-dialog.js @@ -50,6 +50,7 @@ export class EcrymeConfrontDialog extends Dialog { let msg = await EcrymeUtility.createChatMessage(this.rollData.alias, "blindroll", { content: await renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-confrontation-pending.hbs`, this.rollData) }) + EcrymeUtility.blindMessageToGM( { rollData: this.rollData, template: "systems/fvtt-ecryme/templates/chat/chat-confrontation-pending.hbs" }) console.log("MSG", this.rollData) msg.setFlag("world", "ecryme-rolldata", this.rollData) } @@ -82,13 +83,24 @@ export class EcrymeConfrontDialog extends Dialog { let button = this.buttonDisabled setTimeout(function () { $(".launchConfront").attr("disabled", button) }, 180) } + + /* ------------------ -------------------------- */ + _canDragStart(selector) { + console.log("CAN DRAG START", selector, super._canDragStart(selector) ) + return true + } + _canDragDrop(selector) { + console.log("CAN DRAG DROP", selector, super._canDragDrop(selector) ) + return true + } /* ------------------ -------------------------- */ _onDragStart(event) { + console.log("DRAGSTART::::", event) super._onDragStart(event) let dragType = $(event.srcElement).data("drag-type") let diceData = {} - //console.log("DRAGTYPE", dragType) + console.log("DRAGTYPE", dragType) if (dragType == "dice") { diceData = { dragType: "dice", @@ -111,7 +123,7 @@ export class EcrymeConfrontDialog extends Dialog { let data = JSON.parse(dataJSON) if ( data.dragType == "dice") { let idx = Number(data.diceIndex) - //console.log("DATA", data, event, event.srcElement.className) + console.log("DATA", data, event, event.srcElement.className) if (event.srcElement.className.includes("execution") && this.rollData.availableDices.filter(d => d.location == "execution").length < 2) { this.rollData.availableDices[idx].location = "execution" diff --git a/packs/equipment/000108.log b/packs/equipment/000112.log similarity index 100% rename from packs/equipment/000108.log rename to packs/equipment/000112.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index abdfdfe..a451d53 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000106 +MANIFEST-000110 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index 80d81e9..d8f64ef 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,7 +1,7 @@ -2023/10/10-15:44:15.214470 7fb8baffd6c0 Recovering log #104 -2023/10/10-15:44:15.228942 7fb8baffd6c0 Delete type=3 #102 -2023/10/10-15:44:15.229018 7fb8baffd6c0 Delete type=0 #104 -2023/10/10-16:47:17.816560 7fb8b97fa6c0 Level-0 table #109: started -2023/10/10-16:47:17.816585 7fb8b97fa6c0 Level-0 table #109: 0 bytes OK -2023/10/10-16:47:17.822797 7fb8b97fa6c0 Delete type=0 #107 -2023/10/10-16:47:17.832584 7fb8b97fa6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) +2023/10/11-23:48:51.541808 7ffafd7f96c0 Recovering log #108 +2023/10/11-23:48:51.552684 7ffafd7f96c0 Delete type=3 #106 +2023/10/11-23:48:51.552736 7ffafd7f96c0 Delete type=0 #108 +2023/10/12-08:26:09.141923 7ff865e026c0 Level-0 table #113: started +2023/10/12-08:26:09.141979 7ff865e026c0 Level-0 table #113: 0 bytes OK +2023/10/12-08:26:09.148564 7ff865e026c0 Delete type=0 #111 +2023/10/12-08:26:09.156649 7ff865e026c0 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 0dc5368..80d81e9 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,7 +1,7 @@ -2023/10/10-14:47:37.319172 7fb8b9ffb6c0 Recovering log #100 -2023/10/10-14:47:37.374764 7fb8b9ffb6c0 Delete type=3 #98 -2023/10/10-14:47:37.374842 7fb8b9ffb6c0 Delete type=0 #100 -2023/10/10-15:44:02.360675 7fb8b97fa6c0 Level-0 table #105: started -2023/10/10-15:44:02.360734 7fb8b97fa6c0 Level-0 table #105: 0 bytes OK -2023/10/10-15:44:02.452513 7fb8b97fa6c0 Delete type=0 #103 -2023/10/10-15:44:02.600640 7fb8b97fa6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) +2023/10/10-15:44:15.214470 7fb8baffd6c0 Recovering log #104 +2023/10/10-15:44:15.228942 7fb8baffd6c0 Delete type=3 #102 +2023/10/10-15:44:15.229018 7fb8baffd6c0 Delete type=0 #104 +2023/10/10-16:47:17.816560 7fb8b97fa6c0 Level-0 table #109: started +2023/10/10-16:47:17.816585 7fb8b97fa6c0 Level-0 table #109: 0 bytes OK +2023/10/10-16:47:17.822797 7fb8b97fa6c0 Delete type=0 #107 +2023/10/10-16:47:17.832584 7fb8b97fa6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/MANIFEST-000106 b/packs/equipment/MANIFEST-000110 similarity index 73% rename from packs/equipment/MANIFEST-000106 rename to packs/equipment/MANIFEST-000110 index d36446521c4eb6838e9bfc58378c6dfbe7a83ace..b6f3dba0216e59bb58aa5d4e5ef730ca6ae4803b 100644 GIT binary patch delta 39 qcmZ3>xR!B3uYw}m98*pPMy7mD2Ic~mb&TyCf$1QA0gzt=xR!B3uY!M#*cVO)My6~|2Id@=b&QW$W%h&kIY53MkPiUY=LvZL diff --git a/packs/help/000044.log b/packs/help/000048.log similarity index 100% rename from packs/help/000044.log rename to packs/help/000048.log diff --git a/packs/help/CURRENT b/packs/help/CURRENT index 8e0a062..a6d5883 100644 --- a/packs/help/CURRENT +++ b/packs/help/CURRENT @@ -1 +1 @@ -MANIFEST-000042 +MANIFEST-000046 diff --git a/packs/help/LOG b/packs/help/LOG index 0e2c276..233d9ce 100644 --- a/packs/help/LOG +++ b/packs/help/LOG @@ -1,8 +1,8 @@ -2023/10/10-15:44:15.264794 7fb8bb7fe6c0 Recovering log #40 -2023/10/10-15:44:15.274945 7fb8bb7fe6c0 Delete type=3 #38 -2023/10/10-15:44:15.275026 7fb8bb7fe6c0 Delete type=0 #40 -2023/10/10-16:47:17.838950 7fb8b97fa6c0 Level-0 table #45: started -2023/10/10-16:47:17.838969 7fb8b97fa6c0 Level-0 table #45: 0 bytes OK -2023/10/10-16:47:17.846123 7fb8b97fa6c0 Delete type=0 #43 -2023/10/10-16:47:17.846349 7fb8b97fa6c0 Manual compaction at level-0 from '!journal!N3XOO6dRLuKwQfp2' @ 72057594037927935 : 1 .. '!journal.pages!N3XOO6dRLuKwQfp2.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) -2023/10/10-16:47:17.846379 7fb8b97fa6c0 Manual compaction at level-1 from '!journal!N3XOO6dRLuKwQfp2' @ 72057594037927935 : 1 .. '!journal.pages!N3XOO6dRLuKwQfp2.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) +2023/10/11-23:48:51.581592 7ffafdffa6c0 Recovering log #44 +2023/10/11-23:48:51.591855 7ffafdffa6c0 Delete type=3 #42 +2023/10/11-23:48:51.591921 7ffafdffa6c0 Delete type=0 #44 +2023/10/12-08:26:09.156682 7ff865e026c0 Level-0 table #49: started +2023/10/12-08:26:09.156770 7ff865e026c0 Level-0 table #49: 0 bytes OK +2023/10/12-08:26:09.164722 7ff865e026c0 Delete type=0 #47 +2023/10/12-08:26:09.174057 7ff865e026c0 Manual compaction at level-0 from '!journal!N3XOO6dRLuKwQfp2' @ 72057594037927935 : 1 .. '!journal.pages!N3XOO6dRLuKwQfp2.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) +2023/10/12-08:26:09.174129 7ff865e026c0 Manual compaction at level-1 from '!journal!N3XOO6dRLuKwQfp2' @ 72057594037927935 : 1 .. '!journal.pages!N3XOO6dRLuKwQfp2.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) diff --git a/packs/help/LOG.old b/packs/help/LOG.old index ce6d4ee..0e2c276 100644 --- a/packs/help/LOG.old +++ b/packs/help/LOG.old @@ -1,8 +1,8 @@ -2023/10/10-14:47:37.522181 7fb8ba7fc6c0 Recovering log #36 -2023/10/10-14:47:37.575247 7fb8ba7fc6c0 Delete type=3 #34 -2023/10/10-14:47:37.575386 7fb8ba7fc6c0 Delete type=0 #36 -2023/10/10-15:44:02.669413 7fb8b97fa6c0 Level-0 table #41: started -2023/10/10-15:44:02.669471 7fb8b97fa6c0 Level-0 table #41: 0 bytes OK -2023/10/10-15:44:02.803436 7fb8b97fa6c0 Delete type=0 #39 -2023/10/10-15:44:02.803585 7fb8b97fa6c0 Manual compaction at level-0 from '!journal!N3XOO6dRLuKwQfp2' @ 72057594037927935 : 1 .. '!journal.pages!N3XOO6dRLuKwQfp2.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) -2023/10/10-15:44:02.803610 7fb8b97fa6c0 Manual compaction at level-1 from '!journal!N3XOO6dRLuKwQfp2' @ 72057594037927935 : 1 .. '!journal.pages!N3XOO6dRLuKwQfp2.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) +2023/10/10-15:44:15.264794 7fb8bb7fe6c0 Recovering log #40 +2023/10/10-15:44:15.274945 7fb8bb7fe6c0 Delete type=3 #38 +2023/10/10-15:44:15.275026 7fb8bb7fe6c0 Delete type=0 #40 +2023/10/10-16:47:17.838950 7fb8b97fa6c0 Level-0 table #45: started +2023/10/10-16:47:17.838969 7fb8b97fa6c0 Level-0 table #45: 0 bytes OK +2023/10/10-16:47:17.846123 7fb8b97fa6c0 Delete type=0 #43 +2023/10/10-16:47:17.846349 7fb8b97fa6c0 Manual compaction at level-0 from '!journal!N3XOO6dRLuKwQfp2' @ 72057594037927935 : 1 .. '!journal.pages!N3XOO6dRLuKwQfp2.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) +2023/10/10-16:47:17.846379 7fb8b97fa6c0 Manual compaction at level-1 from '!journal!N3XOO6dRLuKwQfp2' @ 72057594037927935 : 1 .. '!journal.pages!N3XOO6dRLuKwQfp2.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) diff --git a/packs/help/MANIFEST-000042 b/packs/help/MANIFEST-000046 similarity index 79% rename from packs/help/MANIFEST-000042 rename to packs/help/MANIFEST-000046 index 83382f0eddd8511fa5c62ffd9ce87c4a4a32d801..21e95c4679d868beb2e45791f181f661b91e3ce6 100644 GIT binary patch delta 37 pcmZ3;xR7x|vs_KZ;l&&bj7<8R49o^BET-jZc_6L1P}aj7-{`49q$#EX=zOD}%T?K&~DO3jnaI2P6Oh diff --git a/packs/maneuvers/000108.log b/packs/maneuvers/000112.log similarity index 100% rename from packs/maneuvers/000108.log rename to packs/maneuvers/000112.log diff --git a/packs/maneuvers/CURRENT b/packs/maneuvers/CURRENT index abdfdfe..a451d53 100644 --- a/packs/maneuvers/CURRENT +++ b/packs/maneuvers/CURRENT @@ -1 +1 @@ -MANIFEST-000106 +MANIFEST-000110 diff --git a/packs/maneuvers/LOG b/packs/maneuvers/LOG index e3f0303..870b4fe 100644 --- a/packs/maneuvers/LOG +++ b/packs/maneuvers/LOG @@ -1,7 +1,7 @@ -2023/10/10-15:44:15.251468 7fb8ba7fc6c0 Recovering log #104 -2023/10/10-15:44:15.263005 7fb8ba7fc6c0 Delete type=3 #102 -2023/10/10-15:44:15.263083 7fb8ba7fc6c0 Delete type=0 #104 -2023/10/10-16:47:17.832601 7fb8b97fa6c0 Level-0 table #109: started -2023/10/10-16:47:17.832642 7fb8b97fa6c0 Level-0 table #109: 0 bytes OK -2023/10/10-16:47:17.838860 7fb8b97fa6c0 Delete type=0 #107 -2023/10/10-16:47:17.846327 7fb8b97fa6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) +2023/10/11-23:48:51.568912 7ff867fff6c0 Recovering log #108 +2023/10/11-23:48:51.579440 7ff867fff6c0 Delete type=3 #106 +2023/10/11-23:48:51.579511 7ff867fff6c0 Delete type=0 #108 +2023/10/12-08:26:09.164906 7ff865e026c0 Level-0 table #113: started +2023/10/12-08:26:09.164969 7ff865e026c0 Level-0 table #113: 0 bytes OK +2023/10/12-08:26:09.173679 7ff865e026c0 Delete type=0 #111 +2023/10/12-08:26:09.174093 7ff865e026c0 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 23e7076..e3f0303 100644 --- a/packs/maneuvers/LOG.old +++ b/packs/maneuvers/LOG.old @@ -1,7 +1,7 @@ -2023/10/10-14:47:37.452515 7fb8baffd6c0 Recovering log #100 -2023/10/10-14:47:37.516010 7fb8baffd6c0 Delete type=3 #98 -2023/10/10-14:47:37.516087 7fb8baffd6c0 Delete type=0 #100 -2023/10/10-15:44:02.600756 7fb8b97fa6c0 Level-0 table #105: started -2023/10/10-15:44:02.600790 7fb8b97fa6c0 Level-0 table #105: 0 bytes OK -2023/10/10-15:44:02.669263 7fb8b97fa6c0 Delete type=0 #103 -2023/10/10-15:44:02.803564 7fb8b97fa6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) +2023/10/10-15:44:15.251468 7fb8ba7fc6c0 Recovering log #104 +2023/10/10-15:44:15.263005 7fb8ba7fc6c0 Delete type=3 #102 +2023/10/10-15:44:15.263083 7fb8ba7fc6c0 Delete type=0 #104 +2023/10/10-16:47:17.832601 7fb8b97fa6c0 Level-0 table #109: started +2023/10/10-16:47:17.832642 7fb8b97fa6c0 Level-0 table #109: 0 bytes OK +2023/10/10-16:47:17.838860 7fb8b97fa6c0 Delete type=0 #107 +2023/10/10-16:47:17.846327 7fb8b97fa6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) diff --git a/packs/maneuvers/MANIFEST-000106 b/packs/maneuvers/MANIFEST-000110 similarity index 76% rename from packs/maneuvers/MANIFEST-000106 rename to packs/maneuvers/MANIFEST-000110 index 447e038ad8c5c76ffa3b3eb69477afce31f46b46..ee1d36ead2c4618a4b9f91625386241a1217abbe 100644 GIT binary patch delta 37 pcmZ3%xPoy)mt4Rb?P3lFMy7mD2Ic}5xyaXN_JFtrKyDF>901HD31k2O delta 37 pcmZ3%xPoy)m)x$4Di$0Jj7-^_49qz!a_9AQK7+V9KyDt3900_`2(bVF diff --git a/packs/specialisation/000108.log b/packs/specialisation/000112.log similarity index 100% rename from packs/specialisation/000108.log rename to packs/specialisation/000112.log diff --git a/packs/specialisation/CURRENT b/packs/specialisation/CURRENT index abdfdfe..a451d53 100644 --- a/packs/specialisation/CURRENT +++ b/packs/specialisation/CURRENT @@ -1 +1 @@ -MANIFEST-000106 +MANIFEST-000110 diff --git a/packs/specialisation/LOG b/packs/specialisation/LOG index 97cf7c4..b6b1b90 100644 --- a/packs/specialisation/LOG +++ b/packs/specialisation/LOG @@ -1,7 +1,7 @@ -2023/10/10-15:44:15.196298 7fb8bb7fe6c0 Recovering log #104 -2023/10/10-15:44:15.211750 7fb8bb7fe6c0 Delete type=3 #102 -2023/10/10-15:44:15.211839 7fb8bb7fe6c0 Delete type=0 #104 -2023/10/10-16:47:17.809484 7fb8b97fa6c0 Level-0 table #109: started -2023/10/10-16:47:17.809511 7fb8b97fa6c0 Level-0 table #109: 0 bytes OK -2023/10/10-16:47:17.816437 7fb8b97fa6c0 Delete type=0 #107 -2023/10/10-16:47:17.832558 7fb8b97fa6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) +2023/10/11-23:48:51.528323 7ffafdffa6c0 Recovering log #108 +2023/10/11-23:48:51.539236 7ffafdffa6c0 Delete type=3 #106 +2023/10/11-23:48:51.539371 7ffafdffa6c0 Delete type=0 #108 +2023/10/12-08:26:09.134584 7ff865e026c0 Level-0 table #113: started +2023/10/12-08:26:09.134646 7ff865e026c0 Level-0 table #113: 0 bytes OK +2023/10/12-08:26:09.141658 7ff865e026c0 Delete type=0 #111 +2023/10/12-08:26:09.148759 7ff865e026c0 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 b3ec885..97cf7c4 100644 --- a/packs/specialisation/LOG.old +++ b/packs/specialisation/LOG.old @@ -1,7 +1,7 @@ -2023/10/10-14:47:37.259593 7fb8ba7fc6c0 Recovering log #100 -2023/10/10-14:47:37.309331 7fb8ba7fc6c0 Delete type=3 #98 -2023/10/10-14:47:37.309445 7fb8ba7fc6c0 Delete type=0 #100 -2023/10/10-15:44:02.452840 7fb8b97fa6c0 Level-0 table #105: started -2023/10/10-15:44:02.452904 7fb8b97fa6c0 Level-0 table #105: 0 bytes OK -2023/10/10-15:44:02.530099 7fb8b97fa6c0 Delete type=0 #103 -2023/10/10-15:44:02.600658 7fb8b97fa6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) +2023/10/10-15:44:15.196298 7fb8bb7fe6c0 Recovering log #104 +2023/10/10-15:44:15.211750 7fb8bb7fe6c0 Delete type=3 #102 +2023/10/10-15:44:15.211839 7fb8bb7fe6c0 Delete type=0 #104 +2023/10/10-16:47:17.809484 7fb8b97fa6c0 Level-0 table #109: started +2023/10/10-16:47:17.809511 7fb8b97fa6c0 Level-0 table #109: 0 bytes OK +2023/10/10-16:47:17.816437 7fb8b97fa6c0 Delete type=0 #107 +2023/10/10-16:47:17.832558 7fb8b97fa6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end) diff --git a/packs/specialisation/MANIFEST-000106 b/packs/specialisation/MANIFEST-000110 similarity index 75% rename from packs/specialisation/MANIFEST-000106 rename to packs/specialisation/MANIFEST-000110 index 3690ba4ed725350684875b58a14d5ce29b69fec7..3acfc30f5ff1dddf49ded08256eba1ce54b73b66 100644 GIT binary patch delta 37 pcmZ3*xQcN?kKF3a6$Ts(j7<5Q49o>Ag-ltV&q3S*Ah(F65CFs*2=V{` delta 37 pcmZ3*xQcN?kDOx5hFlH?My6~|2Id@=LKF2B8$jF~AUBVt5CFdj2+sfj diff --git a/packs/traits/000108.log b/packs/traits/000112.log similarity index 100% rename from packs/traits/000108.log rename to packs/traits/000112.log diff --git a/packs/traits/CURRENT b/packs/traits/CURRENT index abdfdfe..a451d53 100644 --- a/packs/traits/CURRENT +++ b/packs/traits/CURRENT @@ -1 +1 @@ -MANIFEST-000106 +MANIFEST-000110 diff --git a/packs/traits/LOG b/packs/traits/LOG index d818a11..f62c1b1 100644 --- a/packs/traits/LOG +++ b/packs/traits/LOG @@ -1,7 +1,7 @@ -2023/10/10-15:44:15.233698 7fb8b9ffb6c0 Recovering log #104 -2023/10/10-15:44:15.249165 7fb8b9ffb6c0 Delete type=3 #102 -2023/10/10-15:44:15.249275 7fb8b9ffb6c0 Delete type=0 #104 -2023/10/10-16:47:17.823003 7fb8b97fa6c0 Level-0 table #109: started -2023/10/10-16:47:17.823041 7fb8b97fa6c0 Level-0 table #109: 0 bytes OK -2023/10/10-16:47:17.832350 7fb8b97fa6c0 Delete type=0 #107 -2023/10/10-16:47:17.838938 7fb8b97fa6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) +2023/10/11-23:48:51.555605 7ffafcff86c0 Recovering log #108 +2023/10/11-23:48:51.566715 7ffafcff86c0 Delete type=3 #106 +2023/10/11-23:48:51.566824 7ffafcff86c0 Delete type=0 #108 +2023/10/12-08:26:09.148992 7ff865e026c0 Level-0 table #113: started +2023/10/12-08:26:09.149043 7ff865e026c0 Level-0 table #113: 0 bytes OK +2023/10/12-08:26:09.156386 7ff865e026c0 Delete type=0 #111 +2023/10/12-08:26:09.173997 7ff865e026c0 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 d9ffb29..d818a11 100644 --- a/packs/traits/LOG.old +++ b/packs/traits/LOG.old @@ -1,7 +1,7 @@ -2023/10/10-14:47:37.382454 7fb8bb7fe6c0 Recovering log #100 -2023/10/10-14:47:37.442416 7fb8bb7fe6c0 Delete type=3 #98 -2023/10/10-14:47:37.442914 7fb8bb7fe6c0 Delete type=0 #100 -2023/10/10-15:44:02.530318 7fb8b97fa6c0 Level-0 table #105: started -2023/10/10-15:44:02.530361 7fb8b97fa6c0 Level-0 table #105: 0 bytes OK -2023/10/10-15:44:02.600527 7fb8b97fa6c0 Delete type=0 #103 -2023/10/10-15:44:02.600692 7fb8b97fa6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) +2023/10/10-15:44:15.233698 7fb8b9ffb6c0 Recovering log #104 +2023/10/10-15:44:15.249165 7fb8b9ffb6c0 Delete type=3 #102 +2023/10/10-15:44:15.249275 7fb8b9ffb6c0 Delete type=0 #104 +2023/10/10-16:47:17.823003 7fb8b97fa6c0 Level-0 table #109: started +2023/10/10-16:47:17.823041 7fb8b97fa6c0 Level-0 table #109: 0 bytes OK +2023/10/10-16:47:17.832350 7fb8b97fa6c0 Delete type=0 #107 +2023/10/10-16:47:17.838938 7fb8b97fa6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) diff --git a/packs/traits/MANIFEST-000106 b/packs/traits/MANIFEST-000110 similarity index 75% rename from packs/traits/MANIFEST-000106 rename to packs/traits/MANIFEST-000110 index 6ded9fdc4a84b9afaff420e9b283dce0d2a46911..6e1726853edff77f51227ee897f95c1137809cef 100644 GIT binary patch delta 37 pcmZ3*xQcN?kK8@6&2Kpv7@6`p8JG)Lysk@xserfzKyDF>7XZ?}2^jzY delta 37 pcmZ3*xQcN?k6g*N-5WR<7@4v;8JKfeyb>cf=YqI7KyDt37Xa4e33~tl diff --git a/system.json b/system.json index 769002e..2e6dc97 100644 --- a/system.json +++ b/system.json @@ -111,7 +111,7 @@ }, "title": "Ecryme, le Jeu de Rôles", "url": "https://www.uberwald.me/gitea/public/fvtt-ecryme", - "version": "11.0.36", - "download": "https://www.uberwald.me/gitea/public/fvtt-ecryme/archive/fvtt-ecryme-v11.0.36.zip", + "version": "11.0.37", + "download": "https://www.uberwald.me/gitea/public/fvtt-ecryme/archive/fvtt-ecryme-v11.0.37.zip", "background": "systems/fvtt-ecryme/images/assets/ecryme_extract_panel_01.webp" } \ No newline at end of file diff --git a/templates/chat/chat-confrontation-pending.hbs b/templates/chat/chat-confrontation-pending.hbs index 108ac72..76530b3 100644 --- a/templates/chat/chat-confrontation-pending.hbs +++ b/templates/chat/chat-confrontation-pending.hbs @@ -40,7 +40,14 @@
  • {{localize "ECRY.chat.bonusmalustraits"}}: {{bonusMalusTraits}}
    • {{/if}} + {{#if (isGM)}} + {{else}} +
  • {{localize "ECRY.ui.execution"}} : {{executionTotal}}
    • +
  • {{localize "ECRY.ui.preservation"}} : {{preservationTotal}}
    • + {{/if}} + + {{#if (isGM)}} {{#if (eq mode "cephaly")}}
    @@ -55,6 +62,10 @@ {{else}} {{/if}} + {{else}} +
    + {{localize "ECRY.chat.sentogm"}} +
    {{/if}}