Merge pull request #102 from Cussa/master

Roll d66, small fix and automatically reports to Foundry when new version is released

Author: DrOgres

Diff for: .github/workflows/main.yml

@@ -40,3 +40,39 @@ jobs:
         artifacts: './system.json, ./system.zip'
         tag: ${{ github.event.release.tag_name }}
         body: ${{ github.event.release.body }}
+
+    - name: Get Compatibility
+      run: |
+        echo 'COMPATIBILITY<<EOF' >> $GITHUB_ENV
+        cat system.json | jq .compatibility >> $GITHUB_ENV
+        echo 'EOF' >> $GITHUB_ENV
+
+    - name: Send package to foundry
+      run: |
+        HTTP_RESPONSE=$(curl --silent --write-out "HTTPSTATUS:%{http_code}" -X POST 'https://api.foundryvtt.com/_api/packages/release_version/' \
+        --header 'Authorization: ${{ secrets.PACKAGE_TOKEN }}' \
+        --header 'Content-Type: application/json' \
+        --data '{
+            "id": "vaesen",
+            "release": {
+                "version": "${{ github.event.release.tag_name }}",
+                "manifest": "https://github.com/${{github.repository}}/releases/download/${{github.event.release.tag_name}}/system.json",
+                "notes": "https://github.com/${{github.repository}}/releases/tag/${{github.event.release.tag_name}}",
+                "compatibility": ${{ env.COMPATIBILITY }}
+            }
+        }')
+        
+        # extract the body
+        HTTP_BODY=$(echo $HTTP_RESPONSE | sed -e 's/HTTPSTATUS\:.*//g')
+        
+        # extract the status
+        HTTP_STATUS=$(echo $HTTP_RESPONSE | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
+        
+        # print the body
+        echo "$HTTP_BODY"
+        
+        # example using the status
+        if [ ! $HTTP_STATUS -eq 200  ]; then
+          echo "Error [HTTP status: $HTTP_STATUS]"
+          exit 1
+        fi

Diff for: README.md

@@ -31,10 +31,14 @@ This system provides character sheets and items for  your play, if you would lik
 ## Release Notes
 =======
 
+v4.3.0
+- Improvement: any roll using the `/r` chat command now shows the result of the roll directly
+  ![D66 Roll](asset/d66roll.png?raw=true)
+- Deployment Feature: automatically reports to Foundry when a new release is created
+
 v4.2.1
 - Fixed: css heights on inputs sometimes cut off tails of letters
 
-
 v4.2.0
 - Feature: Added random Character Generator!
   ![Character Generation](https://github.com/fvtt-fria-ligan/vaesen-foundry-vtt/blob/master/asset/chargen.png?raw=true)  

Diff for: asset/d66roll.png

@@ -19,12 +19,17 @@
           <div class="dice-formula">{{formula}}</div>
           {{{tooltip}}}
 
+          {{#if (eq options.type "total")}}
+          <h4 class="dice-total">{{total}}</h4>
+          {{/if}}
+          {{#unless (eq options.type "total")}}
           {{#if (gt success 0)}}
           <h4 class="dice-total success">{{localize "CHAT.SUCCESS"}} : {{success}}</h4>
           {{/if}}
           {{#if (eq success 0)}}
           <h4 class="dice-total failure"> {{localize "CHAT.SUCCESS"}} : {{success}}</h4>
           {{/if}}
+          {{/unless}}
         </div>
       </div>
       {{!-- Extra info added for Year Zero rolls --}}

Diff for: model/templates/dice/roll.hbs

@@ -3,7 +3,7 @@ import { PlayerCharacterSheet } from "./sheet/player.js";
 import { NpcCharacterSheet } from "./sheet/npc.js";
 import { VaesenCharacterSheet } from "./sheet/vaesen.js";
 import { HeadquarterCharacterSheet } from "./sheet/headquarter.js";
-import { prepareRollNewDialog, push } from "./util/roll.js";
+import { prepareRollNewDialog, push, totalRoll as totalRoll } from "./util/roll.js";
 import { registerSystemSettings } from "./util/settings.js";
 import { vaesen } from "./config.js";
 import { conditions } from "./util/conditions.js";
@@ -83,7 +83,7 @@ Hooks.once("init", () => {
   });
 
   Handlebars.registerHelper('ifIn', function(elem, list, options) {
-    if(list.indexOf(elem) > -1) {
+    if(list && list.indexOf(elem) > -1) {
       return options.fn(this);
     }
     return options.inverse(this);
@@ -104,6 +104,7 @@ Hooks.once("ready", async function () {
   setupCards();
   conditions.onReady();
   Hooks.on("hotbarDrop", (bar, data, slot) => createRollMacro(data, slot));
+  Hooks.on("chatMessage", (_, messageText, chatData) => totalRoll(messageText, chatData));
   migrate();
 
 });

Diff for: script/hooks.js

@@ -399,3 +399,54 @@ export function adjustBonusText(bonus) {
   bonus = parseInt(bonus, 10);
   return bonus > 0 ? "+" + bonus : bonus;
 }
+
+export function totalRoll(messageText, chatData) {
+  const pattern = /^\/r ((\d*)d(\d+).*$)/g;
+  const matches = [...messageText.toLowerCase().matchAll(pattern)];
+  const customRolls = {
+    "66" : "1d6*10+1d6", 
+    "666": "1d6*100+1d6*10+1d6",
+    "6666": "1d6*1000+1d6*100+1d6*10+1d6"
+  };
+  if (matches.length == 0)
+    return true;
+    
+  let actor = undefined;
+  if (chatData.speaker.actor)
+    actor = game.actors.get(chatData.speaker.actor);
+
+  const diceSide = matches[0][3];
+  const formula = matches[0][1];
+  const numberDice = parseInt(matches[0][2] ? matches[0][2] : "1");
+
+  if (Object.keys(customRolls).indexOf(diceSide) == -1)
+  {
+    createCustomRoll(actor, formula, formula);
+    return false;
+  }
+
+  for (let index = 0; index < numberDice; index++) {
+    createCustomRoll(actor, customRolls[diceSide], `D${diceSide}`);
+  }
+  return false;
+}
+
+async function createCustomRoll(actor, formula, name) {
+  let options = { 
+    token: actor?.img
+  };
+  
+  let templateData = { 
+    flavor: `${name} ${game.i18n.localize("ROLL.ROLL")}`,
+    type: "total"
+  };
+  
+  const roll = Roll.create(formula, options);
+  
+  let messageData = {
+    content: await roll.render(templateData),
+  };
+  let rollMode = game.settings.get("core", "rollMode");
+  
+  await roll.toMessage(messageData, { rollMode });
+}

Diff for: script/util/roll.js

@@ -1,7 +1,7 @@
 {
   "title": "Vaesen",
   "description": "Nordic horror role-playing",
-  "version": "4.2.1",
+  "version": "4.3.0",
   "esmodules": [
     "script/hooks.js"
   ],
@@ -101,6 +101,7 @@
     {
       "name": "Cussa Mitre",
       "url": "https://github.com/Cussa",
+      "discord": "CussaMitre",
       "flags": {}
     },
     {