diff --git a/src/gui/game/GameView.cpp b/src/gui/game/GameView.cpp index ecfeb65d8..96705035a 100644 --- a/src/gui/game/GameView.cpp +++ b/src/gui/game/GameView.cpp @@ -2205,7 +2205,9 @@ void GameView::OnDraw() } // only elements that use .tmp2 show it in the debug HUD - if (type == PT_CRAY || type == PT_DRAY || type == PT_EXOT || type == PT_LIGH || type == PT_SOAP || type == PT_TRON || type == PT_VIBR || type == PT_VIRS || type == PT_WARP || type == PT_LCRY || type == PT_CBNW || type == PT_TSNS || type == PT_DTEC || type == PT_LSNS || type == PT_PSTN || type == PT_LDTC || type == PT_VSNS) + if (type == PT_CRAY || type == PT_DRAY || type == PT_EXOT || type == PT_LIGH || type == PT_SOAP || type == PT_TRON + || type == PT_VIBR || type == PT_VIRS || type == PT_WARP || type == PT_LCRY || type == PT_CBNW || type == PT_TSNS + || type == PT_DTEC || type == PT_LSNS || type == PT_PSTN || type == PT_LDTC || type == PT_VSNS || type == PT_LITH) sampleInfo << ", Tmp2: " << sample.particle.tmp2; sampleInfo << ", Pressure: " << sample.AirPressure; diff --git a/src/simulation/elements/FIRE.cpp b/src/simulation/elements/FIRE.cpp index e4390ef57..6b3e2c94d 100644 --- a/src/simulation/elements/FIRE.cpp +++ b/src/simulation/elements/FIRE.cpp @@ -120,7 +120,7 @@ int Element_FIRE_update(UPDATE_FUNC_ARGS) else parts[i].ctype = PT_IRON; } - else if (pres <= 255 && parts[i].temp >= 5000 && RNG::Ref().chance(1, 5)) + else if (parts[i].temp >= 5000 && RNG::Ref().chance(1, 5)) { if (RNG::Ref().chance(1, 5)) parts[i].ctype = PT_URAN; @@ -131,7 +131,7 @@ int Element_FIRE_update(UPDATE_FUNC_ARGS) } } } - else if (parts[i].ctype == PT_STNE && sim->pv[y / CELL][x / CELL] >= 30.0f) // Form ROCK with pressure + else if ((parts[i].ctype == PT_STNE || !parts[i].ctype) && sim->pv[y / CELL][x / CELL] >= 30.0f) // Form ROCK with pressure { parts[i].tmp2 = RNG::Ref().between(0, 10); // Provide tmp2 for color noise parts[i].ctype = PT_ROCK; diff --git a/src/simulation/elements/LITH.cpp b/src/simulation/elements/LITH.cpp index 8d706caf5..1568ac352 100644 --- a/src/simulation/elements/LITH.cpp +++ b/src/simulation/elements/LITH.cpp @@ -59,11 +59,6 @@ its hydroxide, and also has basic li-ion battery-like behavior. It absorbs CO2 like its hydroxide form, but can only be converted into GLAS after having absorbed CO2. -If LITH comes in contact with water, it will consume 1 WATR, increment tmp, -and heat itself up by 400K. At 1000K it bursts into flames and sets tmp to 10 -if still in contact with WATR, setting its life to 24 and insta-boiling -water in its immediate vincity. - */ static int update(UPDATE_FUNC_ARGS) diff --git a/src/simulation/elements/SLCN.cpp b/src/simulation/elements/SLCN.cpp index f9823229f..c740f3de9 100644 --- a/src/simulation/elements/SLCN.cpp +++ b/src/simulation/elements/SLCN.cpp @@ -31,7 +31,7 @@ void Element::Element_SLCN() Weight = 90; HeatConduct = 100; - Description = "Powdered Silicon. A key element in multiple materials."; + Description = "Powdered Silicon. A key ingredient in producing multiple materials."; Properties = TYPE_PART | PROP_CONDUCTS | PROP_HOT_GLOW | PROP_LIFE_DEC;