From aa5ebd13fc67cf4b9b60ae887ab9925cf1ee287d Mon Sep 17 00:00:00 2001 From: MonteCrysto Date: Wed, 8 Oct 2025 08:14:54 +0200 Subject: [PATCH] Add suggestions from @MeirGavish --- include/joker.h | 2 +- source/game.c | 16 ++++++++++------ source/joker_effects.c | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/include/joker.h b/include/joker.h index f3c81c1b..df8c97f3 100644 --- a/include/joker.h +++ b/include/joker.h @@ -36,7 +36,7 @@ #define DEFAULT_JOKER_ID 0 #define GREEDY_JOKER_ID 1 // This is just an example to show the patern of making joker IDs #define JOKER_STENCIL_ID 16 -#define PAREIDOLIA_JOKER_ID 41 +#define PAREIDOLIA_JOKER_ID 30 typedef struct { diff --git a/source/game.c b/source/game.c index 366809e6..c9ed347a 100644 --- a/source/game.c +++ b/source/game.c @@ -161,7 +161,7 @@ List *get_jokers(void) { return jokers; } -bool is_joker_present(int joker_id) { +bool is_joker_owned(int joker_id) { for (int k = 0; k < list_get_size(jokers); k++) { JokerObject *joker = list_get(jokers, k); @@ -183,19 +183,23 @@ void remove_held_joker(int joker_idx) list_remove_by_idx(jokers, joker_idx); } -int get_deck_top(void) { +int get_deck_top(void) +{ return deck_top; } -int get_num_discards_remaining(void) { +int get_num_discards_remaining(void) +{ return discards; } -int get_num_hands_remaining(void) { +int get_num_hands_remaining(void) +{ return hands; } -int get_money(void) { +int get_money(void) +{ return money; } @@ -446,7 +450,7 @@ bool card_is_face(Card *card) { card->rank == JACK || card->rank == QUEEN || card->rank == KING || - is_joker_present(PAREIDOLIA_JOKER_ID) + is_joker_owned(PAREIDOLIA_JOKER_ID) ); } diff --git a/source/joker_effects.c b/source/joker_effects.c index 963f0d3d..1040f63a 100644 --- a/source/joker_effects.c +++ b/source/joker_effects.c @@ -639,6 +639,7 @@ const JokerInfo joker_registry[] = { // Business card should be paired with Shortcut for palette optimization when it's added { COMMON_JOKER, 4, scary_face_joker_effect }, // 28 { COMMON_JOKER, 4, smiley_face_joker_effect }, // 29 + { UNCOMMON_JOKER, 5, NULL /* Pareidolia */ }, // 30 // The following jokers don't have sprites yet, // uncomment them when their sprites are added.