Fusion, step 1

2 files changed, 37 insertions, 11 deletions

diff --git a/src/elements/h2.c b/src/elements/h2.c
index c601108..529f22b 100644
--- a/src/elements/h2.c
+++ b/src/elements/h2.c
@@ -16,19 +16,44 @@ int update_H2(UPDATE_FUNC_ARGS)
 					part_change_type(r>>8,x+rx,y+ry,PT_WATR);
 					part_change_type(i,x,y,PT_OIL);
 				}
-				if ((r&0xFF)==PT_FIRE)
+				if (parts[i].tmp != 1)
 				{
-					parts[r>>8].temp=2473.15;
-					if(parts[r>>8].tmp&0x02)
-					parts[r>>8].temp=3473;
-					parts[r>>8].tmp |= 1;
-				}
-				if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM || (r&0xFF)==PT_LAVA)
-				{
-					create_part(i,x,y,PT_FIRE);
-					parts[i].temp+=(rand()/(RAND_MAX/100));
-					parts[i].tmp |= 1;
+					if ((r&0xFF)==PT_FIRE)
+					{
+						parts[r>>8].temp=2473.15;
+						if(parts[r>>8].tmp&0x02)
+						parts[r>>8].temp=3473;
+						parts[r>>8].tmp |= 1;
+					}
+					if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM || (r&0xFF)==PT_LAVA)
+					{
+						create_part(i,x,y,PT_FIRE);
+						parts[i].temp+=(rand()/(RAND_MAX/100));
+						parts[i].tmp |= 1;
+					}
 				}
+				if (parts[i].temp > 2273.15 && pv[y/CELL][x/CELL] > 50.0f && (r&0xFF) == PT_H2)
+					parts[r>>8].tmp = 1;
 			}
+	if (parts[i].temp > 2273.15 && pv[y/CELL][x/CELL] > 50.0f)
+	{
+		parts[i].tmp = 1;
+		if (rand()%5 < 1)
+		{
+			int j;
+			part_change_type(i,x,y,PT_PLSM);
+			create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT);
+			create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC);
+			j = create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT);
+			if (j)
+				parts[j].ctype = 0xFFFF00;
+			create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NBLE);
+			if (rand()%2)
+				create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NBLE);
+			if (parts[i].temp < 4273.15)
+				parts[i].temp = 4273.15;
+			pv[y/CELL][x/CELL] += 50;
+		}
+	}
 	return 0;
 }
diff --git a/src/elements/pyro.c b/src/elements/pyro.c
index dc51e76..aa386eb 100644
--- a/src/elements/pyro.c
+++ b/src/elements/pyro.c
@@ -46,6 +46,7 @@ int update_PYRO(UPDATE_FUNC_ARGS) {
 					(t!=PT_SPRK || (rt!=PT_RBDM && rt!=PT_LRBD && rt!=PT_INSL)) &&
 					(t!=PT_PHOT || rt!=PT_INSL) &&
 				    (rt!=PT_SPNG || parts[r>>8].life==0) &&
+					(rt!=PT_H2 || parts[r>>8].tmp!=1) &&
 					ptypes[rt].flammable && (ptypes[rt].flammable + (int)(pv[(y+ry)/CELL][(x+rx)/CELL]*10.0f))>(rand()%1000))
 				{
 					part_change_type(r>>8,x+rx,y+ry,PT_FIRE);