Merge branch 'main' into jokers_palette_swapping

graphics/joker_gfx8.grit

@@ -0,0 +1 @@
+-gB4 -Mw4 -Mh4 -m! -pn 16

include/game.h

@@ -74,9 +74,12 @@ void game_update();
 
 // Utility functions for other files
 typedef struct CardObject CardObject; // forward declaration, actually declared in card.h
-CardObject **get_hand_array(void);
-CardObject **get_played_array(void);
-int get_hand_top(void);
-int get_played_top(void);
+typedef struct JokerObject JokerObject;
+CardObject**    get_hand_array(void);
+int             get_hand_top(void);
+CardObject**    get_played_array(void);
+int             get_played_top(void);
+JokerObject**   get_jokers(void);
+int             get_jokers_top(void);
 
 #endif // GAME_H

include/joker.h

@@ -35,6 +35,7 @@
 
 #define DEFAULT_JOKER_ID 0
 #define GREEDY_JOKER_ID 1 // This is just an example to show the patern of making joker IDs
+#define JOKER_STENCIL_ID 16
 
 typedef struct 
 {
@@ -45,7 +46,7 @@ typedef struct
     bool processed;
 } Joker;
 
-typedef struct // copy of CardObject in card.h
+typedef struct JokerObject
 {
     Joker *joker;
     SpriteObject* sprite_object;

include/joker_gfx.h

@@ -9,5 +9,6 @@
 #include "joker_gfx5.h"
 #include "joker_gfx6.h"
 #include "joker_gfx7.h"
+#include "joker_gfx8.h"
 
 #endif

include/sprite.h

@@ -4,6 +4,8 @@
 #include <tonc.h>
 #include <maxmod.h>
 
+#define CARD_SPRITE_SIZE 32
+
 typedef struct 
 {
     OBJ_ATTR *obj;

source/game.c

@@ -139,6 +139,31 @@ static inline Card *discard_pop()
     return discard_pile[discard_top--];
 }
 
+// get-functions, for other files to view game state (mainly for jokers)
+CardObject **get_hand_array(void) {
+    return hand;
+}
+
+int get_hand_top(void) {
+    return hand_top;
+}
+
+CardObject **get_played_array(void) {
+    return played;
+}
+
+int get_played_top(void) {
+    return played_top;
+}
+
+JokerObject **get_jokers(void) {
+    return jokers;
+}
+
+int get_jokers_top(void) {
+    return jokers_top;
+}
+
 // Consts
 
 // Rects                                       left     top     right   bottom
@@ -290,22 +315,6 @@ void sort_cards()
     }
 }
 
-CardObject **get_hand_array(void) {
-    return hand;
-}
-
-int get_hand_top(void) {
-    return hand_top;
-}
-
-CardObject **get_played_array(void) {
-    return played;
-}
-
-int get_played_top(void) {
-    return played_top;
-}
-
 enum HandType hand_get_type()
 {
     enum HandType res_hand_type = NONE;
@@ -1813,6 +1822,8 @@ static void game_shop_create_items(JokerObject *shop_jokers[], bool first_time)
         }
         
         u8 joker_id = random() % get_joker_registry_size();
+        // TODO: don't pick a joker that we already own
+        // TODO: weight the random choice by joker rarity
 
         shop_jokers[i] = joker_object_new(joker_new(joker_id));
         shop_jokers[i]->sprite_object->x = int2fx(120 + i * 32);
@@ -1821,7 +1832,7 @@ static void game_shop_create_items(JokerObject *shop_jokers[], bool first_time)
         shop_jokers[i]->sprite_object->ty = int2fx(71);
 
         int x = fx2int(shop_jokers[i]->sprite_object->tx) + TILE_SIZE - (get_digits_even(shop_jokers[i]->joker->value) - 1) * TILE_SIZE;
-        int y = fx2int(shop_jokers[i]->sprite_object->ty);
+        int y = fx2int(shop_jokers[i]->sprite_object->ty) + CARD_SPRITE_SIZE + TILE_SIZE;
         tte_printf("#{P:%d,%d; cx:0xC000}$%d", x, y, shop_jokers[i]->joker->value);
 
         if (first_time == false)
@@ -2318,7 +2329,8 @@ void game_shop()
 
                             Rect joker_price_rect;
                             joker_price_rect.left = fx2int(shop_jokers[i]->sprite_object->tx);
-                            joker_price_rect.top = fx2int(shop_jokers[i]->sprite_object->ty) + TILE_SIZE;
+                            // 2*TILE_SIZE because the item is highlighted and raised by 1 additional tile
+                            joker_price_rect.top = fx2int(shop_jokers[i]->sprite_object->ty) + CARD_SPRITE_SIZE + 2*TILE_SIZE;
                             joker_price_rect.right = joker_price_rect.left + TILE_SIZE * 3;
                             joker_price_rect.bottom = joker_price_rect.top + TILE_SIZE;
 

source/joker.c

@@ -126,6 +126,7 @@ void joker_init()
     joker_gfxTiles[5] = joker_gfx5Tiles;
     joker_gfxTiles[6] = joker_gfx6Tiles;
     joker_gfxTiles[7] = joker_gfx7Tiles;
+    joker_gfxTiles[8] = joker_gfx8Tiles;
 
     joker_gfxPal[0] = joker_gfx0Pal;
     joker_gfxPal[1] = joker_gfx1Pal;
@@ -135,6 +136,7 @@ void joker_init()
     joker_gfxPal[5] = joker_gfx5Pal;
     joker_gfxPal[6] = joker_gfx6Pal;
     joker_gfxPal[7] = joker_gfx7Pal;
+    joker_gfxPal[8] = joker_gfx8Pal;
 
     for (int i = 0; i < num_spritesheets; i++)
     {
@@ -258,7 +260,7 @@ bool joker_object_score(JokerObject *joker_object, Card* scored_card, int *chips
     {
         *chips += joker_effect.chips;
         *mult += joker_effect.mult;
-        // TODO: XMult
+        *mult *= joker_effect.xmult > 0 ? joker_effect.xmult : 1; // if xmult is zero, DO NOT multiply by it
         *money += joker_effect.money;
         // TODO: Retrigger
 
@@ -276,6 +278,11 @@ bool joker_object_score(JokerObject *joker_object, Card* scored_card, int *chips
             tte_set_special(0xE000); // Red
             snprintf(score_buffer, sizeof(score_buffer), "+%d", joker_effect.mult);
         }
+        else if (joker_effect.xmult > 0)
+        {
+            tte_set_special(0xE000); // Red
+            snprintf(score_buffer, sizeof(score_buffer), "X%d", joker_effect.xmult);
+        }
         else if (joker_effect.money > 0)
         {
             tte_set_special(0xC000); // Yellow

source/joker_effects.c

@@ -1,7 +1,7 @@
 #include "joker.h"
 #include "util.h"
 #include "hand_analysis.h"
-
+#include <stdlib.h>
 
 static JokerEffect default_joker_effect(Joker *joker, Card *scored_card) {
     JokerEffect effect = {0};
@@ -184,6 +184,37 @@ static JokerEffect half_joker_effect(Joker *joker, Card *scored_card) {
     return effect;
 }
 
+static JokerEffect joker_stencil_effect(Joker *joker, Card *scored_card) {
+    JokerEffect effect = {0};
+    if (scored_card != NULL)
+        return effect; // if card != null, we are not at the end-phase of scoring yet
+
+    // +1 xmult per empty joker slot...
+    int jokers_top = get_jokers_top();
+    effect.xmult = (MAX_JOKERS_HELD_SIZE-1) - jokers_top;
+
+    // ...and also each stencil_joker adds +1 xmult
+    JokerObject** jokers = get_jokers();
+    for (int i = 0; i < jokers_top; i++ )
+    {
+        if (jokers[i]->joker->id == JOKER_STENCIL_ID)
+            effect.xmult++;
+    }
+
+    return effect;
+}
+
+#define MISPRINT_MAX_MULT 23
+static JokerEffect misprint_joker_effect(Joker *joker, Card *scored_card) {
+    JokerEffect effect = {0};
+    if (scored_card != NULL)
+        return effect; // if card != null, we are not at the end-phase of scoring yet
+
+    effect.mult = random() % (MISPRINT_MAX_MULT + 1);
+
+    return effect;
+}
+
 const JokerInfo joker_registry[] = {
     { COMMON_JOKER, 2, default_joker_effect },  // DEFAULT_JOKER_ID = 0
     { COMMON_JOKER, 5, greedy_joker_effect },   // GREEDY_JOKER_ID = 1
@@ -201,6 +232,8 @@ const JokerInfo joker_registry[] = {
     { COMMON_JOKER, 4, devious_joker_effect },
     { COMMON_JOKER, 4, crafty_joker_effect },
     { COMMON_JOKER, 5, half_joker_effect },
+    { UNCOMMON_JOKER, 8, joker_stencil_effect },
+    { COMMON_JOKER, 4, misprint_joker_effect },
 };
 
 static const size_t joker_registry_size = NUM_ELEM_IN_ARR(joker_registry);

source/sprite.c

@@ -1,5 +1,6 @@
 #include "sprite.h"
 #include "util.h"
+#include "audio_utils.h"
 
 #include <tonc.h>
 #include <stdlib.h>
@@ -215,8 +216,7 @@ void sprite_object_shake(SpriteObject* sprite_object, mm_word sound_id)
 
     if (sound_id == UNDEFINED) return; // If no sound ID is provided, do nothing
 
-    mm_sound_effect sfx_select = { {sound_id}, 1024, 0, 255, 128, };
-    mmEffectEx(&sfx_select);
+    play_sfx(sound_id, MM_BASE_PITCH_RATE);
 }
 
 void sprite_object_set_selected(SpriteObject* sprite_object, bool selected)