Commit Graph
39 Commits
Author SHA1 Message Date
MeirGavish 4b35b2f7d8 Added art for jokers Blueprint and Brainstorm by @NoWhammies10 and @GreenNinja2525 2025-10-08 22:40:15 +03:00
NanandMeirGavish 23a14cb76e Update source/joker_effects.c
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
2025-10-08 20:41:09 +02:00
Nan 8ae4968539 Remove duplicated entries 2025-10-08 18:52:10 +02:00
Nan 9ae53bddb8 Fix errors introduced by latest commits 2025-10-08 18:39:49 +02:00
Nan af72fe5749 Fix conflicts
Attempt 1
2025-10-08 18:21:55 +02:00
Nan 7e17419811 Merge branch 'main' into pr-fix 2025-10-08 18:11:20 +02:00
NanandCopilot fec243b482 Update source/joker_effects.c
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-10-08 17:59:27 +02:00
NanandMeirGavish 324478845d Update source/joker_effects.c
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
2025-10-08 17:58:11 +02:00
NanandMeirGavish 0dbde481d5 Update source/joker_effects.c
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
2025-10-08 17:57:50 +02:00
MeirGavish 77f76bd4ef Removed "unused" attribute from integrated jokers 2025-10-08 00:05:37 +03:00
MeirGavish a0f1ef7780 Added art for xmult hand jokers The Duo The Trio, The Family, The Order, and The Tribe by @MathisMartin31 2025-10-07 23:52:49 +03:00
MeirGavish c529c4be69 Added art for jokers Abstract Joker by @MathisMartin31 and Bull by @NoWhammies10 and @GreenNinja2525 2025-10-07 21:26:43 +03:00
MeirGavish 46936c1878 Added art for jokers Raised Fist by @MathisMartin31 and Reserved Parking by @NoWhammies10 2025-10-07 21:13:31 +03:00
noctowlhootandMeirGavish 0187b5f78e Update source/joker_effects.c
Co-authored-by: MeirGavish <meir.gavish@gmail.com>
2025-10-07 20:24:00 +10:30
noctowlhoot b8a441f971 Update joker_effects.c
updated jokers into joker registry
2025-09-24 22:53:54 +09:30
noctowlhoot 26db4e1aa0 Update joker_effects.c
fixed triboulet - was triggering for jacks also, rem
2025-09-22 21:42:15 +09:30
noctowlhoot 591485a5ac Update joker_effects.c
I was unsure of the significance of the number immediately after joker rarity in the joker registry, so I haven't put the joker effects in there. If anyone can tell me what the significance of that number is I can add them in :)
2025-09-22 20:49:35 +09:30
Nan 35c0d383c5 Add blueprint and brainstorm jokers
Implements blueprint and brainstorm to the game, but leaves the implementations commented out as they are still missing assets.
2025-09-13 22:18:31 +02:00
MeirGavish 2d50005e30 Added art for Scary Face and Smiley Face by @GreenNinja2525 and enabled them in code 2025-08-22 19:43:27 +03:00
MeirGavish 46141090a0 Added joker sprites by @GreenNinja2525 for Blue Joker, Even Steven, Odd Todd, Scholar and Business Card. Disabled jokers with no sprites. 2025-08-17 12:36:20 +03:00
MeirGavish 2539954dea Fixed build error from previous merge and applied review comments 2025-08-17 11:10:00 +03:00
MeirGavish 04515839dc (Manual conflict res) merged main into ttm/joker-scope-joker-1 2025-08-17 11:03:27 +03:00
MeirGavish 92fa279059 Refactored jokers stack to be a list (AI used) 2025-08-16 13:18:44 +03:00
MeirGavish b218d4ac3e (Manual conflict res) Merge branch 'main' into ttm/joker-scope-joker-1 2025-08-15 10:56:41 +03:00
theturtlemafia 254efd7841 implement feedback 2025-08-09 19:23:47 -04:00
MeirGavish 039c5771e1 Grouped Banner with Stencil to optimize palettes (Swapped with Misprint) 2025-08-08 02:22:02 +03:00
MeirGavish 863e3a34ae Rearranged jokers for palette optimization (Banner and Mystic Summit don't go well together) 2025-08-08 00:31:10 +03:00
MeirGavish 5e6d28c663 Fixed stack top bugs in joker_effects.c - e.g. Blackboard activated if just the first card in hand was not spades/clubs 2025-08-08 00:01:36 +03:00
theturtlemafia 0f3d1b3b77 adds walkie-talkie, fibonnaci, banner, mystic summit, blackboard 2025-08-02 13:25:04 -04:00
theturtlemafia 174050d813 add fist, parking, business card, scholar, scary face, abstact, bull, smiley, even, odd jokers 2025-08-02 13:25:04 -04:00
theturtlemafia ee0591562f add blue joker 2025-08-02 13:25:04 -04:00
MeirGavish 56a211616a Removed misprint magic number 2025-08-02 19:43:44 +03:00
theturtlemafia 08307d62ad code review feedback 2025-08-02 12:25:31 -04:00
theturtlemafia dbff88add0 Adds XMult, Joker Stencil and Misprint (rebase) 2025-08-01 18:35:31 -04:00
theturtlemafia fe660d6cb8 fix half joker being incorrect 2025-07-28 18:33:12 -04:00
theturtlemafia a72458c2c3 adds jokers 6-16. Extract hand type detection logic from hand_get_type to be used by jokers as well 2025-07-28 18:27:48 -04:00
theturtlemafia ed1204db74 remove usage of extern for joker_registry. Add array size macro to util.h 2025-07-28 14:24:33 -04:00
MeirGavish 5c58b092d7 Extracted sinful jokers effects to single function sinful_joker_effect() 2025-07-27 19:01:26 +03:00
theturtlemafia 47ee3987fd refactor jokers to use struct and function pointer 2025-07-27 07:06:35 -04:00