Skip to content

Commit

Permalink
new default colour
Browse files Browse the repository at this point in the history
  • Loading branch information
aljrico committed Jan 9, 2019
1 parent 3f4bd00 commit 7d46402
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
14 changes: 7 additions & 7 deletions R/got_palette.R
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
#' channels of \code{n} equally spaced colors along the 'Game of Thrones' colour map.
#' \code{n = 256} by default.
#'
gotMap <- function(n = 256, alpha = 1, begin = 0, end = 1, direction = 1, option = "targaryen") {
gotMap <- function(n = 256, alpha = 1, begin = 0, end = 1, direction = 1, option = "Daenerys") {

option <- tolower(option)

Expand Down Expand Up @@ -110,7 +110,7 @@ gotMap <- function(n = 256, alpha = 1, begin = 0, end = 1, direction = 1, option
#' @rdname got
#' @export
#'
got <- function(n, alpha = 1, begin = 0, end = 1, direction = 1, option = "targaryen") {
got <- function(n, alpha = 1, begin = 0, end = 1, direction = 1, option = "Daenerys") {

option <- tolower(option)

Expand Down Expand Up @@ -143,7 +143,7 @@ got <- function(n, alpha = 1, begin = 0, end = 1, direction = 1, option = "targa
#' @rdname got
#'
#' @export
got_pal <- function(alpha = 1, begin = 0, end = 1, direction = 1, option = "targaryen") {
got_pal <- function(alpha = 1, begin = 0, end = 1, direction = 1, option = "Daenerys") {

option <- tolower(option)

Expand All @@ -159,7 +159,7 @@ got_pal <- function(alpha = 1, begin = 0, end = 1, direction = 1, option = "targ
#'
#' @export
scale_color_got <- function(..., alpha = 1, begin = 0, end = 1, direction = 1,
discrete = FALSE, option = "targaryen") {
discrete = FALSE, option = "Daenerys") {

option <- tolower(option)

Expand All @@ -179,7 +179,7 @@ scale_colour_got <- scale_color_got
#' @aliases scale_color_got
#' @export
scale_colour_got_d <- function(..., alpha = 1, begin = 0, end = 1,
direction = 1, option, aesthetics = "colour") {
direction = 1, option = "Daenerys", aesthetics = "colour") {
ggplot2::discrete_scale(
aesthetics,
"got_d",
Expand Down Expand Up @@ -256,7 +256,7 @@ gameofthrones <- got
#'
#' @export
scale_fill_got <- function(..., alpha = 1, begin = 0, end = 1, direction = 1,
discrete = FALSE, option = "targaryen") {
discrete = FALSE, option = "Daenerys") {

option <- tolower(option)

Expand All @@ -271,7 +271,7 @@ scale_fill_got <- function(..., alpha = 1, begin = 0, end = 1, direction = 1,
#' @aliases scale_fill_got
#' @export
scale_fill_got_d <- function(..., alpha = 1, begin = 0, end = 1,
direction = 1, option, aesthetics = "fill") {
direction = 1, option = "Daenerys", aesthetics = "fill") {
discrete_scale(
aesthetics,
"got_d",
Expand Down
8 changes: 4 additions & 4 deletions man/got.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions man/scale_got.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7d46402

Please sign in to comment.