From 464e61160c0e92fdbba78120f831cc260a547d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Sun, 12 Jan 2020 16:26:58 +0100
Subject: [PATCH] Add ammo sprites

---
 assets.h                |  46 +++++++++++++++++++++++++++++++++++++++-
 assets/item_plasma.png  | Bin 0 -> 772 bytes
 assets/item_rockets.png | Bin 0 -> 942 bytes
 levels.h                |   8 ++++---
 4 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 assets/item_plasma.png
 create mode 100644 assets/item_rockets.png

diff --git a/assets.h b/assets.h
index 4598a07..3c2bd4f 100644
--- a/assets.h
+++ b/assets.h
@@ -423,7 +423,7 @@ SFG_PROGRAM_MEMORY uint8_t SFG_itemSprites[][SFG_TEXTURE_STORE_SIZE] =
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
   },
-  { // 2, bullets
+  { // 2, ammo: bullets
 175,124,168,112,125,5,194,21,19,17,113,190,2,3,4,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,51,51,51,0,0,0,0,0,0,0,0,0,0,0,0,51,136,200,211,0,0,
 0,0,0,0,0,0,0,0,0,3,120,119,215,195,32,0,0,0,0,2,34,34,34,34,34,35,51,51,51,54,
@@ -443,6 +443,50 @@ SFG_PROGRAM_MEMORY uint8_t SFG_itemSprites[][SFG_TEXTURE_STORE_SIZE] =
 0,0,34,42,65,17,85,81,17,67,32,0,0,0,0,0,0,0,0,2,65,17,85,81,17,65,32,0,0,0,0,0,
 0,0,0,2,34,34,34,34,34,65,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,32,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  },
+  { // 3, ammo: rockets
+175,1,117,120,30,3,33,82,5,98,101,102,2,178,174,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,204,16,0,0,0,0,0,0,0,0,0,
+0,0,0,17,26,197,81,17,17,17,16,0,0,0,0,0,0,0,17,204,202,85,92,113,119,23,16,0,0,
+0,0,0,0,1,85,197,90,85,204,119,17,119,16,0,0,3,51,0,0,1,170,85,90,85,92,119,119,
+119,16,0,3,59,47,51,0,1,85,197,90,85,204,124,119,199,193,0,59,187,42,169,51,53,
+170,92,90,85,87,246,31,31,193,3,187,238,218,153,157,149,68,37,36,42,39,135,17,
+17,17,0,62,238,217,153,51,53,85,82,36,34,167,136,97,17,16,0,3,222,217,211,0,6,
+68,34,36,42,247,136,246,17,96,0,3,221,221,211,0,6,68,85,36,34,247,136,246,225,
+96,0,59,187,42,169,51,53,68,133,36,42,39,136,246,209,96,3,187,238,218,153,157,
+149,68,40,36,34,167,136,246,145,96,0,62,238,217,153,51,53,68,85,36,42,39,136,
+246,225,96,0,3,222,217,211,0,6,68,130,36,34,167,136,246,209,96,0,3,221,221,211,
+51,54,68,85,36,42,247,136,246,145,96,0,59,187,42,169,51,53,68,85,36,34,247,136,
+246,225,96,3,187,238,218,153,157,149,68,34,36,42,39,136,246,209,96,0,62,238,217,
+153,51,53,68,85,36,34,167,136,118,145,96,0,3,62,217,51,59,230,68,34,36,42,39,
+136,201,153,16,0,0,3,51,0,50,182,68,34,36,34,167,135,106,153,16,0,0,0,0,0,3,54,
+85,82,36,42,247,140,250,169,145,0,0,0,0,0,0,6,136,37,36,34,247,134,34,221,209,0,
+0,0,0,0,0,0,102,72,68,42,39,134,187,238,236,0,0,0,0,0,0,0,0,102,104,34,166,102,
+203,238,192,0,0,0,0,0,0,0,0,0,6,68,105,209,203,190,192,0,0,0,0,0,0,0,0,0,0,102,
+1,145,28,188,0,0,0,0,0,0,0,0,0,0,0,0,0,17,16,192,0,0,0,0,0,0,0,0,0,0,0,0,0,17,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+  },
+  { // 4, ammo: plasma
+175,0,6,2,4,5,206,7,205,142,207,116,62,1,115,201,0,0,0,0,17,17,17,17,17,17,0,1,
+16,0,0,0,0,0,0,1,52,66,66,66,68,67,16,22,97,0,0,0,0,0,0,19,67,17,17,17,17,52,17,
+24,129,17,17,16,0,0,1,52,49,15,255,17,243,17,221,21,65,221,61,16,0,0,1,67,16,
+250,104,143,52,51,51,53,67,61,67,16,0,0,1,65,1,166,136,190,53,68,68,67,52,67,84,
+16,0,0,1,65,1,166,136,187,53,68,68,68,68,67,84,16,0,0,1,65,1,166,104,190,50,85,
+85,85,85,84,37,16,0,0,1,65,0,54,102,104,50,85,85,85,85,84,37,16,0,0,1,65,0,243,
+51,51,247,34,34,34,34,37,114,16,0,0,0,17,1,104,187,190,55,34,194,44,46,230,114,
+16,0,0,1,17,1,166,136,139,55,34,146,41,46,138,114,16,0,0,0,17,1,166,104,142,55,
+34,146,156,46,138,114,16,0,0,1,17,0,54,102,104,55,204,153,194,40,170,114,16,0,0,
+0,17,0,243,51,51,247,201,34,34,34,37,114,16,0,0,1,17,1,104,187,190,55,34,44,44,
+34,37,114,16,0,0,0,17,1,166,136,187,55,41,41,41,34,37,114,16,0,0,1,17,1,166,104,
+190,55,41,41,41,34,37,114,16,0,0,0,17,0,54,102,104,55,44,41,146,34,37,114,16,0,
+0,1,17,0,243,51,51,247,34,34,44,34,37,114,16,0,0,0,17,1,104,187,190,55,34,146,
+41,34,37,114,16,0,0,1,17,1,166,136,187,55,34,146,146,34,37,114,16,0,0,1,65,1,
+166,104,190,55,34,153,41,34,37,114,16,0,0,1,65,0,54,102,104,55,201,34,34,34,37,
+114,16,0,0,1,65,0,243,51,51,247,146,194,34,36,37,114,16,0,0,1,65,1,104,187,190,
+55,34,146,146,37,37,114,16,0,0,1,65,1,166,136,187,55,34,146,201,36,37,114,16,0,
+0,1,67,17,166,104,136,55,34,153,34,34,37,114,16,0,0,1,52,61,54,102,104,55,34,34,
+34,34,37,114,16,0,0,0,19,67,29,221,221,245,85,85,85,85,84,84,16,0,0,0,1,52,66,
+66,66,67,51,17,19,49,17,17,16,0,0,0,0,17,17,17,17,17,17,0,1,16,0,0,0
   }
 };
 
diff --git a/assets/item_plasma.png b/assets/item_plasma.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfd940c0fe46f8a13519ce755c63e47d20dc3027
GIT binary patch
literal 772
zcmV+f1N;1mP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru<N*v16bkc@97+HH02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00L}DL_t(o!|hk0lG`v4eaRRI
z1_l%e7ziB52NW1CJa8bepCEXjP-t)<pHL7GxG*rV;DAAZKtW+ZfxykEK$auLik&u|
zhID5%j$YP!Z&#~TGP8ig18t56+kXKM7f{3#G2m$1?{9r#WUZb60f2}=MA?^w)``fm
zXI<CXb(k4~`7EM6hK`6_UDu9?99nGZamir;SHzJsGdNZ^u?c3N<%{P%Rk3P2F(ymd
zWdeYk$9rP|h)Mt-svFNl9y4+hOqB}UMjp&HP2&|-!r?<X7?}(ra@a2?!(=Ht&UuKw
zvmX{P?TC!ba#AdC&f}s0kUE-7IZlKH&NKtY0>&#|LwV&Rmh)RfVGY&8av3O+3>X0W
z6Hao0pO6sd(5XHdixmjM9B`;k9hUR!uqwrXrt6h~bJiY1XsxlVfR*TX!ta)Q_`TTc
zv*%3if|c+MNtO}-ph};%FrUhp8Jo9FdKZLF*elB10*&wZr0l34zXSD)9lnm4d6cxb
z_`84Vt$^N&PSmB(5IF!8w(ZHxJecYbO|Y==C4t_G#OK<3q4O5F@eU_tK`JH5EglGh
zPwu_m76jNF&1mZNR)C()qGHn6C&t1S<+h^`fWIt^#qO7{%+1@TR}&#xdO8<hoPjvq
z^@~kJggHgMh=?GV(_=W4fjE`duy}qM?X_a`MJPS7hQ9i<?DgB%?(?o<G|T<XXI_>P
z=4g_2vqd=8aCTLDXMA1&$J>r;APr4z@K-SaG{**D^cvFc%O3c&Nd5lO;;l{us8U^R
z#TFNYbYCmZ3JB5vX;-`_1GDh&Sm58AjWb~J82b$?p6tK@k_gWL0000<MNUMnLSTZ#
Co>7(n

literal 0
HcmV?d00001

diff --git a/assets/item_rockets.png b/assets/item_rockets.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bba60d97e852d065498c4e064aa03b992e867ea
GIT binary patch
literal 942
zcmV;f15x~mP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru<N*v16EuCWmnHxJ02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00S0DL_t(o!^M{&jN3>QhQDnC
ztW$u&s#;Y60}KWf1RO9}V6ec@V1dB_g98Qy2MP)f7#1uDC<qKFuucVm0SgQQqC*B%
zH6UPg3J53|usRu3>Vd4Cc;oEOULy4o$A9d3|NQTtdE>JRe()3Hh0Q~*aQ`=UGyzw*
zsLXE-Zj0GO&n7v5(xw^Q1~b|mPoRlp20-i@E9@jC*quFq29mP<%pq*Hqs&nX<g5Xx
zu0Vfl<4<Dd6ebiAzK#ekGdLGu1b{Vm6ak|RSuz4(GN0VnMK}LHhUJ*knXpN;gdCSj
zRPY3LvVFj4L%uYvSye@~hXF0D5|y<Ht#-m-M`jyLCjnU|tVmc9C^}5_D3;8Kxv)~;
ztg9JGZ##GxhT8;Rip@;l1XfrbWufc|NKX)kA@M+wuO#t6;l>f;8%6p~KFeU^8$~cm
z$gYxuBwp~7<K>@_?ato66s-TbW7YG}OU<h1ar=6X^YxtD*K^)}@(F*rVEpfdk5iXl
zdv6H-g7M!D=2gzyPd?^V&fF-RujiEgoKf-{SEVN1-8v5`VAc-e-UGrD=%vQ}EHT$x
z38TUg-~EBQljQvovagW+eTmJr!u>4KUxb|pY6aZB+#BeacrPO2WZdb4hJf@0li$0U
zx^Z-Lt<}KqG~-zXKkAtSd$T`<0*@)t@<3N|fOK)1>!Tj1*FS){Q@DM(y<RKQ1(eRF
z6pP`MbOB?ZXW{8=-CcrR6H2eG!bRnrME(T|zgJOcP)mKd9Y0JsjDlua9!22h{iaz7
zfn+nDTIziT0D{2~fVEShD~*pNdY3#a;q+$GykAGPs@f}~i$E|KQmo2`M6ueOI-P+-
z8l_JrE~iD4ILTtrQ(`Vi^E#<&l6QLGA%S5OF#0%ZNZ5qmt4J<4iY>&n)tb{BrnA{$
z6Fw|K&A4f`OHFaT>HXPl_wVL2;WD9^XC$}v`7Yce(W$^g6V?jYM(`c*?r*+nk`iiK
zX&64O!1i9Y>SkMl+HAr1&8ayl;luqNvzz?jiKvUv?%K7D`hDriy~K6=2VX6~16sxq
Q3;+NC07*qoM6N<$f&~<*wEzGB

literal 0
HcmV?d00001

diff --git a/levels.h b/levels.h
index 48141ba..bc796d9 100644
--- a/levels.h
+++ b/levels.h
@@ -90,6 +90,8 @@ typedef struct
 #define SFG_LEVEL_ELEMENT_BARREL 0x01
 #define SFG_LEVEL_ELEMENT_HEALTH 0x02
 #define SFG_LEVEL_ELEMENT_BULLETS 0x03
+#define SFG_LEVEL_ELEMENT_ROCKETS 0x04
+#define SFG_LEVEL_ELEMENT_PLASMA 0x05
 
 /* 
   Monsters have lower 4 bits zero and are only distinguished by the 4 upper
@@ -268,14 +270,14 @@ SFG_PROGRAM_MEMORY SFG_Level SFG_level0 =
     {SFG_LEVEL_ELEMENT_MONSTER_PLASMABOT, {19, 31}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
     {SFG_LEVEL_ELEMENT_MONSTER_TURRET, {5, 24}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
     {SFG_LEVEL_ELEMENT_MONSTER_EXPLODER, {22, 18}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
-    {SFG_LEVEL_ELEMENT_BULLETS, {7, 23}},     {SFG_LEVEL_ELEMENT_BULLETS, {8, 23}},
+    {SFG_LEVEL_ELEMENT_BULLETS, {2, 56}},     {SFG_LEVEL_ELEMENT_BULLETS, {3, 56}},
     {SFG_LEVEL_ELEMENT_BARREL, {9, 37}},     {SFG_LEVEL_ELEMENT_BARREL, {9, 38}},
     {SFG_LEVEL_ELEMENT_BARREL, {9, 39}},     {SFG_LEVEL_ELEMENT_BARREL, {9, 40}},
     {SFG_LEVEL_ELEMENT_BARREL, {9, 41}},     {SFG_LEVEL_ELEMENT_BARREL, {9, 42}},
     {SFG_LEVEL_ELEMENT_BARREL, {9, 43}},     {SFG_LEVEL_ELEMENT_BARREL, {9, 44}},
     {SFG_LEVEL_ELEMENT_BARREL, {8, 45}},     {SFG_LEVEL_ELEMENT_BARREL, {9, 46}},
-    {SFG_LEVEL_ELEMENT_NONE, {0, 0}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
-    {SFG_LEVEL_ELEMENT_NONE, {0, 0}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
+    {SFG_LEVEL_ELEMENT_ROCKETS, {4, 56}},     {SFG_LEVEL_ELEMENT_ROCKETS, {5, 56}},
+    {SFG_LEVEL_ELEMENT_PLASMA, {3, 57}},     {SFG_LEVEL_ELEMENT_PLASMA, {3, 58}},
     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},