From a0f1ef7780999b17cd62b9189a2d6d376b6150d4 Mon Sep 17 00:00:00 2001
From: MeirGavish <meir.gavish@gmail.com>
Date: Tue, 7 Oct 2025 23:52:49 +0300
Subject: [PATCH] Added art for xmult hand jokers The Duo The Trio, The Family,
 The Order, and The Tribe by @MathisMartin31

---
 graphics/joker_gfx17.grit     |   1 +
 graphics/joker_gfx17.png      | Bin 0 -> 1510 bytes
 graphics/joker_gfx18.grit     |   1 +
 graphics/joker_gfx18.png      | Bin 0 -> 1596 bytes
 graphics/joker_gfx19.grit     |   1 +
 graphics/joker_gfx19.png      | Bin 0 -> 888 bytes
 include/def_joker_gfx_table.h |   5 ++++-
 include/joker_gfx.h           |   3 +++
 source/joker_effects.c        |  22 ++++++----------------
 9 files changed, 16 insertions(+), 17 deletions(-)
 create mode 100644 graphics/joker_gfx17.grit
 create mode 100644 graphics/joker_gfx17.png
 create mode 100644 graphics/joker_gfx18.grit
 create mode 100644 graphics/joker_gfx18.png
 create mode 100644 graphics/joker_gfx19.grit
 create mode 100644 graphics/joker_gfx19.png

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 0000000000000000000000000000000000000000..7ea05f02388019621fdbce91349b2bb58b0e9ec4
GIT binary patch
literal 1510
zcmV<C1sVE@P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(000H8Nkl<ZXo2Nf
zL1<e?5Pb<jATanSj1DCYlI03~5CRuMNd+cV3^F;G9t464WIGUq@Wm8#t-$CagbAe9
z2Nw)F6di&?ZMPWI5DYaK9}KD$3B~weijM(<!GyF2c~-moXTQFr(n}whZ;keA{>;9a
zotb|J41WLP&%ZhOsQCKJFYdTm_h0I_2}t>m+rKIDSSpM9*1EU?K(R0e09egmiFLtn
z0If#b_WknwW8*_``b(9vB9EpMINE$It^iQ8LI8k;OjE4$_`JBeytaM6vY2D_vkoBR
ztA(79SDK#yKp0Ob7RFcy=yCv9o`3Ah0c89u>!pzYaPSKN2;&JgE5tfLmjl4cV$P=j
zuG7OL^JQ_>4VOVX4FH+sUjSe;ei%H>JQG*la2d4I08lM_1^_nWO>lI86FB-83uCaV
z6T|-GK;Y<KvqDJb&j<P)qXT66%ZR12tehM|@johL`pbx>6ReyZLh<hwMh7JGWmF3}
z5e7gn{$r^uR`XX1^#Nzvn;d7t)66rxvR;ZX0DAEsO((FBX)4qQoM~@zoU0rV3<rda
zOM-ye_*g1Cu<-;k-sAHM8J7eBv+>b%!e~6;G6%F8ZQ%qmm{<S+R&@f!!kCQ_WcbDL
z9xjge+^Ax4b9pVCKn4>F03ew^N6iY^7(s@g?Cj%YXP^D;dz_Fv!n)a=<m<LwrS&F8
zv>I*19^7{{l)xQfYIbkhc9qtf7-7l{ECclTCWq)5K9<U2x0!}N5?Aik?;kWV>hVnu
z(T$3x6IeS4V0vy=xmUm6DKWAPAVYLYw;F9_=P4fq!vP_uYH_!zt{D_uk^|IaCexba
zR4uL@Kzw$B(E&1u&Qu0dK9G}R@WZ?AKawMgg)u-XoreYOJe9$e51!92i8U{_H*j-#
ztvI4)g|LQ%qZ3>?KnB(H_0E})#U9+pqnWAhhr?5)j}VRk&^a7bTMtyrAKiX_KEKq{
z2>@6^sZz#Q_dZwFks|=$fYIOA0jv2d1j7ONBXI;jyi=6cJ7=o#fcU@OIfGRNf?;4a
z-^~Hb^KML4L5)mLM-DHxH`ulMx@3L>9-mh*Xl3ym+db}&LCyF_GgC@d|McCr0Dw1#
zr)Z5&qSa`l)o6>}U|6U|b@j^BmkT9s9i1K~xb6j7<CA!EcnSbYbx2C@{`9l5p7O(}
zO;M>*7JA9aGW3#J-iT7A+_xzjsu`j_;nB>LcsNoj=LR`R{u>}CtFh0o0n`f81jig8
z?_Paty_?|=PsIc12G=`h@JHfG)|Uq)gMxOiJ0Hj?dgZGQ+I>JBkZ^Ey3MjpRX0R@k
z(Ji1x?+!ga?``7i#(t?%HtcTidw{Pfbr?e+7!HU(N@(@1b@(H3w8kfe(X_k%NF4r1
z98W@<0Qhox5O{oE@pp51jhoABlqzMs{rFxfhUmNLxmmpZ_#O{uesyg;;J^SAZRM62
zfGC3n?NeD43!7rS+z<@{6K&;|n3Jy|ftuBm%MB3+*M$(*<Xjx@*&OvGw29qj8UPSW
zspax0;F_G1oqe05zJJ)p+Cf)WG#wC*F(pJt2go$myS?3}eJz2?W$GR3Tk8XLg9Mqz
zdbdZlzPy$|<uaAVN1LyWj2gHUwyG1ihV@!xz}`I33}MthKu0overs4jDRQ_D(Bt#=
zZHD^R0W|0+7RGExnpK@pLV}wCm}ZM^L4%H(6|x;^$^5wz65I^HG+QJX9U#X%%>wjz
z_ebK!`5*u>Qyj(#a?CGenquc=OwY|4=Ys&mOwq{+t|mfy#+TuS;&SQi2Ko`^G}G%x
zaX{@Cbg&NK&Tr08IkTHsFbuf!n=@3->?RiU!_Y5A0DG+<pA<y<QFDM3^pKEG3Zi|#
z9AJDoTJM}GBQO&KxPr;_UJ!8qa+I6!=rGm!ruTxJe)eJhPp`-S0eM(b=me*x<^TWy
M07*qoM6N<$f)#7SYXATM

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..a16ea0db046efe5ffaf2348a34f3c210b8ea68d2
GIT binary patch
literal 1596
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

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..e6f9eef80ff9b82bd2cfeffd3936d9daaab6c3ef
GIT binary patch
literal 888
zcmV-;1Bd*HP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(0009&Nkl<ZXo2Nf
zJ!{)g6g@E=LI*(?dCBUb{Q<4Fb~Bj^UgUraA!LZ`p`ankD0eV)$j4AZp$1!vA#=#q
zZmoYnJ9zG3LkVao?&5Z^?#-2SB~0zM&-5(DPfy~V^X}(+TTt-+<L95+_^NnTeYEu_
zzPk!C3nKEDSA)cOe>%pVUEyB<a9eEv!1>uJ&uc^z46JhI`N8uB0P{q+rwtPMu-oCW
zd9$7%4=jig$u!(nJ0Z;F)qq7X38kWkj_32QB%X#8;lar(07<Jb8HEBAK{J21)y8db
zy!xvCB60<g<}cBoj@5Azg#3R~kSl=W`3Somb^`$H2L0(+_5UKX&lB!nW2qR>h$cLi
zjs==4Nc5*;W61+c#(;rUW)X-mSpfjt2FGw)?Tkeb@tbW6H`~_Q7QIfWX)v9_fJJn7
z5$|+d4@l7bJc}4uWgM())oX-m0crmxLDHncZU@yJ8@q4bCf-fIZ*pK%Eda=hKv`kl
ztOEc_y&)XWXG;isL(H3XlzPL&yrTNS1S}N;syj9u&u4;p{!F6KyissrbN~bjEPz1d
z3G-$hyYVikk)BuW4dK`owxl0lzpc97wWH7isyjA-WKkqdns!&#2mIk!q_Epj<A*6I
ztOV!HI{UIDCwE!{2}16WS5=w-wH<!?<ROzJ;-xsq?b(%FLiCQTAm#fXK7HAYc376d
zw3{IoBtih!hx_WsLXi$->rBCM<Jw_a#>&=M%j*NH%)*e{02`bJ9na@L)}M|!CQwN%
zMUbVkd=EgTp)w7*X|NGZaDBMXDbMkIE`e*ah-(27qBe^FEJ|j_^AX1GVlsIkCkUp`
z12v=z9GMD7!3C#1*$~}-@p3bQpa!kUx!JZd@n95O;PJ^3`tg4fMz+)@p-=$X6{fpA
zoE&B5687v0pAJ(tFtr<8+5!l-!SR9^?pkCZ+dNTV+}JEYpo0##)lQuG0}C;vOK4{R
zCRc$#fdJCy&(BVI=Ot>hDEE92xJ!X1i?Gy*5JhrIbrQ>%xXGzd6+r9UG@>%H7u^z>
zjNiT(0kTJ3GE<P*n{56-!R6@pcdt2(0r?i7^#$6Ys;QTw>SF$<>+xR}?Z4f@%6|?3
O0000<MNUMnLSTZzzM%~O

literal 0
HcmV?d00001

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
 };