From e608a2c5480c049ea2b439bc38ea745b61330b8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= <tastyfish@seznam.cz>
Date: Sat, 9 Nov 2019 11:59:52 +0100
Subject: [PATCH] Add plasma sprite

---
 assets.h                 |  19 +++++++++++++++++++
 assets/effect_plasma.png | Bin 0 -> 864 bytes
 main.c                   |  16 +++++++++++-----
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 assets/effect_plasma.png

diff --git a/assets.h b/assets.h
index 65acff2..480c818 100644
--- a/assets.h
+++ b/assets.h
@@ -542,6 +542,25 @@ SFG_PROGRAM_MEMORY uint8_t SFG_effectSprites[][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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0
+  },
+  { // 2, plasma
+175,199,126,213,198,215,118,46,125,204,124,134,45,117,135,116,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,1,17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,68,16,0,0,0,0,0,0,0,0,0,0,16,
+1,17,20,17,16,16,16,0,0,0,0,0,0,0,17,18,7,113,20,17,119,1,1,0,0,0,0,0,0,1,17,65,
+16,34,67,50,33,17,16,0,0,0,0,0,0,1,36,34,1,19,153,51,33,65,0,0,0,0,0,0,0,14,37,
+34,32,51,57,163,35,50,16,0,0,0,0,0,0,114,37,82,2,17,51,170,51,34,17,0,0,0,0,0,0,
+18,51,83,34,17,3,152,138,43,178,16,0,0,0,0,1,20,34,52,83,163,32,123,136,199,34,
+17,0,0,0,0,1,17,18,35,51,51,34,18,34,194,36,68,0,0,0,0,0,17,17,104,109,250,51,
+18,34,34,51,17,0,0,0,0,1,7,113,34,134,136,34,211,70,34,131,17,0,0,0,0,0,16,34,
+34,134,34,34,97,17,102,98,16,0,0,0,0,0,1,18,85,84,17,98,97,33,22,98,1,0,0,0,0,1,
+17,37,83,242,68,70,18,146,33,23,16,0,0,0,0,1,50,53,35,134,133,65,39,185,37,17,1,
+0,0,0,0,0,19,147,34,136,51,81,39,190,36,65,32,0,0,0,0,0,17,18,34,131,34,83,39,0,
+35,34,32,0,0,0,0,1,1,17,34,34,34,57,50,114,49,34,0,0,0,0,0,0,16,17,34,34,83,147,
+67,33,64,0,0,0,0,0,0,0,1,2,33,35,81,17,68,68,65,0,0,0,0,0,0,0,0,2,33,21,17,17,
+17,17,16,0,0,0,0,0,0,0,0,0,0,20,65,0,1,17,0,0,0,0,0,0,0,0,0,0,0,1,65,16,0,16,0,
+0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0
   }
 };
 
diff --git a/assets/effect_plasma.png b/assets/effect_plasma.png
new file mode 100644
index 0000000000000000000000000000000000000000..8890eafe2c7b3617b8eadffb01d121956059eb71
GIT binary patch
literal 864
zcmV-m1E2hfP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru;|mE2F)~%bZu0;D02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00PKKL_t(o!|j)?a^o-*g}-J3
z3=IPW1Op8N0s;*U3k&@ig8K-Dg@uNK1_6bJfdT@7h6bJ41*&BEFKM?s)7hQXOeT&j
z`yQQp?zzfC4?p?FvEiG?e*k|Ufbz|K{PoiO^xhu<P?>rbpxTZDJ)czoGQIa(0Q}1y
z-+DAHSF7mk7*rf6mkz`lz)u124_>XJw?6>T271(JU13yMrww4L8B4du!<rF!0G)+e
z)b7W*C714UCx*ZPT4bX&)BCkl9|sTz_dA{jki23zjPB*OUES##fW;J4TZcRq!(47#
zIJXqiQGGG{@k8g<rC>64LIpNHr2&sP{?6r)j=j9ln~vUe033|sL^qm?Q?Mq+)f8m5
zrj$hxk{6rb<s%KLOk5B&JqpPy7qh1!4O-C#IA#>KAQf{_-Yi2OG-*_zGBXBDM`t=N
zW{=@ODj-44gNqD~8BY{JQ&T2Z0konB<}#X>5@gDiZ1zlZJk50BgQtRzF%Tn6P@%4$
z&x&g6%qEu(NFr0W&gPCWTfi|xi)`izYksg<E5FV{{hk8<qNGua<zzUpBPSKO9iLnG
zj4Wr>H6635&N7sr0c81}cSDP&GBrC<@Fbu=pMns3p@ZUc37V2Zs`2~oRYCbS1`zBO
z$c!PCDTyqBm!R;c<KTFCqzjGng+dN~vc$k<N|9fj**fgT=NzCngWD7`>H|%MW{+l1
zDGPG4Pz|?Q^k&HgJyKtKo`ueIfF4|qJgm!4CAvA02pJfdI^Yrmt48EosTZT)&B5#d
zc$HVc^@KS8Aq8e&XsP_}_5x2=Du}3jB$c}mJd~@=9aADBK?QBR$lJkJ0mOa0+KwBF
zrX9`(k>>-!baFZLfP3eGn+(Jt+;|xb3TQ|%955V$Xm6F=rw%0d4k>Y<7_jdjYyJOA
q0G7NW4*roN*p~tP|6}sc0r&+vc!8u8mo{(!0000<MNUMnLSTa9lWb-H

literal 0
HcmV?d00001

diff --git a/main.c b/main.c
index 431f2dd..5fc8916 100755
--- a/main.c
+++ b/main.c
@@ -328,6 +328,7 @@ typedef struct
 
 #define SFG_PROJECTILE_EXPLOSION 0
 #define SFG_PROJECTILE_FIREBALL 1
+#define SFG_PROJECTILE_PLASMA 2
 
 #define SFG_EXPLOSION_DURATION_DOUBLE_FRAMES \
   (SFG_EXPLOSION_DURATION / SFG_MS_PER_FRAME)
@@ -1569,9 +1570,11 @@ void SFG_gameStep()
   {
     // fire
  
-    if (SFG_player.weapon == SFG_WEAPON_ROCKER_LAUNCHER)
+    if (SFG_player.weapon == SFG_WEAPON_ROCKER_LAUNCHER ||
+        SFG_player.weapon == SFG_WEAPON_PLASMAGUN)
       SFG_launchProjectile(
-        SFG_PROJECTILE_FIREBALL,
+        SFG_player.weapon == SFG_WEAPON_ROCKER_LAUNCHER ?
+           SFG_PROJECTILE_FIREBALL : SFG_PROJECTILE_PLASMA,
         SFG_player.camera.position,
         SFG_player.camera.height,
         RCL_angleToDirection(SFG_player.camera.direction),
@@ -2324,8 +2327,11 @@ void SFG_drawWeapon(int16_t bobOffset)
       bobOffset +=  
           ((animationLength - shotAnimationFrame) * SFG_WEAPON_IMAGE_SCALE * 20)
           / animationLength;
-    
-      if (shotAnimationFrame < animationLength / 2)
+   
+      if (
+        SFG_player.weapon != SFG_WEAPON_KNIFE &&
+        SFG_player.weapon != SFG_WEAPON_PLASMAGUN &&
+        shotAnimationFrame < animationLength / 2)
         SFG_blitImage(SFG_effectSprites[0],
           SFG_WEAPON_IMAGE_POSITION_X,
           SFG_WEAPON_IMAGE_POSITION_Y - (SFG_TEXTURE_SIZE / 3) * SFG_WEAPON_IMAGE_SCALE + bobOffset,
@@ -2460,7 +2466,7 @@ void SFG_draw()
         RCL_mapToScreen(worldPosition,proj->position[2],SFG_player.camera);
        
       const uint8_t *s =
-        SFG_effectSprites[proj->type == SFG_PROJECTILE_FIREBALL ? 1 : 0];
+        SFG_effectSprites[proj->type];
 
       int16_t spriteSize = SFG_GAME_RESOLUTION_Y / 3;