bf66f96844
Add swapping order of Owned Jokers ( #258 )
...
* swap Jokers
* Hide score properly
* add key_released to inputs triggering selection_grid process input
* format code
* Add suggestions and bug fixes from @MeirGavish
* Add comment
* format selection_grid
* toto
* format
* format
* Turned clang-format off for selection grid rows
* revert reroll bug fix, already adressed
* format selection_grid.c
* Move conditions around in game.c
* typo
* Attempt at fixing braced initializer indent format
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-12-07 02:58:50 -08:00
Geralt and MathisMartin31
687d77e18a
Improve Face Cards sprite art ( #284 )
...
* Tweaks by @MeirGavish
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
2025-12-06 16:33:23 +02:00
Geralt and MathisMartin31
07cab81ba1
Fix Wrathful Joker missing pixel ( #272 )
...
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
2025-12-01 09:34:30 +02:00
Geralt and MathisMartin31
10e75f18ae
remove triboulet from code ( #266 )
...
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
2025-11-30 18:11:48 +02:00
Geralt and MathisMartin31
0953a430c4
Implement Seltzer and Joker Expiration effect ( #252 )
...
* Add Seltzer art
* Implement Joker expiration
* Add exception to copying Jokers + Seltzer message fix
* Move all scoring logic to joker_object_score away from check_and_score_joker_for_event
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
2025-11-30 08:52:42 +02:00
435a9a0a1d
Refactor JokerEffect scoring ( #245 )
...
* Remove usage of memcmp for JokerEffect null check
* Added suggestions from @ricfehr3
* Add suggestions from @MeirGavish
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-11-28 19:03:47 +02:00
Geralt and MathisMartin31
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
Geralt and MathisMartin31
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
1ac55692e9
Break up the played cards scoring loop into several functions ( #224 )
...
* rename PLAY_PLAYING state into PLAY_STARTING
* make discarded_card and sound_played global variables
* Broken up cards_score state update
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-11-16 17:33:01 +02:00
Geralt and MathisMartin31
1f3d3bffbd
Fix bug occurring when a retriggered card has a non-scoring card to the left ( #218 )
...
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
2025-11-12 16:06:37 +02:00
Geralt and MathisMartin31
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
Geralt and MathisMartin31
e7eaa82c9d
Add flaming effect when exceeding score requirements ( #210 )
...
* Fix grit palette swapping
* Add suggestions from @MeirGavish
---------
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
2025-11-04 12:31:09 +02:00
Geralt and MathisMartin31
df674a73a6
Iterate over Hanging Chad"s art by @MeirGavish ( #209 )
...
Co-authored-by: MathisMartin31 <mathis.martin31@gmail.com >
2025-11-03 09:34:18 +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
Geralt
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
Geralt
ce6d2049f8
Update game.h
...
Fix missing `is_joker_present` rename into `is_joker_owned`
2025-10-09 14:52:41 +02:00
Geralt
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
Geralt
c4f22be9b9
Update joker.h
...
Restoring the Brainstorm Joker ID, deleted by mistake while adding the Pareidolia Joker ID
2025-10-09 14:46:57 +02:00
Geralt
6787fab0c2
Merge branch 'main' into main
2025-10-08 23:25:24 +02:00
