diff --git a/R/compliments.R b/R/compliments.R index e0066f2..bffdae0 100644 --- a/R/compliments.R +++ b/R/compliments.R @@ -7,9 +7,9 @@ #' @return A compliment string #' #' @export -really_pretty <- function(name, follow_up = TRUE) { +really_pretty <- function(name, follow_up = FALSE) { - compliment <- glue::glue("You're, like, really pretty, {name}.") + compliment <- glue::glue("You're, like, really pretty {name}.") if (follow_up) { compliment <- paste(compliment, diff --git a/R/give_candygrams.R b/R/give_candygrams.R index 8d71397..4a983ec 100644 --- a/R/give_candygrams.R +++ b/R/give_candygrams.R @@ -30,7 +30,7 @@ give_candygrams <- function(person, number, number <- str_to_title(as.english(number)) - glue::glue("{number} for {person}.") + glue::glue("{number} for {person}.{extra_message}") diff --git a/README.Rmd b/README.Rmd index d101a20..9a556d9 100644 --- a/README.Rmd +++ b/README.Rmd @@ -16,10 +16,10 @@ knitr::opts_chunk$set( # meangirls + -The goal of meangirls is to create quotes in the style of the -2004 instant classic movie, *Mean Girls*. +The goal of meangirls is to create quotes in the style of the 2004 instant classic movie, *Mean Girls*. ## Installation @@ -34,7 +34,6 @@ devtools::install_github("Cal-Poly-Advanced-R/meangirls") library(meangirls) ``` - ## insults You can use the function `boo()` to deliver a generic insult: @@ -49,10 +48,9 @@ You can use the function `fetch()` to insult someone's made-up slang word. fetch("Gretchen", "fetch") ``` - ## compliments -You can use the function `nice_style()` to compliment someone's fashion choices. +You can use the function `nice_style()` to compliment someone's fashion choices.\ The default adjective is "vintage", but you can supply your own. ```{r} @@ -61,7 +59,6 @@ nice_style("bracelet") nice_style("bracelet", adjective = "colorful") ``` - You can use the function `really_pretty()` to tell someone they are pretty. ```{r} @@ -77,11 +74,9 @@ really_pretty("Cady", follow_up = TRUE) nice_style("bracelet", follow_up = TRUE) ``` - ## Handing out candygrams -Finally, you can use the `give_candygrams()` function to announce the number of -candygrams a person gets. +Finally, you can use the `give_candygrams()` function to announce the number of candygrams a person gets. ```{r} give_candygrams("Taylor Zimmerman", 2) @@ -96,10 +91,8 @@ give_candygrams("Taylor Zimmerman", 2, extra_message = "Merry Christmas!") ``` - Some special cases trigger automatic extra commentary or special behavior: - ```{r} give_candygrams("Glen Coco", 4) ``` @@ -107,5 +100,3 @@ give_candygrams("Glen Coco", 4) ```{r} give_candygrams("Gretchen Weiners", 4) ``` - - diff --git a/README.md b/README.md index 876c029..6996c03 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ # meangirls - The goal of meangirls is to create quotes in the style of the 2004 @@ -92,7 +91,7 @@ You can also give extra commentary to your announcement: ``` r give_candygrams("Taylor Zimmerman", 2, extra_message = "Merry Christmas!") -#> Two for Taylor Zimmerman. +#> Two for Taylor Zimmerman.Merry Christmas! ``` Some special cases trigger automatic extra commentary or special @@ -100,10 +99,10 @@ behavior: ``` r give_candygrams("Glen Coco", 4) -#> Four for Glen Coco. +#> Four for Glen Coco.You go, Glen Coco! ``` ``` r give_candygrams("Gretchen Weiners", 4) -#> [1] "None for Grethen Weiners." +#> None for Gretchen Weiners. ```