d6ebda657a
Additional PR feedback
2025-10-16 14:48:59 -05:00
f77a715845
Some PR feedback
2025-10-14 23:08:42 -05:00
3a6e004fc6
Rebase and some PR feedback
2025-10-14 10:44:21 -05:00
b9af95d770
Fixing some constant names after a rebase.
2025-10-14 10:26:09 -05:00
597dc62e24
Rebasing onto main. Switching to KEY_ANY to restart after a game over
2025-10-14 10:26:09 -05:00
0f154741ed
Renaming a function, fixing a call to memcpy16. Replacing magic numbers with enum values
2025-10-14 10:26:09 -05:00
3071e512c4
Just some cleanup
2025-10-14 10:26:09 -05:00
dbef1dacdc
Added the ability to restart the game after a game over.
...
The function that handles this is the on_exit of the game lost state. This function is not meant to
be permanent, but is just a placeholder while we decide what we actually want to do when game over is
reached.
2025-10-14 10:26:05 -05:00
6d66ccbb61
Replaced the substate switch statements with function tables.
2025-10-14 10:24:42 -05:00
4e1f418a8d
Preparing for rebase
2025-10-14 10:20:43 -05:00
fb35397238
Cleanup
2025-10-14 10:20:43 -05:00
04ffb0d4dd
A little bit of scope creep here.
...
Renamed some of the state functions to include the word 'on'. Also
replaced the switch statement in set_hand() with a lookup table
access. This lookup table contains the chips, mult and display name
for a given hand. Some may not like these changes, so we can easily
roll back if need be.
2025-10-14 10:20:43 -05:00
121bbc01d5
Refactored state machine.
...
Added a state info map which keeps track of a particular state's on_init, on_update and on_exit functions.
A few of the on_update functions have sub-states, which create extremely long switch statements.
Not sure if perhaps the best route would be to keep the switch statements but break the cases into individual
functions or if we should keep track of substates. The latter sounds like it could get complicated and really
messy quick. Problem for another day.
2025-10-14 10:20:40 -05:00
6dce57e197
Merge pull request #145 from pansythoughts/main
...
kind of fixed how game_speed behaves
2025-10-14 13:57:40 +03:00
b5b7c856d6
Merge pull request #133 from ricfehr3/refactor-blinds
...
Cleanup, Refactor blinds into a map
2025-10-14 13:46:27 +03:00
ef048791c1
Separate out graphics and add ability change boss
2025-10-13 23:36:27 -07:00
f885fa9164
Fix Iterating over every blind instead of 3 max
2025-10-13 23:36:27 -07:00
54d955d1e7
Update for PR
2025-10-13 23:36:27 -07:00
3c2dd0edba
Rename blind enums to represent their type
...
This commit prefixes the enums `BlindType` and `BlindState` with their
types for clarity
2025-10-13 23:36:27 -07:00
7ee07bb34c
Refactor blind into a map
2025-10-13 23:36:27 -07:00
f463ba99a0
changed how game_speed affects hand score animations
2025-10-13 20:28:52 -07:00
767e21d5fa
made the lerped temp score expression clearer
2025-10-13 20:26:20 -07:00
d108836b6a
changed how game_speed affects hand score animations
2025-10-13 20:24:20 -07:00
f36fa5e998
Merge pull request #169 from cellos51/implement_joker_testing
...
Implement joker testing
2025-10-13 21:27:42 +03:00
71de180871
Merge branch 'main' into implement_joker_testing
2025-10-13 20:59:17 +03:00
8c25089966
Allow defining an ID for a joker to always appear in shop and be tested
2025-10-13 20:58:44 +03:00
56c33b2eef
made the lerped temp score expression clearer
2025-10-11 23:45:02 -07:00
cf7c9dc7c3
fixed typo
2025-10-11 13:36:43 -07:00
d7f64d3570
Merge pull request #166 from cellos51/integrate_joker_art
...
Added art for Jokers Bootstraps by @MathisMartin31 and @noctowlhoot and Pareidolia by @NoWhammies10 and @MeirGavish (jokers rearranged for palette optimization)
2025-10-09 23:54:56 +03: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
609e1f19b6
Merge pull request #159 from MathisMartin31/main
...
Add Pareidolia and Acrobat Jokers
2025-10-09 20:43:36 +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
ce6d2049f8
Update game.h
...
Fix missing `is_joker_present` rename into `is_joker_owned`
2025-10-09 14:52:41 +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
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
30638b65e2
Merge pull request #164 from ricfehr3/hotfix/hand-input-order
...
Fix softlock related to #163
2025-10-09 15:16:56 +03:00
94cb898bb9
Merge pull request #134 from drewjohnson2/magic_numbers
...
Magic numbers
2025-10-09 11:18:02 +03:00
73ec9a40d3
Fix softlock related to #163
2025-10-08 20:29:11 -07:00
6787fab0c2
Merge branch 'main' into main
2025-10-08 23:25:24 +02:00
f752793caa
Shop light specific macros for color
2025-10-08 16:16:23 -05:00
9b6c77ea3f
Merge pull request #119 from Nanrech/pr-fix
...
Add blueprint and brainstorm jokers
2025-10-08 22:46:01 +03: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
Drew