fix: Embarrassing bug on the skill roll dialog meaning only the first…

… skill worked. Also set Average difficulty and Normal roll type as defaults.
jonepatr · Aug 30, 2020 · c61cf40 · c61cf40
1 parent a6b86f5
commit c61cf40
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/module/sheets/TwodsixActorSheet.ts b/src/module/sheets/TwodsixActorSheet.ts
@@ -147,7 +147,7 @@ export class TwodsixActorSheet extends ActorSheet {
    * @param {Event} event   The originating click event
    * @private
    */
-  _onRoll(event: { preventDefault: any; currentTarget: any; shiftKey?: any; }):void {
+  _onRoll(event:{ preventDefault:any; currentTarget:any; shiftKey?:any; }):void {
     event.preventDefault();
     const element = event.currentTarget;
     const dataset = element.dataset;
@@ -184,13 +184,14 @@ export class TwodsixActorSheet extends ActorSheet {
     const rollParts = dataset.roll.split("+");
 
     const flavorParts:string[] = [];
-    flavorParts.push(`${skills[0].name}`);
+    const skill = skills.filter(x => x._id === skillId)[0];
+    flavorParts.push(`${skill.name}`);
 
     return TwodsixRolls.Roll({
       parts: rollParts,
       data: skillData,
       flavorParts: flavorParts,
-      title: `${skills[0].name}`,
+      title: `${skill.name}`,
       speaker: ChatMessage.getSpeaker({actor: this.getData().actor}),
     });
   }

diff --git a/src/module/utils/TwodsixRolls.ts b/src/module/utils/TwodsixRolls.ts
@@ -15,12 +15,12 @@ export class TwodsixRolls {
     const dialogData = {
       formula: usefulParts.join(' '),
       data: data,
-      rollType: CONFIG.TWODSIX.ROLLTYPES.Normal,
+      rollType: "Normal",
       rollTypes: CONFIG.TWODSIX.ROLLTYPES,
+      difficulty: "Average",
+      difficulties: CONFIG.TWODSIX.DIFFICULTIES,
       rollMode: game.settings.get('core', 'rollMode'),
-      rollModes: CONFIG.Dice.rollModes,
-      difficulty: CONFIG.TWODSIX.DIFFICULTIES.Normal,
-      difficulties: CONFIG.TWODSIX.DIFFICULTIES
+      rollModes: CONFIG.Dice.rollModes
     };
 
     const buttons = {
@@ -32,7 +32,7 @@ export class TwodsixRolls {
             form: html[0].children[0],
             rollParts: usefulParts,
             flavorParts,
-            speaker,
+            speaker
           });
           rolled = true;
         },
@@ -82,8 +82,10 @@ export class TwodsixRolls {
 
     if (data['rollType'] && data['rollType'].length > 0) {
       rollParts[0] = CONFIG.TWODSIX.ROLLTYPES[data['rollType']];
-      flavorParts.push("with");
-      flavorParts.push(`${data['rollType']}`);
+      if (data['rollType'] != 'Normal') {
+        flavorParts.push("with");
+        flavorParts.push(`${data['rollType']}`);
+      }
     }
 
     //So that the result is the Effect of the skill roll.