New element: Ignition cord

4 files changed, 48 insertions, 4 deletions

diff --git a/src/elements/bomb.c b/src/elements/bomb.c
index ee45624..ae51810 100644
--- a/src/elements/bomb.c
+++ b/src/elements/bomb.c
@@ -2,6 +2,7 @@
 
 int update_BOMB(UPDATE_FUNC_ARGS) {
 	int r, rx, ry, nb;
+	//Spark is used so much now that it should be a seperate element.
 	if (parts[i].tmp==1) {
 		for (rx=-1; rx<2; rx++)
 			for (ry=-1; ry<2; ry++)
@@ -10,7 +11,7 @@ int update_BOMB(UPDATE_FUNC_ARGS) {
 					r = pmap[y+ry][x+rx];
 					if (!r)
 						continue;
-					if (ptypes[r&0xFF].properties & (TYPE_SOLID | TYPE_PART | TYPE_LIQUID) && (r&0xFF)!=PT_BOMB) {
+					if (ptypes[r&0xFF].properties & (TYPE_SOLID | TYPE_PART | TYPE_LIQUID) && !(ptypes[r&0xFF].properties & PROP_SPARKSETTLE)) {
 						kill_part(i);
 						return 1;
 					}
diff --git a/src/elements/coal.c b/src/elements/coal.c
index 14c3138..d17a547 100644
--- a/src/elements/coal.c
+++ b/src/elements/coal.c
@@ -35,7 +35,7 @@ int update_COAL(UPDATE_FUNC_ARGS) {
 					if (parts[r>>8].ctype == PT_IRON) {
 						parts[r>>8].ctype = PT_METL;
 						kill_part(i);
-                                                return 1;
+						return 1;
 					}
 				}
 			}
diff --git a/src/elements/elec.c b/src/elements/elec.c
index a054102..6acbbab 100644
--- a/src/elements/elec.c
+++ b/src/elements/elec.c
@@ -22,9 +22,9 @@ int update_ELEC(UPDATE_FUNC_ARGS) {
 					fire_r[y/CELL][x/CELL] += rand()%200;	//D: Doesn't work with OpenGL, also shouldn't be here
 					fire_g[y/CELL][x/CELL] += rand()%200;
 					fire_b[y/CELL][x/CELL] += rand()%200;
-					for (rrx=-2; rrx<=2; rrx++)
+					for (rrx=-1; rrx<=1; rrx++)
 					{
-						for (rry=-2; rry<=2; rry++)
+						for (rry=-1; rry<=1; rry++)
 						{
 							if (x+rx+rrx>=0 && y+ry+rry>=0 && x+rx+rrx<XRES && y+ry+rry<YRES) {
 								nb = create_part(-1, x+rx+rrx, y+ry+rry, PT_BOMB);
diff --git a/src/elements/ignt.c b/src/elements/ignt.c
new file mode 100644
index 0000000..817e5f9
--- /dev/null
+++ b/src/elements/ignt.c
@@ -0,0 +1,43 @@
+#include <element.h>
+
+int update_IGNT(UPDATE_FUNC_ARGS) {
+	int r, rx, ry;
+	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))
+				{
+					r = pmap[y+ry][x+rx];
+					if (!r)
+						continue;
+					if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM)
+					{
+						parts[i].tmp = 1;
+					}
+					else if ((r&0xFF)==PT_SPRK || (r&0xFF)==PT_LIGH || ((r&0xFF)==PT_IGNT && parts[r>>8].life==1))
+					{
+						parts[i].tmp = 1;
+					}
+				}
+	}
+	else if(parts[i].life > 0)
+	{
+		if(rand()%3)
+		{
+			int nb = create_part(-1, x+rand()%3-1, y+rand()%3-1, PT_BOMB);
+			if (nb!=-1) {
+				parts[nb].tmp = 1;
+				parts[nb].life = 30;
+				parts[nb].vx = rand()%20-10;
+				parts[nb].vy = rand()%20-10;
+			}
+		}
+		else
+		{
+			create_part(-1, x+rand()%3-1, y+rand()%3-1, PT_FIRE);
+		}
+		parts[i].life--;
+	}
+	return 0;
+}