Merge branch 'release/2.14'

CHANGELOG.txt

@@ -1,3 +1,6 @@
+v2.14
+- Fixes Dice-so-Nice integration
+
 v2.13
 - Adds Polish translation (thanks rajmundg10)
 

module/blades-roll.js

@@ -7,15 +7,6 @@
  */
 export async function bladesRoll(dice_amount, attribute_name = "", position = "risky", effect = "standard") {
 
-  // Is Dice So Nice enabled ?
-  let niceDice = false;
-  
-  try {
-    niceDice = game.settings.get('dice-so-nice', 'settings').enabled;      
-  } catch {
-    console.log("Dice-is-nice! not enabled");
-  }
-
   // ChatMessage.getSpeaker(controlledToken)
   let zeromode = false;
   
@@ -26,14 +17,7 @@ export async function bladesRoll(dice_amount, attribute_name = "", position = "r
 
   // show 3d Dice so Nice if enabled
   r.roll();
-  if (niceDice) {
-    game.dice3d.showForRoll(r).then((displayed) => {
-      showChatRollMessage(r, zeromode, attribute_name, position, effect);
-      ui.chat.scrollBottom();
-    });
-  } else {
-    showChatRollMessage(r, zeromode, attribute_name, position, effect)
-  }
+  showChatRollMessage(r, zeromode, attribute_name, position, effect);
 }
 
 /**
@@ -93,7 +77,7 @@ async function showChatRollMessage(r, zeromode, attribute_name = "", position =
   let messageData = {
     speaker: speaker,
     content: result,
-    type: CONST.CHAT_MESSAGE_TYPES.OOC,
+    type: CONST.CHAT_MESSAGE_TYPES.ROLL,
     roll: r
   }
 

system.json

@@ -2,7 +2,7 @@
   "name": "blades-in-the-dark",
   "title": "Blades in the Dark",
   "description": "Blades in the dark game system.",
-  "version": "2.13",
+  "version": "2.14",
   "minimumCoreVersion": "0.7.2",
   "compatibleCoreVersion": "0.7.9",
   "templateVersion": 1,
@@ -37,7 +37,7 @@
   ],
   "url": "https://github.com/megastruktur/foundryvtt-blades-in-the-dark/",
   "manifest": "https://raw.githubusercontent.com/megastruktur/foundryvtt-blades-in-the-dark/master/system.json",
-  "download": "https://github.com/megastruktur/foundryvtt-blades-in-the-dark/archive/2.13.zip",
+  "download": "https://github.com/megastruktur/foundryvtt-blades-in-the-dark/archive/2.14.zip",
   "packs": [
     {
       "name": "class",