mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-23 08:22:55 +02:00
Code Issues Projects Releases Wiki Activity

Fix BASE eating ICE(BASE) and SNOW(BASE). Better concentration (thanks to @ArolaunTech), added rudimentary enthalpy of vaporization.

Browse Source
This commit is contained in:
Saveliy Skresanov
2025-03-09 20:42:25 +07:00
parent da4fe72154
commit 2a08c7abc1
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/simulation/elements/BASE.cpp
View File

@@ -68,12 +68,23 @@ static int update(UPDATE_FUNC_ARGS)
//Base evaporates into BOYL or increases concentration //Base evaporates into BOYL or increases concentration
if (parts[i].life < 100 && pres < 10.0f && parts[i].temp > (120.0f + 273.15f)) if (parts[i].life < 100 && pres < 10.0f && parts[i].temp > (120.0f + 273.15f))
{ {
if (sim->rng.chance(parts[i].life+900, 1000)) //Slow down boiling
parts[i].life++; if (sim->rng.chance(1, 20))
else
{ {
sim->create_part(i, x, y, PT_BOYL); //This way we preserve the total amount of concentrated BASE in the solution
return 1; 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);
}
} }
} }
@@ -100,7 +111,8 @@ static int update(UPDATE_FUNC_ARGS)
int rt = TYP(r); int rt = TYP(r);
if (rt != PT_BASE && rt != PT_SALT && rt != PT_SLTW && rt != PT_BOYL && rt != PT_MERC && 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_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 //Base is diluted by water
if (parts[i].life > 1 && (rt == PT_WATR || rt == PT_DSTW || rt == PT_CBNW)) if (parts[i].life > 1 && (rt == PT_WATR || rt == PT_DSTW || rt == PT_CBNW))