Add suggestions from @MeirGavish

This commit is contained in:
MonteCrysto
2025-10-08 08:14:54 +02:00
parent 8cd86f1640
commit aa5ebd13fc
3 changed files with 12 additions and 7 deletions
+1 -1
View File
@@ -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
{
+10 -6
View File
@@ -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)
);
}
+1
View File
@@ -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.