diff options
| -rw-r--r-- | data/rbot/plugins/dice.rb | 10 | ||||
| -rw-r--r-- | data/rbot/plugins/games/uno.rb | 2 | ||||
| -rw-r--r-- | data/rbot/plugins/games/wheelfortune.rb | 4 | ||||
| -rw-r--r-- | data/rbot/plugins/markov.rb | 2 | ||||
| -rw-r--r-- | data/rbot/plugins/salut.rb | 2 | ||||
| -rw-r--r-- | data/rbot/plugins/url.rb | 3 |
6 files changed, 11 insertions, 12 deletions
diff --git a/data/rbot/plugins/dice.rb b/data/rbot/plugins/dice.rb index 230035ec..85e98f36 100644 --- 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,14 +86,14 @@ 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| @@ -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) end end plugin = DicePlugin.new diff --git a/data/rbot/plugins/games/uno.rb b/data/rbot/plugins/games/uno.rb index dc8de03e..5b2593ee 100644 --- a/data/rbot/plugins/games/uno.rb +++ b/data/rbot/plugins/games/uno.rb @@ -941,7 +941,7 @@ class UnoPlugin < Plugin when :tu # show whose turn is it return if m.params if g.has_turn?(m.source) - m.nickreply _("it's your turn, sleepyhead") + m.reply _("it's your turn, sleepyhead"), :nick => true else g.show_turn(:cards => false) end diff --git a/data/rbot/plugins/games/wheelfortune.rb b/data/rbot/plugins/games/wheelfortune.rb index 4c1a48f0..7e818953 100644 --- a/data/rbot/plugins/games/wheelfortune.rb +++ b/data/rbot/plugins/games/wheelfortune.rb @@ -476,9 +476,7 @@ class WheelOfFortune < Plugin # m.reply "STUPID! YOU SO STUPID!" return when *game.must_buy - m.nickreply _("You must buy the %{vowel}") % { - :vowel => check - } + m.reply _("You must buy the %{vowel}") % {:vowel => check}, :nick => true when :wrong return when Numeric, :missing diff --git a/data/rbot/plugins/markov.rb b/data/rbot/plugins/markov.rb index 48be7067..3a1fea59 100644 --- a/data/rbot/plugins/markov.rb +++ b/data/rbot/plugins/markov.rb @@ -187,7 +187,7 @@ class MarkovPlugin < Plugin # of the line we received return if message.index(line) == 0 @bot.timer.add_once(delay) { - m.plainreply line + m.reply line, :nick => false } end diff --git a/data/rbot/plugins/salut.rb b/data/rbot/plugins/salut.rb index 569bade4..131821a7 100644 --- a/data/rbot/plugins/salut.rb +++ b/data/rbot/plugins/salut.rb @@ -158,7 +158,7 @@ class SalutPlugin < Plugin end end debug "Replying #{choice}" - m.plainreply choice + m.reply choice, :nick => false end def reload diff --git a/data/rbot/plugins/url.rb b/data/rbot/plugins/url.rb index 8c4746b5..826af10d 100644 --- a/data/rbot/plugins/url.rb +++ b/data/rbot/plugins/url.rb @@ -160,7 +160,8 @@ class UrlPlugin < Plugin if display_info > urls_displayed if reply - m.plainreply(reply, :overlong => :truncate) + m.reply reply, :overlong => :truncate, + :nick => (m.address? ? :auto : false) urls_displayed += 1 end end |