summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2010-10-19 00:39:13 +0200
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2010-10-19 00:39:13 +0200
commita306b2c68eb58c1c88057ff7ee78895401adb6a9 (patch)
treeac7167206a5fb64346de01f4130e70c7218a886e /data
parent94a06f9ea2fb8f19aa75ca80c152699243edd6dc (diff)
uno plugin: don't allow g9r9 card specification
The regexp should make sure that the second card is equal to the first specified card, instead of matching the card expression one or two times. Otherwise, a play like 'pl g9r9' would be accepted when the player had two r9 cards and could play them. This is only a aesthetical change because the plays would still be valid, albeit (1) surprising and (2) mismatching what the user actually wrote.
Diffstat (limited to 'data')
-rw-r--r--data/rbot/plugins/games/uno.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/rbot/plugins/games/uno.rb b/data/rbot/plugins/games/uno.rb
index 870526fc..adaa127f 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,2}|([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?")