Changed to more closely match the rules people know. I thought it was an unnecessary distraction that they were changed.

Author: emilybache

README.md

@@ -2,11 +2,12 @@
 
 This Refactoring Kata was designed by Jon Jagger and is available in his Cyber-Dojo. See [his blog post](http://jonjagger.blogspot.co.uk/2012/05/yahtzee-cyber-dojo-refactoring-in-java.html)
 
-The other language translations have been contributed by:
+I have changed it a little, so that the rules more closely match the original game.
 
-Python: Emily Bache
+The other language translations have been contributed by:
 
-Ruby: Kim Persson and Lennart Fridén
+- Python: Emily Bache
+- Ruby: Kim Persson and Lennart Fridén
 
 ## Kata: Yahtzee rules
 
@@ -43,74 +44,85 @@ highest scoring category for a given roll.
 
 ## Kata: Yahzee Categories and Scoring Rules
 
-_Note these rules differ from the original (copyrighted) rules_
-
-Chance: 
-  The player scores the sum of all dice,
-  no matter what they read.
-  For example,
-   1,1,3,3,6 placed on "chance" scores 14 (1+1+3+3+6)
-   4,5,5,6,1 placed on "chance" scores 21 (4+5+5+6+1)  
-
-Yahtzee: 
-  If all dice have the same number,
-  the player scores 50 points. 
-  For example,
-   1,1,1,1,1 placed on "yahtzee" scores 50
-   1,1,1,2,1 placed on "yahtzee" scores 0
-
-Ones, Twos, Threes, Fours, Fives, Sixes: 
-  The player scores the sum of the dice that reads one, 
-  two, three, four, five or six, respectively. 
-  For example,  
-   1,1,2,4,4 placed on "fours" scores 8 (4+4)
-   2,3,2,5,1 placed on "twos" scores 4  (2+2)
-   3,3,3,4,5 placed on "ones" scores 0
-
-Pair: 
-  The player scores the sum of the two highest matching dice.
-  For example, when placed on "pair" 
-   3,3,3,4,4 scores 8 (4+4)
-   1,1,6,2,6 scores 12 (6+6)
-   3,3,3,4,1 scores 0
-   3,3,3,3,1 scores 0
-
-Two pairs: 
-  If there are two pairs of dice with the same number, the
-  player scores the sum of these dice. 
-  For example, when placed on "two pairs"
-   1,1,2,3,3 scores 8 (1+1+3+3)
-   1,1,2,3,4 scores 0
-   1,1,2,2,2 scores 0
-
-Three of a kind: 
-  If there are three dice with the same number, the player
-  scores the sum of these dice. 
-  For example, when placed on "three of a kind"  
-    3,3,3,4,5 scores 9 (3+3+3)
-    3,3,4,5,6 scores 0
-    3,3,3,3,1 scores 0
-
-Four of a kind: 
-  If there are four dice with the same number, the player
-  scores the sum of these dice. 
-  For example, when placed on "four of a kind"  
-    2,2,2,2,5 scores 8 (2+2+2+2)
-    2,2,2,5,5 scores 0
-    2,2,2,2,2 scores 0
-
-Small straight: 
-  When placed on "small straight", if the dice read 
-  1,2,3,4,5, the player scores 15 (the sum of all the dice.
-
-Large straight: 
-  When placed on "large straight", if the dice read 
-  2,3,4,5,6, the player scores 20 (the sum of all the dice).
-
-Full house: 
-  If the dice are two of a kind and three of a kind, the
-  player scores the sum of all the dice. 
-  For example, when placed on "full house"  
-    1,1,2,2,2 scores 8 (1+1+2+2+2) 
-    2,2,3,3,4 scores 0
-    4,4,4,4,4 scores 0
+### Chance: 
+The player scores the sum of all dice, no matter what they read.
+For example:
+  
+-   1,1,3,3,6 placed on "chance" scores 14 (1+1+3+3+6)
+-   4,5,5,6,1 placed on "chance" scores 21 (4+5+5+6+1)  
+
+### Yahtzee: 
+If all dice have the same number,
+the player scores 50 points. 
+For example:
+  
+-   1,1,1,1,1 placed on "yahtzee" scores 50
+-   1,1,1,2,1 placed on "yahtzee" scores 0
+
+### Ones, Twos, Threes, Fours, Fives, Sixes: 
+The player scores the sum of the dice that reads one, 
+two, three, four, five or six, respectively. 
+For example:
+
+-   1,1,2,4,4 placed on "fours" scores 8 (4+4)
+-   2,3,2,5,1 placed on "twos" scores 4  (2+2)
+-   3,3,3,4,5 placed on "ones" scores 0
+
+### Pair: 
+The player scores the sum of the two highest matching dice.
+For example, when placed on "pair":
+  
+-   3,3,3,4,4 scores 8 (4+4)
+-   1,1,6,2,6 scores 12 (6+6)
+-   3,3,3,4,1 scores 6 (3+3)
+-   3,3,3,3,1 scores 6 (3+3)
+
+### Two pairs: 
+If there are two pairs of dice with the same number, the
+player scores the sum of these dice. 
+For example, when placed on "two pairs":
+  
+-   1,1,2,3,3 scores 8 (1+1+3+3)
+-   1,1,2,3,4 scores 0
+-   1,1,2,2,2 scores 6 (1+1+2+2)
+
+### Three of a kind: 
+If there are three dice with the same number, the player
+scores the sum of these dice. 
+For example, when placed on "three of a kind":
+    
+-    3,3,3,4,5 scores 9 (3+3+3)
+-    3,3,4,5,6 scores 0
+-    3,3,3,3,1 scores 9 (3+3+3)
+
+### Four of a kind: 
+If there are four dice with the same number, the player
+scores the sum of these dice. 
+For example, when placed on "four of a kind":
+  
+-    2,2,2,2,5 scores 8 (2+2+2+2)
+-    2,2,2,5,5 scores 0
+-    2,2,2,2,2 scores 8 (2+2+2+2)
+
+### Small straight: 
+When placed on "small straight", if the dice read
+
+   1,2,3,4,5, 
+   
+the player scores 15 (the sum of all the dice.
+
+### Large straight: 
+When placed on "large straight", if the dice read
+
+   2,3,4,5,6, 
+   
+the player scores 20 (the sum of all the dice).
+
+### Full house: 
+If the dice are two of a kind and three of a kind, the
+player scores the sum of all the dice. 
+For example, when placed on "full house":
+   
+-    1,1,2,2,2 scores 8 (1+1+2+2+2) 
+-    2,2,3,3,4 scores 0
+-    4,4,4,4,4 scores 0

cpp/yahtzee.cpp

@@ -130,7 +130,7 @@ int Yahtzee::TwoPair(int d1, int d2, int d3, int d4, int d5)
     int n = 0;
     int score = 0;
     for (int i = 0; i < 6; i += 1)
-        if (counts[6-i-1] == 2) {
+        if (counts[6-i-1] >= 2) {
             n++;
             score += (6-i);
         }        
@@ -152,7 +152,7 @@ int Yahtzee::FourOfAKind(int _1, int _2, int d3, int d4, int d5)
     tallies[d4-1]++;
     tallies[d5-1]++;
     for (int i = 0; i < 6; i++)
-        if (tallies[i] == 4)
+        if (tallies[i] >= 4)
             return (i+1) * 4;
     return 0;
 }
@@ -169,7 +169,7 @@ int Yahtzee::ThreeOfAKind(int d1, int d2, int d3, int d4, int d5)
     t[d4-1]++;
     t[d5-1]++;
     for (int i = 0; i < 6; i++)
-        if (t[i] == 3)
+        if (t[i] >= 3)
             return (i+1) * 3;
     return 0;
 }

cpp/yahtzee.tests.cpp

@@ -80,21 +80,21 @@ static void one_pair()
 static void two_Pair() 
 {
     assert(16 == Yahtzee().TwoPair(3,3,5,4,5));
-    assert(0 == Yahtzee().TwoPair(3,3,5,5,5));
+    assert(16 == Yahtzee().TwoPair(3,3,5,5,5));
 }
 
 static void three_of_a_kind() 
 {
     assert(9 == Yahtzee().ThreeOfAKind(3,3,3,4,5));
     assert(15 == Yahtzee().ThreeOfAKind(5,3,5,4,5));
-    assert(0 == Yahtzee::ThreeOfAKind(3,3,3,3,5));
+    assert(9 == Yahtzee::ThreeOfAKind(3,3,3,3,5));
 }
 
 static void four_of_a_knd() 
 {
     assert(12 == Yahtzee::FourOfAKind(3,3,3,3,5));
     assert(20 == Yahtzee::FourOfAKind(5,5,5,4,5));
-    assert(0  == Yahtzee::FourOfAKind(3,3,3,3,3));
+    assert(12  == Yahtzee::FourOfAKind(3,3,3,3,3));
 }
 
 static void smallStraight() 

csharp/Yahtzee.cs

@@ -107,7 +107,7 @@ public static int ScorePair(int d1, int d2, int d3, int d4, int d5)
         counts[d5-1]++;
         int at;
         for (at = 0; at != 6; at++)
-            if (counts[6-at-1] == 2)
+            if (counts[6-at-1] >= 2)
                 return (6-at)*2;
         return 0;
     }
@@ -123,7 +123,7 @@ public static int TwoPair(int d1, int d2, int d3, int d4, int d5)
         int n = 0;
         int score = 0;
         for (int i = 0; i < 6; i += 1)
-            if (counts[6-i-1] == 2) {
+            if (counts[6-i-1] >= 2) {
                 n++;
                 score += (6-i);
             }        
@@ -143,7 +143,7 @@ public static int FourOfAKind(int _1, int _2, int d3, int d4, int d5)
         tallies[d4-1]++;
         tallies[d5-1]++;
         for (int i = 0; i < 6; i++)
-            if (tallies[i] == 4)
+            if (tallies[i] >= 4)
                 return (i+1) * 4;
         return 0;
     }
@@ -158,7 +158,7 @@ public static int ThreeOfAKind(int d1, int d2, int d3, int d4, int d5)
         t[d4-1]++;
         t[d5-1]++;
         for (int i = 0; i < 6; i++)
-            if (t[i] == 3)
+            if (t[i] >= 3)
                 return (i+1) * 3;
         return 0;
     }

csharp/YahtzeeTest.cs

@@ -79,23 +79,23 @@ public void one_pair()
     public void two_Pair() 
     {
         Assert.AreEqual(16, Yahtzee.TwoPair(3,3,5,4,5));
-        Assert.AreEqual(0, Yahtzee.TwoPair(3,3,5,5,5));
+        Assert.AreEqual(16, Yahtzee.TwoPair(3,3,5,5,5));
     }
 
     [Test]
     public void three_of_a_kind() 
     {
         Assert.AreEqual(9, Yahtzee.ThreeOfAKind(3,3,3,4,5));
         Assert.AreEqual(15, Yahtzee.ThreeOfAKind(5,3,5,4,5));
-        Assert.AreEqual(0, Yahtzee.ThreeOfAKind(3,3,3,3,5));
+        Assert.AreEqual(9, Yahtzee.ThreeOfAKind(3,3,3,3,5));
     }
 
     [Test]
     public void four_of_a_knd() 
     {
         Assert.AreEqual(12, Yahtzee.FourOfAKind(3,3,3,3,5));
         Assert.AreEqual(20, Yahtzee.FourOfAKind(5,5,5,4,5));
-        Assert.AreEqual(0, Yahtzee.FourOfAKind(3,3,3,3,3));
+        Assert.AreEqual(12, Yahtzee.FourOfAKind(3,3,3,3,3));
     }
 
     [Test]
@@ -121,4 +121,3 @@ public void fullHouse()
         Assert.AreEqual(0, Yahtzee.FullHouse(2,3,4,5,6));
     }
 }
-

java/Yahtzee.java

@@ -107,7 +107,7 @@ public static int score_pair(int d1, int d2, int d3, int d4, int d5)
         counts[d5-1]++;
         int at;
         for (at = 0; at != 6; at++)
-            if (counts[6-at-1] == 2)
+            if (counts[6-at-1] >= 2)
                 return (6-at)*2;
         return 0;
     }
@@ -123,7 +123,7 @@ public static int two_pair(int d1, int d2, int d3, int d4, int d5)
         int n = 0;
         int score = 0;
         for (int i = 0; i < 6; i += 1)
-            if (counts[6-i-1] == 2) {
+            if (counts[6-i-1] >= 2) {
                 n++;
                 score += (6-i);
             }        
@@ -143,7 +143,7 @@ public static int four_of_a_kind(int _1, int _2, int d3, int d4, int d5)
         tallies[d4-1]++;
         tallies[d5-1]++;
         for (int i = 0; i < 6; i++)
-            if (tallies[i] == 4)
+            if (tallies[i] >= 4)
                 return (i+1) * 4;
         return 0;
     }
@@ -158,7 +158,7 @@ public static int three_of_a_kind(int d1, int d2, int d3, int d4, int d5)
         t[d4-1]++;
         t[d5-1]++;
         for (int i = 0; i < 6; i++)
-            if (t[i] == 3)
+            if (t[i] >= 3)
                 return (i+1) * 3;
         return 0;
     }

java/YahtzeeTest.java

@@ -70,22 +70,22 @@ public void one_pair() {
     @Test
     public void two_Pair() {
         assertEquals(16, Yahtzee.two_pair(3,3,5,4,5));
-        assertEquals(0, Yahtzee.two_pair(3,3,5,5,5));
+        assertEquals(16, Yahtzee.two_pair(3,3,5,5,5));
     }
 
     @Test
     public void three_of_a_kind() 
     {
         assertEquals(9, Yahtzee.three_of_a_kind(3,3,3,4,5));
         assertEquals(15, Yahtzee.three_of_a_kind(5,3,5,4,5));
-        assertEquals(0, Yahtzee.three_of_a_kind(3,3,3,3,5));
+        assertEquals(9, Yahtzee.three_of_a_kind(3,3,3,3,5));
     }
 
     @Test
     public void four_of_a_knd() {
         assertEquals(12, Yahtzee.four_of_a_kind(3,3,3,3,5));
         assertEquals(20, Yahtzee.four_of_a_kind(5,5,5,4,5));
-        assertEquals(0, Yahtzee.three_of_a_kind(3,3,3,3,3));
+        assertEquals(9, Yahtzee.three_of_a_kind(3,3,3,3,3));
     }
 
     @Test

python/test_yahtzee.py

@@ -61,19 +61,21 @@ def test_one_pair():
 
 def test_two_Pair():
         assert 16 == Yahtzee.two_pair(3,3,5,4,5)
-        assert 0 == Yahtzee.two_pair(3,3,5,5,5)
+        assert 18 == Yahtzee.two_pair(3,3,6,6,6)
+        assert 0 == Yahtzee.two_pair(3,3,6,5,4)
 
 
 def test_three_of_a_kind():
         assert 9 == Yahtzee.three_of_a_kind(3,3,3,4,5)
         assert 15 == Yahtzee.three_of_a_kind(5,3,5,4,5)
-        assert 0 == Yahtzee.three_of_a_kind(3,3,3,3,5)
+        assert 9 == Yahtzee.three_of_a_kind(3,3,3,3,5)
 
 
 def test_four_of_a_knd():
         assert 12 == Yahtzee.four_of_a_kind(3,3,3,3,5)
         assert 20 == Yahtzee.four_of_a_kind(5,5,5,4,5)
-        assert 0 == Yahtzee.three_of_a_kind(3,3,3,3,3)
+        assert 12 == Yahtzee.four_of_a_kind(3,3,3,3,3)
+        assert 0  == Yahtzee.four_of_a_kind(3,3,3,2,1)
 
 
 def test_smallStraight():