droll 1.0rc5.3.1 → 1.0rc5.4.0

data/{README.markdown → README.md}

@@ -4,18 +4,23 @@ Droll, for "d roll" (as in "die roll"), is a dice rolling library and a command
 line utility.  Drollbot is an IRC bot that uses the droll and Isaac libraries
 to provide dicebot functionality over IRC.
 
-At present, droll provides both normal die rolling capability and simplistic
-exploding die rolling capability (exploding automatically on die rolls that
-return the highest value available on the die).  Alternate thresholds for
-exploding can be used.  Use NdN as the pattern for normal die rolls (where N
-stands in for a number), and NxN for exploding die rolls.  Modifiers can be
-included as well: NdN+N or NdN-N.  Die codes, at this time, do not work if they
-have spaces in them.  Certain die codes are rejected (i.e.  0x0).  Exploding is
-limited to an unreasonably high number (1000), to prevent crashing.  Changing
-the exploding threshold uses a .N syntax (NxN.N).  Die values are chosen
-(pseudo)randomly from numbers between 1 and N (the number following the x or
-d), or between 0 and N if the N is preceded by a 0 character.  An example of
-the full sophistication of die code parsing is:
+At present, droll provides a number of different die rolling techniques,
+including simplistic roll-and-sum, various exploding roll schemes, counting
+dice that meet a threshhold, and rolling several dice then discarding some by
+threshhold before summing.  Threshholds are typically the highest possible
+number for the die type, or the maximum possible for the sum in some cases, or
+even the lowest possible number for the die type, though alternate thresholds
+can be used.
+
+Use NdN as the pattern for normal die rolls (where N stands in for a number),
+and NxN for exploding die rolls.  Modifiers can be included as well: NdN+N or
+NdN-N.  Die codes, at this time, do not work if they have spaces in them.
+Certain die codes are rejected (i.e.  0x0).  Exploding is limited to an
+unreasonably high number (1000), to prevent crashing.  Specifying alternate
+thresholds uses a .N syntax (NxN.N).  Die values are chosen (pseudo)randomly
+from numbers between 1 and N (the number following the x or d), or between 0
+and N if the N is preceded by a 0 character.  An example of the full
+sophistication of die code parsing is:
 
     4x05.4+7
 
@@ -26,10 +31,6 @@ total to yield a final number.
 The first number following each 4 or 5 in this example is the result of a die
 immediately rolled to handle exploding die values.
 
-This brief explanation of capabilities is slightly out of date.  See RDoc and
-code comments for details.  In fact, anything in this file might be out of date
-at any given time, though I will try to update it in a timely manner.
-
 
 ## installation
 

data/bin/droll

@@ -45,7 +45,9 @@ SYNTAX
                 "K", use the lowest die values instead.
 
             n   Count the number of dice that yield values equal to or
-                higher than a threshhold value.
+                higher than a threshhold value.  When the "n" is capitalized
+                "N", count values equal to or lower than the threshhold
+                instead.
 
     3. Die Value (Mandatory; No Default)
 
@@ -113,6 +115,12 @@ EXAMPLES
     3n10.6  Same as 3n10, but count the number of dice whose values are 6
             or higher.
 
+    3N10    Roll three ten-sided dice for values between 1 and 10, and count
+            only the number of dice whose values are 1.
+
+    3N10.5  Same as 3N10, but count the number of dice whose values are 5 or
+            lower.
+
 EOF
 
 version_help = <<EOF

data/lib/droll.rb

@@ -136,7 +136,7 @@ This method returns the version number for the Droll gem.
 
 =end
 
-  def self.version; '1.0rc5.3.1'; end
+  def self.version; '1.0rc5.4.0'; end
 
 =begin rdoc
 
@@ -198,7 +198,7 @@ The +dcode+ argument is any valid die code recognized by Droll.
     d['val'], d['thresh'] = die_vals.split(/\./)
     d['val'] = d['val'].to_s
 
-    if d['type'].match(/[Kk]/)
+    if d['type'].match(/[KkN]/)
       d['thresh'] ||= 1
     else
       d['thresh'] ||= d['val'].sub(/^0/, '')
@@ -259,6 +259,24 @@ Given a threshhold of 2:
 
 =begin rdoc
 
+This method takes an array of numeric values as its sole argument, and compares it to the instantiated die code's threshhold value.  It returns an integer value equal to the number of values in the array argument that are equal to or greater than the threshhold value.
+
+Given a thresshold of 1:
+
+        count_dice_max_thresh([0,1,2,3])        #=> 2
+
+        count_dice_max_thresh([2,3])            #=> 0
+
+=end
+
+  def count_dice_max_thresh(dresults)
+    num_dice_max_thresh = dresults.reject do |n|
+      n > @pcode['thresh'].to_i
+    end.size
+  end
+
+=begin rdoc
+
 This method takes an array of numeric values as its sole argument, and returns
 the total of the highest N values in the array, where N is the instantiated die
 code's threshhold value.
@@ -363,6 +381,8 @@ an integer equal to the total result.
         total_result = sum_thresh_low_dice running_totals
     elsif @pcode['type'] == 'n'
       total_result = count_dice_min_thresh running_totals
+    elsif @pcode['type'] == 'N'
+      total_result = count_dice_max_thresh running_totals
     else # "normal" totaling
       total_result = running_totals.map {|s| s.to_i }.inject do |sum,n|
         sum ? sum+n : n

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: droll
 version: !ruby/object:Gem::Version
-  version: 1.0rc5.3.1
+  version: 1.0rc5.4.0
   prerelease: 3
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isaac
-  requirement: &6030100 !ruby/object:Gem::Requirement
+  requirement: &11059500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,9 +21,12 @@ dependencies:
         version: '0.2'
   type: :runtime
   prerelease: false
-  version_requirements: *6030100
+  version_requirements: *11059500
 description: ! "    Droll is a Ruby library providing dice roller functionality, with
-  a\n    command line utility and an IRC bot as included user interfaces.\n"
+  a command\n    line utility and an IRC bot as included user interfaces.  It was
+  created\n    with roleplaying gamers in mind, with a range of sophisticated capabilities\n
+  \   for such users, and comes with command line interface and IRC dicebot front\n
+  \   ends.\n"
 email: code@apotheon.net
 executables:
 - droll
@@ -32,16 +35,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - COPYING
-- README.markdown
+- README.md
 - owl.txt
 - lib/droll.rb
 - bin/droll
 - bin/drollbot
 - etc/drollbot.conf.sample
-homepage: https://bitbucket.org/apotheon/droll
+homepage: http://droll.fossrec.com
 licenses:
 - OWL
-post_install_message: 
+post_install_message: ! "    Thank you for using droll.  In addition to library documentation
+  in RDoc,\n    the \"droll\" command line utility and \"drollbot\" IRC dicebot can
+  both be\n    executed from the shell prompt with a \"-h\" option for more help on
+  how to\n    use and/or configure these tools.\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -50,7 +56,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: