Replace all explosion sparks with new element (EMBR)

Replaces: BOMB sparks and flash, electrons + glass sparks, sparks from
IGNC, sparks from TNT explosion, and sparks from FWRK and FIRW.

1 files changed, 28 insertions, 37 deletions

diff --git a/src/elements/firw.c b/src/elements/firw.c
index 5bb8f3d..3f392b6 100644
--- a/src/elements/firw.c
+++ b/src/elements/firw.c
@@ -14,10 +14,11 @@
  */
 
 #include <element.h>
+#include "hmap.h"
 
 int update_FIRW(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, rt, np;
-	if (parts[i].tmp==0) {
+	if (parts[i].tmp<=0) {
 		for (rx=-1; rx<2; rx++)
 			for (ry=-1; ry<2; ry++)
 				if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
@@ -29,52 +30,42 @@ int update_FIRW(UPDATE_FUNC_ARGS) {
 					if (rt==PT_FIRE||rt==PT_PLSM||rt==PT_THDR)
 					{
 						parts[i].tmp = 1;
-						parts[i].life = rand()%50+60;
+						parts[i].life = rand()%40+60;
 					}
 				}
 	}
 	else if (parts[i].tmp==1) {
-		if (parts[i].life==0) {
+		if (parts[i].life<=0) {
 			parts[i].tmp=2;
 		} else {
-			float newVel = parts[i].life/25;
-			parts[i].flags &= ~FLAG_STAGNANT;
-			/* TODO:
-			if ((pmap[(int)(ly-newVel)][(int)lx]&0xFF)==PT_NONE && ly-newVel>0) {
-				parts[i].vy = -newVel;
-				ly-=newVel;
-				iy-=newVel;
-			}*/
-			parts[i].vy = -newVel;
+			// TODO: different gravity modes + Newtonian gravity
+			parts[i].vy = -parts[i].life*0.04f - 0.1f;
 		}
 	}
-	else if (parts[i].tmp==2) {
-		int col = rand()%200+4;
-		int tmul;
-		for (rx=-2; rx<3; rx++)
-			for (ry=-2; ry<3; ry++)
-				if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
-				{
-					tmul = rand()%7;
-					np = create_part(-1, x+rx, y+ry, PT_FIRW);
-					if (np>-1)
-					{
-						parts[np].vx = (rand()%3-1)*tmul;
-						parts[np].vy = (rand()%3-1)*tmul;
-						parts[np].tmp = col;
-						parts[np].life = rand()%100+100;
-						parts[np].temp = 6000.0f;
-						parts[np].dcolour = parts[i].dcolour;
-					}
-				}
-		pv[y/CELL][x/CELL] += 20;
+	else if (parts[i].tmp>=2) {
+		float angle, magnitude;
+		int caddress = (rand()%200)*3;
+		int n;
+		unsigned col = (((unsigned char)(firw_data[caddress]))<<16) | (((unsigned char)(firw_data[caddress+1]))<<8) | ((unsigned char)(firw_data[caddress+2]));
+		for (n=0; n<40; n++)
+		{
+			np = create_part(-3, x, y, PT_EMBR);
+			if (np>-1)
+			{
+				magnitude = ((rand()%60)+40)*0.05f;
+				angle = (rand()%6284)*0.001f;//(in radians, between 0 and 2*pi)
+				parts[np].vx = parts[i].vx + cosf(angle)*magnitude;
+				parts[np].vy = parts[i].vy + sinf(angle)*magnitude - 2.5f;
+				parts[np].ctype = col;
+				parts[np].tmp = 1;
+				parts[np].life = rand()%40+70;
+				parts[np].temp = (rand()%500)+5750.0f;
+				parts[np].dcolour = parts[i].dcolour;
+			}
+		}
+		pv[y/CELL][x/CELL] += 8.0f;
 		kill_part(i);
 		return 1;
-	} else if (parts[i].tmp>=3) {
-		if (parts[i].life<=0) {
-			kill_part(i);
-			return 1;
-		}
 	}
 	return 0;
 }