public/fvtt-ecryme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 20 Wiki Activity

Fix confrontation with players

Browse Source
This commit is contained in:
LeRatierBretonnien 2023-10-12 08:28:30 +02:00
parent 9d26d7bfad
commit ec6e6be231
32 changed files with 128 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,10 +1,12 @@
# Ecryme v2 system for FoundryVTT (French RPG, Open Sesam Games, Official) # 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. 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 You can join the kickstarter and obtain the base books here : https://www.kickstarter.com/projects/osg-us/ecryme
# System overview # System overview
The game system in Foundry offers the following features : The game system in Foundry offers the following features :
- PC/NPC sheet - PC/NPC sheet
- Skill rolls - Skill rolls

4
lang/en.json
View File

@ -33,7 +33,9 @@
"traitbonus": "Bonus trait", "traitbonus": "Bonus trait",
"traitmalus": "Malus trait", "traitmalus": "Malus trait",
"bonusmalustraits": "Traits Bonus/Malus", "bonusmalustraits": "Traits Bonus/Malus",
"spectranscend": "Self-Transcend : " "spectranscend": "Self-Transcend : ",
"confrontselect": "Selected for confrontation",
"sentogm": "Confrontation has been sent to GM"
}, },
"rule": { "rule": {
"cephaly-success-2": "Duration : 1 scene - Impact : Superficial - Bonus : 1 - Elegy : 1", "cephaly-success-2": "Duration : 1 scene - Impact : Superficial - Bonus : 1 - Elegy : 1",

4
lang/fr.json
View File

@ -33,7 +33,9 @@
"traitbonus": "Trait bonus", "traitbonus": "Trait bonus",
"traitmalus": "Trait malus", "traitmalus": "Trait malus",
"bonusmalustraits": "Bonus/Malus des Traits", "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": { "rule": {
"cephaly-success-12": "Durée : 1 scène - Impact : Superficiel - Bonus : 1 - Elegie : 1", "cephaly-success-12": "Durée : 1 scène - Impact : Superficiel - Bonus : 1 - Elegie : 1",

32
modules/common/ecryme-utility.js
View File

@ -300,6 +300,7 @@ export class EcrymeUtility {
let messageId = EcrymeUtility.findChatMessageId(event.currentTarget) let messageId = EcrymeUtility.findChatMessageId(event.currentTarget)
let message = game.messages.get(messageId) let message = game.messages.get(messageId)
let rollData = message.getFlag("world", "ecryme-rolldata") let rollData = message.getFlag("world", "ecryme-rolldata")
ui.notifications.info( game.i18n.localize("ECRY.chat.confrontselect"))
EcrymeUtility.manageConfrontation(rollData) EcrymeUtility.manageConfrontation(rollData)
}) })
html.on("click", '.button-apply-cephaly-difficulty', event => { html.on("click", '.button-apply-cephaly-difficulty', event => {
@ -409,10 +410,15 @@ export class EcrymeUtility {
/* -------------------------------------------- */ /* -------------------------------------------- */
static async onSocketMesssage(msg) { static async onSocketMesssage(msg) {
console.log("SOCKET MESSAGE", msg.name) console.log("SOCKET MESSAGE", msg)
if (msg.name == "msg-draw-card") { if (msg.name == "msg_gm_chat_message") {
if (game.user.isGM && game.system.ecryme.currentTirage) { let rollData = msg.data.rollData
game.system.ecryme.currentTirage.addCard(msg.data.msgId) 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) { static blindMessageToGM(chatData) {
let chatGM = duplicate(chatOptions); chatData.whisper = this.getUsers(user => user.isGM);
chatGM.whisper = this.getUsers(user => user.isGM); console.log("blindMessageToGM", chatData);
chatGM.content = "Blinde message of " + game.user.name + "<br>" + chatOptions.content; game.socket.emit("system.fvtt-ecryme", { name: "msg_gm_chat_message", data: chatData });
console.log("blindMessageToGM", chatGM);
game.socket.emit("system.fvtt-ecryme", { msg: "msg_gm_chat_message", data: chatGM });
} }
@ -656,18 +660,14 @@ export class EcrymeUtility {
} }
return array; return array;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static async createChatMessage(name, rollMode, chatOptions) { static async createChatMessage(name, rollMode, chatOptions) {
switch (rollMode) { switch (rollMode) {
case "blindroll": // GM only case "blindroll": // GM only
if (!game.user.isGM) { if (!game.user.isGM) {
this.blindMessageToGM(chatOptions);
chatOptions.whisper = [game.user.id]; chatOptions.whisper = [game.user.id];
chatOptions.content = "Message only to the GM"; } else {
}
else {
chatOptions.whisper = this.getUsers(user => user.isGM); chatOptions.whisper = this.getUsers(user => user.isGM);
} }
break; break;

16
modules/dialogs/ecryme-confront-dialog.js
View File

@ -50,6 +50,7 @@ export class EcrymeConfrontDialog extends Dialog {
let msg = await EcrymeUtility.createChatMessage(this.rollData.alias, "blindroll", { let msg = await EcrymeUtility.createChatMessage(this.rollData.alias, "blindroll", {
content: await renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-confrontation-pending.hbs`, this.rollData) 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) console.log("MSG", this.rollData)
msg.setFlag("world", "ecryme-rolldata", this.rollData) msg.setFlag("world", "ecryme-rolldata", this.rollData)
} }
@ -82,13 +83,24 @@ export class EcrymeConfrontDialog extends Dialog {
let button = this.buttonDisabled let button = this.buttonDisabled
setTimeout(function () { $(".launchConfront").attr("disabled", button) }, 180) 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) { _onDragStart(event) {
console.log("DRAGSTART::::", event)
super._onDragStart(event) super._onDragStart(event)
let dragType = $(event.srcElement).data("drag-type") let dragType = $(event.srcElement).data("drag-type")
let diceData = {} let diceData = {}
//console.log("DRAGTYPE", dragType) console.log("DRAGTYPE", dragType)
if (dragType == "dice") { if (dragType == "dice") {
diceData = { diceData = {
dragType: "dice", dragType: "dice",
@ -111,7 +123,7 @@ export class EcrymeConfrontDialog extends Dialog {
let data = JSON.parse(dataJSON) let data = JSON.parse(dataJSON)
if ( data.dragType == "dice") { if ( data.dragType == "dice") {
let idx = Number(data.diceIndex) 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") && if (event.srcElement.className.includes("execution") &&
this.rollData.availableDices.filter(d => d.location == "execution").length < 2) { this.rollData.availableDices.filter(d => d.location == "execution").length < 2) {
this.rollData.availableDices[idx].location = "execution" this.rollData.availableDices[idx].location = "execution"

0
packs/equipment/000108.log → packs/equipment/000112.log
View File

2
packs/equipment/CURRENT
View File

@ -1 +1 @@
MANIFEST-000106 MANIFEST-000110

14
packs/equipment/LOG
View File

@ -1,7 +1,7 @@
2023/10/10-15:44:15.214470 7fb8baffd6c0 Recovering log #104 2023/10/11-23:48:51.541808 7ffafd7f96c0 Recovering log #108
2023/10/10-15:44:15.228942 7fb8baffd6c0 Delete type=3 #102 2023/10/11-23:48:51.552684 7ffafd7f96c0 Delete type=3 #106
2023/10/10-15:44:15.229018 7fb8baffd6c0 Delete type=0 #104 2023/10/11-23:48:51.552736 7ffafd7f96c0 Delete type=0 #108
2023/10/10-16:47:17.816560 7fb8b97fa6c0 Level-0 table #109: started 2023/10/12-08:26:09.141923 7ff865e026c0 Level-0 table #113: started
2023/10/10-16:47:17.816585 7fb8b97fa6c0 Level-0 table #109: 0 bytes OK 2023/10/12-08:26:09.141979 7ff865e026c0 Level-0 table #113: 0 bytes OK
2023/10/10-16:47:17.822797 7fb8b97fa6c0 Delete type=0 #107 2023/10/12-08:26:09.148564 7ff865e026c0 Delete type=0 #111
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/12-08:26:09.156649 7ff865e026c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end)

14
packs/equipment/LOG.old
View File

@ -1,7 +1,7 @@
2023/10/10-14:47:37.319172 7fb8b9ffb6c0 Recovering log #100 2023/10/10-15:44:15.214470 7fb8baffd6c0 Recovering log #104
2023/10/10-14:47:37.374764 7fb8b9ffb6c0 Delete type=3 #98 2023/10/10-15:44:15.228942 7fb8baffd6c0 Delete type=3 #102
2023/10/10-14:47:37.374842 7fb8b9ffb6c0 Delete type=0 #100 2023/10/10-15:44:15.229018 7fb8baffd6c0 Delete type=0 #104
2023/10/10-15:44:02.360675 7fb8b97fa6c0 Level-0 table #105: started 2023/10/10-16:47:17.816560 7fb8b97fa6c0 Level-0 table #109: started
2023/10/10-15:44:02.360734 7fb8b97fa6c0 Level-0 table #105: 0 bytes OK 2023/10/10-16:47:17.816585 7fb8b97fa6c0 Level-0 table #109: 0 bytes OK
2023/10/10-15:44:02.452513 7fb8b97fa6c0 Delete type=0 #103 2023/10/10-16:47:17.822797 7fb8b97fa6c0 Delete type=0 #107
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-16:47:17.832584 7fb8b97fa6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end)

BIN
packs/equipment/MANIFEST-000106 → packs/equipment/MANIFEST-000110
View File

Binary file not shown.

0
packs/help/000044.log → packs/help/000048.log
View File

2
packs/help/CURRENT
View File

@ -1 +1 @@
MANIFEST-000042 MANIFEST-000046

16
packs/help/LOG
View File

@ -1,8 +1,8 @@
2023/10/10-15:44:15.264794 7fb8bb7fe6c0 Recovering log #40 2023/10/11-23:48:51.581592 7ffafdffa6c0 Recovering log #44
2023/10/10-15:44:15.274945 7fb8bb7fe6c0 Delete type=3 #38 2023/10/11-23:48:51.591855 7ffafdffa6c0 Delete type=3 #42
2023/10/10-15:44:15.275026 7fb8bb7fe6c0 Delete type=0 #40 2023/10/11-23:48:51.591921 7ffafdffa6c0 Delete type=0 #44
2023/10/10-16:47:17.838950 7fb8b97fa6c0 Level-0 table #45: started 2023/10/12-08:26:09.156682 7ff865e026c0 Level-0 table #49: started
2023/10/10-16:47:17.838969 7fb8b97fa6c0 Level-0 table #45: 0 bytes OK 2023/10/12-08:26:09.156770 7ff865e026c0 Level-0 table #49: 0 bytes OK
2023/10/10-16:47:17.846123 7fb8b97fa6c0 Delete type=0 #43 2023/10/12-08:26:09.164722 7ff865e026c0 Delete type=0 #47
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/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/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/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)

16
packs/help/LOG.old
View File

@ -1,8 +1,8 @@
2023/10/10-14:47:37.522181 7fb8ba7fc6c0 Recovering log #36 2023/10/10-15:44:15.264794 7fb8bb7fe6c0 Recovering log #40
2023/10/10-14:47:37.575247 7fb8ba7fc6c0 Delete type=3 #34 2023/10/10-15:44:15.274945 7fb8bb7fe6c0 Delete type=3 #38
2023/10/10-14:47:37.575386 7fb8ba7fc6c0 Delete type=0 #36 2023/10/10-15:44:15.275026 7fb8bb7fe6c0 Delete type=0 #40
2023/10/10-15:44:02.669413 7fb8b97fa6c0 Level-0 table #41: started 2023/10/10-16:47:17.838950 7fb8b97fa6c0 Level-0 table #45: started
2023/10/10-15:44:02.669471 7fb8b97fa6c0 Level-0 table #41: 0 bytes OK 2023/10/10-16:47:17.838969 7fb8b97fa6c0 Level-0 table #45: 0 bytes OK
2023/10/10-15:44:02.803436 7fb8b97fa6c0 Delete type=0 #39 2023/10/10-16:47:17.846123 7fb8b97fa6c0 Delete type=0 #43
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-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-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-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)

BIN
packs/help/MANIFEST-000042 → packs/help/MANIFEST-000046
View File

Binary file not shown.

0
packs/maneuvers/000108.log → packs/maneuvers/000112.log
View File

2
packs/maneuvers/CURRENT
View File

@ -1 +1 @@
MANIFEST-000106 MANIFEST-000110

14
packs/maneuvers/LOG
View File

@ -1,7 +1,7 @@
2023/10/10-15:44:15.251468 7fb8ba7fc6c0 Recovering log #104 2023/10/11-23:48:51.568912 7ff867fff6c0 Recovering log #108
2023/10/10-15:44:15.263005 7fb8ba7fc6c0 Delete type=3 #102 2023/10/11-23:48:51.579440 7ff867fff6c0 Delete type=3 #106
2023/10/10-15:44:15.263083 7fb8ba7fc6c0 Delete type=0 #104 2023/10/11-23:48:51.579511 7ff867fff6c0 Delete type=0 #108
2023/10/10-16:47:17.832601 7fb8b97fa6c0 Level-0 table #109: started 2023/10/12-08:26:09.164906 7ff865e026c0 Level-0 table #113: started
2023/10/10-16:47:17.832642 7fb8b97fa6c0 Level-0 table #109: 0 bytes OK 2023/10/12-08:26:09.164969 7ff865e026c0 Level-0 table #113: 0 bytes OK
2023/10/10-16:47:17.838860 7fb8b97fa6c0 Delete type=0 #107 2023/10/12-08:26:09.173679 7ff865e026c0 Delete type=0 #111
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/12-08:26:09.174093 7ff865e026c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end)

14
packs/maneuvers/LOG.old
View File

@ -1,7 +1,7 @@
2023/10/10-14:47:37.452515 7fb8baffd6c0 Recovering log #100 2023/10/10-15:44:15.251468 7fb8ba7fc6c0 Recovering log #104
2023/10/10-14:47:37.516010 7fb8baffd6c0 Delete type=3 #98 2023/10/10-15:44:15.263005 7fb8ba7fc6c0 Delete type=3 #102
2023/10/10-14:47:37.516087 7fb8baffd6c0 Delete type=0 #100 2023/10/10-15:44:15.263083 7fb8ba7fc6c0 Delete type=0 #104
2023/10/10-15:44:02.600756 7fb8b97fa6c0 Level-0 table #105: started 2023/10/10-16:47:17.832601 7fb8b97fa6c0 Level-0 table #109: started
2023/10/10-15:44:02.600790 7fb8b97fa6c0 Level-0 table #105: 0 bytes OK 2023/10/10-16:47:17.832642 7fb8b97fa6c0 Level-0 table #109: 0 bytes OK
2023/10/10-15:44:02.669263 7fb8b97fa6c0 Delete type=0 #103 2023/10/10-16:47:17.838860 7fb8b97fa6c0 Delete type=0 #107
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-16:47:17.846327 7fb8b97fa6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end)

BIN
packs/maneuvers/MANIFEST-000106 → packs/maneuvers/MANIFEST-000110
View File

Binary file not shown.

0
packs/specialisation/000108.log → packs/specialisation/000112.log
View File

2
packs/specialisation/CURRENT
View File

@ -1 +1 @@
MANIFEST-000106 MANIFEST-000110

14
packs/specialisation/LOG
View File

@ -1,7 +1,7 @@
2023/10/10-15:44:15.196298 7fb8bb7fe6c0 Recovering log #104 2023/10/11-23:48:51.528323 7ffafdffa6c0 Recovering log #108
2023/10/10-15:44:15.211750 7fb8bb7fe6c0 Delete type=3 #102 2023/10/11-23:48:51.539236 7ffafdffa6c0 Delete type=3 #106
2023/10/10-15:44:15.211839 7fb8bb7fe6c0 Delete type=0 #104 2023/10/11-23:48:51.539371 7ffafdffa6c0 Delete type=0 #108
2023/10/10-16:47:17.809484 7fb8b97fa6c0 Level-0 table #109: started 2023/10/12-08:26:09.134584 7ff865e026c0 Level-0 table #113: started
2023/10/10-16:47:17.809511 7fb8b97fa6c0 Level-0 table #109: 0 bytes OK 2023/10/12-08:26:09.134646 7ff865e026c0 Level-0 table #113: 0 bytes OK
2023/10/10-16:47:17.816437 7fb8b97fa6c0 Delete type=0 #107 2023/10/12-08:26:09.141658 7ff865e026c0 Delete type=0 #111
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/12-08:26:09.148759 7ff865e026c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end)

14
packs/specialisation/LOG.old
View File

@ -1,7 +1,7 @@
2023/10/10-14:47:37.259593 7fb8ba7fc6c0 Recovering log #100 2023/10/10-15:44:15.196298 7fb8bb7fe6c0 Recovering log #104
2023/10/10-14:47:37.309331 7fb8ba7fc6c0 Delete type=3 #98 2023/10/10-15:44:15.211750 7fb8bb7fe6c0 Delete type=3 #102
2023/10/10-14:47:37.309445 7fb8ba7fc6c0 Delete type=0 #100 2023/10/10-15:44:15.211839 7fb8bb7fe6c0 Delete type=0 #104
2023/10/10-15:44:02.452840 7fb8b97fa6c0 Level-0 table #105: started 2023/10/10-16:47:17.809484 7fb8b97fa6c0 Level-0 table #109: started
2023/10/10-15:44:02.452904 7fb8b97fa6c0 Level-0 table #105: 0 bytes OK 2023/10/10-16:47:17.809511 7fb8b97fa6c0 Level-0 table #109: 0 bytes OK
2023/10/10-15:44:02.530099 7fb8b97fa6c0 Delete type=0 #103 2023/10/10-16:47:17.816437 7fb8b97fa6c0 Delete type=0 #107
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-16:47:17.832558 7fb8b97fa6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end)

BIN
packs/specialisation/MANIFEST-000106 → packs/specialisation/MANIFEST-000110
View File

Binary file not shown.

0
packs/traits/000108.log → packs/traits/000112.log
View File

2
packs/traits/CURRENT
View File

@ -1 +1 @@
MANIFEST-000106 MANIFEST-000110

14
packs/traits/LOG
View File

@ -1,7 +1,7 @@
2023/10/10-15:44:15.233698 7fb8b9ffb6c0 Recovering log #104 2023/10/11-23:48:51.555605 7ffafcff86c0 Recovering log #108
2023/10/10-15:44:15.249165 7fb8b9ffb6c0 Delete type=3 #102 2023/10/11-23:48:51.566715 7ffafcff86c0 Delete type=3 #106
2023/10/10-15:44:15.249275 7fb8b9ffb6c0 Delete type=0 #104 2023/10/11-23:48:51.566824 7ffafcff86c0 Delete type=0 #108
2023/10/10-16:47:17.823003 7fb8b97fa6c0 Level-0 table #109: started 2023/10/12-08:26:09.148992 7ff865e026c0 Level-0 table #113: started
2023/10/10-16:47:17.823041 7fb8b97fa6c0 Level-0 table #109: 0 bytes OK 2023/10/12-08:26:09.149043 7ff865e026c0 Level-0 table #113: 0 bytes OK
2023/10/10-16:47:17.832350 7fb8b97fa6c0 Delete type=0 #107 2023/10/12-08:26:09.156386 7ff865e026c0 Delete type=0 #111
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/12-08:26:09.173997 7ff865e026c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end)

14
packs/traits/LOG.old
View File

@ -1,7 +1,7 @@
2023/10/10-14:47:37.382454 7fb8bb7fe6c0 Recovering log #100 2023/10/10-15:44:15.233698 7fb8b9ffb6c0 Recovering log #104
2023/10/10-14:47:37.442416 7fb8bb7fe6c0 Delete type=3 #98 2023/10/10-15:44:15.249165 7fb8b9ffb6c0 Delete type=3 #102
2023/10/10-14:47:37.442914 7fb8bb7fe6c0 Delete type=0 #100 2023/10/10-15:44:15.249275 7fb8b9ffb6c0 Delete type=0 #104
2023/10/10-15:44:02.530318 7fb8b97fa6c0 Level-0 table #105: started 2023/10/10-16:47:17.823003 7fb8b97fa6c0 Level-0 table #109: started
2023/10/10-15:44:02.530361 7fb8b97fa6c0 Level-0 table #105: 0 bytes OK 2023/10/10-16:47:17.823041 7fb8b97fa6c0 Level-0 table #109: 0 bytes OK
2023/10/10-15:44:02.600527 7fb8b97fa6c0 Delete type=0 #103 2023/10/10-16:47:17.832350 7fb8b97fa6c0 Delete type=0 #107
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-16:47:17.838938 7fb8b97fa6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end)

BIN
packs/traits/MANIFEST-000106 → packs/traits/MANIFEST-000110
View File

Binary file not shown.

4
system.json
View File

@ -111,7 +111,7 @@
}, },
"title": "Ecryme, le Jeu de Rôles", "title": "Ecryme, le Jeu de Rôles",
"url": "https://www.uberwald.me/gitea/public/fvtt-ecryme", "url": "https://www.uberwald.me/gitea/public/fvtt-ecryme",
"version": "11.0.36", "version": "11.0.37",
"download": "https://www.uberwald.me/gitea/public/fvtt-ecryme/archive/fvtt-ecryme-v11.0.36.zip", "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" "background": "systems/fvtt-ecryme/images/assets/ecryme_extract_panel_01.webp"
} }

11
templates/chat/chat-confrontation-pending.hbs
View File

@ -40,7 +40,14 @@
<li>{{localize "ECRY.chat.bonusmalustraits"}}: {{bonusMalusTraits}} </li> <li>{{localize "ECRY.chat.bonusmalustraits"}}: {{bonusMalusTraits}} </li>
{{/if}} {{/if}}
{{#if (isGM)}}
{{else}}
<li>{{localize "ECRY.ui.execution"}} : {{executionTotal}}</li>
<li>{{localize "ECRY.ui.preservation"}} : {{preservationTotal}}</li>
{{/if}}
</ul> </ul>
{{#if (isGM)}} {{#if (isGM)}}
{{#if (eq mode "cephaly")}} {{#if (eq mode "cephaly")}}
<div> <div>
@ -55,6 +62,10 @@
{{else}} {{else}}
<button class="button-select-confront">{{localize "ECRY.ui.selectconfront"}}</button> <button class="button-select-confront">{{localize "ECRY.ui.selectconfront"}}</button>
{{/if}} {{/if}}
{{else}}
<div>
{{localize "ECRY.chat.sentogm"}}
</div>
{{/if}} {{/if}}
</div> </div>