From 4b35b2f7d8f0ac402b8a0439a4f00cb5e8d47116 Mon Sep 17 00:00:00 2001
From: MeirGavish <meir.gavish@gmail.com>
Date: Wed, 8 Oct 2025 22:40:15 +0300
Subject: [PATCH] Added art for jokers Blueprint and Brainstorm by 
 @NoWhammies10 and @GreenNinja2525

---
 graphics/joker_gfx19.png      | Bin 888 -> 1514 bytes
 graphics/joker_gfx20.grit     |   1 +
 graphics/joker_gfx20.png      | Bin 0 -> 955 bytes
 include/def_joker_gfx_table.h |   3 ++-
 include/joker.h               |   3 +--
 include/joker_gfx.h           |   1 +
 source/joker_effects.c        |   9 +++------
 7 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 graphics/joker_gfx20.grit
 create mode 100644 graphics/joker_gfx20.png

diff --git a/graphics/joker_gfx19.png b/graphics/joker_gfx19.png
index e6f9eef80ff9b82bd2cfeffd3936d9daaab6c3ef..a93051e1a7c0007386e96f201fc9ca0cc9b5c968 100644
GIT binary patch
delta 1497
zcmV;~1t$9V2I>otBYy?4Nkl<ZXo2NfO=ufO6#gtC>XSl=D--OSWFzW(amgX25Zqjx
zLy8ZT1&Rr-50(u+2xFNXid>ALh9o|?p~MT)UQBaPE~zM#`cjqLQ$!RWL$I>MwGSr6
zLFz$zPj6>uR)40Kejs+|?d-0;Z{B<JW_AD?{Ql=(b)CIme19?d=|Cs_{>%4!4D|9x
zPx3B%u3AANJjO==NG&Y`03JTL&;4dkkB|=yd#=ylo;Cgn-TUwD);!l@ks*{19X_gd
z*#_XUeYX(MzW<W$PY`)~YlCgI<cy0v5hIc+QcKG&VIDonvk2`#<PY{H*mnKS3qB_i
zWSbzxkb>RYb$?g{39m&Up3d-55?3Kb_;~$$0B*176+~K+CzKBz{%x+ru(=ZJ=^efT
z_(A9XsikEcXV-dtWKY;!iD7lSjMeQjHdkUi;%Zo!U=%>QzeKKD(b`E6ivNBg-QNTv
zPv@`Seqa$gArJTn5Km`dZ*6cG0N^mlRV&)~_j7xbaDOITzw-hIdlR16CrI)Du)1Bw
z$S0RvHhG`S84}tgNFeeuv(rpK(1n6Tx5OpX*q3px5~XXZFn~ymH@ZxMgnVciv!_P@
zT7=090N^;ghSbus$0LY*aWI79V5pN<8L_z%!{evt{8J&XNuk>10<8zAQy9?5?kO}!
zTJZv)<$nPtkI09HG4DfALUq^VtsyOG6G#NB&^{MvJwT0b5=13sZ*5?5G>n_OKe_Hz
z@9#D-$|+7q{^hGf&poQ`@zZl8Z#9H8#XsPa15^?;E7X!R0DyqCk9a!6o?u)1s3m6*
zu=ZX3{OX5pF*hA_iIGY~8~-);%GgI1L%=)FGk-hE0h6O)#M2ojXo_bNh59|u?(~%e
zX=<CB4q|RP2%t66L|&fLHR}KR?FaS(Qz*0*fXEYS$r+c+OQ`)ON5e>j$FvEu6Ica@
zr#6|{5B4VTOR2S9`ufX{Fcyt)oBErkMG0R4CP%{n+(nUeX&PNwAMk^lp<r)qX!A!q
zkbmpy2>krpKltkN0TfGh6ian(t7u0a@W}!8)`lzIB{?dROh|;sU^n~asukGH(C8Gp
zsf!ZXcr@aQc>s9XY|5~Z&+(fIwH`nfAdRd{Zgd@J2otdOxlR4m3bK}*@fA#kjy!q8
z+;otM9_&qU$(%|=wJuM>byW$<GMGs<34hxFo-N$fKFk)mK`xysId-}nRtb<GRNxd#
zb)*tet`z0S%SzBQ`rTH7xoU-7UoMSx^Ljos%)(IU0R2saDtW8mz$!Qh)K5?>)iEB8
zU_2T@u~f&efBenYNhmq`CJ*pk43XRCsuj)&R1!-OWT`Cg1H9qT4|xE%Iuyj!p?@F(
z^%IO-Im5`6GX&}<YzM$1$W@^!2N;v!?CBAnE!@S;CYg9T!zJ+4`%|t3NQkNTrvMry
zb3C1a-3*tDCJz8_oO3=WJK5-*L|EM}`xZh*0f<;$A)roqM4avGi%4a6n7CXJ^#a=H
zAQ6b@8^>K9OA&y^`eAju?A{;L<bMF)<*<Zqky9KDdGf*Y><&I#Uqr6iCSfQ<x&@6Q
z#kEy%Fm>%Rtb)T;p0rI}yX?8w555A(RiV1t!}_A9FCh^g<2?kL4Z2wkN)UOu^8>U-
zm~6U!(gPakA_Po0&aO3xp|wN?yo)DFj2E#OQg?oIyFoe|pd`OuLO_xt@_%YuhKDLb
zKeK=dR>8Z)C2f+lx~-<dI1Nft4<Fq3kOvwG(6m1Yw5Gsrsz8Feu_^ZmOl^6LMTVHX
z-v(<(J3?y4m*~XBd+`9k{E?$wec!s)7%)E%&<dbix#@_?%<lJ<=pxaMyoz>7u;&jW
zfOo4)&J^VKy|}+0+&esalu{2JcKaXKhkd^jXgy&5_AJi!e&A`$1i4*KAWu-;zMF;6
zH#gql-l2Oxzta&Xe49PeejHVy{ZjjX`aJ$G=TOFzR)^s!00000NkvXXu0mjfO83i|

delta 866
zcmV-o1D*Wp3-|_*BYy)wNkl<ZXo2NfJ!{)g6g@E=LI*(?dCBUb{Q<4Fb~Bj^UgUra
zA!LZ`p`ankD0eV)$j4AZp$1!vA#=#qZmoYnJ9zG3LkVao?&5Z^?#-2SB~0zM&-5(D
zPfy~V^X}(+TTt-+<L95+_^NnTeYEu_zPk!C3nKEDSA)cOe}6j0o?YQz0B~Dv0Koa#
zDbH&}6AY|!=J~<%1_1L!xTg&g`LNsJv3aweAP+2v5y>>%Ry!fg<<)>iFbSoihmPm-
zuOyy^6yd?iD*#EWFd2mc6hSk8x7EgNaJ>4e{vvV(kmfJZpN`dW5`_GJQ;;iw<M{}?
z9d-i%><0bmSbz2ZBD2pE?q6f67|@6&JeH0Hnkz{3r(<Ku153t$fmLP^h%i|J0Ne)0
za9iz+MG*0uZ3{Qs*4h@mPN-=xox*@cbaxT&bX*Te(EL1$7+7T-tZUV4glYk4|0Y4w
zq{40o)g2qVZ{8-}O}}q)U{oyt$cjK&Vcx6*07|_f9DmPeO9*>I%$s$Tdc(xLqWZxE
zEENN)J2o88XM%bDOrp@dQE*{&00aswfI#F4^JX2p@h+#4o>%P+;n)?nq#s|ut-9W|
zqtF7XJ2rr1Q6x>8c30L1{NY%nu-j4Nhbbtm1n12<`?4e_cUl7pLhg`PRhj^`9e(=c
zA(JHHrGGfc?b(%FLiCQTAm#fXK7HAYc376dw3{IoBtih!hx_WsLXi$->rBCM<Jw_a
z#>&=M%j*NH%)*e{02`bJ9na@L)}M|!CQwN%MUbVkd=EgTp)w7*X|NGZaDBMXDbMkI
zE`e*ah-(27qBe^FEJ|j_^AX1GVlsIkCkUp`1AjH73mlmWN5KWBJ=qZ5fAMlNf}jSi
z$+_9KGVx#(T;TD^5&H3e5=OSvCZSLO*%hX{J)9h6<`VYo3ZD*BHZZjtT-pK%x54p(
z817nRAlp1qVBFX&K%j#Tx7ALZ`2!0vq)TXL047&~K!E_#=g-ehdFLf+vncm`5V%W$
zCR>ZJ)QJ#9a!Pd)%b2*ysZbR_>)bS=GO`!l5}AzOz8C?rM_n>gklCAT{y@Ry==XQ8
sIgJ7N7NGS7+M%kcm!s-p{-^8lUl#4Z-NDL#4gdfE07*qoM6N<$f=3gfd;kCd

diff --git a/graphics/joker_gfx20.grit b/graphics/joker_gfx20.grit
new file mode 100644
index 0000000..a8ac3f6
--- /dev/null
+++ b/graphics/joker_gfx20.grit
@@ -0,0 +1 @@
+-gB4 -Mw4 -Mh4 -m! -pn 16
\ No newline at end of file
diff --git a/graphics/joker_gfx20.png b/graphics/joker_gfx20.png
new file mode 100644
index 0000000000000000000000000000000000000000..4031b3d98bd3546dd8e531c96daf7f4ed302717c
GIT binary patch
literal 955
zcmV;s14R6ZP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(000AmNkl<ZXo1yO
zJ!soN6#i0*yHrCd6k=*{!B9K|Iww#Fge-wHQwi1(FD(I)jK&m%F{WTLCKxgmXOJnG
znn0Ek$W+e(4<-<Zz{NwrWRMqoQ3v<Q?|$UCf64WO<D}C)+3(YL@4dSjXmE9Y7$#F$
zbUSVQt^UQUw==rmx^Fy?2L`=XIE|t2xI%v$rhV^S<Dopz?X;tQSZ%<k2erz?7ez$W
zDzSEhUMqa`bj~OxC<;iXvQeKX<^Uk-Welqgq+^JQ8#fIK0bBtxhSi2}pD5;pCBTXD
z9XGlsQcZ+b0m)Pr!)ilNgYURV*DCNGR~Y9#Cn)`MDG;WO6?Y9~Jzkw3h5&GOa*Bo4
zwIF38;a9<(fBE@~`7z+^<P-q#ZSI-yY?AY3FF@G~w9m-S#JHdk;O*~4*Y@UCbgh#x
z%`JNYO16cPZ7C#}Dt&??N1m^Be_sBI-u_-h6cItaY@e=GU|JfS7z2Q@3Uuqg>;=dK
zbzvSkPmt|QBS0yH#wqJm7$+yV#7njXZ+|>TRsgp%71}zW+i7EQWl4wuz}R{Ig*mwM
zoG9OMjg1Adb%0#F$bpVX;3UZkAQDVgL97CJCCI;~yvEC3fJ-Y6017#}tY8|ZR)8Gc
zsg-OCnV_za#CwwwyBh>XWXN)+sLsi-S%9RuJYJN&02_DV&2L~r78pU6wci{$`tJ32
zl)dMXV|<M4XuM=w@SFe8i$8!?0knys;H8WD$y634dql|Y5fPLHAj&>2W0(T10(^GQ
z(^tAy!NGh18_k{Qiyq7ufIbw-lP&Ea{~KJLABNNhy;eBrwZe<_weVtnExP}(+Z6h^
zF|y_TefuZl)+`{GvT`Lz0Z&ei+}30TX!iocY6FR4PC4?T-Cu7u4*=MHBd+h=qcJ%*
zeR2I08K&(8Vt0eS;|k{imsTE`ppM>bK60Ep3_uy@B$!Ho_B^25X(Lh031x03sAHjZ
zEjYRT#u6GiPII0-Hoq8BvVgt0#STTp9pUkE0jrLS<K=?jFoDL10C^dh2<={Aab-!_
z4cePqxap75-s;z#=*!;pM-325U~=Ac1t|FR@x747D1}ja<JY&PL2hGe8q{V1`7{U^
z7er~P?&lCnW|jg?J`qxu069;PD?x(p%unaM{0`&6D?z!6(^YuWR)QwVKNgcpSzVKz
dmq{?$`5y+RM^9A<wL|~_002ovPDHLkV1kzwwl@F(

literal 0
HcmV?d00001

diff --git a/include/def_joker_gfx_table.h b/include/def_joker_gfx_table.h
index 8c6ff6e..b39b077 100644
--- a/include/def_joker_gfx_table.h
+++ b/include/def_joker_gfx_table.h
@@ -17,4 +17,5 @@ DEF_JOKER_GFX(15)
 DEF_JOKER_GFX(16)
 DEF_JOKER_GFX(17)
 DEF_JOKER_GFX(18)
-DEF_JOKER_GFX(19)
\ No newline at end of file
+DEF_JOKER_GFX(19)
+DEF_JOKER_GFX(20)
\ No newline at end of file
diff --git a/include/joker.h b/include/joker.h
index 8362445..23418fd 100644
--- a/include/joker.h
+++ b/include/joker.h
@@ -36,8 +36,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
-#define JOKER_BLUEPRINT_ID 99 // This needs to be changed
-#define JOKER_BRAINSTORM_ID 100 // This needs to be changed
+#define JOKER_BRAINSTORM_ID 40
 
 typedef struct 
 {
diff --git a/include/joker_gfx.h b/include/joker_gfx.h
index 9de8b0c..ce9c604 100644
--- a/include/joker_gfx.h
+++ b/include/joker_gfx.h
@@ -21,5 +21,6 @@
 #include "joker_gfx17.h"
 #include "joker_gfx18.h"
 #include "joker_gfx19.h"
+#include "joker_gfx20.h"
 
 #endif
\ No newline at end of file
diff --git a/source/joker_effects.c b/source/joker_effects.c
index 3297ee4..2ac5a55 100644
--- a/source/joker_effects.c
+++ b/source/joker_effects.c
@@ -582,7 +582,6 @@ static JokerEffect triboulet_joker_effect(Joker *joker, Card *scored_card) {
     return effect;
 }
 
-__attribute__((unused))
 static JokerEffect blueprint_joker_effect(Joker *joker, Card *scored_card) {
     JokerEffect effect = {0};
     List* jokers = get_jokers();
@@ -600,7 +599,6 @@ static JokerEffect blueprint_joker_effect(Joker *joker, Card *scored_card) {
     return effect;
 }
 
-__attribute__((unused))
 static JokerEffect brainstorm_joker_effect(Joker *joker, Card *scored_card) {
     JokerEffect effect = {0};
     static bool in_brainstorm = false;
@@ -610,9 +608,8 @@ static JokerEffect brainstorm_joker_effect(Joker *joker, Card *scored_card) {
     List* jokers = get_jokers();
     JokerObject* first_joker = list_get(jokers, 0);
 
-    // JOKER_BRAINSTORM_ID (joker.h) will need to be updated
     if (first_joker != NULL && first_joker->joker->id != JOKER_BRAINSTORM_ID) {
-        // manually flip this to avoid infinite blueprint + brainstorm loops
+        // Static var to avoid infinite blueprint + brainstorm loops
         in_brainstorm = true;
         effect = joker_get_score_effect(first_joker->joker, scored_card);
         in_brainstorm = false;
@@ -671,12 +668,12 @@ const JokerInfo joker_registry[] = {
     { RARE_JOKER, 8, the_family_joker_effect},          // 36
     { RARE_JOKER, 8, the_order_joker_effect},           // 37
     { RARE_JOKER, 8, the_tribe_joker_effect},           // 38
+    { RARE_JOKER, 10, blueprint_joker_effect },         // 39
+    { RARE_JOKER, 10, brainstorm_joker_effect },        // 40
 
     // The following jokers don't have sprites yet, 
     // uncomment them when their sprites are added.
 #if 0
-    { RARE_JOKER, 10, blueprint_joker_effect },
-    { RARE_JOKER, 10, brainstorm_joker_effect },
     { UNCOMMON_JOKER, 7, bootstraps_joker_effect},   
     { COMMON_JOKER, 5, shoot_the_moon_joker_effect},
 #endif