X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=data%2Frbot%2Fplugins%2Fdice.rb;h=7e0662b1d0f42a3dd5f96660fa51d6eec543f4ee;hb=8b811d21babf8f9e5a10a953b595d55ebd08820d;hp=85e98f36a7c7a8f6cdfc47a8c9a15fce4b7718d1;hpb=ec5745fa7abd47b8ca12bd783b0759079dff9917;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/data/rbot/plugins/dice.rb b/data/rbot/plugins/dice.rb index 85e98f36..7e0662b1 100644 --- a/data/rbot/plugins/dice.rb +++ b/data/rbot/plugins/dice.rb @@ -86,7 +86,7 @@ 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 =~ /^\d*d\d+(\s*[-]\s*(\d+|\d*d\d)+)*$/ + unless m.params && m.params =~ /^\d*d\d+(\s*[+-]\s*(\d+|\d*d\d)+)*$/ m.reply "incorrect usage: " + help(m.plugin) return end @@ -100,14 +100,14 @@ class DicePlugin < Plugin 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.reply(r.to_s + " || " + m.params + ": " + t) + m.reply(r.to_s + " || " + m.params + ": " + t, :nick => true) end end plugin = DicePlugin.new