RELEASE 1.3.0 - Game now has "Maxi Yatzy" game option (with 6 dice to…

… roll)
JerBoon · Sep 20, 2019 · 27e4f47 · 27e4f47
1 parent f9a2c69
commit 27e4f47
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: yahtzR
 Type: Package
 Title: Play variations of the well-known dice rolling game in an R session
-Version: 1.2.1
+Version: 1.3.0
 Author: Jer Boon
 Maintainer: Jer Boon <jer.booner@gmail.com>
 Description: 

diff --git a/NEWS.md b/NEWS.md
@@ -1,11 +1,16 @@
+# yahtzR 1.3.0
+
+Added "maxi_yatzy" game option - the game with 6 dice, and the ability to store
+and use unused dice rolls later on..
+
 # yahtzR 1.2.0
 
 Behind the scenes, much of the gamme variation related code is now implemented
 with S3 methods.
 
 Added game variations for Yatzy and a 4 dice variation of said.
 
-"Long straight" nor relabled as "Large straight".
+"Long straight" now relabled as "Large straight".
 
 Change to the argument calls for the yahtzR() function. Introduces a slight backward
 incompatibility to previous releases. Apologies to my zero users...

diff --git a/R/calc_scores.maxi_yatzy.R b/R/calc_scores.maxi_yatzy.R
@@ -34,7 +34,7 @@ calc_scores.maxi_yatzy <- function(game) {
 
   t[t$section == "1p","score.available"] <- {if (x[1] >= 2) (max(as.integer(names(x)[x >= 2]))*2) else 0}
   t[t$section == "2p","score.available"] <- (x[1] >= 2)*(length(x) > 1 & x[2] >= 2)*
-                                            (sum(as.integer(names(x)[1:2]))*2)
+                                            (sum(as.integer(sort(names(x)[x >= 2], decreasing=T)[1:2]))*2)
   t[t$section == "3p","score.available"] <- (x[1] == 2)*(length(x) > 1 & x[2] == 2)*(length(x) > 2 & x[3] == 2)*
                                             sum(game$dice)