Drew
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
MeirGavish
6dce57e197
Merge pull request #145 from pansythoughts/main
...
kind of fixed how game_speed behaves
2025-10-14 13:57:40 +03:00
Rickey Fehr
ef048791c1
Separate out graphics and add ability change boss
2025-10-13 23:36:27 -07:00
Rickey Fehr
f885fa9164
Fix Iterating over every blind instead of 3 max
2025-10-13 23:36:27 -07:00
Rickey Fehr
54d955d1e7
Update for PR
2025-10-13 23:36:27 -07:00
Rickey Fehr
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
Rickey Fehr
7ee07bb34c
Refactor blind into a map
2025-10-13 23:36:27 -07:00
alex
f463ba99a0
changed how game_speed affects hand score animations
2025-10-13 20:28:52 -07:00
alex
767e21d5fa
made the lerped temp score expression clearer
2025-10-13 20:26:20 -07:00
alex
d108836b6a
changed how game_speed affects hand score animations
2025-10-13 20:24:20 -07:00
MeirGavish
71de180871
Merge branch 'main' into implement_joker_testing
2025-10-13 20:59:17 +03:00
MeirGavish
8c25089966
Allow defining an ID for a joker to always appear in shop and be tested
2025-10-13 20:58:44 +03:00
alex
56c33b2eef
made the lerped temp score expression clearer
2025-10-11 23:45:02 -07:00
alex
cf7c9dc7c3
fixed typo
2025-10-11 13:36:43 -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
MeirGavish
609e1f19b6
Merge pull request #159 from MathisMartin31/main
...
Add Pareidolia and Acrobat Jokers
2025-10-09 20:43:36 +03: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
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
MeirGavish
30638b65e2
Merge pull request #164 from ricfehr3/hotfix/hand-input-order
...
Fix softlock related to #163
2025-10-09 15:16:56 +03:00
MeirGavish
94cb898bb9
Merge pull request #134 from drewjohnson2/magic_numbers
...
Magic numbers
2025-10-09 11:18:02 +03:00
Rickey Fehr
73ec9a40d3
Fix softlock related to #163
2025-10-08 20:29:11 -07:00
Geralt
6787fab0c2
Merge branch 'main' into main
2025-10-08 23:25:24 +02:00
Drew
f752793caa
Shop light specific macros for color
2025-10-08 16:16:23 -05:00
MeirGavish
4b35b2f7d8
Added art for jokers Blueprint and Brainstorm by @NoWhammies10 and @GreenNinja2525
2025-10-08 22:40:15 +03:00
Nan and MeirGavish
23a14cb76e
Update source/joker_effects.c
...
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-10-08 20:41:09 +02:00
Nan
8ae4968539
Remove duplicated entries
2025-10-08 18:52:10 +02:00
Nan
9ae53bddb8
Fix errors introduced by latest commits
2025-10-08 18:39:49 +02:00
Nan
af72fe5749
Fix conflicts
...
Attempt 1
2025-10-08 18:21:55 +02:00
Nan
7e17419811
Merge branch 'main' into pr-fix
2025-10-08 18:11:20 +02:00
Nan and Copilot
fec243b482
Update source/joker_effects.c
...
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-10-08 17:59:27 +02:00
Nan and MeirGavish
324478845d
Update source/joker_effects.c
...
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-10-08 17:58:11 +02:00
Nan and MeirGavish
0dbde481d5
Update source/joker_effects.c
...
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-10-08 17:57:50 +02:00
Drew
4e0d72ca8a
PR Feedback
2025-10-08 01:27:15 -05:00
MonteCrysto
aa5ebd13fc
Add suggestions from @MeirGavish
2025-10-08 08:14:54 +02:00
MeirGavish
77f76bd4ef
Removed "unused" attribute from integrated jokers
2025-10-08 00:05:37 +03:00
MeirGavish
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
MeirGavish
c529c4be69
Added art for jokers Abstract Joker by @MathisMartin31 and Bull by @NoWhammies10 and @GreenNinja2525
2025-10-07 21:26:43 +03:00
MonteCrysto
8cd86f1640
Merge remote-tracking branch 'upstream/main'
...
And add NULL Acrobat Joker effect
2025-10-07 20:18:41 +02:00
MeirGavish
46936c1878
Added art for jokers Raised Fist by @MathisMartin31 and Reserved Parking by @NoWhammies10
2025-10-07 21:13:31 +03:00
MeirGavish
f7c68934f7
Merge pull request #146 from noctowlhoot/main
...
Added more Jokers all outside of scope, some with art available already from MathisMartin31
2025-10-07 13:01:48 +03:00
MeirGavish
4fc0fbf5a8
Merge pull request #139 from mannodermaus/wrap-hand-input-on-oob-movement
...
Wrap around hand selection when going out of bounds horizontally
2025-10-07 12:56:53 +03:00
noctowlhoot and MeirGavish
0187b5f78e
Update source/joker_effects.c
...
Co-authored-by: MeirGavish <meir.gavish@gmail.com >
2025-10-07 20:24:00 +10:30
MonteCrysto
0cfe0e5126
Added forgotten base price for the Acrobat Joker
2025-09-30 23:51:46 +02:00
MonteCrysto
b7a94fa085
Fix some issues (I actually forgot to compile)
2025-09-30 23:34:11 +02:00
MonteCrysto
de7c9d4d60
Add a "get_num_hands_remaining" function and implement the Acrobat Joker
2025-09-30 23:06:13 +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
Drew
1f40279a36
Created a define for a screen entry horizontal flip.
2025-09-30 00:09:53 -05:00
Drew
a6dd95ab0a
Added a few more defines
2025-09-28 16:03:04 -05:00
Drew
cc95554db7
Added constants for timer values. The names on these might be bad.
2025-09-28 16:03:04 -05:00
Drew
34d885674c
Finished adding palette memory indexs to an enum
2025-09-28 16:03:04 -05:00
Drew