markov plugin: don't echo a line a line that is just a substring of the input line

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

diff --git a/data/rbot/plugins/games/uno.rb b/data/rbot/plugins/games/uno.rb
index 7b13beafcf278775456900dc83c318db8b20cec5..47fac28d52205109bf4a70abab358e53c99776e1 100644 (file)
--- a/data/rbot/plugins/games/uno.rb
+++ b/data/rbot/plugins/games/uno.rb
@@ -160,6 +160,9 @@ class UnoGame
   # number of cards to be picked if the player can't play an appropriate card
   attr_reader :picker
 
+  # game start time
+  attr :start_time
+
   # the IRC user that created the game
   attr_accessor :manager
 
@@ -517,6 +520,13 @@ class UnoGame
   end
 
   def choose_color(user, color)
+    # you can only pick a color if the current color is unset
+    if @color
+      announce _("you can't pick a color now, %{p}") % {
+        :p => get_player(user)
+      }
+      return
+    end
     case color
     when 'r'
       @color = 'Red'
@@ -562,7 +572,7 @@ class UnoGame
   end
 
   def has_turn?(source)
-    @players.first.user == source
+    @start_time && (@players.first.user == source)
   end
 
   def show_picker
@@ -582,6 +592,7 @@ class UnoGame
 
   def show_user_cards(player)
     p = Player === player ? player : get_player(player)
+    return unless p
     notify p, _('Your cards: %{cards}') % {
       :cards => p.cards.join(' ')
     }
@@ -639,9 +650,9 @@ class UnoGame
     end
     cards = 7
     if @start_time
-      cards = @players.inject(0) do |s, pl|
+      cards = (@players.inject(0) do |s, pl|
         s +=pl.cards.length
-      end/@players.length
+      end*1.0/@players.length).ceil
     end
     p = Player.new(user)
     @players << p
@@ -798,7 +809,7 @@ class UnoPlugin < Plugin
       _("'od' to show the playing order"),
       _("'ti' to show play time"),
       _("'tu' to show whose turn it is")
-    ].join(" ; ")
+    ].join("; ")
     when 'challenge'
       _("A Wild +4 can only be played legally if you don't have normal (not special) cards of the current color. ") +
       _("The next player can challenge a W+4 by using the 'ch' command. ") +
@@ -811,16 +822,39 @@ class UnoPlugin < Plugin
       _("Wild +4 also forces the next player to take 4 cards, but it can only be played if you can't play a color card. ") +
       _("you can play another +2 or +4 card on a +2 card, and a +4 on a +4, forcing the first player who can't play one to pick the cumulative sum of all cards. ") +
       _("you can also play a Reverse on a +2 or +4, bouncing the effect back to the previous player (that now comes next). ")
+    when /scor(?:e|ing)/, /points?/
+      [
+      _("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.")
+      ].join(" ") % { :uno => UnoGame::UNO }
+    when /cards?/
+      [
+      _("There are 108 cards in a standard %{uno} deck."),
+      _("For each color (Blue, Green, Red, Yellow) there are 19 numbered cards (from 0 to 9), with two of each number except for 0."),
+      _("There are also 6 special cards for each color, two each of +2, Reverse, Skip."),
+      _("Finally, there are 4 Wild and 4 Wild +4 cards.")
+      ].join(" ") % { :uno => UnoGame::UNO }
+    when 'admin'
+      _("The game manager (the user that started the game) can execute the following commands to manage it: ") +
+      [
+      _("'uno drop <user>' to drop a user from the game (any user can drop itself using 'uno drop')"),
+      _("'uno replace <old> [with] <new>' to replace a player with someone else (useful in case of disconnects)"),
+      _("'uno transfer [to] <nick>' to transfer game ownership to someone else"),
+      _("'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. commands: %{cmds}") % {
+      _("%{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 => UnoGame::UNO,
         :cmds => help(plugin, 'commands')
-      })
+      }
     end
   end
 
   def message(m)
     return unless @games.key?(m.channel)
+    return unless m.plugin # skip messages such as: <someuser> botname,
     g = @games[m.channel]
     case m.plugin.intern
     when :jo # join game
@@ -840,7 +874,7 @@ class UnoPlugin < Plugin
         m.reply _("It's not your turn")
       end
     when :pa # pass turn
-      return if m.params
+      return if m.params or not g.start_time
       if g.has_turn?(m.source)
         g.pass(m.source)
       else
@@ -862,7 +896,7 @@ class UnoPlugin < Plugin
       return if m.params
       g.show_all_cards(m.source)
     when :cd # show current discard
-      return if m.params
+      return if m.params or not g.start_time
       g.show_discard
     when :ch
       if g.has_turn?(m.source)