fix scoring error when reaching 31

diff --git a/src/game/cribbage/mod.rs b/src/game/cribbage/mod.rs
index 66e01fa4d965050fa3ed26ad61103257042fc671..c720e0a6f3444f493db02ddd0ec69e8178cd682c 100644 (file)
--- a/src/game/cribbage/mod.rs
+++ b/src/game/cribbage/mod.rs
@@ -718,4 +718,244 @@ mod tests {
 
         test_game(actions, settings, seed);
     }
+
+    #[test]
+    fn score_two_when_last_score_is_31() {
+        let actions = r#"[
+            {"timestamp":1685913050789,"username":"Geoff","action":{"action":"Join","seat":0,"chips":0}},
+            {"timestamp":1685913060711,"username":"Aga","action":{"action":"Join","seat":1,"chips":0}},
+            {"timestamp":1685913060712,"username":"Geoff","action":{"action":"NextToDeal"}},
+            {"timestamp":1685913060713,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Two","suit":"Clubs"}}},
+            {"timestamp":1685913060714,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Eight","suit":"Hearts"}}},
+            {"timestamp":1685913060715,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Queen","suit":"Spades"}}},
+            {"timestamp":1685913060716,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Seven","suit":"Clubs"}}},
+            {"timestamp":1685913060717,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Nine","suit":"Clubs"}}},
+            {"timestamp":1685913060718,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Ace","suit":"Hearts"}}},
+            {"timestamp":1685913060718,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Six","suit":"Spades"}}},
+            {"timestamp":1685913060719,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Nine","suit":"Diamonds"}}},
+            {"timestamp":1685913060720,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Jack","suit":"Hearts"}}},
+            {"timestamp":1685913060721,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Six","suit":"Hearts"}}},
+            {"timestamp":1685913060721,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Four","suit":"Diamonds"}}},
+            {"timestamp":1685913060722,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"King","suit":"Diamonds"}}},
+            {"timestamp":1685913060723,"username":"Geoff","action":{"action":"EndDeal"}},
+            {"timestamp":1685913074761,"username":"Aga","action":{"action":"PutInBox","card":{"rank":"Jack","suit":"Hearts"}}},
+            {"timestamp":1685913076394,"username":"Aga","action":{"action":"PutInBox","card":{"rank":"Queen","suit":"Spades"}}},
+            {"timestamp":1685913095179,"username":"Geoff","action":{"action":"PutInBox","card":{"rank":"Ace","suit":"Hearts"}}},
+            {"timestamp":1685913096139,"username":"Geoff","action":{"action":"PutInBox","card":{"rank":"King","suit":"Diamonds"}}},
+            {"timestamp":1685913096140,"username":"Geoff","action":{"action":"CommunityCard","card":{"rank":"Five","suit":"Hearts"}}},
+            {"timestamp":1685913107133,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Nine","suit":"Clubs"}}},
+            {"timestamp":1685913110003,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Six","suit":"Hearts"}}},
+            {"timestamp":1685913110004,"username":"Geoff","action":{"action":"Score","points":2,"reason":"Fifteen for two"}},
+            {"timestamp":1685913125371,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Six","suit":"Spades"}}},
+            {"timestamp":1685913125372,"username":"Aga","action":{"action":"Score","points":2,"reason":"Two"}},
+            {"timestamp":1685913133659,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Nine","suit":"Diamonds"}}},
+            {"timestamp":1685913140290,"username":"Aga","action":{"action":"Pass"}},
+            {"timestamp":1685913186735,"username":"Geoff","action":{"action":"Pass"}},
+            {"timestamp":1685913186737,"username":"Geoff","action":{"action":"Score","points":1,"reason":"One for a go"}},
+            {"timestamp":1685913203300,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Four","suit":"Diamonds"}}},
+            {"timestamp":1685913206977,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Seven","suit":"Clubs"}}},
+            {"timestamp":1685913209564,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Two","suit":"Clubs"}}},
+            {"timestamp":1685913211783,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Eight","suit":"Hearts"}}},
+            {"timestamp":1685913211784,"username":"Geoff","action":{"action":"Score","points":1,"reason":"One for a go"}},
+            {"timestamp":1685913211784,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Two","suit":"Clubs"}}},
+            {"timestamp":1685913211785,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Four","suit":"Diamonds"}}},
+            {"timestamp":1685913211786,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Six","suit":"Spades"}}},
+            {"timestamp":1685913211786,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Nine","suit":"Clubs"}}},
+            {"timestamp":1685913211787,"username":"Aga","action":{"action":"Score","points":9,"reason":"Fifteen two, fifteen four, fifteen six and three is 9"}},
+            {"timestamp":1685913211787,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Six","suit":"Hearts"}}},
+            {"timestamp":1685913211788,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Seven","suit":"Clubs"}}},
+            {"timestamp":1685913211788,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Eight","suit":"Hearts"}}},
+            {"timestamp":1685913211789,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Nine","suit":"Diamonds"}}},
+            {"timestamp":1685913211790,"username":"Geoff","action":{"action":"Score","points":9,"reason":"Fifteen two, fifteen four and five is 9"}},
+            {"timestamp":1685913211792,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Jack","suit":"Hearts"}}},
+            {"timestamp":1685913211793,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Queen","suit":"Spades"}}},
+            {"timestamp":1685913211794,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"King","suit":"Diamonds"}}},
+            {"timestamp":1685913211795,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Ace","suit":"Hearts"}}},
+            {"timestamp":1685913211807,"username":"Geoff","action":{"action":"Score","points":10,"reason":"Fifteen two, fifteen four, fifteen six and three and one for his nob is 10"}},
+            {"timestamp":1685913211808,"username":"Aga","action":{"action":"NextToDeal"}},
+            {"timestamp":1685913211809,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Eight","suit":"Hearts"}}},
+            {"timestamp":1685913211810,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"King","suit":"Diamonds"}}},
+            {"timestamp":1685913211821,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Nine","suit":"Diamonds"}}},
+            {"timestamp":1685913211821,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Queen","suit":"Spades"}}},
+            {"timestamp":1685913211822,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Nine","suit":"Clubs"}}},
+            {"timestamp":1685913211823,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Ace","suit":"Spades"}}},
+            {"timestamp":1685913211823,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Ace","suit":"Hearts"}}},
+            {"timestamp":1685913211824,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Six","suit":"Hearts"}}},
+            {"timestamp":1685913211824,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Ten","suit":"Clubs"}}},
+            {"timestamp":1685913211825,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Eight","suit":"Spades"}}},
+            {"timestamp":1685913211826,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Three","suit":"Hearts"}}},
+            {"timestamp":1685913211826,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Ten","suit":"Spades"}}},
+            {"timestamp":1685913211827,"username":"Aga","action":{"action":"EndDeal"}},
+            {"timestamp":1685913383130,"username":"Geoff","action":{"action":"PutInBox","card":{"rank":"Ace","suit":"Hearts"}}},
+            {"timestamp":1685913383842,"username":"Geoff","action":{"action":"PutInBox","card":{"rank":"Three","suit":"Hearts"}}},
+            {"timestamp":1685913389539,"username":"Aga","action":{"action":"PutInBox","card":{"rank":"Eight","suit":"Spades"}}},
+            {"timestamp":1685913390329,"username":"Aga","action":{"action":"PutInBox","card":{"rank":"Six","suit":"Hearts"}}},
+            {"timestamp":1685913390330,"username":"Aga","action":{"action":"CommunityCard","card":{"rank":"King","suit":"Spades"}}},
+            {"timestamp":1685913397938,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Nine","suit":"Diamonds"}}},
+            {"timestamp":1685913400309,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"King","suit":"Diamonds"}}},
+            {"timestamp":1685913402131,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Ten","suit":"Clubs"}}},
+            {"timestamp":1685913406204,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Ace","suit":"Spades"}}},
+            {"timestamp":1685913408062,"username":"Geoff","action":{"action":"Pass"}},
+            {"timestamp":1685913409647,"username":"Aga","action":{"action":"Pass"}},
+            {"timestamp":1685913409649,"username":"Aga","action":{"action":"Score","points":1,"reason":"One for a go"}},
+            {"timestamp":1685913418255,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Nine","suit":"Clubs"}}},
+            {"timestamp":1685913419971,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Ten","suit":"Spades"}}},
+            {"timestamp":1685913421544,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Eight","suit":"Hearts"}}},
+            {"timestamp":1685913421545,"username":"Geoff","action":{"action":"Score","points":3,"reason":"Three"}},
+            {"timestamp":1685913426272,"username":"Aga","action":{"action":"Pass"}},
+            {"timestamp":1685913426274,"username":"Geoff","action":{"action":"Score","points":1,"reason":"One for a go"}},
+            {"timestamp":1685913429058,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Queen","suit":"Spades"}}},
+            {"timestamp":1685913429060,"username":"Aga","action":{"action":"Score","points":1,"reason":"One for a go"}},
+            {"timestamp":1685913429060,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Eight","suit":"Hearts"}}},
+            {"timestamp":1685913429061,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Nine","suit":"Clubs"}}},
+            {"timestamp":1685913429061,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Nine","suit":"Diamonds"}}},
+            {"timestamp":1685913429062,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Ten","suit":"Clubs"}}},
+            {"timestamp":1685913429062,"username":"Geoff","action":{"action":"Score","points":8,"reason":"Eight"}},
+            {"timestamp":1685913429063,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Ten","suit":"Spades"}}},
+            {"timestamp":1685913429064,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Queen","suit":"Spades"}}},
+            {"timestamp":1685913429065,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"King","suit":"Diamonds"}}},
+            {"timestamp":1685913429066,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Ace","suit":"Spades"}}},
+            {"timestamp":1685913429067,"username":"Aga","action":{"action":"Score","points":2,"reason":"Two"}},
+            {"timestamp":1685913429068,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Three","suit":"Hearts"}}},
+            {"timestamp":1685913429068,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Six","suit":"Hearts"}}},
+            {"timestamp":1685913429069,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Eight","suit":"Spades"}}},
+            {"timestamp":1685913429070,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Ace","suit":"Hearts"}}},
+            {"timestamp":1685913429097,"username":"Aga","action":{"action":"Score","points":2,"reason":"Fifteen two, and the rest won't do"}},
+            {"timestamp":1685913429098,"username":"Geoff","action":{"action":"NextToDeal"}},
+            {"timestamp":1685913429099,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Two","suit":"Clubs"}}},
+            {"timestamp":1685913429100,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Ace","suit":"Spades"}}},
+            {"timestamp":1685913429101,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Seven","suit":"Diamonds"}}},
+            {"timestamp":1685913429101,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Six","suit":"Spades"}}},
+            {"timestamp":1685913429102,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Three","suit":"Spades"}}},
+            {"timestamp":1685913429102,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Two","suit":"Diamonds"}}},
+            {"timestamp":1685913429103,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Jack","suit":"Spades"}}},
+            {"timestamp":1685913429104,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Queen","suit":"Spades"}}},
+            {"timestamp":1685913429105,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Jack","suit":"Clubs"}}},
+            {"timestamp":1685913429105,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Nine","suit":"Spades"}}},
+            {"timestamp":1685913429106,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Eight","suit":"Spades"}}},
+            {"timestamp":1685913429106,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Three","suit":"Diamonds"}}},
+            {"timestamp":1685913429107,"username":"Geoff","action":{"action":"EndDeal"}},
+            {"timestamp":1685913922631,"username":"Geoff","action":{"action":"PutInBox","card":{"rank":"Two","suit":"Diamonds"}}},
+            {"timestamp":1685913923358,"username":"Geoff","action":{"action":"PutInBox","card":{"rank":"Three","suit":"Diamonds"}}},
+            {"timestamp":1685913946348,"username":"Aga","action":{"action":"PutInBox","card":{"rank":"Two","suit":"Clubs"}}},
+            {"timestamp":1685913947114,"username":"Aga","action":{"action":"PutInBox","card":{"rank":"Three","suit":"Spades"}}},
+            {"timestamp":1685913947115,"username":"Geoff","action":{"action":"CommunityCard","card":{"rank":"Four","suit":"Clubs"}}},
+            {"timestamp":1685913954671,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Jack","suit":"Clubs"}}},
+            {"timestamp":1685913956315,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Queen","suit":"Spades"}}},
+            {"timestamp":1685913962536,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Jack","suit":"Spades"}}},
+            {"timestamp":1685913964815,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Ace","suit":"Spades"}}},
+            {"timestamp":1685913964817,"username":"Geoff","action":{"action":"Score","points":2,"reason":"Thirty-one for two"}},
+            {"timestamp":1685913971911,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Eight","suit":"Spades"}}},
+            {"timestamp":1685913974184,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Nine","suit":"Spades"}}},
+            {"timestamp":1685913978052,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Seven","suit":"Diamonds"}}},
+            {"timestamp":1685913978054,"username":"Aga","action":{"action":"Score","points":3,"reason":"Three"}},
+            {"timestamp":1685913984049,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Six","suit":"Spades"}}},
+            {"timestamp":1685913984050,"username":"Geoff","action":{"action":"Score","points":5,"reason":"Four and a go is five"}},
+            {"timestamp":1685913984051,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Seven","suit":"Diamonds"}}},
+            {"timestamp":1685913984051,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Eight","suit":"Spades"}}},
+            {"timestamp":1685913984052,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Jack","suit":"Clubs"}}},
+            {"timestamp":1685913984052,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Jack","suit":"Spades"}}},
+            {"timestamp":1685913984053,"username":"Aga","action":{"action":"Score","points":5,"reason":"Fifteen two and two and one for his nob is 5"}},
+            {"timestamp":1685913984053,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Six","suit":"Spades"}}},
+            {"timestamp":1685913984054,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Nine","suit":"Spades"}}},
+            {"timestamp":1685913984054,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Queen","suit":"Spades"}}},
+            {"timestamp":1685913984056,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Ace","suit":"Spades"}}},
+            {"timestamp":1685913984056,"username":"Geoff","action":{"action":"Score","points":8,"reason":"Fifteen two, fifteen four and four is 8"}},
+            {"timestamp":1685913984057,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Two","suit":"Clubs"}}},
+            {"timestamp":1685913984057,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Two","suit":"Diamonds"}}},
+            {"timestamp":1685913984058,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Three","suit":"Diamonds"}}},
+            {"timestamp":1685913984058,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Three","suit":"Spades"}}},
+            {"timestamp":1685913984059,"username":"Geoff","action":{"action":"Score","points":16,"reason":"Sixteen"}},
+            {"timestamp":1685913984059,"username":"Aga","action":{"action":"NextToDeal"}},
+            {"timestamp":1685913984060,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Ace","suit":"Spades"}}},
+            {"timestamp":1685913984060,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Queen","suit":"Hearts"}}},
+            {"timestamp":1685913984077,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Queen","suit":"Clubs"}}},
+            {"timestamp":1685913984077,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Ten","suit":"Hearts"}}},
+            {"timestamp":1685913984078,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"King","suit":"Clubs"}}},
+            {"timestamp":1685913984079,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Ten","suit":"Clubs"}}},
+            {"timestamp":1685913984079,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Two","suit":"Spades"}}},
+            {"timestamp":1685913984080,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Jack","suit":"Hearts"}}},
+            {"timestamp":1685913984080,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Five","suit":"Spades"}}},
+            {"timestamp":1685913984081,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Nine","suit":"Hearts"}}},
+            {"timestamp":1685913984082,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Jack","suit":"Diamonds"}}},
+            {"timestamp":1685913984082,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Four","suit":"Clubs"}}},
+            {"timestamp":1685913984083,"username":"Aga","action":{"action":"EndDeal"}},
+            {"timestamp":1685914080294,"username":"Geoff","action":{"action":"PutInBox","card":{"rank":"Two","suit":"Spades"}}},
+            {"timestamp":1685914081136,"username":"Geoff","action":{"action":"PutInBox","card":{"rank":"Ace","suit":"Spades"}}},
+            {"timestamp":1685914092255,"username":"Aga","action":{"action":"PutInBox","card":{"rank":"Four","suit":"Clubs"}}},
+            {"timestamp":1685914093012,"username":"Aga","action":{"action":"PutInBox","card":{"rank":"Nine","suit":"Hearts"}}},
+            {"timestamp":1685914093013,"username":"Aga","action":{"action":"CommunityCard","card":{"rank":"Two","suit":"Diamonds"}}},
+            {"timestamp":1685914096913,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Jack","suit":"Diamonds"}}},
+            {"timestamp":1685914100829,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Jack","suit":"Hearts"}}},
+            {"timestamp":1685914100831,"username":"Aga","action":{"action":"Score","points":2,"reason":"Two"}},
+            {"timestamp":1685914104232,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"King","suit":"Clubs"}}},
+            {"timestamp":1685914106976,"username":"Aga","action":{"action":"Pass"}},
+            {"timestamp":1685914108318,"username":"Geoff","action":{"action":"Pass"}},
+            {"timestamp":1685914108320,"username":"Geoff","action":{"action":"Score","points":1,"reason":"One for a go"}},
+            {"timestamp":1685914113732,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Ten","suit":"Hearts"}}},
+            {"timestamp":1685914115703,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Five","suit":"Spades"}}},
+            {"timestamp":1685914115704,"username":"Geoff","action":{"action":"Score","points":2,"reason":"Fifteen for two"}},
+            {"timestamp":1685914120025,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Ten","suit":"Clubs"}}},
+            {"timestamp":1685914122593,"username":"Geoff","action":{"action":"Pass"}},
+            {"timestamp":1685914124100,"username":"Aga","action":{"action":"Pass"}},
+            {"timestamp":1685914124102,"username":"Aga","action":{"action":"Score","points":1,"reason":"One for a go"}},
+            {"timestamp":1685914126904,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Queen","suit":"Clubs"}}},
+            {"timestamp":1685914128930,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Queen","suit":"Hearts"}}},
+            {"timestamp":1685914128931,"username":"Aga","action":{"action":"Score","points":3,"reason":"Two and a go is three"}},
+            {"timestamp":1685914128932,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Five","suit":"Spades"}}},
+            {"timestamp":1685914128933,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Jack","suit":"Diamonds"}}},
+            {"timestamp":1685914128934,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"Queen","suit":"Clubs"}}},
+            {"timestamp":1685914128936,"username":"Geoff","action":{"action":"RevealCard","card":{"rank":"King","suit":"Clubs"}}},
+            {"timestamp":1685914128937,"username":"Geoff","action":{"action":"Score","points":10,"reason":"Fifteen two, fifteen four, fifteen six and three and one for his nob is 10"}},
+            {"timestamp":1685914128938,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Ten","suit":"Clubs"}}},
+            {"timestamp":1685914128938,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Ten","suit":"Hearts"}}},
+            {"timestamp":1685914128939,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Jack","suit":"Hearts"}}},
+            {"timestamp":1685914128940,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Queen","suit":"Hearts"}}},
+            {"timestamp":1685914128940,"username":"Aga","action":{"action":"Score","points":8,"reason":"Eight"}},
+            {"timestamp":1685914128941,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Two","suit":"Spades"}}},
+            {"timestamp":1685914128942,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Four","suit":"Clubs"}}},
+            {"timestamp":1685914128953,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Nine","suit":"Hearts"}}},
+            {"timestamp":1685914128954,"username":"Aga","action":{"action":"RevealCard","card":{"rank":"Ace","suit":"Spades"}}},
+            {"timestamp":1685914128955,"username":"Aga","action":{"action":"Score","points":6,"reason":"Fifteen two, fifteen four and two is 6"}},
+            {"timestamp":1685914128956,"username":"Geoff","action":{"action":"NextToDeal"}},
+            {"timestamp":1685914128957,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Three","suit":"Hearts"}}},
+            {"timestamp":1685914128960,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Two","suit":"Hearts"}}},
+            {"timestamp":1685914128962,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"King","suit":"Clubs"}}},
+            {"timestamp":1685914128963,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Seven","suit":"Diamonds"}}},
+            {"timestamp":1685914128964,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Ace","suit":"Clubs"}}},
+            {"timestamp":1685914128966,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Nine","suit":"Spades"}}},
+            {"timestamp":1685914128967,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"King","suit":"Diamonds"}}},
+            {"timestamp":1685914128968,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Ace","suit":"Diamonds"}}},
+            {"timestamp":1685914128970,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Ten","suit":"Hearts"}}},
+            {"timestamp":1685914128970,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Eight","suit":"Hearts"}}},
+            {"timestamp":1685914128971,"username":"Aga","action":{"action":"ReceiveCard","card":{"rank":"Four","suit":"Clubs"}}},
+            {"timestamp":1685914128972,"username":"Geoff","action":{"action":"ReceiveCard","card":{"rank":"Three","suit":"Spades"}}},
+            {"timestamp":1685914128973,"username":"Geoff","action":{"action":"EndDeal"}},
+            {"timestamp":1685914174859,"username":"Geoff","action":{"action":"PutInBox","card":{"rank":"Nine","suit":"Spades"}}},
+            {"timestamp":1685914183250,"username":"Geoff","action":{"action":"PutInBox","card":{"rank":"Eight","suit":"Hearts"}}},
+            {"timestamp":1685914194267,"username":"Aga","action":{"action":"PutInBox","card":{"rank":"King","suit":"Clubs"}}},
+            {"timestamp":1685914195021,"username":"Aga","action":{"action":"PutInBox","card":{"rank":"King","suit":"Diamonds"}}},
+            {"timestamp":1685914195022,"username":"Geoff","action":{"action":"CommunityCard","card":{"rank":"King","suit":"Spades"}}},
+            {"timestamp":1685914201453,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Ten","suit":"Hearts"}}},
+            {"timestamp":1685914203297,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Three","suit":"Spades"}}},
+            {"timestamp":1685914205236,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Three","suit":"Hearts"}}},
+            {"timestamp":1685914205238,"username":"Aga","action":{"action":"Score","points":2,"reason":"Two"}},
+            {"timestamp":1685914207574,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Seven","suit":"Diamonds"}}},
+            {"timestamp":1685914210760,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Four","suit":"Clubs"}}},
+            {"timestamp":1685914213096,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Ace","suit":"Diamonds"}}},
+            {"timestamp":1685914215055,"username":"Aga","action":{"action":"PlayCard","card":{"rank":"Ace","suit":"Clubs"}}},
+            {"timestamp":1685914215056,"username":"Aga","action":{"action":"Score","points":2,"reason":"Two"}},
+            {"timestamp":1685914218934,"username":"Geoff","action":{"action":"PlayCard","card":{"rank":"Two","suit":"Hearts"}}},
+            {"timestamp":1685914218935,"username":"Geoff","action":{"action":"Score","points":2,"reason":"Thirty-one for two"}}
+        ]"#;
+
+        let actions = serde_json::from_str(actions).unwrap();
+
+        let settings = r#"{"format":"Cribbage","title":"Nice Occupation","max_players":2,"target_score":121,"start_time":null}"#;
+        let settings = serde_json::from_str(settings).unwrap();
+        let seed = r#"{"rng":"ChaCha20","seed":"805afe30bb5bc1ad5962e6c0c7c3b8ba45dcda733186eecbd62f6190f8764a95"}"#;
+        let seed = serde_json::from_str(seed).unwrap();
+
+        test_game(actions, settings, seed);
+    }
 }

diff --git a/src/game/cribbage/score.rs b/src/game/cribbage/score.rs
index ec7379ce63e31bbfe851d4b54d2c004fe66b3bc8..9628b4e089dec0db773b01130c7f05a3611ab83c 100644 (file)
--- a/src/game/cribbage/score.rs
+++ b/src/game/cribbage/score.rs
@@ -205,6 +205,7 @@ pub fn score_pegging(cards: &[Card], go: bool) -> PeggingScore {
 
     if sum_value(cards) == 31 {
         score.thirty_one += 2;
+        score.go = false;
     }
 
     for start in 0..cards.len() {