Add files via upload

Author: TabletopsAndAnvils

README.md

@@ -13,13 +13,6 @@ This is my first time programming anything in about 27 years, as such, there may
 ## Change Log ##
 The most recent [changelog.md](https://github.com/TabletopsAndAnvils/Foundry-Stream-Module/blob/main/changelog.md)
 
-## Installation ##
-For manual installation:
-* Open the main screen of FoundryVTT.
-* Go to the 'Add-on Modules' tab.
-* Click the button 'Install Module'.
-* Enter the following in the Manifest URL textbox: https://raw.githubusercontent.com/TabletopsAndAnvils/Foundry-Stream-Module/main/module.json
-* Click 'Install'.
 <img align="right" height="50%" width ="50%" src="https://github.com/TabletopsAndAnvils/Foundry-Stream-Module/blob/main/img/Screen%20Shot%202021-01-25%20at%2017.12.24.png"><p>
 ## Configuration ##
 - `Twitch Channel` - This is your Twitch stream name.
@@ -37,18 +30,19 @@ For manual installation:
 ## Features ##
 - `Chat` - Two way communication between Foundry and Twitch. 
 - `GM Moderation` - On the side controls there are buttons to Clear Twitch chat, Timeout or Ban viewers and a Raid button. Please note, in order for the Raid function to work you must be signed in through a browser as well in order to click on confirmation dialog.
+- `Roll Request` - GM/Moderator can request a roll from a Twitch viewer. If DSN is enabled the dice will roll within the Foundry canvas, if not the result will just be sent to the chat card. 
 
 # Links #
 * https://www.twitch.tv/tabletopsandanvils - My Twitch.tv where we livestream.
 * https://www.patreon.com/tabletopsandanvils - See what else I'm doing for Foundry.
 * https://www.youtube.com/channel/UCx1lu5HlZtmmk4JtsU_noSw - Tabletops & Anvils on Youtube.
 
 ## Acknowledgements ##
-Many thanks go out to the entire FoundryVTT community especially Atropos for creating it, just about everyone over in the #module-development channel on the FVTT Discord, League of Extraordinary FoundryVTT Developers, Melbz who wrote his own Twitch-bot for Foundry (https://bitbucket.org/Melbz/foundryvtt-twitch-bot/src/master/) that pointed me in the right direction for starting this module and Pint and Pie (https://github.com/thomasmckay) who is doing things with Twitch and Foundry that are absolutely mind-numbingly insane. His play through chat module lit the spark of inspiration for Foundry Stream Module many, many months ago! 
+Many thanks go out to the entire FoundryVTT community especially Atropos for creating it, just about everyone over in the #module-development channel on the FVTT Discord, League of Extraordinary FoundryVTT Developers, cwendrowski for creating Tabbed Chatlog, Melbz who wrote his own Twitch-bot for Foundry (https://bitbucket.org/Melbz/foundryvtt-twitch-bot/src/master/) that pointed me in the right direction for starting this module and Pint and Pie (https://github.com/thomasmckay) who is doing things with Twitch and Foundry that are absolutely mind-numbingly insane. His play through chat module lit the spark of inspiration for Foundry Stream Module many, many months ago! 
 
 ## License
 - This work is licensed under a [Creative Commons Attribution 4.0 International License](https://creativecommons.org/licenses/by/4.0/legalcode).
 - This work is licensed under the [Foundry Virtual Tabletop EULA - Limited License Agreement for Module Development](https://foundryvtt.com/article/license/).
 
 ### Bugs
-- View current known bugs in the [Issue Tracker Backlog](https://github.com/TabletopsAndAnvils/Foundry-Stream-Module/issues)
+- View current known bugs in the [Issue Tracker Backlog](https://github.com/TabletopsAndAnvils/Foundry-Stream-Module/issues)

changelog.md

@@ -1,3 +1,12 @@
+## Release 0.2.6
+- Added user requested output to dice roll requests. Roll request now outputs the forumula + rolltotal to Twitch after a request has been rolled. Ie 'Julia rolls
+1d20 = [19] Thank you for the roll!'
+- Updated localization file to reflect above change.
+- Updated default configuration for above.
+
+## Release 0.2.5
+- Minor hotfix to module.json
+
 ## Release 0.2.4
 - Added option from directly within Request Roll to hide the roll from players. This is not a blindroll, it is a gmroll to the GM and/or their moderator(s)
 depending on who made the request. While this has always been possible by using the drop down selector in the chat box itself, this is here as a matter of 

lang/en.json

@@ -59,5 +59,5 @@
   "fsMod.tabs.fsm": "Twitch",
 
   "fsMod.settings.thankRoll.name": "Roll Received Message",
-  "fsMod.settings.thankRoll.hint": "How you want to thank your viewer for their roll. This message will automatically include the viewer who rolled the request at the end of it, be sure to include an extra space after your final character. Example: Thank you for the roll,"
+  "fsMod.settings.thankRoll.hint": "How you want to thank your viewer for their roll. The output for this message is 'viewername rolls diceformula = [dicetotal] yourmessage' Example: Julia rolls 1d20 = [19] Thank you for the roll!"
 }

module.json

@@ -12,9 +12,9 @@
     "patreon": "TabletopsAndAnvils"
   }
   ],
-  "version": "0.2.5",
+  "version": "0.2.6",
   "minimumCoreVersion": "0.7.5",
-  "compatibleCoreVersion": "0.7.9",
+  "compatibleCoreVersion": "0.8.0",
 
   "styles": [
     "/styles/fsmtabs.css" 
@@ -46,15 +46,15 @@
   }
   ],
   "media":[
-    {
+   {
       "type": "cover",
       "link": "https://raw.githubusercontent.com/TabletopsAndAnvils/Foundry-Stream-Module/main/img/fsm-cover.png"
-    }
+   }
   ],
     "bugs": "https://github.com/TabletopsAndAnvils/Foundry-Stream-Module/issues",
     "allowBugReporter": true,
     "url": "https://github.com/TabletopsAndAnvils/Foundry-Stream-Module",
 
     "manifest": "https://raw.githubusercontent.com/TabletopsAndAnvils/Foundry-Stream-Module/main/module.json",
-    "download": "https://github.com/TabletopsAndAnvils/Foundry-Stream-Module/archive/0.2.5.zip"
+    "download": "https://github.com/TabletopsAndAnvils/Foundry-Stream-Module/archive/0.2.6.zip"
   }

scripts/fsmcore.js

@@ -490,11 +490,14 @@ export function diceWait(dice, who, priv) { // G M   R E Q U E S T   R O L L
       if (whoIs != idCheck) { return diceWait(dice, who); }
       if (whoIs == idCheck) {
         if (priv === 'true') {
-          new Roll(res).roll().toMessage({ speaker: { alias: `${tags["display-name"]}` } }, { rollMode: "gmroll" })
+          let roll = new Roll(res).roll()
+          let xroll = roll.toMessage({ speaker: { alias: `${tags["display-name"]}` } }, { rollMode: "gmroll" })
+          fsMod.client.say(myChannel, `${tags["display-name"]} rolls ` + dice + ` = [` + roll.total + `] ` + thankRoll);
         } else {
-          new Roll(res).roll().toMessage({ speaker: { alias: `${tags["display-name"]}` } });
+          let roll = new Roll(res).roll()
+          let xroll = roll.toMessage({ speaker: { alias: `${tags["display-name"]}` } });
+          fsMod.client.say(myChannel, `${tags["display-name"]} rolls ` + dice + ` = [` + roll.total + `] ` + thankRoll);
         }
-        fsMod.client.say(myChannel, thankRoll + ` ${tags["display-name"]}!`);
         return;
       }
     } return diceWait(dice, who);
@@ -513,11 +516,14 @@ export function diceWaitAll(dice, priv) { // G M   R E Q U E S T   R O L L   -
       let res = message.slice(3);
       let thankRoll = game.settings.get("streamMod", "streamThank"); //(localize('settings.thankRoll.req'));
       if (priv === 'true') {
-        new Roll(res).roll().toMessage({ speaker: { alias: `${tags["display-name"]}` } }, { rollMode: "gmroll" })
+        let roll = new Roll(res).roll()
+        let xroll = roll.toMessage({ speaker: { alias: `${tags["display-name"]}` } }, { rollMode: "gmroll" })
+        fsMod.client.say(myChannel, `${tags["display-name"]} rolls ` + dice + ` = [` + roll.total + `] ` + thankRoll);
       } else {
-        new Roll(res).roll().toMessage({ speaker: { alias: `${tags["display-name"]}` } });
+        let roll = new Roll(res).roll()
+        let xroll = roll.toMessage({ speaker: { alias: `${tags["display-name"]}` } });
+        fsMod.client.say(myChannel, `${tags["display-name"]} rolls ` + dice + ` = [` + roll.total + `] ` + thankRoll);
       }
-      fsMod.client.say(myChannel, thankRoll + ` ${tags["display-name"]}`);
       return;
     }
     else return diceWaitAll(dice);

scripts/settings.js

@@ -279,7 +279,7 @@ function registerSettings() { // R E G I S T E R   M O D U L E   S E T T I N G S
                 config: true,
                 scope: "world",
                 type: String,
-                default: "Thank you for the roll, ",
+                default: "Thank you for the roll!",
                 restricted: true,
             }
         },