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
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
517d40c294
Cleanup for PR, return old sprite tracker
2025-10-19 15:52:36 -07:00
Rickey Fehr
d499abe2c4
Cleanup for PR
2025-10-17 16:55:09 -07: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
Rickey Fehr
72c0a6c4a9
Optimize bit operations, style fix, cleanup
2025-10-17 16:55:07 -07:00
Rickey Fehr
e00c51502b
Replace Malloc With Pools
...
This commit introduces an object pool and replaces instances of malloc with pools where sensible.
2025-10-17 16:54:09 -07:00
MonteCrysto
8cd86f1640
Merge remote-tracking branch 'upstream/main'
...
And add NULL Acrobat Joker effect
2025-10-07 20:18:41 +02:00
Drew
e620697917
Renamed joker_table.h to def_joker_gfx_table.h. Removed an unnecessary constant
2025-09-22 16:06:45 -05:00
Drew
7c377fca94
Making joker_gfxTiles and joker_gfxPal static
2025-09-17 15:35:21 -05:00
Drew
c4e804234b
Moving macro into pool definition
2025-09-17 15:01:26 -05:00
Drew
3dc959c17d
Converting joker_gfxTiles and joker_gfxPal to pools
2025-09-17 14:35:00 -05:00
Drew
2c5bc3b5dd
Adding an x macro to cut down on some boilerplate.
...
This should make adding additional jokers require a little less
typing. Additional jokers will need an entry in /include/joker_table.h
2025-09-15 21:36:20 -05: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
64274ae465
Added joker selling (still no animation) + fixed SpriteObject constructor focused bug
2025-08-16 15:38:34 +03:00
MeirGavish
fd8e52d48a
Removed magic numbers for card score length and intmax buffer sizes
2025-08-08 01:59:21 +03:00
MeirGavish
2ce3acbe1c
Merge branch 'main' into jokers_with_graphics
2025-08-08 00:32:10 +03:00
theturtlemafia
4492176df2
allows multiple joker-effect popup texts
2025-08-07 23:08:41 +03:00
MeirGavish
50ec1bcdab
Added art by @GreenNinja2525 for jokers Walkie-Talkie, Fibonacci, Banner, Mystic Summit, and Blackboard
2025-08-07 23:08:35 +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
4731fea21b
add joker sprites
2025-08-02 13:08:42 -04:00
theturtlemafia
dbff88add0
Adds XMult, Joker Stencil and Misprint (rebase)
2025-08-01 18:35:31 -04:00
MeirGavish
305d093042
Added more joker art by for jokers 6-16, missing code implementation so they are not yet displayed.
2025-08-01 02:03:24 +03: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
ea5e4d5d1e
refactor: remove commented-out code and simplify joker initialization
2025-07-23 17:35:42 -04:00
cellos51
300e725dfe
made jokers dynamic and changed memcpy to us 32
2025-07-23 17:00:18 -04:00
MeirGavish
5e6bc76f5f
Merge branch 'main' into jokers_refactors
2025-07-23 19:33:39 +03:00
cellos51
c025d35468
null check on greedy joker
2025-07-22 20:07:51 -04: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
