plugin(script): remove deprecated $SAFE

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / dice.rb

diff --git a/data/rbot/plugins/dice.rb b/data/rbot/plugins/dice.rb
index 230035ec419acf36b447b0bcb08bf326542d4d58..7e0662b1d0f42a3dd5f96660fa51d6eec543f4ee 100644 (file)
--- a/data/rbot/plugins/dice.rb
+++ b/data/rbot/plugins/dice.rb
@@ -53,7 +53,7 @@ class DicePlugin < Plugin
     dice = d.split(/d/)
     repr = []
     r = 0
-    unless dice[0] =~ /^[0-9]+/
+    unless dice[0] =~ /^\d+/
       dice[0] = 1
     end
     for i in 0...dice[0].to_i
@@ -86,28 +86,28 @@ class DicePlugin < Plugin
   def privmsg(m)
     # If either not given parameters or given incorrect parameters, return with
     # the help message
-    unless(m.params && m.params =~ /^[0-9]*d[0-9]+(\s*[+-]\s*([0-9]+|[0-9]*d[0-9])+)*$/)
-      m.nickreply "incorrect usage: " + help(m.plugin)
+    unless m.params && m.params =~ /^\d*d\d+(\s*[+-]\s*(\d+|\d*d\d)+)*$/
+      m.reply "incorrect usage: " + help(m.plugin)
       return
     end
 
     # Extract the actual dice request from the message parameters, splitting it
     # into dice and modifiers
-    a = m.params.gsub(/\s+/,'').scan(/^[0-9]*d[0-9]+|[+-][0-9]*d[0-9]+|[+-][0-9]+/)
+    a = m.params.gsub(/\s+/,'').scan(/^\d*d\d+|[+-]\d*d\d+|[+-]\d+/)
     # check nr of total dices and sides per dice
     nr = 0
     a.each { |dice|
       dc, ds = dice.split(/d/)
       # check sides
       if ds.to_i > @bot.config['dice.max_sides']
-       m.reply "sorry, don't have any dices with more than %u sides" % @bot.config['dice.max_sides']
+       m.reply "sorry, don't have any dices with more than %u sides" % @bot.config['dice.max_sides'], :nick => true
        return
       end
       # We use .max with 1 so that specs such as d6 count as 1 and not as 0
       nr += [dc.to_i, 1].max
     }
     if nr > @bot.config['dice.max_dices']
-      m.reply "can't handle more than %u dices" % @bot.config['dice.max_dices']
+      m.reply "can't handle more than %u dices" % @bot.config['dice.max_dices'], :nick => true
       return
     end
 
@@ -123,7 +123,7 @@ class DicePlugin < Plugin
       t = t + tmp.get_view
     end
     t.chop!
-    m.nickreply r.to_s + " || " + m.params + ": " + t
+    m.reply(r.to_s + " || " + m.params + ": " + t, :nick => true)
   end
 end
 plugin = DicePlugin.new