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

Fix some issues (I actually forgot to compile)

Browse Source
This commit is contained in:
MonteCrysto
2025-09-30 23:34:11 +02:00
parent de7c9d4d60
commit b7a94fa085
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/card.h
+1 -1
View File
@@ -38,7 +38,7 @@
#define IMPOSSIBLY_HIGH_CARD_VALUE 100 #define IMPOSSIBLY_HIGH_CARD_VALUE 100
// Card types // Card types
typedef struct typedef struct Card
{ {
u8 suit; u8 suit;
u8 rank; u8 rank;
source/joker_effects.c
+4 -4
View File
@@ -341,7 +341,7 @@ static JokerEffect reserved_parking_joker_effect(Joker *joker, Card *scored_card
int hand_size = hand_get_size(); int hand_size = hand_get_size();
for (int i = 0; i < hand_size; i++ ) for (int i = 0; i < hand_size; i++ )
{ {
if ((random() % 2 == 0) && card_is_face(scored_card)) { if ((random() % 2 == 0) && card_is_face(hand[i]->card)) {
effect.money += 1; effect.money += 1;
} }
} }
@@ -451,12 +451,12 @@ static JokerEffect odd_todd_joker_effect(Joker *joker, Card *scored_card) {
} }
__attribute__((unused)) __attribute__((unused))
static JokerEffect abstract_joker_effect(Joker *joker, Card *scored_card) { static JokerEffect acrobat_joker_effect(Joker *joker, Card *scored_card) {
JokerEffect effect = {0}; JokerEffect effect = {0};
if (scored_card == NULL) if (scored_card == NULL)
return effect; return effect;
// 0 remaining hands mean it's the last hand // 0 remaining hands mean we're scoring the last hand
if (get_num_hands_remaining() == 0) { if (get_num_hands_remaining() == 0) {
effect.xmult = 3; effect.xmult = 3;
} }
@@ -514,7 +514,7 @@ const JokerInfo joker_registry[] = {
{ COMMON_JOKER, 4, abstract_joker_effect }, { COMMON_JOKER, 4, abstract_joker_effect },
{ UNCOMMON_JOKER, 6, bull_joker_effect}, { UNCOMMON_JOKER, 6, bull_joker_effect},
{ UNCOMMON_JOKER, ?, abstract_joker_effect }, { UNCOMMON_JOKER, ?, acrobat_joker_effect },
#endif #endif
}; };