Fix confrontation with players

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 + "<br>" + 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;

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"