diff --git a/graphics/joker_gfx17.grit b/graphics/joker_gfx17.grit new file mode 100644 index 0000000..a8ac3f6 --- /dev/null +++ b/graphics/joker_gfx17.grit @@ -0,0 +1 @@ +-gB4 -Mw4 -Mh4 -m! -pn 16 \ No newline at end of file diff --git a/graphics/joker_gfx17.png b/graphics/joker_gfx17.png new file mode 100644 index 0000000..7ea05f0 Binary files /dev/null and b/graphics/joker_gfx17.png differ diff --git a/graphics/joker_gfx18.grit b/graphics/joker_gfx18.grit new file mode 100644 index 0000000..a8ac3f6 --- /dev/null +++ b/graphics/joker_gfx18.grit @@ -0,0 +1 @@ +-gB4 -Mw4 -Mh4 -m! -pn 16 \ No newline at end of file diff --git a/graphics/joker_gfx18.png b/graphics/joker_gfx18.png new file mode 100644 index 0000000..a16ea0d Binary files /dev/null and b/graphics/joker_gfx18.png differ diff --git a/graphics/joker_gfx19.grit b/graphics/joker_gfx19.grit new file mode 100644 index 0000000..a8ac3f6 --- /dev/null +++ b/graphics/joker_gfx19.grit @@ -0,0 +1 @@ +-gB4 -Mw4 -Mh4 -m! -pn 16 \ No newline at end of file diff --git a/graphics/joker_gfx19.png b/graphics/joker_gfx19.png new file mode 100644 index 0000000..e6f9eef Binary files /dev/null and b/graphics/joker_gfx19.png differ diff --git a/include/def_joker_gfx_table.h b/include/def_joker_gfx_table.h index 796940f..8c6ff6e 100644 --- a/include/def_joker_gfx_table.h +++ b/include/def_joker_gfx_table.h @@ -14,4 +14,7 @@ DEF_JOKER_GFX(12) DEF_JOKER_GFX(13) DEF_JOKER_GFX(14) DEF_JOKER_GFX(15) -DEF_JOKER_GFX(16) \ No newline at end of file +DEF_JOKER_GFX(16) +DEF_JOKER_GFX(17) +DEF_JOKER_GFX(18) +DEF_JOKER_GFX(19) \ No newline at end of file diff --git a/include/joker_gfx.h b/include/joker_gfx.h index bab5633..9de8b0c 100644 --- a/include/joker_gfx.h +++ b/include/joker_gfx.h @@ -18,5 +18,8 @@ #include "joker_gfx14.h" #include "joker_gfx15.h" #include "joker_gfx16.h" +#include "joker_gfx17.h" +#include "joker_gfx18.h" +#include "joker_gfx19.h" #endif \ No newline at end of file diff --git a/source/joker_effects.c b/source/joker_effects.c index 3f1bb9e..ae04f43 100644 --- a/source/joker_effects.c +++ b/source/joker_effects.c @@ -464,7 +464,6 @@ static JokerEffect odd_todd_joker_effect(Joker *joker, Card *scored_card) { return effect; } - __attribute__((unused)) static JokerEffect the_duo_joker_effect(Joker *joker, Card *scored_card) { JokerEffect effect = {0}; if (scored_card != NULL) @@ -480,9 +479,6 @@ static JokerEffect odd_todd_joker_effect(Joker *joker, Card *scored_card) { return effect; } - -// graphics available from @MathisMartin31 - __attribute__((unused)) static JokerEffect the_trio_joker_effect(Joker *joker, Card *scored_card) { JokerEffect effect = {0}; if (scored_card != NULL) @@ -498,8 +494,6 @@ static JokerEffect odd_todd_joker_effect(Joker *joker, Card *scored_card) { return effect; } -// graphics available from @MathisMartin31 - __attribute__((unused)) static JokerEffect the_family_joker_effect(Joker *joker, Card *scored_card) { JokerEffect effect = {0}; if (scored_card != NULL) @@ -515,8 +509,6 @@ static JokerEffect odd_todd_joker_effect(Joker *joker, Card *scored_card) { return effect; } -// graphics available from @MathisMartin31 - __attribute__((unused)) static JokerEffect the_order_joker_effect(Joker *joker, Card *scored_card) { JokerEffect effect = {0}; if (scored_card != NULL) @@ -531,8 +523,6 @@ static JokerEffect odd_todd_joker_effect(Joker *joker, Card *scored_card) { return effect; } -// graphics available from @MathisMartin31 - __attribute__((unused)) static JokerEffect the_tribe_joker_effect(Joker *joker, Card *scored_card) { JokerEffect effect = {0}; if (scored_card != NULL) @@ -643,16 +633,16 @@ const JokerInfo joker_registry[] = { { COMMON_JOKER, 6, reserved_parking_joker_effect }, // 31 { COMMON_JOKER, 4, abstract_joker_effect }, // 32 { UNCOMMON_JOKER, 6, bull_joker_effect}, // 33 + { RARE_JOKER, 8, the_duo_joker_effect}, // 34 + { RARE_JOKER, 8, the_trio_joker_effect}, // 35 + { RARE_JOKER, 8, the_family_joker_effect}, // 36 + { RARE_JOKER, 8, the_order_joker_effect}, // 37 + { RARE_JOKER, 8, the_tribe_joker_effect}, // 38 // The following jokers don't have sprites yet, // uncomment them when their sprites are added. #if 0 - { RARE_JOKER, 8, the_duo_joker_effect}, - { RARE_JOKER, 8, the_trio_joker_effect}, - { RARE_JOKER, 8, the_family_joker_effect}, - { RARE_JOKER, 8, the_order_joker_effect}, - { RARE_JOKER, 8, the_tribe_joker_effect}, - { UNCOMMON_JOKER, 7, bootstraps_joker_effect}, + { UNCOMMON_JOKER, 7, bootstraps_joker_effect}, { COMMON_JOKER, 5, shoot_the_moon_joker_effect}, #endif };