From 893002eb29e6b81e4719bfc772bca02eb188c707 Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Mon, 22 Mar 2021 21:27:59 +0000
Subject: [PATCH] Significantly improve explosions and make dead npcs vanish

---
 README.md    |   2 --
 Spr,ff9      | Bin 72616 -> 77784 bytes
 c/CTheEscape |  12 ++++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index a098e33..e6585ca 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,4 @@ Known bugs:
 
 No ending
 
-Exploding NPCs go on forever
-
 Flashing cursor in top left
\ No newline at end of file
diff --git a/Spr,ff9 b/Spr,ff9
index 9899157a5b689065434b8c98146be134d2941bff..5858f5cf28027b809bc5a192bbdb569bfa5072e3 100644
GIT binary patch
delta 4251
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
D=!}*C

delta 2936
zcmZve&5j#I6ospZ2akW^vB&nzxGgk6qD2(Y(1w;JBo;)lfFxpCkrx(1EF+|B!luN|
zd4eQNDXQg&9fSdCV1a@lQ67O!#Ez_y2zdY`b58xVyFFc!?ds3BZr$!W_ul^VuiCf2
z)S5jZL>Hfv@oBUF<08h?j#-$9nP*C=0B1_AL!iI}EtL>NIdgC}Eiu3(onnAmhYPza
zsKsd-3pMwFD3vBD2aE&5dcXl#nj>zM4r*{4%x1HMV=$ej(>ddcV}xdX!43>NU{M?^
zwIJVy!{E<hm2Ri0;@U9c30MLa0Dghe6p<IqCfp^#{irM$(kcPM2yB8~L9jpK3eZ|i
zCW2uV*@TX0>!DIGawCod3&fi0%jfzs!}nGF;!eFK#M0Xf^T$QG^V-s1FEQ*toCF&`
zH%}sYU=AbM&>y$jQs~ocM}OXKnn#iB5t)A@`Le!ny`%5W`{wDs?CWQpx&_Chrb#0C
zihl5*ZH|YsZvKg6)7*~awtkp(^rKdN%Wi{B{dPz9c6Sjch7UELEzPqx<f|qd%S$@@
zVXO0Y4Hjd3Hu2dv-?Zg-GUgpG;-FTXxc9;*?5B9r?wr6p%#k1?<avbCv}`(CM^rBl
z&$@*|;*^5M2}4S5tGQBB$^c3YNQij~HYg!6S6EmZz$)yC2<B7x8(0C)LhN9)<3N~D
zGd7yzVnCH*P%>%(2+2auWJE3;Y?CHnlRVXFNZn#_K{pvhi|oW$!HnLSoCQnE;GK6D
zEWzSyv6w*E7;axOJGIcWI0Qjc$DEOyPr_Op=ob{PzI}hwyx+yyKfYRjNeJ`xP!9Fq
zCp#vK<c7Y{?&#=x|BNvE`qo}eACKz#SLp3{M4@i!7w=-l9<S^A@?lw?L-R=l&%d=A
zmz*T+cP>XtlOekQT(Dwk-s{S-&dz;k?)Bu}My|+*Hv6DRe>=3#Z>{1HR6Qy|xb{fN
z_*B=QJ>dEoB|wYvVOAY_l{l(IbVhBsqY71))k{Uvu0rM&=}?t6#rz6-fk(<6Nw>;F
zZbPU_`HD2Lup+TtX3emIORb$lu8VmX(5j#amKs}Dsm!C%hDo}z-3dBzD$$ScUTDCD
z6N^5{#w>Y|Vw<WRn}bO1=e1FHvkkA%o-3nw<~<KuEV6y`995Xrv#oz`ZCcI$*KFu3
zsKIcziDG=7lg<ZWM;HA{s+_Hun-ywp_>&RqFYoUjjry##=KCG_bWz!0oQujvgePi?
zLaAX9mK)ou1Ll3r_0zRZ2?<rS)XLT?)>}052RpA?IW8<=jT|61*vqTl4S0M09bz$n
z%Ir&oyXUhn8{q8bYcC}hG5w}0yfWAvrD#_#IZR~gSRpX_$4Ov{mP2CEHG8IHPMH4n
ziYK~~u&b#`<>w4thdNu3u<eqzSKeT0eFv`nP1&8-=ecNXV7yuia|%7aSv2<@oEj>6
zV<;FXkvE6(b@LU(yKwnHYKJ$lKV=pSeMBWg&+tR<?ys|~5DZOdD?XyRGj+=x_sk;i
t(ff1Av3v_a^L!|GQT1z~LFvOM4RfU{&zrXn<W8VRqxR3A{dDou{{eyL-0%PZ

diff --git a/c/CTheEscape b/c/CTheEscape
index 6aefa97..b01ad5a 100644
--- a/c/CTheEscape
+++ b/c/CTheEscape
@@ -24,8 +24,8 @@ extern int current_element;
 #define MAX_STARS 49
 #define MAX_PROJECTILES 10
 
-enum sprite_e{player_ship, durno_ship, ship_trgt, durno_ship2, ship2_trgt, player_shipl,player_shipr,explode_shp1,explode_shp2,explode_shp3,explode_shp4,photon1,photon2};
-char *sprites[] = {"player_ship","durno_ship","ship_trgt","durno_ship2","ship2_trgt","player_shipl","player_shipr","explode_shp1","explode_shp2","explode_shp3","explode_shp4","photon1","photon2"};
+enum sprite_e{player_ship, durno_ship, ship_trgt, durno_ship2, ship2_trgt, player_shipl,player_shipr,explode_start,explode_shp2,explode_shp3,explode_shp4,explode_shp5,explode_shp6,explode_shp7,explode_end,photon1,photon2};
+char *sprites[] = {"player_ship","durno_ship","ship_trgt","durno_ship2","ship2_trgt","player_shipl","player_shipr","explode_shp1","explode_shp2","explode_shp3","explode_shp4","explode_shp5","explode_shp6","explode_shp7","explode_shp8","photon1","photon2"};
 
 char hudbuffer[63];
 
@@ -339,11 +339,11 @@ void game_draw_npcs()
 
     if(tick > NPCS[i].explodenextframe)
     {
-      if((NPCS[i].sprite >= explode_shp1) && (NPCS[i].sprite <= explode_shp4))
+      if((NPCS[i].sprite >= explode_start) && (NPCS[i].sprite <= explode_end))
       {
         NPCS[i].sprite++;
-        if(NPCS[i].sprite > explode_shp4)
-          NPCS[i].sprite = explode_shp1;
+        if(NPCS[i].sprite > explode_end)
+          game_respawn_npc(i);
       }
       NPCS[i].explodenextframe = tick + 4;
     }
@@ -883,7 +883,7 @@ void game_npcs_tick()
       if(NPCS[i].sprite == NPCS[i].idlesprite)
       {
         NPCS[i].collidable = 0;
-        NPCS[i].sprite = explode_shp1;
+        NPCS[i].sprite = explode_start;
         NPCS[i].explodenextframe = tick + 4;
         sound_play(1,-5,0,100);
         sound_play(3,-15,0,1000);