Fix hydrogen not burning right (with and without realistic heat), allow h2 to burn at all temps while still allowing fusion to work correctly

1 files changed, 24 insertions, 10 deletions

diff --git a/src/simulation/elements/H2.cpp b/src/simulation/elements/H2.cpp
index 31e7d06..2b6c31b 100644
--- a/src/simulation/elements/H2.cpp
+++ b/src/simulation/elements/H2.cpp
@@ -48,11 +48,8 @@ Element_H2::Element_H2()
 
 //#TPT-Directive ElementHeader Element_H2 static int update(UPDATE_FUNC_ARGS)
 int Element_H2::update(UPDATE_FUNC_ARGS)
-
 {
 	int r,rx,ry,rt;
-	if (parts[i].temp > 2273.15 && sim->pv[y/CELL][x/CELL] > 50.0f)
-		parts[i].tmp = 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))
@@ -66,9 +63,9 @@ int Element_H2::update(UPDATE_FUNC_ARGS)
 					sim->part_change_type(r>>8,x+rx,y+ry,PT_WATR);
 					sim->part_change_type(i,x,y,PT_OIL);
 				}
-				if (parts[r>>8].temp > 2273.15)// && pv[y/CELL][x/CELL] > 50.0f)
+				if (parts[r>>8].temp > 2273.15 && sim->pv[y/CELL][x/CELL] > 45.0f)
 					continue;
-				if (parts[i].temp < 2273.15)
+				if (sim->pv[y/CELL][x/CELL] <= 45.0f)
 				{
 					if (rt==PT_FIRE)
 					{
@@ -77,7 +74,7 @@ int Element_H2::update(UPDATE_FUNC_ARGS)
 						parts[r>>8].temp=3473;
 						parts[r>>8].tmp |= 1;
 					}
-					if (rt==PT_FIRE || rt==PT_PLSM || rt==PT_LAVA)
+					if (rt==PT_FIRE || (rt==PT_PLSM && !(parts[r>>8].tmp&4)) || (rt==PT_LAVA && parts[r>>8].ctype != PT_BMTL))
 					{
 						sim->create_part(i,x,y,PT_FIRE);
 						parts[i].temp+=(rand()/(RAND_MAX/100));
@@ -93,11 +90,28 @@ int Element_H2::update(UPDATE_FUNC_ARGS)
 			float temp = parts[i].temp;
 			sim->create_part(i,x,y,PT_NBLE);
 
-			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT); if (j != -1) parts[j].temp = temp;
-			if (!(rand()%10)) { j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); if (j != -1) parts[j].temp = temp; }
-			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); if (j != -1) { parts[j].ctype = 0x7C0000; parts[j].temp = temp; }
+			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT);
+			if (j != -1)
+				parts[j].temp = temp;
+			if (!(rand()%10))
+			{
+				j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC);
+				if (j != -1)
+					parts[j].temp = temp;
+			}
+			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT);
+			if (j != -1)
+			{
+				parts[j].ctype = 0x7C0000;
+				parts[j].temp = temp;
+			}
 
-			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM); if (j != -1) parts[j].temp = temp;
+			j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM);
+			if (j != -1)
+			{
+				parts[j].temp = temp;
+				parts[j].tmp |= 4;
+			}
 
 			parts[i].temp = temp+750+rand()%500;
 			sim->pv[y/CELL][x/CELL] += 30;