Rickey and MeirGavish
2fb9e6d633
Clang format joker files and def files ( #257 )
...
* Clang format joker files and def files
* Fix blind usage of GBLA_UNUSED macro
* Add final files for clang-format (main.c and selection_grid.h)
---------
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-12-10 09:41:24 +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
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
Rickey and rfehr-idexx
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
b38433d191
Weight jokers by rarity in the shop ( #152 )
...
* Added weight for the rarity of jokers in the shop
* Includes manual conflict resolution
---------
Co-authored-by: JustinL-12 <jlong30@uic.edu >
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-10-27 19:18:48 +02:00
Rickey Fehr
06cd13a17f
Centralize location of memory pools
...
This commit centralizes the location of memory pools and adds an
associated script (scripts/get_memory_map.sh) to read the memory map.
2025-10-17 16:55:09 -07:00
MeirGavish
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
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
MeirGavish
4b35b2f7d8
Added art for jokers Blueprint and Brainstorm by @NoWhammies10 and @GreenNinja2525
2025-10-08 22:40:15 +03:00
Nan and Copilot
bc44de0493
Update include/joker.h
...
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-10-08 17:57:20 +02:00
MonteCrysto
aa5ebd13fc
Add suggestions from @MeirGavish
2025-10-08 08:14:54 +02:00
MonteCrysto
c781ee9666
Add a "is_card_face" function to take into account if Pareidolia is present
2025-09-30 22:47:00 +02:00
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
64274ae465
Added joker selling (still no animation) + fixed SpriteObject constructor focused bug
2025-08-16 15:38:34 +03:00
MeirGavish
8956501591
Merge branch 'main' into jokers_palette_swapping
2025-08-04 10:21:19 +03:00
MeirGavish
de672572b1
Updated joker palette swapping system to reuse palettes when jokers are removed
2025-08-04 10:18:33 +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
MeirGavish
0c834d17c2
Added dynamic palette loading for jokers and added new joker designs by @GreenNinja2525
2025-07-30 21:00:29 +03: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
theturtlemafia
47ee3987fd
refactor jokers to use struct and function pointer
2025-07-27 07:06:35 -04:00
MeirGavish
95565862b0
Extracted JokerObject and CardObject common functionalities to SpriteObject, removing duplicate code and dangerous casts.
2025-07-27 01:13:57 +03:00
cellos51
6a1f3bcd7a
I hope this works
2025-07-23 20:14:22 -04:00
MeirGavish
c781807ed8
Revert "Sprite vram optimizations"
2025-07-24 02:14:04 +03:00
cellos51
6a326e27fe
refactor: update blind and joker definitions; change game state to GAME_BLIND_SELECT
2025-07-23 17:31:21 -04:00
MeirGavish
5e6bc76f5f
Merge branch 'main' into jokers_refactors
2025-07-23 19:33:39 +03:00
cellos51
1b4267893d
Added greedy joker and refactor joker system
2025-07-22 20:00:05 -04:00
MeirGavish
c24dcab726
Added TODO note and a warning comment
2025-07-23 00:02:24 +03:00
cellos51
793da72465
added co-pilot's fixes
2025-07-22 15:45:29 -04:00
cellos51
e7c5536cc2
added shop rerolling and edition pricing for jokers
2025-07-21 22:05:31 -04:00
cellos51
414bfa2a32
Semi functional jokers
2025-07-20 20:55:11 -04:00
cellos51
176910c483
Jokers appear in the shop but don't do anything yet
2025-07-18 19:29:17 -04:00
cellos51
4a5644eddb
Defining a basic system for jokers
2025-07-17 21:47:50 -04:00
