Browse Source

Merge branch 'master' of github.com:/hrbrmstr/ggalt

pull/3/head
boB Rudis 8 years ago
parent
commit
bf0592c626
  1. 5
      DESCRIPTION
  2. 1
      NAMESPACE
  3. 8
      R/a-pokemon-colors.r
  4. 2
      R/ggalt-package.r
  5. 1
      R/pokemon.r
  6. 3
      man/scale_pokemon.Rd

5
DESCRIPTION

@ -1,5 +1,5 @@
Package: ggalt Package: ggalt
Title: Extra Coordinate Systems, Geoms, Statistical Transformations and Scales for 'ggplot2' Title: Extra Coordinate Systems, 'Geoms', Statistical Transformations and Scales for 'ggplot2'
Version: 0.1.5.9000 Version: 0.1.5.9000
Authors@R: c(person("Bob", "Rudis", email = "bob@rudis.net", role = c("aut", "cre"))) Authors@R: c(person("Bob", "Rudis", email = "bob@rudis.net", role = c("aut", "cre")))
Description: A compendium of 'geoms', 'coords', 'stats' & scales for 'ggplot2', Description: A compendium of 'geoms', 'coords', 'stats' & scales for 'ggplot2',
@ -31,7 +31,6 @@ Imports:
gtable, gtable,
ash, ash,
maps, maps,
MASS, MASS
ggplot2
RoxygenNote: 5.0.1 RoxygenNote: 5.0.1
VignetteBuilder: knitr VignetteBuilder: knitr

1
NAMESPACE

@ -37,6 +37,7 @@ import(ash)
import(ggplot2) import(ggplot2)
import(grDevices) import(grDevices)
import(graphics) import(graphics)
import(maps)
import(proj4) import(proj4)
importFrom(RColorBrewer,brewer.pal) importFrom(RColorBrewer,brewer.pal)
importFrom(dplyr,filter) importFrom(dplyr,filter)

8
R/a-pokemon-colors.r

@ -66,14 +66,14 @@ pokemon <- structure(list(bulbasaur = c("#399494", "#62d5b4", "#101010",
"#cdbdb4", "#734a18", "#e6d5c5", "#eeeede", "#836210", "#838383", "#cdbdb4", "#734a18", "#e6d5c5", "#eeeede", "#836210", "#838383",
"#ffffff", "#10397b", "#297bcd"), sandslash = c("#8b6218", "#101010", "#ffffff", "#10397b", "#297bcd"), sandslash = c("#8b6218", "#101010",
"#f6d520", "#d5ac20", "#4a3910", "#ded5b4", "#ac8331", "#5a4a00", "#f6d520", "#d5ac20", "#4a3910", "#ded5b4", "#ac8331", "#5a4a00",
"#ffffff", "#525252", "#947b00", "#8b8b8b"), `nidoran` = c("#d5d5ff", "#ffffff", "#525252", "#947b00", "#8b8b8b"), `nidoran female` = c("#d5d5ff",
"#acaccd", "#414183", "#101010", "#7383ac", "#189c94", "#bd314a", "#acaccd", "#414183", "#101010", "#7383ac", "#189c94", "#bd314a",
"#ffffff", "#396a94", "#eeeeff", "#ff5241", "#dedede"), nidorina = c("#8bc5cd", "#ffffff", "#396a94", "#eeeeff", "#ff5241", "#dedede"), nidorina = c("#8bc5cd",
"#c5e6ee", "#5a94b4", "#395a62", "#101010", "#183973", "#4a83f6", "#c5e6ee", "#5a94b4", "#395a62", "#101010", "#183973", "#4a83f6",
"#ffffff", "#838383", "#1062b4", "#d5d5d5", "#c52010", "#ee4a39", "#ffffff", "#838383", "#1062b4", "#d5d5d5", "#c52010", "#ee4a39",
"#ff9c8b"), nidoqueen = c("#628bac", "#5ab4cd", "#314a4a", "#101010", "#ff9c8b"), nidoqueen = c("#628bac", "#5ab4cd", "#314a4a", "#101010",
"#bdac5a", "#e6cd8b", "#9cd5de", "#735a29", "#eee6a4", "#ffffff", "#bdac5a", "#e6cd8b", "#9cd5de", "#735a29", "#eee6a4", "#ffffff",
"#d5d5d5"), `nidoran` = c("#bd62c5", "#e69cd5", "#62416a", "#d5d5d5"), `nidoran male` = c("#bd62c5", "#e69cd5", "#62416a",
"#101010", "#006241", "#eebdee", "#9c4aac", "#00a473", "#18cd9c", "#101010", "#006241", "#eebdee", "#9c4aac", "#00a473", "#18cd9c",
"#cdcdcd", "#ffffff", "#b41800", "#de4129", "#ff6a52"), nidorino = c("#945ab4", "#cdcdcd", "#ffffff", "#b41800", "#de4129", "#ff6a52"), nidorino = c("#945ab4",
"#cd83de", "#5a3962", "#101010", "#e6acee", "#009462", "#4acda4", "#cd83de", "#5a3962", "#101010", "#e6acee", "#009462", "#4acda4",
@ -1508,8 +1508,8 @@ pokemon <- structure(list(bulbasaur = c("#399494", "#62d5b4", "#101010",
"wartortle", "blastoise", "caterpie", "metapod", "butterfree", "wartortle", "blastoise", "caterpie", "metapod", "butterfree",
"weedle", "kakuna", "beedrill", "pidgey", "pidgeotto", "pidgeot", "weedle", "kakuna", "beedrill", "pidgey", "pidgeotto", "pidgeot",
"rattata", "raticate", "spearow", "fearow", "ekans", "arbok", "rattata", "raticate", "spearow", "fearow", "ekans", "arbok",
"pikachu", "raichu", "sandshrew", "sandslash", "nidoran\342\231\200", "pikachu", "raichu", "sandshrew", "sandslash", "nidoran male",
"nidorina", "nidoqueen", "nidoran\342\231\202", "nidorino", "nidoking", "nidorina", "nidoqueen", "nidoran female", "nidorino", "nidoking",
"clefairy", "clefable", "vulpix", "ninetales", "jigglypuff", "clefairy", "clefable", "vulpix", "ninetales", "jigglypuff",
"wigglytuff", "zubat", "golbat", "oddish", "gloom", "vileplume", "wigglytuff", "zubat", "golbat", "oddish", "gloom", "vileplume",
"paras", "parasect", "venonat", "venomoth", "diglett", "dugtrio", "paras", "parasect", "venonat", "venomoth", "diglett", "dugtrio",

2
R/ggalt-package.r

@ -5,7 +5,7 @@
#' @name ggalt #' @name ggalt
#' @docType package #' @docType package
#' @author Bob Rudis (@@hrbrmstr) #' @author Bob Rudis (@@hrbrmstr)
#' @import ggplot2 graphics grDevices KernSmooth proj4 ash MASS #' @import maps ggplot2 graphics grDevices KernSmooth proj4 ash MASS
#' @importFrom dplyr filter #' @importFrom dplyr filter
#' @importFrom scales rescale expand_range #' @importFrom scales rescale expand_range
#' @importFrom grid grobName grobTree unit.c grobHeight grobWidth viewport #' @importFrom grid grobName grobTree unit.c grobHeight grobWidth viewport

1
R/pokemon.r

@ -8,7 +8,6 @@
#' @inheritParams pokemon_pal #' @inheritParams pokemon_pal
#' @family colour pokemon #' @family colour pokemon
#' @rdname scale_pokemon #' @rdname scale_pokemon
#' @seealso \code{\link{theme_economist}} for examples.
#' @export #' @export
scale_colour_pokemon <- function(avatar="bulbasaur", ...) { scale_colour_pokemon <- function(avatar="bulbasaur", ...) {
discrete_scale("colour", "pokemon", pokemon_pal(avatar=avatar), ...) discrete_scale("colour", "pokemon", pokemon_pal(avatar=avatar), ...)

3
man/scale_pokemon.Rd

@ -24,7 +24,4 @@ Color scales using the colors in the Pokemon characters
\details{ \details{
Data taken from the hard work by the \href{http://www.pokegraphs.com/}{folks here}. Data taken from the hard work by the \href{http://www.pokegraphs.com/}{folks here}.
} }
\seealso{
\code{\link{theme_economist}} for examples.
}

Loading…
Cancel
Save