More stuff for CO2

3 files changed, 79 insertions, 1 deletions

diff --git a/src/elements/cbnw.c b/src/elements/cbnw.c
new file mode 100644
index 0000000..7329f96
--- /dev/null
+++ b/src/elements/cbnw.c
@@ -0,0 +1,71 @@
+#include <element.h>
+
+int update_CBNW(UPDATE_FUNC_ARGS) {
+	int r, rx, ry, oldt;
+	oldt = parts[i].tmp;
+	if (parts[i].tmp>0)
+		parts[i].tmp--;
+	if(!(rand()%200))
+	{
+		parts[i].tmp2 = rand()%40;
+	} else if(parts[i].tmp2!=20) {
+		parts[i].tmp2 -= (parts[i].tmp2>20)?1:-1;
+	}
+	if(oldt==1)
+	{
+		//Explode
+		if(!(rand()%2))
+		{
+			part_change_type(i,x,y,PT_WATR);
+		} else {
+			pv[y/CELL][x/CELL] += 0.5f;
+			part_change_type(i,x,y,PT_CO2);
+		}
+	}
+	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_SALT && parts[i].tmp == 0 && 1>(rand()%250))
+				{
+					//Start explode
+					parts[i].tmp = (rand()%100)+50;
+				}
+				if ((r&0xFF)==PT_CBNW)
+				{
+					if(!parts[i].tmp && parts[r>>8].tmp)
+					{
+						parts[i].tmp = parts[r>>8].tmp;
+						if((r>>8)>i) //If the other particle hasn't been life updated
+							parts[i].tmp--;
+					}
+					else if(parts[i].tmp && !parts[r>>8].tmp)
+					{
+						parts[r>>8].tmp = parts[i].tmp;
+						if((r>>8)>i) //If the other particle hasn't been life updated
+							parts[r>>8].tmp++;
+					}
+				}
+				if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && (legacy_enable||parts[i].temp>(273.15f+12.0f)) && 1>(rand()%500))
+				{
+					part_change_type(i,x,y,PT_FIRE);
+					parts[i].life = 4;
+				}
+				if ((r&0xFF)==PT_FIRE){
+					kill_part(r>>8);
+						if(1>(rand()%150)){
+							kill_part(i);
+							return 1;
+						}
+				}
+				/*if ((r&0xFF)==PT_CNCT && 1>(rand()%500))	Concrete+Water to paste, not very popular
+				{
+					part_change_type(i,x,y,PT_PSTE);
+					kill_part(r>>8);
+				}*/
+			}
+	return 0;
+}
diff --git a/src/elements/co2.c b/src/elements/co2.c
index 9c5463a..e9114a8 100644
--- a/src/elements/co2.c
+++ b/src/elements/co2.c
@@ -9,6 +9,13 @@ int update_CO2(UPDATE_FUNC_ARGS) {
 				r = pmap[y+ry][x+rx];
 				if ((r>>8)>=NPART || !r)
 					continue;
+				if ((r&0xFF)==PT_FIRE){
+					kill_part(r>>8);
+						if(1>(rand()%150)){
+							kill_part(i);
+							return 1;
+						}
+				}
 				/*if ((r&0xFF)==PT_CNCT && 1>(rand()%500))	Concrete+Water to paste, not very popular
 				{
 					part_change_type(i,x,y,PT_PSTE);
diff --git a/src/elements/plnt.c b/src/elements/plnt.c
index 2ca38dd..5baec2f 100644
--- a/src/elements/plnt.c
+++ b/src/elements/plnt.c
@@ -20,7 +20,7 @@ int update_PLNT(UPDATE_FUNC_ARGS) {
 					part_change_type(i,x,y,PT_FIRE);
 					parts[i].life = 4;
 				}
-				else if ((r&0xFF)==PT_SMKE && (1>rand()%250))
+				else if (((r&0xFF)==PT_SMKE || (r&0xFF)==PT_CO2) && (1>rand()%250))
 				{
 					kill_part(r>>8);
 					parts[i].life = rand()%60 + 60;