rbot 0.9.14 → 0.9.15

data/data/rbot/plugins/games/quiz.rb

@@ -33,9 +33,6 @@ define_structure :QuizBundle, :question, :answer
 define_structure :PlayerStats, :score, :jokers, :jokers_time
 # Why do we still need jokers_time? //Firetech
 
-# Maximum number of jokers a player can gain
-Max_Jokers = 3
-
 # Control codes
 Color = "\003"
 Bold = "\002"
@@ -164,6 +161,11 @@ class QuizPlugin < Plugin
     :default => ['quiz.rbot'],
     :desc => "List of files and URLs that will be used to retrieve quiz questions")
 
+
+  Config.register Config::IntegerValue.new('quiz.max_jokers',
+    :default => 3,
+    :desc => "Maximum number of jokers a player can gain")
+
   def initialize()
     super
 
@@ -184,10 +186,11 @@ class QuizPlugin < Plugin
   # (in quiz/) or web pages.
   #
   def fetch_data( m )
-    # Read the winning messages file 
+    # Read the winning messages file
     @win_messages = Array.new
-    if File.exists? "#{@bot.botclass}/quiz/win_messages"
-      IO.foreach("#{@bot.botclass}/quiz/win_messages") { |line| @win_messages << line.chomp }
+    winfile = datafile 'win_messages'
+    if File.exists? winfile
+      IO.foreach(winfile) { |line| @win_messages << line.chomp }
     else
       warning( "win_messages file not found!" )
       # Fill the array with a least one message or code accessing it would fail
@@ -212,13 +215,12 @@ class QuizPlugin < Plugin
           m.reply "Failed to download questions from #{p}, ignoring sources"
         end
       else
-        path = "#{@bot.botclass}/quiz/#{p}"
+        path = datafile p
         debug "Fetching from #{path}"
 
         # Local data
         begin
-          datafile = File.new( path, File::RDONLY )
-          data << "\n\n" << datafile.read
+          data << "\n\n" << File.read(path)
         rescue
           m.reply "Failed to read from local database file #{p}, skipping."
         end
@@ -338,7 +340,7 @@ class QuizPlugin < Plugin
         end
       end
 
-      # If less than all other players' scores, append to table 
+      # If less than all other players' scores, append to table
       unless inserted
         i += 1 unless q.rank_table.empty?
         q.rank_table << [nick, stats]
@@ -369,7 +371,7 @@ class QuizPlugin < Plugin
 
     message = m.message.downcase.strip
 
-    nick = m.sourcenick.to_s 
+    nick = m.sourcenick.to_s
 
     # Support multiple alternate answers and cores
     answer = q.answers.find { |ans| ans.valid?(message) }
@@ -406,7 +408,7 @@ class QuizPlugin < Plugin
       player.score = player.score + points
 
       # Reward player with a joker every X points
-      if player.score % 15 == 0 and player.jokers < Max_Jokers
+      if player.score % 15 == 0 and player.jokers < @bot.config['quiz.max_jokers']
         player.jokers += 1
         m.reply "#{nick} gains a new joker. Rejoice :)"
       end
@@ -899,7 +901,7 @@ class QuizPlugin < Plugin
     debug q.rank_table.inspect
 
     nick = params[:nick]
-    val = [params[:jokers].to_i, Max_Jokers].min
+    val = [params[:jokers].to_i, @bot.config['quiz.max_jokers']].min
     if q.registry.has_key?(nick)
       player = q.registry[nick]
       player.jokers = val

data/data/rbot/plugins/games/roshambo.rb

@@ -15,7 +15,7 @@ require 'time'
 class RoshamboPlugin < Plugin
 
   def initialize
-    super 
+    super
     @scoreboard = {}
     @beats = { :rock => :scissors, :paper => :rock, :scissors => :paper}
     @plays = @beats.keys

data/data/rbot/plugins/games/roulette.rb

@@ -2,13 +2,13 @@ define_structure :RouletteHistory, :games, :shots, :deaths, :misses, :wins
 
 class RoulettePlugin < Plugin
   Config.register Config::BooleanValue.new('roulette.autospin',
-    :default => true, 
+    :default => true,
     :desc => "Automatically spins the roulette at the butlast shot")
   Config.register Config::BooleanValue.new('roulette.kick',
-    :default => false, 
+    :default => false,
     :desc => "Kicks shot players from the channel")
   Config.register Config::BooleanValue.new('roulette.twice_in_a_row',
-    :default => false, 
+    :default => false,
     :desc => "Allow players to go twice in a row")
 
   def initialize
@@ -174,7 +174,7 @@ class RoulettePlugin < Plugin
       k = match[1]
 
       total_players += 1
-      
+
       win_rate = v.wins.to_f / v.games * 100
       if h_win_percent[0].nil? || win_rate > h_win_percent[1] && v.games > 2
         h_win_percent = [[k], win_rate]

data/data/rbot/plugins/games/shiritori.rb

@@ -1,7 +1,7 @@
 #-- vim:sw=2:et
 #kate: indent-width 2
 #++
-# 
+#
 # :title: Shiritori Plugin for RBot
 #
 # Author:: Yaohan Chen <yaohan.chen@gmail.com>
@@ -16,10 +16,10 @@
 # players can interrupt a turn to join, or a free mode where anyone can speak at any
 # time.
 #
-# In Japanese mode, if present, the plugin can use normalize-japanese 
+# In Japanese mode, if present, the plugin can use normalize-japanese
 # <http://neruchan.mine.nu:60880/normalize-japanese.rb> to allow
 # katakana words be used like hiragana.
-# 
+#
 # TODO
 # * a system to describe settings, so they can be displayed, changed and saved
 # * adjust settings during game
@@ -35,7 +35,7 @@ class Dictionary
   def has_word?(s)
     raise NotImplementedError
   end
-  
+
   # whether any word starts with prefix, excluding words in excludes. This can be
   # possible with non-enumerable dictionaries since some dictionary engines provide
   # prefix searching.
@@ -51,12 +51,12 @@ class WordlistDictionary < Dictionary
     @words = words
     # debug "Created dictionary with #{@words.length} words"
   end
-  
+
     # whether string s is a word
   def has_word?(s)
     @words.include? s
   end
-  
+
   # whether any word starts with prefix, excluding words in excludes
   def any_word_starting?(prefix, excludes)
     # (@words - except).any? {|w| w =~ /\A#{prefix}.+/}
@@ -69,7 +69,7 @@ end
 # whether it's possible to continue a word
 class Shiritori
   attr_reader :used_words
-  
+
   # dictionary:: a Dictionary object
   # overlap_lengths:: a Range for allowed lengths to overlap when continuing words
   # check_continuable:: whether all words are checked whether they're continuable,
@@ -82,7 +82,7 @@ class Shiritori
     @allow_reuse = allow_reuse
     @used_words = []
   end
-  
+
   # Prefix of s with length n
   def head_of(s, n)
     # TODO ruby2 unicode
@@ -102,7 +102,7 @@ class Shiritori
   def range_under(r, n)
     r.begin .. [r.end, n-1].min
   end
-  
+
   # TODO allow the ruleset to customize this
   def continues?(w2, w1)
     # this uses the definition w1[-n,n] == w2[0,n] && n < [w1.length, w2.length].min
@@ -110,7 +110,7 @@ class Shiritori
     range_under(@overlap_lengths, [len(w1), len(w2)].min).any? {|n|
       tail_of(w1, n)== head_of(w2, n)}
   end
-  
+
   # Checks whether *any* unused word in the dictionary completes the word
   # This has the limitation that it can't detect when a word is continuable, but the
   # only continuers aren't continuable
@@ -118,8 +118,8 @@ class Shiritori
     range_under(@overlap_lengths, len(s)).any? {|n|
       @dictionary.any_word_starting?(tail_of(s, n), @used_words) }
   end
-  
-  # Given a string, give a verdict based on current shiritori state and dictionary 
+
+  # Given a string, give a verdict based on current shiritori state and dictionary
   def process(s)
     # TODO optionally allow used words
     # TODO ruby2 unicode
@@ -167,14 +167,14 @@ class ShiritoriGame
     @timer_handle = nil
     @say = say
     @when_die = when_die
-    
+
     # TODO allow other forms of dictionaries
     dictionary = WordlistDictionary.new(@ruleset[:words])
     @game = Shiritori.new(dictionary, @ruleset[:overlap_lengths],
                                       @ruleset[:check_continuable],
                                       @ruleset[:allow_reuse])
   end
-  
+
   def say(s)
      @say.call(s)
   end
@@ -184,10 +184,10 @@ class ShiritoriGame
   # * when time_limit > 0, new players can join at any time, but existing players must
   #   take turns, each of which expires after time_limit
   # * when time_imit is 0, anyone can speak in the game at any time
-  def take_turns? 
+  def take_turns?
     @players.length > 1 && @ruleset[:time_limit] > 0
   end
-  
+
   # the player who has the current turn
   def current_player
     @players.first
@@ -200,7 +200,7 @@ class ShiritoriGame
   def previous_word
     @game.used_words[-2]
   end
-  
+
   # announce the current word, and player if take_turns?
   def announce
     say(if take_turns?
@@ -237,13 +237,13 @@ class ShiritoriGame
     end
     announce
   end
-  
+
   # handle when turn time limit goes out
   def time_out
     if @ruleset[:lose_when_timeout]
       say _("%{player} took too long and is out of the game. Try again next game!") %
       { :player => current_player }
-      if @players.length == 2 
+      if @players.length == 2
         # 2 players before, and one should remain now
         # since the game is ending, save the trouble of removing and booting the player
         say _("%{player} is the last remaining player and the winner! Congratulations!") %
@@ -269,12 +269,12 @@ class ShiritoriGame
   def handle_message(m)
     message = m.message
     speaker = m.sourcenick.to_s
-    
+
     return unless @ruleset[:listen] =~ message
 
     # in take_turns mode, only new players are allowed to interrupt a turn
     return if @booted_players.include? speaker ||
-              (take_turns? && 
+              (take_turns? &&
                speaker != current_player &&
                (@players.length > 1 && @players.include?(speaker)))
 
@@ -310,7 +310,7 @@ class ShiritoriGame
       m.reply _("It's impossible to continue the chain from %{word}. Start with another word.") % {:word => message}
     end
   end
-  
+
   # end the game
   def die
     # redefine restart_timer to no-op
@@ -331,11 +331,11 @@ class ShiritoriPlugin < Plugin
     _("A game in which each player must continue the previous player's word, by using its last one or few characters/letters of the word to start a new word. 'shiritori <ruleset>' => Play shiritori with a set of rules. Available rulesets: %{rulesets}. 'shiritori stop' => Stop the current shiritori game.") %
       {:rulesets => @rulesets.keys.join(', ')}
   end
-  
+
   def initialize()
     super
     @games = {}
-    
+
     # TODO make rulesets more easily customizable
     # TODO initialize default ruleset from config
     # Default values of rulesets
@@ -390,7 +390,7 @@ class ShiritoriPlugin < Plugin
       if ruleset.has_key?(:wordlist_file)
         begin
           ruleset[:words] =
-            File.new("#{@bot.botclass}/shiritori/#{ruleset[:wordlist_file]}").grep(
+            File.new(datafile(ruleset[:wordlist_file])).grep(
               ruleset[:listen]) {|l| ruleset[:normalize].call l.chomp}
         rescue
           raise "unable to load word list"
@@ -401,7 +401,7 @@ class ShiritoriPlugin < Plugin
     end
     return ruleset
   end
-  
+
   # start shiritori in a channel
   def cmd_shiritori(m, params)
     if @games.has_key?( m.channel )
@@ -426,7 +426,7 @@ class ShiritoriPlugin < Plugin
       end
     end
   end
-  
+
   # change rules for current game
   def cmd_set(m, params)
     require 'enumerator'
@@ -434,7 +434,7 @@ class ShiritoriPlugin < Plugin
     params[:rules].each_slice(2) {|opt, value| new_rules[opt] = value}
     raise NotImplementedError
   end
-  
+
   # stop the current game
   def cmd_stop(m, params)
     if @games.has_key? m.channel
@@ -446,19 +446,19 @@ class ShiritoriPlugin < Plugin
       m.reply _("No game to stop here, because no game is being played.")
     end
   end
-  
+
   # remove the game, so channel messages are no longer processed, and timer removed
   def remove_game(channel)
     @games.delete channel
   end
-  
+
   # all messages from a channel is sent to its shiritori game if any
   def message(m)
     return unless @games.has_key?(m.channel)
     # send the message to the game in the channel to handle it
     @games[m.channel].handle_message m
   end
-  
+
   # remove all games
   def cleanup
     @games.each_key {|g| g.die}

data/data/rbot/plugins/games/uno.rb

@@ -108,7 +108,7 @@ class UnoGame
       @color = 'Wild'
       raise if value and not value == '+4'
       if value
-        @value = value.dup 
+        @value = value.dup
         @shortform = 'w'+value
       else
         @value = nil
@@ -411,7 +411,7 @@ class UnoGame
         # only be possible if the first W+4 was illegal, so it wouldn't
         # apply for a W+4 played on a +2 anyway.
         #
-        if @picker == 0 and Wild === cards.first and cards.first.value 
+        if @picker == 0 and Wild === cards.first and cards.first.value
           # save the previous discard in case of challenge
           @last_discard = @discard.dup
           # save the color too, in case it was a Wild
@@ -761,7 +761,11 @@ class UnoGame
       }
     end
     if @picker > 0 and not halted
-      p = @players[1]
+      if @discard.value == 'Reverse'
+        p = @players.last
+      else
+        p = @players[1]
+      end
       announce _("%{p} has to pick %{b}%{n}%{b} cards!") % {
         :p => p, :n => @picker, :b => Bold
       }
@@ -841,8 +845,14 @@ class UnoPlugin < Plugin
       _("The points won with a game of %{uno} are totalled from the cards remaining in the hands of the other players."),
       _("Each normal (not special) card is worth its face value (from 0 to 9 points)."),
       _("Each colored special card (+2, Reverse, Skip) is worth 20 points."),
-      _("Each Wild and Wild +4 is worth 50 points.")
+      _("Each Wild and Wild +4 is worth 50 points."),
+      help(plugin, 'top'),
+      help(plugin, 'topwin'),
       ].join(" ") % { :uno => UnoGame::UNO }
+    when 'top'
+      _("You can see the scoring table with 'uno top N' where N is the number of top scores to show.")
+    when 'topwin'
+      _("You can see the winners table with 'uno topwin N' where N is the number of top winners to show.")
     when /cards?/
       [
       _("There are 108 cards in a standard %{uno} deck."),
@@ -859,7 +869,7 @@ class UnoPlugin < Plugin
       _("'uno end' to end the game before its natural completion")
       ].join("; ")
     else
-      _("%{uno} game. !uno to start a game. see 'help uno rules' for the rules, 'help uno admin' for admin commands. In-game commands: %{cmds}.") % {
+      _("%{uno} game. !uno to start a game. see 'help uno rules' for the rules, 'help uno admin' for admin commands, 'help uno score' for scoring rules. In-game commands: %{cmds}.") % {
         :uno => UnoGame::UNO,
         :cmds => help(plugin, 'commands')
       }
@@ -870,6 +880,7 @@ class UnoPlugin < Plugin
     return unless @games.key?(m.channel)
     return unless m.plugin # skip messages such as: <someuser> botname,
     g = @games[m.channel]
+    replied = true
     case m.plugin.intern
     when :jo # join game
       return if m.params
@@ -931,11 +942,14 @@ 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
+    else
+      replied=false
     end
+    m.replied=true if replied
   end
 
   def create_game(m, p)
@@ -1147,6 +1161,14 @@ class UnoPlugin < Plugin
       scores << [v.won.inject(0) { |s, w| s+=w.score }, k]
     end
 
+    if wins.empty?
+      m.reply(_("no %{uno} games were completed here") % {
+        :uno => UnoGame::UNO
+      })
+      return
+    end
+
+
     if n = p[:scorenum]
       msg = _("%{uno} %{num} highest scores: ") % {
         :uno => UnoGame::UNO, :num => p[:scorenum]

data/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