From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Mon, 8 Nov 2010 19:25:06 +0000 (+0100)
Subject: UNO!: fix g9r9 fix
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=6eed70298a021fc6b789936c8fa7e591ac6427be;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

UNO!: fix g9r9 fix

Commit a306b2c68eb58c1c88057ff7ee78895401adb6a9 introduced a fix to
prevent a player from playing something like g9r9, but the fix actually
prevented any single-card play. Fix by making the \1 optional.
---

diff --git a/data/rbot/plugins/games/uno.rb b/data/rbot/plugins/games/uno.rb
index adaa127f..6a056278 100644
--- a/data/rbot/plugins/games/uno.rb
+++ b/data/rbot/plugins/games/uno.rb
@@ -382,7 +382,7 @@ class UnoGame
   def play_card(source, cards)
     debug "Playing card #{cards}"
     p = get_player(source)
-    shorts = cards.gsub(/\s+/,'').match(/^(?:([rbgy]\+?\d)\1|([rbgy][rs])|(w(?:\+4)?)([rbgy])?)$/).to_a
+    shorts = cards.gsub(/\s+/,'').match(/^(?:([rbgy]\+?\d)\1?|([rbgy][rs])|(w(?:\+4)?)([rbgy])?)$/).to_a
     debug shorts.inspect
     if shorts.empty?
       announce _("what cards were that again?")