Addressing issue in dice module where bonus may be equal to the numbe…

…r of dice closes #18
paulofmandown · Jan 10, 2017 · 108ee1e · 108ee1e
1 parent b66f1df
commit 108ee1e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/rotLove/rotLove.lua b/rotLove/rotLove.lua
@@ -5658,8 +5658,8 @@ function ROT.Dice:__init(dice_notation, minimum, rng)
     self.num = tonumber(string.match(dice_notation, '%d+'))
     self.faces = tonumber(string.match(dice_notation, '[d](%d+)'))
 
-    local double_bonus = string.match(dice_notation, '[^%^+-]([+-]?[+-])%d+')
-    local bonus = string.match(dice_notation, '[^%^+-][+-]?([+-]%d+)')
+    local double_bonus = string.match(dice_notation, '[d]%d+([+-]?[+-])%d+')
+    local bonus = string.match(dice_notation, '[d]%d+[+-]?([+-]%d+)')
     self.is_bonus_plural = double_bonus == '++' or double_bonus == '--'
     self.bonus = tonumber(bonus) or 0
 

diff --git a/src/dice.lua b/src/dice.lua
@@ -22,8 +22,8 @@ function Dice:__init(dice_notation, minimum, rng)
     self.num = tonumber(string.match(dice_notation, '%d+'))
     self.faces = tonumber(string.match(dice_notation, '[d](%d+)'))
 
-    local double_bonus = string.match(dice_notation, '[^%^+-]([+-]?[+-])%d+')
-    local bonus = string.match(dice_notation, '[^%^+-][+-]?([+-]%d+)')
+    local double_bonus = string.match(dice_notation, '[d]%d+([+-]?[+-])%d+')
+    local bonus = string.match(dice_notation, '[d]%d+[+-]?([+-]%d+)')
     self.is_bonus_plural = double_bonus == '++' or double_bonus == '--'
     self.bonus = tonumber(bonus) or 0