Added a worm chart type. Required storing some extra progress info du…

…ring the game

.Rbuildignore

@@ -1,2 +1,3 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
+.DS_Store

.gitignore

@@ -2,3 +2,4 @@
 .Rhistory
 .RData
 .Ruserdata
+.DS_Store

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.3.3
+Version: 1.3.4
 Author: Jer Boon
 Maintainer: Jer Boon <[email protected]>
 Description: 

R/make_choice.R

@@ -56,6 +56,8 @@ make_choice <- function(game, work.mode=F) {
       supply_more_info <- T
       if(!work.mode)
         cat("Select which option to score using the 2 letter code. Valid entries are:\n")
+    } else if (input == "test") {
+      print(game$table)
     } else if (input %in% sections.available) {
       print(paste("you chose",input))
       table[table$section == input, "score"] <- table[table$section == input, "score.available"]
@@ -81,6 +83,10 @@ make_choice <- function(game, work.mode=F) {
   table[table$section=="lt", "score"] <- sum(table[table$half == 2,"score"],na.rm=T)
   table[table$section=="gt", "score"] <- sum(table[table$half %in% c(1,2),"score"],na.rm=T)
 
+  #update running total and choice order info
+  table[table$section == input, "score.running"] <- table[table$section=="gt", "score"]
+  table[table$section == input, "score.sequence"] <- sum(!is.na(table$score.running))
+
   game$table <- table
   game$dice <- NA
 

R/plot_card.R

@@ -27,7 +27,7 @@ plot_card <- function(game, work.mode) {
   random_colour <- sample(c("red","green","orange","blue","black","grey"),1)
 
   # Print a random chart
-  style <-  sample(1:5,1)
+  style <-  sample(1:7,1)
 
   # ------------------------
 
@@ -110,6 +110,25 @@ plot_card <- function(game, work.mode) {
         ggplot2::scale_x_discrete(name="") +
         ggplot2::theme(axis.text.x = ggplot2::element_text(angle=90, hjust=1, vjust=0.5))
 
+  }
+  else if (style %in% c(6,7))
+  {
+    #Progress worm - inspired by watching cricket! :)
+
+    gg <-
+      ggplot2::ggplot(gg.dat[!is.na(gg.dat$score.sequence),],
+                      ggplot2::aes(x=factor(score.sequence),y=score.running)) +
+      base_theme +
+      ggplot2::scale_fill_brewer(palette = base_palette) +
+      ggplot2::geom_line(ggplot2::aes(group="1"),size=1.5,alpha=0.7,color=random_colour) +
+      ggplot2::geom_point(size=3,color=random_colour) +
+      ggplot2::geom_text(ggplot2::aes(label=label),hjust=-0.2, angle=-15) +
+      ggplot2::scale_y_continuous(limits=c(0,max(gg.dat$score.running))) +
+      ggplot2::scale_x_discrete(expand=ggplot2::expand_scale(add=1)) +
+      ggplot2::ylab("Cumulative total") +
+      ggplot2::xlab("Turn") +
+      ggplot2::theme(legend.position = "none")
+
   }
 
   # Standard titles
@@ -121,5 +140,4 @@ plot_card <- function(game, work.mode) {
                                 subtitle = paste("Total score = ",game$table[game$table$section == "gt", "score"]))
 
   suppressWarnings(print(gg))
-
 }