d5f59e904b
Fixed game stuck due to interest bug + cleanup refactor ( #214 )
...
Co-authored-by: MeirGavish <34395426+MeirGavish@users.noreply.github.com >
---------
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com >
Co-authored-by: MeirGavish <34395426+MeirGavish@users.noreply.github.com >
---------
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com >
2025-11-07 00:33:52 +02:00
64dd586df8
Optimized score lerping by changing the number of steps to a power of 2 ( #211 )
2025-11-06 12:15:07 +02:00
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
ada2650c50
New Run Button ( #206 )
...
* New Run Button
* Refactor - replaced cashout copies with main_bg_se_copy_expand_3x3_rect() - WIP (Palette still messed)
2025-11-03 07:34:46 +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
dfe6edad88
Refactor - Replaced magic number copies with main_bg_se_copy_rect() ( #192 )
2025-11-01 08:12:20 +02:00
c510e78704
Implement Interest ( #144 )
...
* Implemented Interest
* Very carefully applied changes from PR #144 to implement interest and fixed magic numbers
---------
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-29 20:43:26 +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
b01e9e5f01
Added option for a second test joker
2025-10-25 15:18:23 +03:00
9c78094399
Fixed invalid access to game state array
2025-10-21 12:49:02 +03:00
462c040e9a
Changed the check in game_change_state() to full bounds checking
2025-10-19 11:45:48 +03:00
53d2e53d78
Changed music to start after Splash Screen
2025-10-17 13:43:21 +03:00
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
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
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
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
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
609e1f19b6
Merge pull request #159 from MathisMartin31/main
...
Add Pareidolia and Acrobat Jokers
2025-10-09 20:43:36 +03: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
f752793caa
Shop light specific macros for color
2025-10-08 16:16:23 -05:00
4e0d72ca8a
PR Feedback
2025-10-08 01:27:15 -05:00
aa5ebd13fc
Add suggestions from @MeirGavish
2025-10-08 08:14:54 +02:00
8cd86f1640
Merge remote-tracking branch 'upstream/main'
...
And add NULL Acrobat Joker effect
2025-10-07 20:18:41 +02:00
de7c9d4d60
Add a "get_num_hands_remaining" function and implement the Acrobat Joker
2025-09-30 23:06:13 +02:00
c781ee9666
Add a "is_card_face" function to take into account if Pareidolia is present
2025-09-30 22:47:00 +02:00
1f40279a36
Created a define for a screen entry horizontal flip.
2025-09-30 00:09:53 -05:00
a6dd95ab0a
Added a few more defines
2025-09-28 16:03:04 -05:00
cc95554db7
Added constants for timer values. The names on these might be bad.
2025-09-28 16:03:04 -05:00
MeirGavish