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

Fix solidification temperature of molten TUGN

Browse Source 
Previously it was 973 K, not the same as the melting point of TUGN
This commit is contained in:
jacksonmj 2013-05-04 16:58:57 +01:00
parent f93a70edfb
commit 79a75c4441
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/simulation/Simulation.cpp
View File

@ -4001,6 +4001,9 @@ void Simulation::update_particles_i(int start, int inc)
if (parts[i].ctype>0 && parts[i].ctype<PT_NUM && parts[i].ctype!=PT_LAVA) {
if (parts[i].ctype==PT_THRM&&pt>=elements[PT_BMTL].HighTemperature) s = 0;
else if ((parts[i].ctype==PT_VIBR || parts[i].ctype==PT_BVBR) && pt>=273.15f) s = 0;
else if (parts[i].ctype==PT_TUGN) {
if (pt>3695.0) s = 0;
}
else if (elements[parts[i].ctype].HighTemperatureTransition==PT_LAVA) {
if (pt>=elements[parts[i].ctype].HighTemperature) s = 0;
}

4
src/simulation/elements/LAVA.cpp
View File

@ -37,7 +37,7 @@ Element_LAVA::Element_LAVA()
LowPressureTransition = NT;
HighPressure = IPH;
HighPressureTransition = NT;
LowTemperature = 2573.15f;
LowTemperature = 3695.0f;// Highest temperature at which any type of lava can solidify
LowTemperatureTransition = ST;
HighTemperature = ITH;
HighTemperatureTransition = NT;
@ -68,4 +68,4 @@ int Element_LAVA::graphics(GRAPHICS_FUNC_ARGS)
}
Element_LAVA::~Element_LAVA() {}
Element_LAVA::~Element_LAVA() {}

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

@ -40,7 +40,7 @@ Element_TUGN::Element_TUGN()
HighPressureTransition = NT;
LowTemperature = ITL;
LowTemperatureTransition = NT;
HighTemperature = ITL;
HighTemperature = ITH;
HighTemperatureTransition = NT;
/*HighTemperature = 3895.0f;
HighTemperatureTransition = PT_LAVA;*/