From 20a0fdc4096f91af119c9753fdb882a50c6bd353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Fri, 27 Dec 2019 13:39:16 +0100
Subject: [PATCH] Add turret

---
 assets.h                         |  60 +++++++++++++++++++++++++++++++
 assets/monster_turret_attack.png | Bin 0 -> 879 bytes
 assets/monster_turret_idle.png   | Bin 0 -> 854 bytes
 assets/monster_turret_walk.png   | Bin 0 -> 828 bytes
 levels.h                         |   3 +-
 main.c                           |  10 ++++++
 settings.h                       |   8 +++++
 7 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 assets/monster_turret_attack.png
 create mode 100644 assets/monster_turret_idle.png
 create mode 100644 assets/monster_turret_walk.png

diff --git a/assets.h b/assets.h
index 76c1a63..db9b135 100644
--- a/assets.h
+++ b/assets.h
@@ -848,6 +848,66 @@ SFG_PROGRAM_MEMORY uint8_t SFG_monsterSprites[][SFG_TEXTURE_STORE_SIZE] =
 150,101,238,231,125,221,119,117,111,75,64,51,51,0,95,102,255,85,224,96,119,215,
 112,85,90,171,64,51,51,51,0,5,85,94,0,153,7,119,3,0,10,171,64,51,51,51,51,48,0,
 0,51,0,48,112,51,51,48,0,0
+  },
+  { // 13, turret idle
+175,0,131,26,41,168,37,6,91,7,48,93,90,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,1,16,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,25,145,0,0,0,0,0,0,0,0,17,0,0,0,0,17,151,98,16,0,0,0,0,0,0,1,130,16,0,0,
+1,35,184,130,81,16,0,0,0,0,0,1,40,16,0,0,1,34,123,178,85,65,0,0,0,0,0,23,49,0,0,
+0,25,98,187,98,81,16,0,0,0,0,0,23,65,0,0,0,25,98,118,98,16,0,0,0,0,0,1,115,16,0,
+17,17,71,98,118,98,81,16,0,0,0,1,20,116,16,0,0,0,22,35,114,36,85,65,0,0,1,25,
+103,53,16,0,0,1,50,52,98,36,81,16,0,0,25,151,39,69,161,0,0,25,51,68,98,36,16,0,
+0,0,25,118,100,84,161,0,1,151,54,35,184,36,16,0,0,1,151,98,35,52,85,17,23,102,
+70,35,104,132,81,16,0,1,151,98,35,52,85,162,50,34,70,35,104,132,85,65,0,1,118,
+34,51,68,85,17,19,51,70,35,104,132,81,16,0,1,118,35,51,68,81,0,1,67,70,35,184,
+36,16,0,0,1,102,35,52,69,81,0,0,20,66,53,98,36,16,0,0,1,115,51,68,81,16,0,0,1,
+67,165,98,36,81,16,0,1,114,51,69,16,0,0,0,0,20,85,98,36,85,65,0,27,98,35,65,0,0,
+1,17,17,18,58,35,58,81,16,0,27,34,35,16,0,0,23,98,51,18,58,35,58,16,0,1,123,130,
+52,16,0,0,22,34,68,18,58,140,58,81,16,23,98,184,129,0,0,0,1,35,65,1,90,44,202,
+85,65,25,34,35,193,0,0,0,1,20,81,1,85,140,202,81,16,22,34,52,65,0,0,0,17,1,16,0,
+17,35,58,16,0,1,35,68,16,0,0,0,16,0,0,0,0,19,49,0,0,0,17,17,0,0,0,0,0,0,0,0,0,1,
+16,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
+  },
+  { // 14 turret walk
+175,0,131,26,41,37,168,6,91,7,48,93,90,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,17,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,153,16,0,0,0,0,0,0,0,0,0,0,0,0,1,25,117,33,0,0,0,0,0,0,0,0,1,16,0,0,
+18,59,136,33,0,0,0,0,0,0,0,0,24,33,0,0,18,39,187,38,16,0,0,0,0,0,0,0,18,129,0,1,
+149,43,181,38,65,0,0,0,0,0,0,1,115,16,0,1,149,39,85,38,16,0,0,0,0,0,0,25,33,0,1,
+20,117,39,85,33,0,0,0,0,0,1,17,114,49,0,16,1,82,55,34,70,16,0,0,0,1,25,87,51,16,
+0,0,19,35,69,34,65,0,0,0,0,25,151,39,70,16,0,1,147,52,69,34,65,0,0,0,0,25,117,
+84,100,161,0,25,115,82,59,130,70,16,0,0,1,151,82,35,52,161,17,117,83,82,53,136,
+70,65,0,0,1,151,82,35,52,102,35,34,35,82,53,136,70,16,0,0,1,117,34,51,68,102,17,
+51,52,82,53,136,65,0,0,0,1,117,34,51,68,102,0,20,52,82,59,130,65,0,0,0,23,85,35,
+52,70,97,0,1,68,35,101,34,65,0,0,0,23,82,51,68,102,96,0,0,20,58,101,34,70,16,0,
+1,181,34,52,65,16,0,17,16,1,70,101,34,65,0,0,23,178,34,52,16,0,1,119,81,17,35,
+162,51,161,0,1,117,40,35,65,0,0,1,82,35,49,35,162,51,166,16,1,146,43,136,65,0,0,
+17,34,52,17,35,168,195,166,65,1,82,34,60,16,0,0,1,51,65,0,22,162,204,166,16,1,
+34,51,68,16,0,0,0,17,16,0,22,104,204,161,0,0,17,52,65,0,0,0,0,0,0,0,1,18,51,161,
+0,0,0,17,16,0,0,0,0,0,0,0,0,1,51,16,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,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
+  },
+  { // 15 turret attack
+175,0,131,41,26,1,168,191,7,48,81,6,37,21,35,44,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,17,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,136,16,0,0,0,0,0,0,0,0,0,0,0,0,1,24,188,33,0,0,0,0,0,0,0,0,0,0,0,0,
+18,77,170,38,16,0,0,0,0,0,0,0,0,0,0,0,18,43,212,38,49,0,0,0,0,0,0,0,0,0,0,1,140,
+45,220,38,16,0,0,0,0,0,0,0,0,0,0,1,140,43,220,33,0,0,0,0,0,0,0,0,0,1,17,19,188,
+43,220,38,16,0,0,0,0,80,85,0,0,0,0,1,194,75,226,54,49,0,0,0,85,135,188,165,0,0,
+0,148,36,61,226,54,16,0,0,90,136,183,15,254,80,0,9,132,67,61,226,49,0,0,0,168,
+139,119,112,238,80,0,24,180,194,77,162,49,0,0,1,187,183,120,135,116,161,21,189,
+211,194,77,170,54,16,0,1,192,119,120,135,119,9,173,204,195,194,77,170,54,49,0,1,
+204,192,119,119,106,169,21,221,211,194,77,170,54,16,0,0,175,255,247,122,170,80,
+0,94,211,194,77,162,49,0,0,0,90,255,231,68,170,80,0,5,227,36,109,226,49,0,0,0,0,
+85,224,74,85,0,0,0,83,73,109,226,54,16,0,0,0,0,85,85,0,0,0,0,1,54,109,226,54,49,
+0,0,0,0,0,0,0,0,68,68,65,36,158,68,150,16,0,0,0,0,0,0,0,4,141,221,225,36,158,68,
+145,0,0,0,0,0,0,0,0,4,221,35,49,36,154,164,150,16,0,0,0,0,0,0,0,0,18,67,16,22,
+158,170,150,49,0,0,0,0,0,0,0,0,17,54,16,22,106,170,150,16,0,0,0,0,0,0,0,1,16,17,
+0,1,30,68,145,0,0,0,0,0,0,0,0,1,0,0,0,0,1,68,16,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,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
   }
 };
 
diff --git a/assets/monster_turret_attack.png b/assets/monster_turret_attack.png
new file mode 100644
index 0000000000000000000000000000000000000000..e517083651cadbd6ce63b084532de346d717a420
GIT binary patch
literal 879
zcmV-#1CacQP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;|v=N94lQtqiO&E02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00P%ZL_t(o!^KuDkfSgdeY=A|
zB2FMyL?9wgAS)wIAd!d@6)RSpI9Z9TtgJXuiA0=0oItEVtU#QIKtxnTA|pD(34Tfm
zbSZP)%}l2xfiEvF?|WY!6j0$4+ao@?eL4VR>4#?TS$!k`>JSja0*@nb836#iml)zy
zf*0ccM?ee<$=?hB;Igm=wedj=>;4*`4(S#L0Q1zF+xVak`4|z3Lcnt91q*l20_qTO
z&My}4vtYmFSbOfxEIiCLA~~SkYP4VW@<AB@bI46%oXr4p2+D#(P2|nbXNJw1-B$x#
zM%W%gD5KtayZhj)TeFmv_XEHSf!#|C066^cyYW@Sh|J1GUT_lw;#9(Z%R9;efKd12
zte6)9G&viRG62vTSUZ1fdsteIO#s%DUDJP*+Pv?10Dw42E^3EXHxy7U`2naHbt{a_
zd7f9Pld43ztI)iQi8zmQcdOL|hhWWCAQQ$TU-w8O4jOK*R?Nqx^e4X)lq=xyeLd-Z
zTib#wGEnA@ZekGt`^knnDVQ?p#yro{K%@}|(ge9Eq0;>Sq@n#}Lka;gP<!yj)<6iO
z7A8+~h$}~MH49qWD09Kn96`@&b209Ee6U-!Bn`WiIjOGv#xlYoRd7WHcf|ACxm=V0
z^Ui?6?NuPg*y62ncdy&g1@cr6=ZXx;9}ep%u_BhnfH?s|W55IutQm5$(iUiGcZq)e
z$_{DwTs8*PmF}aQ)WHP+v!Olvwu8O*AzxzH`*Y!uZ}lY<zf9n{7jDqs7qt#(WP%5(
z`;Wp{1JMC!7Z-&<<cDB(Q)HUJZO}HbCcfYt+RPh)_Vw6=JH+V)2u%aAjG8YcvaqN6
z;(QIu10aavt{(;d<#Acf#gzeOTBoeC$opB)7ogVCWVT<(LXM7?M>%~2eGq-DVx*6m
zW5fPvDo#~8%FdN;*q=K#_RjD(>4d|)9n0f6W9B<<_zzHOs$9Ru*+~EZ002ovPDHLk
FV1lvtfRX?J

literal 0
HcmV?d00001

diff --git a/assets/monster_turret_idle.png b/assets/monster_turret_idle.png
new file mode 100644
index 0000000000000000000000000000000000000000..c66c1f9e04afca6d1001ca5341815acb6f57d704
GIT binary patch
literal 854
zcmV-c1F8IpP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;|v=N8!r_R@w5N{02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00O>AL_t(o!?ji+ldCWg{;pGj
zL?TWgk&(!VCr%=f6({%!Cy|vWE0IWK#S;-HkjRLNhzew7L}z#cLPH2NZQo^vDG6!5
z-OcXz?VAKT{NnJmcWL>)`E78{IpkGh&+>^eYP|hM1QZbG993JQU^m}+zMn*5`#(Z!
z4n`>epv^KAG#=N9sKJfB+h>90wf94u1OT9FOC&)$z86d)Eh`*Yjf}=1qDCVwuU&z+
z0IWt+Ff?I2`A=F_;Bhd5bJo0m1>z(|VEul{5N2fr5p{1k6F}(Cz#oc$@?L>YfCnIR
zG~xozn$<FVC<5O<dlXD!M?EXJe#Z(}-Z|4L0v>>f5>$si>`9h_g#OH10FbPKZ~%6S
zfL_l4knb}z;sVJUU`J<OKMKAWfmL7t9woDbo&mQS-~q^^2xXd#wW}wR{~q+e=XPEl
zPZ$6Rbov9Ji}J57kD?C4-24up3$@3#&-Gco0(mDt{PzHtb8Fpap0RZ1W+5t0p$tBE
zt174z(0f&mmxO1DfOI{G@~_osKGhE>51TMXx}#PD6;l#XBcf!{iOn<M@+v1HWCI|g
z2H0^@zAqb~>%jyp^cTJ4clcqIiapIk&Kjfx`<V=A0^&{|=*)z=_N$~Kq6X0n(eHe0
zI_Srw1zR&@YZaa$bH9J~R)B^{YegLYa`@*Ku_jbH4@g%kPIq+H+2}2mse}Mf7i@gL
z40Jux_qkongNXqu$?88J2o49dS%%<nnAA1^#5qHq->$)&s}fAh3T2v%zh*}~F+k7o
zGD$##-V1fG-T|d$HS?rQlNmvI>{cz3hW);RO^n#s7;Fq{POXWfgW2XLsB;zQ2{>=|
zkIsD2o?7d=O}MN{7#bRH&f&Ngy7US*jfST4wz=z?ZIAgZQnA@~+1fCdHQOF1DmID3
gMkFq4-W@vr2gcI=$Z8nq1ONa407*qoM6N<$g5#cQ00000

literal 0
HcmV?d00001

diff --git a/assets/monster_turret_walk.png b/assets/monster_turret_walk.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2432dc472b4abeb4bc2bea95552bcaec5602001
GIT binary patch
literal 828
zcmV-C1H=4@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;|v=N91Qq376AYN02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00N{*L_t(o!^KuDv!gH+J#VKX
z5{X!WL`EVbRy>JBR`w@UMm&LBSy_p!d}2k!3M4Y3BBBCW8POS5w4ot{68idPnPC{X
zA?JSNo^#(c(BVH`tMA&FIPZF5-H-1Amr_DsG)lpd^6ki>Z_9uIKeQG0m7ZPy_Np^r
zA{2}P05&Y^ZB*3&fNC#BrC7bH#!^ZExJE8Cis}Fs$GszsI=?0Z23TLNv8bc!fdODI
z?lBhC0Wynwa4DLvWq>>YcEL^BiBLcidBGQFz&N0e${Vo(wNoxd^RNw9&w|^)Hh3uT
zQziKQx5Qp(tQnb&S_keKTmoX9^n6o*CegtD40vz`3^*@0Xw(^6G{BmT+DqTk{!%S4
zwWl8(^aes09rd*ita-2l#3C5_!9i7xYA*l)(XqWgPwl+(&zu1QfTt;{A|C*2$GOD%
zM|tdXN@$FodjsfFzU_FLcJSEkHSm0wQg)@_UCOszv1XHdXrNn7I0eE>@EPx^sv#$A
zE>B?TJfIzL;^~Se$xy7>DCLGFsj4SMXwg7IocijE9%w+y=v|}$Y#Hyt=Xhb!L}b(P
zpcF|oaH5y!08)C$gv5$aiU!4ve0&UOg9dlNqc(Ik-v|&@HK@lCV{6nIVDEQ_c)3gs
z34oMud-3rBG@cVqRgKR-649weX6b~UA*E3U2!LYE&?MOiz@*z1A^@mwWCZ}{pYgyJ
zo!S9WO*&u>S^euB@otB9vq8MujoK^Y0yV#v!F@LzP*ew0MczLpFGo)F4%jEW%5$*z
z8im=|o%P(SDsulgW=g>l?_@k`L%YB2sHVVt?=EO?7uW}IbcxSkzG#nrl{}x?=@MW@
z>5|*iXM^?q(Hb49hP~P`+AA3z*z|%m?mf$d`U}HG$eMpd1_Q|+vXD0b0000<MNUMn
GLSTZO%x1{|

literal 0
HcmV?d00001

diff --git a/levels.h b/levels.h
index 6c6288e..cebbfec 100644
--- a/levels.h
+++ b/levels.h
@@ -98,6 +98,7 @@ typedef struct
 #define SFG_LEVEL_ELEMENT_MONSTER_WARRIOR 0x20
 #define SFG_LEVEL_ELEMENT_MONSTER_PLASMABOT 0x30
 #define SFG_LEVEL_ELEMENT_MONSTER_ENDER 0x40
+#define SFG_LEVEL_ELEMENT_MONSTER_TURRET 0x50
 
 typedef struct
 {
@@ -250,7 +251,7 @@ SFG_PROGRAM_MEMORY SFG_Level SFG_level0 =
     {SFG_LEVEL_ELEMENT_MONSTER_DESTROYER, {16, 7}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
     {SFG_LEVEL_ELEMENT_MONSTER_WARRIOR, {18, 31}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
     {SFG_LEVEL_ELEMENT_MONSTER_PLASMABOT, {19, 31}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
-    {SFG_LEVEL_ELEMENT_NONE, {0, 0}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
+    {SFG_LEVEL_ELEMENT_MONSTER_TURRET, {5, 24}},     {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}},     {SFG_LEVEL_ELEMENT_NONE, {0, 0}},
diff --git a/main.c b/main.c
index 7cd5fe7..36c180a 100755
--- a/main.c
+++ b/main.c
@@ -551,6 +551,15 @@ const uint8_t *SFG_getMonsterSprite(
       }
       break;
 
+    case SFG_LEVEL_ELEMENT_MONSTER_TURRET:
+      switch (state)
+      {
+        case SFG_MONSTER_STATE_ATTACKING: return SFG_monsterSprites[15]; break;
+        case SFG_MONSTER_STATE_IDLE: return SFG_monsterSprites[13]; break;
+        default: return SFG_monsterSprites[frame ? 13 : 14]; break;
+      }
+      break;
+
     default:
       return SFG_monsterSprites[0];
       break;
@@ -1100,6 +1109,7 @@ void SFG_setAndInitLevel(const SFG_Level *level)
       case SFG_LEVEL_ELEMENT_MONSTER_WARRIOR:
       case SFG_LEVEL_ELEMENT_MONSTER_PLASMABOT:
       case SFG_LEVEL_ELEMENT_MONSTER_ENDER:
+      case SFG_LEVEL_ELEMENT_MONSTER_TURRET:
         SFG_LOG("adding monster");
 
         monster =
diff --git a/settings.h b/settings.h
index a97bfdd..8263bf9 100644
--- a/settings.h
+++ b/settings.h
@@ -146,4 +146,12 @@
 */
 #define SFG_HUD_HEALTH_INDICATOR_DURATION 500
 
+/**
+  How many element (items, monsters, ...) distances will be checked per frame
+  for distance. Higher value may decrease performance a tiny bit, but things
+  will react more quickly and appear less "out of thin air".
+*/
+
+#define SFG_ELEMENT_DISTANCES_CHECKED_PER_FRAME 8
+
 #endif // guard