From 6160d24e4fa951c2c13f3bfbf9aab9dcd598b2a4 Mon Sep 17 00:00:00 2001
From: Psychedelic Squid <psquid@psquid.net>
Date: Wed, 7 Mar 2012 23:18:19 +0000
Subject: [PATCH] Correct handling of modifiers, per golem

---
 modules/dice.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/modules/dice.js b/modules/dice.js
index d794e7b..f29c2f9 100644
--- a/modules/dice.js
+++ b/modules/dice.js
@@ -54,9 +54,9 @@ var dice = function(dbot) {
                 if (diceSpec === false) {
                     rolls.push([params[i], false]);
                 } else {
-                    rolls.push([normalizeDiceSpec(params[i]), []]);
+                    rolls.push([normalizeDiceSpec(params[i]), [], diceSpec["modifier"]]);
                     for (var j = 0; j < diceSpec["count"] ; j++) {
-                        rolls[rolls.length-1][1].push(Math.ceil(Math.random() * diceSpec["sides"]) + diceSpec["modifier"]);
+                        rolls[rolls.length-1][1].push(Math.ceil(Math.random() * diceSpec["sides"]));
                     }
                 }
             }
@@ -66,7 +66,16 @@ var dice = function(dbot) {
                     dbot.say(data.channel, rolls[i][0] + ": invalid dice spec");
                 } else {
                     if (rolls[i][1].length > 1) {
-                        var total = " (total " + rolls[i][1].sum() + ")";
+                        var total = " (total " + rolls[i][1].sum();
+                        if (rolls[i][2] != 0) {
+                            if (rolls[i][2] > 0) {
+                                total += " + ";
+                            } else {
+                                total += " - ";
+                            }
+                            total += Math.abs(rolls[i][2]) + " -> " + (rolls[i][1].sum() + rolls[i][2]);
+                        }
+                        total += ")"
                     } else {
                         var total = "";
                     }