From 847b9ec6d603516f0af6662bebb3364a01071acb Mon Sep 17 00:00:00 2001 From: xenofem Date: Wed, 27 Jul 2022 08:53:22 -0400 Subject: [PATCH] suit colors --- deck.asy | 8 +++++--- suits.asy | 9 +++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/deck.asy b/deck.asy index d6bc467..97ef413 100644 --- a/deck.asy +++ b/deck.asy @@ -1,7 +1,9 @@ import "cards.asy" as cards; import "numerals.asy" as numerals; +import "suits.asy" as suits; for (int suit = 0; suit <= 5; ++suit) { + currentpen = evenodd+suit_colors[suit]; for (int value = 1; value <= 10; ++value) { currentpicture = new picture; filldraw(card, white, black); @@ -9,13 +11,13 @@ for (int suit = 0; suit <= 5; ++suit) { if (suit == CARDS && value == 1) { // due to exponential growth, with the larger suit icon on the 1 // card, the endpoint of the recursion is a *lot* more visible - fill(recursive_card(value, suit, 6), evenodd+red); + fill(recursive_card(value, suit, 6)); } else if (suit == CARDS && value > 6) { // conversely, face cards don't need as much recursion depth // because the only icons present are significantly smaller - fill(recursive_card(value, suit, 3), evenodd+red); + fill(recursive_card(value, suit, 3)); } else { - fill(recursive_card(value, suit), evenodd+red); + fill(recursive_card(value, suit)); } string suit_str; diff --git a/suits.asy b/suits.asy index ce90eb4..eff27fc 100644 --- a/suits.asy +++ b/suits.asy @@ -19,3 +19,12 @@ icons[CHAIRS] = chair; icons[BLADES] = blade; icons[WHEELS] = wheel; icons[CARDS] = null; + +pen suit_colors[] = { defaultpen, defaultpen, defaultpen, defaultpen, defaultpen, defaultpen }; + +suit_colors[PUPPETS] = black; +suit_colors[CARDS] = black; +suit_colors[BLADES] = red; +suit_colors[BREAD] = red; +suit_colors[CHAIRS] = blue; +suit_colors[WHEELS] = blue;