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

Small refactors

Browse Source
This commit is contained in:
MeirGavish
2025-08-09 21:31:41 +03:00
parent f77a58a07c
commit 38282d0f2a
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/game.c
+7 -10
View File
@@ -173,7 +173,7 @@ int get_jokers_top(void) {
return jokers_top; return jokers_top;
} }
IntList* jokers_available_to_shop; IntList* jokers_available_to_shop; // List of joker IDs
// Consts // Consts
@@ -1005,7 +1005,7 @@ void game_set_state(enum GameState new_game_state)
void jokers_avialable_to_shop_init() void jokers_avialable_to_shop_init()
{ {
int num_defined_jokers = get_joker_registry_size(); int num_defined_jokers = get_joker_registry_size();
jokers_available_to_shop = int_list_new(get_joker_registry_size()); jokers_available_to_shop = int_list_new(num_defined_jokers);
for (int i = 0; i < num_defined_jokers; i++) for (int i = 0; i < num_defined_jokers; i++)
{ {
// Add all joker IDs sequentially // Add all joker IDs sequentially
@@ -2140,17 +2140,14 @@ void game_round_end()
static void game_shop_create_items(JokerObject *shop_jokers[]) static void game_shop_create_items(JokerObject *shop_jokers[])
{ {
tte_erase_rect_wrapper(SHOP_PRICES_TEXT_RECT); tte_erase_rect_wrapper(SHOP_PRICES_TEXT_RECT);
for (int i = 0; i < MAX_SHOP_JOKERS; i++)
{
// Note: this needs to happen after the existing joker destruction above
if (int_list_get_size(jokers_available_to_shop) == 0) if (int_list_get_size(jokers_available_to_shop) == 0)
{ {
// No jokers to create // No jokers to create
continue; return;
} }
for (int i = 0; i < MAX_SHOP_JOKERS; i++)
{
// TODO: weight the random choice by joker rarity // TODO: weight the random choice by joker rarity
int joker_idx = random() % int_list_get_size(jokers_available_to_shop); int joker_idx = random() % int_list_get_size(jokers_available_to_shop);
int joker_id = int_list_get(jokers_available_to_shop, joker_idx); int joker_id = int_list_get(jokers_available_to_shop, joker_idx);
@@ -2235,7 +2232,7 @@ static void game_shop_reroll(JokerObject** shop_jokers, int *reroll_cost)
// Shop menu input and selection // Shop menu input and selection
static void game_shop_process_user_input(JokerObject** shop_jokers) static void game_shop_process_user_input(JokerObject** shop_jokers)
{ {
const int REROLL_BASE_COST = 5; // Base cost for rerolling the shop items static const int REROLL_BASE_COST = 5; // Base cost for rerolling the shop items
static int reroll_cost = REROLL_BASE_COST; static int reroll_cost = REROLL_BASE_COST;
// temp variables for future implementation // temp variables for future implementation
@@ -2469,7 +2466,7 @@ void game_shop()
joker_object_destroy(&shop_jokers[i]); // Destroy the joker objects joker_object_destroy(&shop_jokers[i]); // Destroy the joker objects
} }
increment_blind(BLIND_DEFEATED); increment_blind(BLIND_DEFEATED); // TODO: Move to game_round_end()?
game_set_state(GAME_BLIND_SELECT); // If we reach here, we should go to the blind select state game_set_state(GAME_BLIND_SELECT); // If we reach here, we should go to the blind select state
break; break;