diff --git a/images/major_0_.png b/images/major_0_.png new file mode 100644 index 0000000..629106f Binary files /dev/null and b/images/major_0_.png differ diff --git a/images/major_10_.png b/images/major_10_.png new file mode 100644 index 0000000..aa39c4f Binary files /dev/null and b/images/major_10_.png differ diff --git a/images/major_11_.png b/images/major_11_.png new file mode 100644 index 0000000..2c88c77 Binary files /dev/null and b/images/major_11_.png differ diff --git a/images/major_12_.png b/images/major_12_.png new file mode 100644 index 0000000..63acaf9 Binary files /dev/null and b/images/major_12_.png differ diff --git a/images/major_13_.png b/images/major_13_.png new file mode 100644 index 0000000..b102d6a Binary files /dev/null and b/images/major_13_.png differ diff --git a/images/major_14_.png b/images/major_14_.png new file mode 100644 index 0000000..1297847 Binary files /dev/null and b/images/major_14_.png differ diff --git a/images/major_15_.png b/images/major_15_.png new file mode 100644 index 0000000..0961035 Binary files /dev/null and b/images/major_15_.png differ diff --git a/images/major_16_.png b/images/major_16_.png new file mode 100644 index 0000000..228f671 Binary files /dev/null and b/images/major_16_.png differ diff --git a/images/major_17_.png b/images/major_17_.png new file mode 100644 index 0000000..cb8d6bd Binary files /dev/null and b/images/major_17_.png differ diff --git a/images/major_18_.png b/images/major_18_.png new file mode 100644 index 0000000..f2ab2d6 Binary files /dev/null and b/images/major_18_.png differ diff --git a/images/major_19_.png b/images/major_19_.png new file mode 100644 index 0000000..c4d6fc7 Binary files /dev/null and b/images/major_19_.png differ diff --git a/images/major_1_.png b/images/major_1_.png new file mode 100644 index 0000000..8e7db93 Binary files /dev/null and b/images/major_1_.png differ diff --git a/images/major_20_.png b/images/major_20_.png new file mode 100644 index 0000000..8cd1cd4 Binary files /dev/null and b/images/major_20_.png differ diff --git a/images/major_21_.png b/images/major_21_.png new file mode 100644 index 0000000..22631b0 Binary files /dev/null and b/images/major_21_.png differ diff --git a/images/major_2_.png b/images/major_2_.png new file mode 100644 index 0000000..c19a6e5 Binary files /dev/null and b/images/major_2_.png differ diff --git a/images/major_3_.png b/images/major_3_.png new file mode 100644 index 0000000..b1e7e25 Binary files /dev/null and b/images/major_3_.png differ diff --git a/images/major_4_.png b/images/major_4_.png new file mode 100644 index 0000000..e31ff49 Binary files /dev/null and b/images/major_4_.png differ diff --git a/images/major_5_.png b/images/major_5_.png new file mode 100644 index 0000000..dd24336 Binary files /dev/null and b/images/major_5_.png differ diff --git a/images/major_6_.png b/images/major_6_.png new file mode 100644 index 0000000..9efa5d7 Binary files /dev/null and b/images/major_6_.png differ diff --git a/images/major_7_.png b/images/major_7_.png new file mode 100644 index 0000000..ca27a42 Binary files /dev/null and b/images/major_7_.png differ diff --git a/images/major_8_.png b/images/major_8_.png new file mode 100644 index 0000000..0cf9d18 Binary files /dev/null and b/images/major_8_.png differ diff --git a/images/major_9_.png b/images/major_9_.png new file mode 100644 index 0000000..46e4c03 Binary files /dev/null and b/images/major_9_.png differ diff --git a/tarot.c b/tarot.c index 27efecd..0d18704 100644 --- a/tarot.c +++ b/tarot.c @@ -169,7 +169,29 @@ const struct Card card[] = { {"The Moon", &I_major_18}, {"The Sun", &I_major_19}, {"Judgement", &I_major_20}, - {"The World", &I_major_21} + {"The World", &I_major_21}, + {"The Fool", &I_major_0_}, + {"The Magician", &I_major_1_}, + {"The High Priestess", &I_major_2_}, + {"The Empress", &I_major_3_}, + {"The Emperor", &I_major_4_}, + {"The Hierophant", &I_major_5_}, + {"The Lovers", &I_major_6_}, + {"The Chariot", &I_major_7_}, + {"Strength", &I_major_8_}, + {"The Hermit", &I_major_9_}, + {"Wheel of Fortune", &I_major_10_}, + {"Justice", &I_major_11_}, + {"The Hanged Man", &I_major_12_}, + {"Death", &I_major_13_}, + {"Temperance", &I_major_14_}, + {"The Devil", &I_major_15_}, + {"The Tower", &I_major_16_}, + {"The Star", &I_major_17_}, + {"The Moon", &I_major_18_}, + {"The Sun", &I_major_19_}, + {"Judgement", &I_major_20_}, + {"The World", &I_major_21_} }; static uint16_t unbiased_rand (uint16_t max) { @@ -184,7 +206,6 @@ static uint16_t unbiased_rand (uint16_t max) { struct Spread { int card[3]; bool selected[3]; - bool rotation[3]; // 0 - up, 1 - down }; struct Spread spread; @@ -232,11 +253,11 @@ static bool widget_input_callback(InputEvent* input_event, void* context) { break; case InputKeyUp: // UP - consumed = true; + //consumed = true; break; case InputKeyDown: // DOWN - consumed = true; + //consumed = true; break; default: consumed = false; @@ -261,6 +282,13 @@ void tarot_app_scene_on_enter_game(void* context) { while (spread.card[2] == spread.card[0] || spread.card[2] == spread.card[1]) { spread.card[2] = unbiased_rand(card_number); } + + // Upside down card option + if (0/*settings.upside_down*/) { + spread.card[0] += card_number*unbiased_rand(2); + spread.card[1] += card_number*unbiased_rand(2); + spread.card[2] += card_number*unbiased_rand(2); + } draw_tarot(app);