From 9a87aca70c43217195f04cbfdb9194a6f929e876 Mon Sep 17 00:00:00 2001 From: Stephen Waits Date: Tue, 2 Sep 2008 21:50:21 -0700 Subject: [PATCH] bugfix, misc cleanup * change 'steve' to 'steven' in hand list * detect Ace-bottomed straights * add Casey to player list --- gameday.html | 154 +++++++++++++++++++++++++-------------------------- gameday.txt | 20 +++---- hand.rb | 6 +- score.rb | 1 + 4 files changed, 93 insertions(+), 88 deletions(-) diff --git a/gameday.html b/gameday.html index 32ab3ac..ba92cbd 100644 --- a/gameday.html +++ b/gameday.html @@ -54,7 +54,7 @@ 10 -
[steve] + Steven Gher
[steven] @@ -218,14 +218,14 @@ 25 -
[casey] + Casey Lowe
[casey] -
flush (7) +
straight flush (20) @@ -233,11 +233,11 @@
(0) - 7 - 7 + 20 + 20 -
[steve] + Steven Gher
[steven] @@ -255,7 +255,7 @@ 28 -
[steve] + Steven Gher
[steven] @@ -274,7 +274,7 @@ 35 -
[steve] + Steven Gher
[steven] @@ -333,18 +333,20 @@ Dundee Reyno
[dundee] - - - - -
full house (10) - + +
straight flush (20) + + + + + +
(0) - 10 - 10 + 20 + 20 Stéphanie Plante
[stephanie] @@ -572,7 +574,7 @@ 62 -
[steve] + Steven Gher
[steven] @@ -590,7 +592,7 @@ 45 -
[steve] + Steven Gher
[steven] @@ -609,7 +611,7 @@ 52 -
[steve] + Steven Gher
[steven] @@ -666,21 +668,21 @@ Randy Yumul
[randy] - - + + -
(0) +
straight (5) + - - -
(0) - 0 - 15 + +
straight (5) + 10 + 25 Jen Gratz
[jen] @@ -768,9 +770,9 @@ -
flush (40) - 40 - 50 +
straight flush (80) + 80 + 100 Mike Skinner
[mike] @@ -829,22 +831,20 @@ Randy Yumul
[randy] - - - - - - -
flush (7) - + + + + + -
(0) - 7 - 22 + +
straight (20) + 20 + 45
[cynthia] @@ -1005,7 +1005,7 @@ -
flush (7) +
straight flush (20) @@ -1013,27 +1013,27 @@
(0) - 7 - 32 + 20 + 45 Rob Whyte
[rob] - - - - - -
flush (7) - - + + +
straight (5) + + + + + -
(0) - 7 - 39 +
straight (5) + 10 + 55 Rob Whyte
[rob] @@ -1051,7 +1051,7 @@
(0) 10 - 49 + 65 Jen Gratz
[jen] @@ -1086,7 +1086,7 @@
(0) 21 - 70 + 86 Josh Hart
[josh] @@ -1113,7 +1113,7 @@ -
flush (7) +
straight flush (20) @@ -1121,8 +1121,8 @@
flush (7) - 14 - 59 + 27 + 72 Fred Thompson
[fred] @@ -1143,7 +1143,7 @@ 62 -
[steve] + Steven Gher
[steven] @@ -1162,7 +1162,7 @@ 103 -
[steve] + Steven Gher
[steven] @@ -1181,7 +1181,7 @@ 113 -
[steve] + Steven Gher
[steven] @@ -1222,17 +1222,17 @@ Stéphanie Plante
[stephanie] + -
(0) - +
straight flush (20) 20 54 @@ -1658,7 +1658,7 @@ -
flush (7) +
straight flush (20) @@ -1666,8 +1666,8 @@
royal flush (21) - 28 - 78 + 41 + 141 Jen Gratz
[jen] @@ -1786,7 +1786,7 @@ -
(0) +
straight (5) @@ -1794,8 +1794,8 @@
(0) - 0 - 22 + 5 + 50 Cathy Waits
[cathy] @@ -1875,27 +1875,27 @@

Total Scores

+141 - Dundee Reyno [dundee]
120 - Jen Gratz [jen]
115 - Josh Hart [josh]
-113 - [steve]
+113 - Steven Gher [steven]
105 - Eddy Cramm [eddy]
101 - Jonathan Leghart [jonathan]
98 - Eileen Gher [eileen]
95 - Adam Dickinson [adam]
94 - Stéphanie Plante [stephanie]
+86 - Rob Whyte [rob]
85 - Aaron Dickinson [aaron]
84 - François Bertrand [francois]
-78 - Dundee Reyno [dundee]
+72 - Jeff Curley [jeff]
71 - Mike Skinner [mike]
-70 - Rob Whyte [rob]
65 - Lonna Leghart [lonna]
62 - Fred Thompson [fred]
60 - [cynthia]
-59 - Jeff Curley [jeff]
+50 - Randy Yumul [randy]
46 - Shaelagh Skinner [shaelagh]
36 - Cathy Waits [cathy]
-22 - Randy Yumul [randy]
-7 - [casey]
+20 - Casey Lowe [casey]
diff --git a/gameday.txt b/gameday.txt index 6ce3962..efd3c27 100644 --- a/gameday.txt +++ b/gameday.txt @@ -1,6 +1,6 @@ fred,2h2c2cacahqcts9d7d4h aaron,4h7h7s7sjsjdjdjhkhks -steve,tsksqsjsas2dtckc9c6d +steven,tsksqsjsas2dtckc9c6d eileen,5h6s7s2s3c4d8d9dtcjh randy,qsqhqc6d6h2s2sth9d3d cathy,5c5s5d5s7h8h9hthqckd @@ -10,9 +10,9 @@ jen,4d4s4cah6h6s6s9c9c jen,2h3s4s5c6dtdtcth3c3c aaron,thtstc6c6hjsjdjs9dtd casey,4h3h2hah5h3dqcqsts8d -steve,3s2sas4s9s3s2d8h7d7s -steve,tsqs9s5stskhah3h9h2h -steve,kckd6d6c6h5c7hqdqsjh +steven,3s2sas4s9s3s2d8h7d7s +steven,tsqs9s5stskhah3h9h2h +steven,kckd6d6c6h5c7hqdqsjh francois,5d6d7d8d9d6c7c8c9ctc jeff,5h5d3s3h3casts9s8s3s dundee,ah2h3h4h5hadadas2c2c @@ -28,9 +28,9 @@ fred,6s7c8c8skhqhjhth9h5h josh,2d3d4d5d6djdjcjh7h7c jen,4h4s4c4c6h6d2sjcjsjd josh,3s3c3d3h5cahac2h2s2c -steve,7s7h7h7hqsqdqs5d5c3s -steve,9c6c5c2cjcjh9dad2dqc -steve,6hkhqdjcts9c8dac7s5h +steven,7s7h7h7hqsqdqs5d5c3s +steven,9c6c5c2cjcjh9dad2dqc +steven,6hkhqdjcts9c8dac7s5h jen,3d3c3skcqdqckskdtstd josh,6s6c5h5s5stcjcqckcac randy,ahas2h2s3s3d4d4h5c5s @@ -59,9 +59,9 @@ rob,tcjcqckcacadac7d7d7h josh,5h8h8s7s4c3s7s8s9sts jeff,5s4s3s2sas3c4c5c6c9c fred,6h2d6h2d5d8s9dthqdkd -steve,3h3c2s2h2dackcqcjctc -steve,8c7c4c4c8c6h6d6s4h4s -steve,7h2h7dkc9s3c3s3sahah +steven,3h3c2s2h2dackcqcjctc +steven,8c7c4c4c8c6h6d6s4h4s +steven,7h2h7dkc9s3c3s3sahah jen,9sqcadaskskhjdjsjcjh stephanie,9c9s2c6s6d5s4s3s2sas stephanie,2c3s4d5s6c7s8h9dtsjh diff --git a/hand.rb b/hand.rb index 59e9ca7..b7958a8 100644 --- a/hand.rb +++ b/hand.rb @@ -31,7 +31,11 @@ class Hand ranks.each { |s| rank_counts[s] += 1 } # test for straight & flush - straight = (ranks.sort == (ranks.min .. ranks.max).to_a) + straight = + ranks.sort == (ranks.min .. ranks.max).to_a || + ranks.sort == [2,3,4,5,14] || + ranks.sort == [2,3,4,5,6,7,8,9,10,14] + flush = (suits.sort.uniq.size == 1) # rank hand diff --git a/score.rb b/score.rb index d3b55bf..e920d41 100755 --- a/score.rb +++ b/score.rb @@ -34,6 +34,7 @@ PlayerNames = { 'aaron' => 'Aaron Dickinson', 'adam' => 'Adam Dickinson', 'angel' => 'Angel Madigan', + 'casey' => 'Casey Lowe', 'cathy' => 'Cathy Waits', 'dundee' => 'Dundee Reyno', 'eddy' => 'Eddy Cramm',