wuxu/balatro-gba-chinese-jocker-descriptions
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix card selection logic in play state handling

Browse Source
This commit is contained in:
cellos51
2025-06-11 14:51:22 -04:00
parent 85b25e575f
commit cbe70fad19
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/card.c
+7 -2
View File
@@ -525,7 +525,7 @@ void card_update() // This whole function is currently pretty unoptimized due to
switch (play_state) switch (play_state)
{ {
case PLAY_PLAYING: case PLAY_PLAYING:
if (i == played_top && (timer % 10 == 0 || played[played_selections - 1]->selected == false) && timer > 40) if (i == 0 && (timer % 10 == 0 || played[played_top - played_selections]->selected == false) && timer > 40)
{ {
played_selections--; played_selections--;
@@ -553,6 +553,10 @@ void card_update() // This whole function is currently pretty unoptimized due to
scored_cards++; scored_cards++;
if (scored_cards > played_selections) if (scored_cards > played_selections)
{ {
tte_erase_rect(72, 48, 240, 56);
tte_set_pos(fx2int(played[played_top - j]->x), 48);
tte_write("#{cx:0x2000} 10");
played_selections = scored_cards; played_selections = scored_cards;
//played[j]->vy += (3 << FIX_SHIFT); //played[j]->vy += (3 << FIX_SHIFT);
played[played_top - j]->vscale = float2fx(0.3f); // Scale down the card when it's scored played[played_top - j]->vscale = float2fx(0.3f); // Scale down the card when it's scored
@@ -566,6 +570,7 @@ void card_update() // This whole function is currently pretty unoptimized due to
if (j == 0 && scored_cards == played_selections) // Check if it's the last card if (j == 0 && scored_cards == played_selections) // Check if it's the last card
{ {
tte_erase_rect(72, 48, 240, 56);
play_state = PLAY_ENDING; play_state = PLAY_ENDING;
timer = 1; timer = 1;
played_selections = played_top + 1; // Reset the played selections to the top of the played stack played_selections = played_top + 1; // Reset the played selections to the top of the played stack
@@ -580,7 +585,7 @@ void card_update() // This whole function is currently pretty unoptimized due to
} }
break; break;
case PLAY_ENDING: // This is the reverse of PLAY_PLAYING. The cards get reset back to their neutral position sequentially case PLAY_ENDING: // This is the reverse of PLAY_PLAYING. The cards get reset back to their neutral position sequentially
if (i == played_top && (timer % 10 == 0 || played[played_selections - 1]->selected == false) && timer > 40) if (i == 0 && (timer % 10 == 0 || played[played_top - played_selections]->selected == false) && timer > 40)
{ {
played_selections--; played_selections--;