Adds Shortcut and Four Fingers (#95)

* adds shortcut joker

* adds Four Fingers joker, and combination support for Four Fingers + Shortcut

---------

Co-authored-by: MeirGavish <meir.gavish@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
theturtlemafia
2025-11-01 16:28:40 +02:00
committed by GitHub
co-authored by MeirGavish Copilot
parent eb815b7820
commit 03273de829
11 changed files with 553 additions and 153 deletions
+2 -1
View File
@@ -21,4 +21,5 @@ DEF_JOKER_GFX(19)
DEF_JOKER_GFX(20)
DEF_JOKER_GFX(21)
DEF_JOKER_GFX(22)
DEF_JOKER_GFX(23)
DEF_JOKER_GFX(23)
DEF_JOKER_GFX(24)
+5 -1
View File
@@ -118,4 +118,8 @@ int get_money(void);
int get_game_speed(void);
void set_game_speed(int new_game_speed);
#endif // GAME_H
// joker specific functions
bool is_shortcut_joker_active(void);
int get_straight_and_flush_size(void);
#endif // GAME_H
+4
View File
@@ -13,4 +13,8 @@ bool hand_contains_full_house(u8 *ranks);
bool hand_contains_straight(u8 *ranks);
bool hand_contains_flush(u8 *suits);
int find_flush_in_played_cards(CardObject** played, int top, int min_len, bool* out_selection);
int find_straight_in_played_cards(CardObject** played, int top, bool shortcut_active, int min_len, bool* out_selection);
void select_paired_cards_in_hand(CardObject** played, int top, bool* selection);
#endif
+2
View File
@@ -65,6 +65,8 @@ enum JokerEvent
#define JOKER_STENCIL_ID 16
#define PAREIDOLIA_JOKER_ID 30
#define JOKER_BRAINSTORM_ID 40
#define SHORTCUT_JOKER_ID 26
#define FOUR_FINGERS_JOKER_ID 48
typedef struct
+1
View File
@@ -25,5 +25,6 @@
#include "joker_gfx21.h"
#include "joker_gfx22.h"
#include "joker_gfx23.h"
#include "joker_gfx24.h"
#endif