09dd996181
Clang Format Blinds ( #253 )
...
* Quick cleanup on bitset docs
* Clang format blind.h/c
* Replace `_` with `s_` for functions
* Fix newline size for macros.
* Fix format for ci
* Add macro for "unused" attribute
2025-11-25 13:47:44 -08:00
408c264e85
Modify blueprint and brainstorm implementation to fix retrigger bug ( #244 )
...
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
2025-11-21 20:09:07 +02:00
2fb41e533c
Make Chips, Mult and Score unsigned and protect against overflow ( #212 )
...
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
2025-11-20 12:39:15 +02:00
28043bd7ca
Integrated Photograph joker art by @MathisMartin31
2025-11-12 14:11:16 +02:00
4183f563ab
Implement cards held in hand effects ( #205 )
...
* Adapt existing Jokers to the Held Card mechanic + effect display location
* Add suggestions from @ricfehr3
* Add suggestions from @MeirGavish
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
2025-11-12 13:18:53 +02:00
e0cffab768
Update list implementation to work with memory pools ( #168 )
...
* Introduce indexed list implementation
* Fix CI tests for pool
* Take bitset out of pool
* Replace joker bitset interactions with wrappers
* Add bitset tests
* Add test to gitignore
---------
Co-authored-by: rfehr-idexx <ric-fehr@idexx.com >
2025-11-11 17:56:21 +02:00
03273de829
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 >
2025-11-01 16:28:40 +02:00
eb815b7820
Refactor of scoring flow, Joker Callbacks and Card Retriggers ( #160 )
...
* Remove Baseball Card for now, will have to wait a future PR
* Removed cards held in hand joker scoring stage - should be in another PR
---------
Co-authored-by: MonteCrysto <mathis.martin31@gmail.com >
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-11-01 15:50:52 +02:00
9d1a51884f
Added art for Jokers Bootstraps by @MathisMartin31 and @noctowlhoot and Pareidolia by @NoWhammies10 and @MeirGavish (jokers rearranged for palette optimization)
2025-10-09 23:42:07 +03:00
ce5150bffb
Update joker_effects.c
...
Temporarily remove Pareidolia from shop until @MeirGavish can add the artwork for it
2025-10-09 18:57:10 +02:00
f14f200cb0
Update joker_effects.c
...
Remove the "unused" attribute from joker effect functions that was added by mistake during merge
2025-10-09 14:50:18 +02:00
6787fab0c2
Merge branch 'main' into main
2025-10-08 23:25:24 +02:00
4b35b2f7d8
Added art for jokers Blueprint and Brainstorm by @NoWhammies10 and @GreenNinja2525
2025-10-08 22:40:15 +03:00
23a14cb76e
Update source/joker_effects.c
...
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-10-08 20:41:09 +02:00
8ae4968539
Remove duplicated entries
2025-10-08 18:52:10 +02:00
9ae53bddb8
Fix errors introduced by latest commits
2025-10-08 18:39:49 +02:00
af72fe5749
Fix conflicts
...
Attempt 1
2025-10-08 18:21:55 +02:00
7e17419811
Merge branch 'main' into pr-fix
2025-10-08 18:11:20 +02:00
fec243b482
Update source/joker_effects.c
...
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-10-08 17:59:27 +02:00
324478845d
Update source/joker_effects.c
...
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-10-08 17:58:11 +02:00
0dbde481d5
Update source/joker_effects.c
...
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-10-08 17:57:50 +02:00
aa5ebd13fc
Add suggestions from @MeirGavish
2025-10-08 08:14:54 +02:00
77f76bd4ef
Removed "unused" attribute from integrated jokers
2025-10-08 00:05:37 +03:00
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
c529c4be69
Added art for jokers Abstract Joker by @MathisMartin31 and Bull by @NoWhammies10 and @GreenNinja2525
2025-10-07 21:26:43 +03:00
8cd86f1640
Merge remote-tracking branch 'upstream/main'
...
And add NULL Acrobat Joker effect
2025-10-07 20:18:41 +02:00
46936c1878
Added art for jokers Raised Fist by @MathisMartin31 and Reserved Parking by @NoWhammies10
2025-10-07 21:13:31 +03:00
0187b5f78e
Update source/joker_effects.c
...
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-10-07 20:24:00 +10:30
0cfe0e5126
Added forgotten base price for the Acrobat Joker
2025-09-30 23:51:46 +02:00
b7a94fa085
Fix some issues (I actually forgot to compile)
2025-09-30 23:34:11 +02:00
de7c9d4d60
Add a "get_num_hands_remaining" function and implement the Acrobat Joker
2025-09-30 23:06:13 +02:00
c781ee9666
Add a "is_card_face" function to take into account if Pareidolia is present
2025-09-30 22:47:00 +02:00
b8a441f971
Update joker_effects.c
...
updated jokers into joker registry
2025-09-24 22:53:54 +09:30
26db4e1aa0
Update joker_effects.c
...
fixed triboulet - was triggering for jacks also, rem
2025-09-22 21:42:15 +09:30
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
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
2d50005e30
Added art for Scary Face and Smiley Face by @GreenNinja2525 and enabled them in code
2025-08-22 19:43:27 +03:00
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
2539954dea
Fixed build error from previous merge and applied review comments
2025-08-17 11:10:00 +03:00
04515839dc
(Manual conflict res) merged main into ttm/joker-scope-joker-1
2025-08-17 11:03:27 +03:00
92fa279059
Refactored jokers stack to be a list (AI used)
2025-08-16 13:18:44 +03:00
b218d4ac3e
(Manual conflict res) Merge branch 'main' into ttm/joker-scope-joker-1
2025-08-15 10:56:41 +03:00
254efd7841
implement feedback
2025-08-09 19:23:47 -04:00
039c5771e1
Grouped Banner with Stencil to optimize palettes (Swapped with Misprint)
2025-08-08 02:22:02 +03:00
863e3a34ae
Rearranged jokers for palette optimization (Banner and Mystic Summit don't go well together)
2025-08-08 00:31:10 +03:00
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
0f3d1b3b77
adds walkie-talkie, fibonnaci, banner, mystic summit, blackboard
2025-08-02 13:25:04 -04:00
174050d813
add fist, parking, business card, scholar, scary face, abstact, bull, smiley, even, odd jokers
2025-08-02 13:25:04 -04:00
ee0591562f
add blue joker
2025-08-02 13:25:04 -04:00
56a211616a
Removed misprint magic number
2025-08-02 19:43:44 +03:00
Rickey