matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make LITH->GLAS reaction easier

Browse Source
This commit is contained in:
jacob1 2021-07-13 23:01:02 -04:00
parent 31f1b62a4c
commit cea629c6c0
No known key found for this signature in database
GPG Key ID: 4E58A32D510E1995
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/simulation/Simulation.cpp
View File

@ -3853,17 +3853,17 @@ void Simulation::UpdateParticles(int start, int end)
} }
else if (t == PT_LAVA) else if (t == PT_LAVA)
{ {
if (parts[i].ctype>0 && parts[i].ctype<PT_NUM && parts[i].ctype!=PT_LAVA && parts[i].ctype!=PT_LAVA && elements[parts[i].ctype].Enabled) if (parts[i].ctype > 0 && parts[i].ctype < PT_NUM && parts[i].ctype != PT_LAVA && elements[parts[i].ctype].Enabled)
{ {
if (parts[i].ctype==PT_THRM&&pt>=elements[PT_BMTL].HighTemperature) if (parts[i].ctype == PT_THRM && pt >= elements[PT_BMTL].HighTemperature)
s = 0; s = 0;
else if ((parts[i].ctype==PT_VIBR || parts[i].ctype==PT_BVBR) && pt>=273.15f) else if ((parts[i].ctype == PT_VIBR || parts[i].ctype == PT_BVBR) && pt >= 273.15f)
s = 0; s = 0;
else if (parts[i].ctype==PT_TUNG) else if (parts[i].ctype == PT_TUNG)
{ {
// TUNG does its own melting in its update function, so HighTemperatureTransition is not LAVA so it won't be handled by the code for HighTemperatureTransition==PT_LAVA below // TUNG does its own melting in its update function, so HighTemperatureTransition is not LAVA so it won't be handled by the code for HighTemperatureTransition==PT_LAVA below
// However, the threshold is stored in HighTemperature to allow it to be changed from Lua // However, the threshold is stored in HighTemperature to allow it to be changed from Lua
if (pt>=elements[parts[i].ctype].HighTemperature) if (pt >= elements[parts[i].ctype].HighTemperature)
s = 0; s = 0;
} }
else if (parts[i].ctype == PT_CRMC) else if (parts[i].ctype == PT_CRMC)
@ -3947,6 +3947,7 @@ void Simulation::UpdateParticles(int start, int end)
else if (parts[i].ctype == PT_SAND) parts[i].ctype = PT_GLAS; else if (parts[i].ctype == PT_SAND) parts[i].ctype = PT_GLAS;
else if (parts[i].ctype == PT_BGLA) parts[i].ctype = PT_GLAS; else if (parts[i].ctype == PT_BGLA) parts[i].ctype = PT_GLAS;
else if (parts[i].ctype == PT_PQRT) parts[i].ctype = PT_QRTZ; else if (parts[i].ctype == PT_PQRT) parts[i].ctype = PT_QRTZ;
else if (parts[i].ctype == PT_LITH && parts[i].tmp2 > 3) parts[i].ctype = PT_GLAS;
parts[i].life = RNG::Ref().between(240, 359); parts[i].life = RNG::Ref().between(240, 359);
} }
transitionOccurred = true; transitionOccurred = true;

2
src/simulation/elements/LITH.cpp
View File

@ -209,7 +209,7 @@ static int update(UPDATE_FUNC_ARGS)
} }
} }
} }
if (self.temp > 440.f && burnTimer == 1000) if (burnTimer == 1000)
{ {
sim->part_change_type(i, x, y, PT_LAVA); sim->part_change_type(i, x, y, PT_LAVA);
if (carbonationFactor < 3) if (carbonationFactor < 3)