Powered Breakable clone, Gravity Pump, New menu section for powered elements (needs icon)

9 files changed, 176 insertions, 14 deletions

diff --git a/src/elements/bcln.c b/src/elements/bcln.c
index 5d95d97..6ecacac 100644
--- a/src/elements/bcln.c
+++ b/src/elements/bcln.c
@@ -23,7 +23,8 @@ int update_BCLN(UPDATE_FUNC_ARGS) {
 						continue;
 					if ((r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PCLN &&
 				        (r&0xFF)!=PT_BCLN && (r&0xFF)!=PT_STKM &&
-				        (r&0xFF)!=PT_STKM2 && (r&0xFF)<PT_NUM)
+				        (r&0xFF)!=PT_STKM2 && (r&0xFF)!=PT_PBCN &&
+				        (r&0xFF)<PT_NUM)
 					parts[i].ctype = r&0xFF;
 				}
 	}
diff --git a/src/elements/clne.c b/src/elements/clne.c
index adc9a18..850a3ae 100644
--- a/src/elements/clne.c
+++ b/src/elements/clne.c
@@ -15,7 +15,8 @@ int update_CLNE(UPDATE_FUNC_ARGS) {
 						continue;
 					if ((r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PCLN &&
 				        (r&0xFF)!=PT_BCLN && (r&0xFF)!=PT_STKM &&
-				        (r&0xFF)!=PT_STKM2 && (r&0xFF)<PT_NUM)
+				        (r&0xFF)!=PT_PBCN && (r&0xFF)!=PT_STKM2 &&
+				        (r&0xFF)<PT_NUM)
 					parts[i].ctype = r&0xFF;
 				}
 	}
diff --git a/src/elements/gpmp.c b/src/elements/gpmp.c
new file mode 100644
index 0000000..2f0f839
--- /dev/null
+++ b/src/elements/gpmp.c
@@ -0,0 +1,34 @@
+#include <element.h>
+
+int update_GPMP(UPDATE_FUNC_ARGS) {
+	int r, rx, ry;
+	if (parts[i].life>0 && parts[i].life!=10)
+		parts[i].life--;
+	if (parts[i].life==10)
+	{
+		if (parts[i].temp>=256.0+273.15)
+			parts[i].temp=256.0+273.15;
+		if (parts[i].temp<= -256.0+273.15)
+			parts[i].temp = -256.0+273.15;
+
+		gravmap[y/CELL][x/CELL] = 0.2f*(parts[i].temp-273.15);
+		if (y+CELL<YRES && pv[y/CELL+1][x/CELL]<(parts[i].temp-273.15))
+			gravmap[y/CELL+1][x/CELL] += 0.1f*((parts[i].temp-273.15)-gravmap[y/CELL+1][x/CELL]);
+		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))
+				{
+					r = pmap[y+ry][x+rx];
+					if ((r>>8)>=NPART || !r)
+						continue;
+					if ((r&0xFF)==PT_GPMP)
+					{
+						if (parts[r>>8].life<10&&parts[r>>8].life>0)
+							parts[i].life = 9;
+						else if (parts[r>>8].life==0)
+							parts[r>>8].life = 10;
+					}
+				}
+	}
+	return 0;
+}
diff --git a/src/elements/pbcn.c b/src/elements/pbcn.c
new file mode 100644
index 0000000..bfd65d5
--- /dev/null
+++ b/src/elements/pbcn.c
@@ -0,0 +1,82 @@
+#include <element.h>
+
+int update_PBCN(UPDATE_FUNC_ARGS) {
+	int r, rx, ry;
+	if (parts[i].life>0 && parts[i].life!=10)
+		parts[i].life--;
+	if (!parts[i].tmp && pv[y/CELL][x/CELL]>4.0f)
+		parts[i].tmp = rand()%40+80;
+	if (parts[i].tmp)
+	{
+		float advection = 0.1f;
+		parts[i].vx += advection*vx[y/CELL][x/CELL];
+		parts[i].vy += advection*vy[y/CELL][x/CELL];
+		parts[i].tmp--;
+		if(!parts[i].tmp){
+			kill_part(i);
+			return 1;
+		}
+	}
+	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))
+			{
+				r = pmap[y+ry][x+rx];
+				if ((r>>8)>=NPART || !r)
+					continue;
+				if ((r&0xFF)==PT_SPRK)
+				{
+					if (parts[r>>8].ctype==PT_PSCN)
+						parts[i].life = 10;
+					else if (parts[r>>8].ctype==PT_NSCN)
+						parts[i].life = 9;
+				}
+				if ((r&0xFF)==PT_PBCN)
+				{
+					if (parts[i].life==10&&parts[r>>8].life<10&&parts[r>>8].life>0)
+						parts[i].life = 9;
+					else if (parts[i].life==0&&parts[r>>8].life==10)
+						parts[i].life = 10;
+				}
+			}
+	if (parts[i].ctype<=0 || parts[i].ctype>=PT_NUM)
+		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)
+				{
+					r = photons[y+ry][x+rx];
+					if (!r || (r>>8)>=NPART)
+						r = pmap[y+ry][x+rx];
+					if (!r || (r>>8)>=NPART)
+						continue;
+					if ((r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PCLN &&
+				        (r&0xFF)!=PT_BCLN &&  (r&0xFF)!=PT_SPRK &&
+				        (r&0xFF)!=PT_NSCN && (r&0xFF)!=PT_PSCN &&
+				        (r&0xFF)!=PT_STKM && (r&0xFF)!=PT_STKM2 &&
+				        (r&0xFF)!=PT_PBCN && (r&0xFF)<PT_NUM)
+					parts[i].ctype = r&0xFF;
+				}
+	if (parts[i].ctype>0 && parts[i].ctype<PT_NUM && parts[i].life==10) {
+		if (parts[i].ctype==PT_PHOT) {//create photons a different way
+			for (rx=-1; rx<2; rx++) {
+				for (ry=-1; ry<2; ry++) {
+					int r = create_part(-1, x+rx, y+ry, parts[i].ctype);
+					if (r!=-1) {
+						parts[r].vx = rx*3;
+						parts[r].vy = ry*3;
+					}
+				}
+			}
+		}
+		else if (ptypes[parts[i].ctype].properties&PROP_LIFE) {//create life a different way
+			for (rx=-1; rx<2; rx++) {
+				for (ry=-1; ry<2; ry++) {
+					create_part(-1, x+rx, y+ry, parts[i].ctype);
+				}
+			}
+		} else {
+			create_part(-1, x+rand()%3-1, y+rand()%3-1, parts[i].ctype);
+		}
+	}
+	return 0;
+}
diff --git a/src/elements/pcln.c b/src/elements/pcln.c
index 3ba431c..3f785bb 100644
--- a/src/elements/pcln.c
+++ b/src/elements/pcln.c
@@ -40,7 +40,7 @@ int update_PCLN(UPDATE_FUNC_ARGS) {
 				        (r&0xFF)!=PT_BCLN &&  (r&0xFF)!=PT_SPRK &&
 				        (r&0xFF)!=PT_NSCN && (r&0xFF)!=PT_PSCN &&
 				        (r&0xFF)!=PT_STKM && (r&0xFF)!=PT_STKM2 &&
-				        (r&0xFF)<PT_NUM)
+				        (r&0xFF)!=PT_PBCN && (r&0xFF)<PT_NUM)
 					parts[i].ctype = r&0xFF;
 				}
 	if (parts[i].ctype>0 && parts[i].ctype<PT_NUM && parts[i].life==10) {
diff --git a/src/elements/phot.c b/src/elements/phot.c
index b4b6157..12e7da5 100644
--- a/src/elements/phot.c
+++ b/src/elements/phot.c
@@ -3,6 +3,8 @@
 int update_PHOT(UPDATE_FUNC_ARGS) {
 	int r, rt, rx, ry;
 	float rr, rrr;
+	parts[i].pavg[0] = x;
+	parts[i].pavg[1] = y;
 	if (!parts[i].ctype) {
 		kill_part(i);
 		return 1;
@@ -37,12 +39,12 @@ int update_PHOT(UPDATE_FUNC_ARGS) {
 					pv[y/CELL][x/CELL] -= 15.0f * CFDS;
 				}
 			}
-	r = pmap[y][x];
-	rt = r&0xFF;
-	if (rt==PT_CLNE || rt==PT_PCLN || rt==PT_BCLN) {
+	//r = pmap[y][x];
+	//rt = r&0xFF;
+	/*if (rt==PT_CLNE || rt==PT_PCLN || rt==PT_BCLN || rt==PT_PBCN) {
 		if (!parts[r>>8].ctype)
 			parts[r>>8].ctype = PT_PHOT;
-	}
+	}*/
 
 	return 0;
 }
diff --git a/src/elements/sprk.c b/src/elements/sprk.c
index 0d579f5..fdb0fa3 100644
--- a/src/elements/sprk.c
+++ b/src/elements/sprk.c
@@ -94,7 +94,7 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
 						parts[r>>8].life = 9;
 					}
 				}
-				else if ((ct==PT_PSCN||ct==PT_NSCN) && (rt==PT_PUMP||rt==PT_HSWC||(rt==PT_LCRY&&abs(rx)<2&&abs(ry)<2)))
+				else if ((ct==PT_PSCN||ct==PT_NSCN) && (rt==PT_PUMP||rt==PT_GPMP||rt==PT_HSWC||(rt==PT_LCRY&&abs(rx)<2&&abs(ry)<2))) // PROP_PTOGGLE, Maybe? We seem to use 2 different methods for handling actived elements, this one seems better
 				{
 					if (ct==PT_PSCN) parts[r>>8].life = 10;
 					else if (ct==PT_NSCN && parts[r>>8].life>=10) parts[r>>8].life = 9;
diff --git a/src/graphics.c b/src/graphics.c
index 459706e..4d53ec2 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1757,7 +1757,7 @@ void draw_parts(pixel *vid)
 
 					isplayer2 = 1;  //It's a secret. Tssss...
 				}
-				if (cmode==CM_NOTHING && t!=PT_PIPE && t!=PT_SWCH && t!=PT_LCRY && t!=PT_PUMP && t!=PT_FILT && t!=PT_HSWC && t!=PT_PCLN && t!=PT_DEUT && t!=PT_WIFI)//nothing display but show needed color changes
+				if (cmode==CM_NOTHING && t!=PT_PIPE && t!=PT_SWCH && t!=PT_LCRY && t!=PT_PUMP && t!=PT_GPMP && t!=PT_PBCN && t!=PT_FILT && t!=PT_HSWC && t!=PT_PCLN && t!=PT_DEUT && t!=PT_WIFI)//nothing display but show needed color changes
 				{
 					if (t==PT_PHOT)
 					{
@@ -1815,7 +1815,8 @@ void draw_parts(pixel *vid)
 				         t!=PT_NEUT && t!=PT_LAVA && t!=PT_BOMB &&
 				         t!=PT_PHOT && t!=PT_THDR && t!=PT_SMKE &&
 				         t!=PT_LCRY && t!=PT_SWCH && t!=PT_PCLN &&
-				         t!=PT_PUMP && t!=PT_HSWC && t!=PT_FILT)
+				         t!=PT_PUMP && t!=PT_HSWC && t!=PT_FILT &&
+				         t!=PT_GPMP && t!=PT_PBCN)
 				{
 					if (ptypes[parts[i].type].properties&TYPE_LIQUID) //special effects for liquids in fancy mode
 					{
@@ -2791,6 +2792,22 @@ void draw_parts(pixel *vid)
 						blendpixel(vid, nx-1, ny+1, GR, GR, 10, 112);
 					}
 				}
+				else if (t==PT_PBCN)
+				{
+					uint8 GR = 0x3B+((parts[i].life>10?10:parts[i].life)*19);
+					vid[ny*(XRES+BARSIZE)+nx] = PIXRGB(GR, GR/2, 10);
+					if (cmode == CM_BLOB) {
+						blendpixel(vid, nx+1, ny, GR, GR/2, 10, 223);
+						blendpixel(vid, nx-1, ny, GR, GR/2, 10, 223);
+						blendpixel(vid, nx, ny+1, GR, GR/2, 10, 223);
+						blendpixel(vid, nx, ny-1, GR, GR/2, 10, 223);
+
+						blendpixel(vid, nx+1, ny-1, GR, GR/2, 10, 112);
+						blendpixel(vid, nx-1, ny-1, GR, GR/2, 10, 112);
+						blendpixel(vid, nx+1, ny+1, GR, GR/2, 10, 112);
+						blendpixel(vid, nx-1, ny+1, GR, GR/2, 10, 112);
+					}
+				}
 				else if (t==PT_HSWC)
 				{
 					uint8 GR = 0x3B+((parts[i].life>10?10:parts[i].life)*19);
@@ -2823,6 +2840,22 @@ void draw_parts(pixel *vid)
 						blendpixel(vid, nx-1, ny+1, 10, 10, GR, 112);
 					}
 				}
+				else if (t==PT_GPMP)
+				{
+					uint8 GR = 0x3B+((parts[i].life>10?10:parts[i].life)*19);
+					vid[ny*(XRES+BARSIZE)+nx] = PIXRGB(10, GR, GR);
+					if (cmode == CM_BLOB) {
+						blendpixel(vid, nx+1, ny, 10, GR/2, GR, 223);
+						blendpixel(vid, nx-1, ny, 10, GR/2, GR, 223);
+						blendpixel(vid, nx, ny+1, 10, GR/2, GR, 223);
+						blendpixel(vid, nx, ny-1, 10, GR/2, GR, 223);
+
+						blendpixel(vid, nx+1, ny-1, 10, GR/2, GR, 112);
+						blendpixel(vid, nx-1, ny-1, 10, GR/2, GR, 112);
+						blendpixel(vid, nx+1, ny+1, 10, GR/2, GR, 112);
+						blendpixel(vid, nx-1, ny+1, 10, GR/2, GR, 112);
+					}
+				}
 				else if (t==PT_PLSM)
 				{
 					float ttemp = (float)parts[i].life;
diff --git a/src/powder.c b/src/powder.c
index c048e97..5b81890 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -215,7 +215,7 @@ int try_move(int i, int x, int y, int nx, int ny)
 			if ((r & 0xFF) < PT_NUM && ptypes[r&0xFF].hconduct)
 				parts[i].temp = parts[r>>8].temp = restrict_flt((parts[r>>8].temp+parts[i].temp)/2, MIN_TEMP, MAX_TEMP);
 		}
-		if (parts[i].type==PT_NEUT && ((r&0xFF)==PT_CLNE || (r&0xFF)==PT_PCLN || (r&0xFF)==PT_BCLN)) {
+		if (parts[i].type==PT_NEUT && ((r&0xFF)==PT_CLNE || (r&0xFF)==PT_PCLN || (r&0xFF)==PT_BCLN || (r&0xFF)==PT_PBCN)) {
 			if (!parts[r>>8].ctype)
 				parts[r>>8].ctype = PT_NEUT;
 		}
@@ -652,7 +652,7 @@ inline int create_part(int p, int x, int y, int t)//the function for creating a
 		{
 			if (t==SPC_HEAT&&parts[pmap[y][x]>>8].temp<MAX_TEMP)
 			{
-				if ((pmap[y][x]&0xFF)==PT_PUMP) {
+				if ((pmap[y][x]&0xFF)==PT_PUMP || (pmap[y][x]&0xFF)==PT_GPMP) {
 					parts[pmap[y][x]>>8].temp = restrict_flt(parts[pmap[y][x]>>8].temp + 0.1f, MIN_TEMP, MAX_TEMP);
 				} else if ((sdl_mod & (KMOD_SHIFT)) && (sdl_mod & (KMOD_CTRL))) {
 					parts[pmap[y][x]>>8].temp = restrict_flt(parts[pmap[y][x]>>8].temp + 50.0f, MIN_TEMP, MAX_TEMP);
@@ -662,7 +662,7 @@ inline int create_part(int p, int x, int y, int t)//the function for creating a
 			}
 			if (t==SPC_COOL&&parts[pmap[y][x]>>8].temp>MIN_TEMP)
 			{
-				if ((pmap[y][x]&0xFF)==PT_PUMP) {
+				if ((pmap[y][x]&0xFF)==PT_PUMP || (pmap[y][x]&0xFF)==PT_GPMP) {
 					parts[pmap[y][x]>>8].temp = restrict_flt(parts[pmap[y][x]>>8].temp - 0.1f, MIN_TEMP, MAX_TEMP);
 				} else if ((sdl_mod & (KMOD_SHIFT)) && (sdl_mod & (KMOD_CTRL))) {
 					parts[pmap[y][x]>>8].temp = restrict_flt(parts[pmap[y][x]>>8].temp - 50.0f, MIN_TEMP, MAX_TEMP);
@@ -741,7 +741,16 @@ inline int create_part(int p, int x, int y, int t)//the function for creating a
 	{
 		if (pmap[y][x])
 		{
-			if (((pmap[y][x]&0xFF)==PT_CLNE||(pmap[y][x]&0xFF)==PT_BCLN||((pmap[y][x]&0xFF)==PT_PCLN&&t!=PT_PSCN&&t!=PT_NSCN))&&(t!=PT_CLNE&&t!=PT_PCLN&&t!=PT_BCLN&&t!=PT_STKM&&t!=PT_STKM2))
+			if ((
+				(pmap[y][x]&0xFF)==PT_CLNE||
+				(pmap[y][x]&0xFF)==PT_BCLN||
+				((pmap[y][x]&0xFF)==PT_PCLN&&t!=PT_PSCN&&t!=PT_NSCN)||
+				((pmap[y][x]&0xFF)==PT_PBCN&&t!=PT_PSCN&&t!=PT_NSCN)
+			)&&(
+				t!=PT_CLNE&&t!=PT_PCLN&&
+				t!=PT_BCLN&&t!=PT_STKM&&
+				t!=PT_STKM2&&t!=PT_PBCN)
+			)
 			{
 				parts[pmap[y][x]>>8].ctype = t;
 			}