dice_roller 0.0.3 → 0.0.4

data/lib/dice_roller/dice_result.rb

@@ -85,21 +85,29 @@ class DiceRoller::DiceResult
 
     # loop through the rolled results and count successes. values greater than
     # the reroll value are rolled again.
-    @ten_result.each do |result|
-      count += 1 if result >= min
-      count -= 1 if subtract and result == 1
-
-      # each pass through this loop is a rerolled dice
-      while result >= reroll
-        result = bonus_dice.roll
+    final_result = []
 
-        # add the result for historical accuracy
-        @ten_result << result
+    @ten_result.each do |dice|
+      this_dice = [dice]
 
+      this_dice.each do |result|
         count += 1 if result >= min
+        count -= 1 if subtract and result == 1
+
+        # each pass through this loop is a rerolled dice
+        if result >= reroll
+          bonus_result = bonus_dice.roll
+
+          # add the reroll result to the current dice's results, this will
+          # reroll as appropriate
+          this_dice << bonus_result
+        end
       end
+
+      final_result += this_dice
     end
 
+    @ten_result = final_result
     @rerolled = true
     count
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dice_roller
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000 Z
+date: 2012-05-02 00:00:00.000000000 Z
 dependencies: []
 description: ! "    dice_roller is a pure ruby application that rolls dice for role
   playing games.\n    it is primarily built to handle d20 or Storytelling style rolls.\n"