Merge remote-tracking branch 'origin/alkali' into playtest-june2025

Author: jacob1

src/simulation/elements/ANAR.cpp

@@ -25,7 +25,7 @@ void Element::Element_ANAR()
 	Flammable = 0;
 	Explosive = 0;
 	Meltable = 0;
-	Hardness = 30;
+	Hardness = 29;
 
 	Weight = 85;
 

src/simulation/elements/BASE.cpp

@@ -0,0 +1,242 @@
+#include "simulation/ElementCommon.h"
+
+static int update(UPDATE_FUNC_ARGS);
+static int graphics(GRAPHICS_FUNC_ARGS);
+
+void Element::Element_BASE()
+{
+	Identifier = "DEFAULT_PT_BASE";
+	Name = "BASE";
+	Colour = 0x90D5FF_rgb;
+	MenuVisible = 1;
+	MenuSection = SC_LIQUID;
+	Enabled = 1;
+
+	Advection = 0.5f;
+	AirDrag = 0.01f * CFDS;
+	AirLoss = 0.97f;
+	Loss = 0.96f;
+	Collision = 0.0f;
+	Gravity = 0.08f;
+	Diffusion = 0.00f;
+	HotAir = 0.000f	* CFDS;
+	Falldown = 2;
+
+	Flammable = 0;
+	Explosive = 0;
+	Meltable = 0;
+	Hardness = 0;
+
+	Weight = 16;
+
+	HeatConduct = 31;
+	Description = "Corrosive liquid. Rusts conductive solids, neutralizes acid.";
+
+	Properties = TYPE_LIQUID|PROP_DEADLY;
+
+	LowPressure = IPL;
+	LowPressureTransition = NT;
+	HighPressure = IPH;
+	HighPressureTransition = NT;
+	LowTemperature = ITL;
+	LowTemperatureTransition = NT;
+	HighTemperature = ITH;
+	HighTemperatureTransition = NT;
+
+	DefaultProperties.life = 75;
+
+	Update = &update;
+	Graphics = &graphics;
+}
+
+static int update(UPDATE_FUNC_ARGS)
+{
+	auto &sd = SimulationData::CRef();
+	auto &elements = sd.elements;
+
+	//Reset spark effect
+	parts[i].tmp = 0;
+
+	if (parts[i].life < 1)
+		parts[i].life = 1;
+
+	if (parts[i].life > 100)
+		parts[i].life = 100;
+
+	float pres = sim->pv[y/CELL][x/CELL];
+
+	//Base evaporates into BOYL or increases concentration
+	if (parts[i].life < 100 && pres < 10.0f && parts[i].temp > (120.0f + 273.15f))
+	{
+		//Slow down boiling
+		if (sim->rng.chance(1, 20))
+		{
+			//This way we preserve the total amount of concentrated BASE in the solution
+			if (sim->rng.chance(1, parts[i].life+1))
+			{
+				auto temp = parts[i].temp;
+				sim->create_part(i, x, y, PT_BOYL);
+				parts[i].temp = temp;
+				return 1;
+			}
+			else
+			{
+				parts[i].life++;
+				//Enthalpy of vaporization
+				parts[i].temp -= 20.0f / ((float)parts[i].life);
+			}
+		}
+	}
+
+	//Base's freezing point lowers with its concentration
+	if (parts[i].temp < (273.15f - ((float)parts[i].life)/4.0f))
+	{
+		//We don't save base's concentration, so ICEI(BASE) will unfreeze into life = 0
+		sim->part_change_type(i, x, y, PT_ICEI);
+		parts[i].ctype = PT_BASE;
+		parts[i].life = 0;
+		return 1;
+	}
+
+	//Reactions
+	for (auto rx = -1; rx <= 1; rx++)
+	{
+		for (auto ry = -1; ry <= 1; ry++)
+		{
+			if (rx || ry)
+			{
+				auto r = pmap[y+ry][x+rx];
+				if (!r)
+					continue;
+				int rt = TYP(r);
+
+				if (rt != PT_BASE && rt != PT_SALT && rt != PT_SLTW && rt != PT_BOYL && rt != PT_MERC &&
+					       	rt != PT_BMTL && rt != PT_BRMT && rt != PT_SOAP && rt != PT_CLNE && rt != PT_PCLN &&
+						!(rt == PT_ICEI && parts[ID(r)].ctype == PT_BASE) && !(rt == PT_SNOW && parts[ID(r)].ctype == PT_BASE))
+				{
+					//Base is diluted by water
+					if (parts[i].life > 1 && (rt == PT_WATR || rt == PT_DSTW || rt == PT_CBNW))
+					{
+					       	if (sim->rng.chance(1, 20))
+						{
+							int saturh = parts[i].life/2;
+
+							sim->part_change_type(ID(r), x+rx, y+ry, PT_BASE);
+							parts[ID(r)].life = saturh;
+							parts[ID(r)].temp += ((float)saturh)/10.0f;
+							parts[i].life -= saturh;
+						}
+					} //Base neutralizes acid
+					else if (rt == PT_ACID && parts[i].life >= parts[ID(r)].life)
+					{
+						sim->part_change_type(i, x, y, PT_SLTW);
+						sim->part_change_type(ID(r), x+rx, y+ry, PT_SLTW);
+						return 1;
+					} //BASE + OIL = SOAP
+					else if (parts[i].life >= 70 && rt == PT_OIL)
+					{
+						sim->part_change_type(i, x, y, PT_SOAP);
+						parts[i].tmp = parts[i].tmp2 = parts[i].ctype = 0;
+						sim->kill_part(ID(r));
+						return 1;
+					} //BASE + GOO = GEL
+					else if (parts[i].life > 1 && rt == PT_GOO)
+					{
+						sim->create_part(ID(r), x+rx, y+ry, PT_GEL);
+						parts[i].life--;
+					} //BASE + BCOL = GUNP
+					else if (parts[i].life > 1 && rt == PT_BCOL)
+					{
+						sim->create_part(ID(r), x+rx, y+ry, PT_GUNP);
+						parts[i].life--;
+					} //BASE + Molten ROCK = MERC
+				        else if (rt == PT_LAVA && parts[ID(r)].ctype == PT_ROCK && pres >= 10.0f && sim->rng.chance(1, 1000))
+					{
+						sim->part_change_type(i, x, y, PT_MERC);
+						parts[i].life = 0;
+						parts[i].tmp = 10;
+
+						sim->kill_part(ID(r));
+						return 1;
+					} //Base rusts conductive solids
+					else if (parts[i].life >= 10 &&
+						       	(elements[rt].Properties & (TYPE_SOLID|PROP_CONDUCTS)) == (TYPE_SOLID|PROP_CONDUCTS) && sim->rng.chance(1, 10))
+					{
+						sim->part_change_type(ID(r), x+rx, y+ry, PT_BMTL);
+						parts[ID(r)].tmp = sim->rng.between(20, 29);
+						parts[i].life--;
+						//Draw a spark effect
+						parts[i].tmp = 1;
+					} //Base destroys a substance slower if acid destroys it faster
+					else if (elements[rt].Hardness > 0 && elements[rt].Hardness < 50 &&
+							parts[i].life >= (2*elements[rt].Hardness) && sim->rng.chance(50-elements[rt].Hardness, 1000))
+					{
+						sim->kill_part(ID(r));
+						parts[i].life -= 2;
+						//Draw a spark
+						parts[i].tmp = 1;
+					}
+				}
+			}
+		}
+	}
+
+	//Diffusion
+	for (auto trade = 0; trade<2; trade++)
+	{
+		auto rx = sim->rng.between(-1, 1);
+		auto ry = sim->rng.between(-1, 1);
+		if (rx || ry)
+		{
+			auto r = pmap[y+ry][x+rx];
+			if (!r)
+				continue;
+			if (TYP(r) == PT_BASE && (parts[i].life > parts[ID(r)].life) && parts[i].life>1)
+			{
+				int temp = parts[i].life - parts[ID(r)].life;
+				if (temp == 1)
+				{
+					parts[ID(r)].life++;
+					parts[i].life--;
+				}
+				else if (temp>0)
+				{
+					parts[ID(r)].life += temp/2;
+					parts[i].life -= temp/2;
+				}
+			}
+		}
+	}
+	return 0;
+}
+
+static int graphics(GRAPHICS_FUNC_ARGS)
+{
+	int s = cpart->life;
+
+	if (s < 25)
+	{
+		*colr = 0x33;
+		*colg = 0x4C;
+		*colb = 0xD8;
+	}
+	else if (s < 50)
+	{
+		*colr = 0x58;
+		*colg = 0x83;
+		*colb = 0xE8;
+	}
+	else if (s < 75)
+	{
+		*colr = 0x7D;
+		*colg = 0xBA;
+		*colb = 0xF7;
+	}
+
+	*pixel_mode |= PMODE_BLUR;
+
+	if (cpart->tmp == 1)
+		*pixel_mode |= PMODE_SPARK;
+
+	return 0;
+}

src/simulation/elements/COAL.cpp

@@ -23,7 +23,7 @@ void Element::Element_COAL()
 	Flammable = 0;
 	Explosive = 0;
 	Meltable = 0;
-	Hardness = 20;
+	Hardness = 18;
 	PhotonReflectWavelengths = 0x00000000;
 
 	Weight = 100;

src/simulation/elements/DEUT.cpp

@@ -26,7 +26,7 @@ void Element::Element_DEUT()
 	Flammable = 0;
 	Explosive = 0;
 	Meltable = 0;
-	Hardness = 20;
+	Hardness = 19;
 
 	Weight = 31;
 

src/simulation/elements/DSTW.cpp

@@ -95,6 +95,18 @@ static int update(UPDATE_FUNC_ARGS)
 						return 1;
 					}
 					break;
+				case PT_SMKE: //DSTW + SMKE = BASE
+					if (parts[ID(r)].temp > (40 + 273.15f) && parts[ID(r)].temp < (60 + 273.15f) &&
+						parts[i].temp > (40 + 273.15f) && parts[i].temp < (60 + 273.15f))
+					{
+						if (sim->rng.chance(1, 100))
+						{
+							sim->part_change_type(i,x,y,PT_BASE);
+							parts[i].life = 1;
+							sim->kill_part(ID(r));
+						}
+					}
+					break;
 				default:
 					continue;
 				}

src/simulation/elements/EMBR.cpp

@@ -25,7 +25,7 @@ void Element::Element_EMBR()
 	Flammable = 0;
 	Explosive = 0;
 	Meltable = 0;
-	Hardness = 20;
+	Hardness = 21;
 
 	Weight = 30;
 

src/simulation/elements/FIRW.cpp

@@ -25,7 +25,7 @@ void Element::Element_FIRW()
 	Flammable = 0;
 	Explosive = 0;
 	Meltable = 0;
-	Hardness = 30;
+	Hardness = 28;
 
 	Weight = 55;
 

src/simulation/elements/FSEP.cpp

@@ -24,7 +24,7 @@ void Element::Element_FSEP()
 	Flammable = 0;
 	Explosive = 0;
 	Meltable = 0;
-	Hardness = 30;
+	Hardness = 27;
 
 	Weight = 70;
 

src/simulation/elements/FUSE.cpp

@@ -24,7 +24,7 @@ void Element::Element_FUSE()
 	Flammable = 0;
 	Explosive = 0;
 	Meltable = 0;
-	Hardness = 20;
+	Hardness = 19;
 
 	Weight = 100;
 

src/simulation/elements/GEL.cpp

@@ -25,7 +25,7 @@ void Element::Element_GEL()
 	Flammable = 0;
 	Explosive = 0;
 	Meltable = 0;
-	Hardness = 20;
+	Hardness = 19;
 
 	Weight = 35;