dicebag 3.0.5 → 3.1.0

data/lib/dicebag.rb

@@ -18,7 +18,7 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE 
 # USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-# dicelib.rb -- version: 3.0.5
+# dicelib.rb -- version: 3.1.0
 
 require 'parslet'
 
@@ -131,6 +131,18 @@ module DiceBag
 
       # Negate :drop. See why in RollPart#roll.
       xdx[:options][:drop] = -(drop)
+
+      # Finally, if we have a target number, make sure it is equal
+      # to or less than the dice sides and greater than 0, otherwise, 
+      # set it to 0 (aka no target number) and add a note.
+      if xdx[:options].has_key?(:target)
+        target = xdx[:options][:target]
+
+        if target > sides or target < 0
+          xdx[:options][:target] = 0
+          notes.push("Target number too large or is negative; reset to 0.")
+        end
+      end
     end
 
     xdx[:notes] = notes unless notes.empty?

data/lib/dicebag/parser.rb

@@ -41,15 +41,16 @@ module DiceBag
     # assigned, which will leave it with a nil value.
     # This is handled in RollPart#initialize.
     rule(:explode) { str('e') >> number?.as(:explode) >> space? }
-    rule(:drop)    { str('~') >> number.as(:drop) >> space? }
-    rule(:keep)    { str('!') >> number.as(:keep) >> space? }
+    rule(:drop)    { str('d') >> number.as(:drop) >> space? }
+    rule(:keep)    { str('k') >> number.as(:keep) >> space? }
     rule(:reroll)  { str('r') >> number.as(:reroll) >> space? }
+    rule(:target)  { str('t') >> number.as(:target) >> space? }
 
     # This allows options to be defined in any order and
     # even have more than one of the same option, however
     # only the last option of a given key will be kept.
     rule(:options) { 
-      space? >> (drop | explode | keep | reroll).repeat >> space?
+      space? >> (drop | explode | keep | reroll | target).repeat >> space?
     }
 
     rule(:options?) { options.maybe.as(:options) }

data/lib/dicebag/roll_part.rb

@@ -20,7 +20,8 @@ module DiceBag
         :explode => 0,
         :drop    => 0,
         :keep    => 0,
-        :reroll  => 0
+        :reroll  => 0,
+        :target  => 0
       }
 
       @options.update(part[:options]) if part.has_key?(:options)
@@ -82,8 +83,15 @@ module DiceBag
         results = results[0 ... @options[:keep]]
       end
 
-      # I think reduce(:+) is ugly, but it's very fast.
-      @total = results.reduce(:+)
+      # If we have a target number, count how many rolls
+      # in the tally are >= than this number, otherwise
+      # we just add up all the numbers.
+      if @options[:target] and @options[:target] > 0
+        @total = results.count {|r| r >= @options[:target]}
+      else
+        # I think reduce(:+) is ugly, but it's very fast.
+        @total = results.reduce(:+)
+      end
 
       return self
     end
@@ -118,6 +126,7 @@ module DiceBag
         s += @options[:explode].to_s unless @options[:explode] == self.sides
       end
 
+      s += "#{sp}t" + @options[:target].to_s   unless @options[:target].zero?
       s += "#{sp}~" + @options[:drop].abs.to_s unless @options[:drop].zero?
       s += "#{sp}!" + @options[:keep].to_s     unless @options[:keep].zero?
       s += "#{sp}r" + @options[:reroll].to_s   unless @options[:reroll].zero?

data/lib/dicebag/transform.rb

@@ -11,9 +11,10 @@ module DiceBag
     # 2-element arrays ('tagged arrays'), which is then
     # hashified later. (There is no way to update the 
     # options when these rules are matched.)
-    rule(:drop    => simple(:x)) { [:drop,    Integer(x)] }
-    rule(:keep    => simple(:x)) { [:keep,    Integer(x)] }
-    rule(:reroll  => simple(:x)) { [:reroll,  Integer(x)] }
+    rule(:drop    => simple(:x)) { [:drop,   Integer(x)] }
+    rule(:keep    => simple(:x)) { [:keep,   Integer(x)] }
+    rule(:reroll  => simple(:x)) { [:reroll, Integer(x)] }
+    rule(:target  => simple(:x)) { [:target, Integer(x)] }
     
     # Explode is special, in that if it is nil, then it
     # must remain that way.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dicebag
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors: