Skip to content

Commit

Permalink
Add graphics for each species and level, close #10
Browse files Browse the repository at this point in the history
  • Loading branch information
matt-dray committed Oct 4, 2022
1 parent 72bcc96 commit d631fb5
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 16 deletions.
1 change: 1 addition & 0 deletions NEWS.md
Expand Up @@ -2,6 +2,7 @@
# tamRgo 0.0.0.9004

* Simplified the output of `get_stats()` and included 'bars' for status values.
* Added graphics for species X, Y and Z for levels 0 (shared), 1, 2 and 3 (#10).

# tamRgo 0.0.0.9003

Expand Down
30 changes: 23 additions & 7 deletions R/draw.R
Expand Up @@ -7,20 +7,36 @@
#' @examples \dontrun{ .get_pet_matrix("X")}
#'
#' @noRd
.get_pet_matrix <- function(species = c("X", "Y", "Z")) {
.get_pet_matrix <- function(species = c("X", "Y", "Z"), level = 1L:3L) {

species <- match.arg(species)

if (species == "X") {
return(species_images[["X"]])
if (level == 0L) {
return(species_images[["X"]][["level_0"]])
}

if (species == "Y") {
return(species_images[["Y"]])
if (species == "X" & level == 1L) {
return(species_images[["X"]][["level_1"]])
} else if (species == "X" & level == 2L) {
return(species_images[["X"]][["level_2"]])
} else if (species == "X" & level == 3L) {
return(species_images[["X"]][["level_3"]])
}

if (species == "Z") {
return(species_images[["Z"]])
if (species == "Y" & level == 1L) {
return(species_images[["Y"]][["level_1"]])
} else if (species == "Y" & level == 2L) {
return(species_images[["Y"]][["level_2"]])
} else if (species == "Y" & level == 3L) {
return(species_images[["Y"]][["level_3"]])
}

if (species == "Z" & level == 1L) {
return(species_images[["Z"]][["level_1"]])
} else if (species == "Z" & level == 2L) {
return(species_images[["Z"]][["level_2"]])
} else if (species == "Z" & level == 3L) {
return(species_images[["Z"]][["level_3"]])
}

}
Expand Down
6 changes: 5 additions & 1 deletion R/interact.R
Expand Up @@ -81,7 +81,11 @@ see_pet <- function() {

bp <- .check_and_update()

pet_matrix <- .get_pet_matrix(bp$characteristics$species)
pet_matrix <- .get_pet_matrix(
bp$characteristics$species,
bp$experience$level
)

.draw_pet(pet_matrix)

}
Expand Down
Binary file modified R/sysdata.rda
Binary file not shown.
39 changes: 31 additions & 8 deletions data-raw/images.R
@@ -1,9 +1,18 @@
xyz0 <- pixeltrix::click_pixels(7, 7)

xm <- pixeltrix::click_pixels(8, 8)
ym <- pixeltrix::click_pixels(8, 8)
zm <- pixeltrix::click_pixels(8, 8)
x1 <- pixeltrix::click_pixels(8, 8)
x2 <- pixeltrix::click_pixels(10, 10)
x3 <- pixeltrix::click_pixels(12, 12)

matrix_to_sprite <- function(m, states = c("0" = "", "1" = ""), preview = TRUE) {
y1 <- pixeltrix::click_pixels(8, 8)
y2 <- pixeltrix::click_pixels(10, 10)
y3 <- pixeltrix::click_pixels(12, 12)

z1 <- pixeltrix::click_pixels(8, 8)
z2 <- pixeltrix::click_pixels(10, 10)
z3 <- pixeltrix::click_pixels(12, 12)

matrix_to_sprite <- function(m, states = c("0" = " ", "1" = ""), preview = TRUE) {

mode(m) <- "character"
x <- matrix(states[m], nrow(m), ncol(m))
Expand All @@ -19,10 +28,24 @@ matrix_to_sprite <- function(m, states = c("0" = "░", "1" = "█"), preview =

}

matrix_to_sprite(xm) -> x
matrix_to_sprite(ym) -> y
matrix_to_sprite(zm) -> z
matrix_to_sprite(xyz0) -> xyz0_s

matrix_to_sprite(x1) -> x1_s
matrix_to_sprite(x2) -> x2_s
matrix_to_sprite(x3) -> x3_s

matrix_to_sprite(y1) -> y1_s
matrix_to_sprite(y2) -> y2_s
matrix_to_sprite(y3) -> y3_s

matrix_to_sprite(z1) -> z1_s
matrix_to_sprite(z2) -> z2_s
matrix_to_sprite(z3) -> z3_s

species_images <- list(X = x, Y = y, Z = z)
species_images <- list(
X = list(level_0 = xyz0_s, level_1 = x1_s, level_2 = x2_s, level_3 = x3_s),
Y = list(level_0 = xyz0_s, level_1 = y1_s, level_2 = y2_s, level_3 = y3_s) ,
Z = list(level_0 = xyz0_s, level_1 = z1_s, level_2 = z2_s, level_3 = z3_s)
)

usethis::use_data(species_images, internal = TRUE, overwrite = TRUE)

0 comments on commit d631fb5

Please sign in to comment.