Skip to content

Commit 14ba1db

Browse files
committed
tpt++/jacksonmj: Fix SNOW(SLTW) melting temperature, and change ACID hardness value to make more sense on the wiki a78bd78 02e1969
tpt++/jacksonmj: Prevent fast particles from skipping over DESTROYALL wall f7b53d0
1 parent 45b6dbd commit 14ba1db

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/powder.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,7 +1300,7 @@ int transfer_heat(int i, int surround[8])
13001300
{
13011301
if (parts[i].ctype > 0 && parts[i].ctype < PT_NUM&&parts[i].ctype != t)
13021302
{
1303-
if (ptransitions[parts[i].ctype].tlt==t&&pt<ptransitions[parts[i].ctype].tlv)
1303+
if ((ptransitions[parts[i].ctype].tlt==PT_ICEI || ptransitions[parts[i].ctype].tlt==PT_SNOW) && pt<ptransitions[parts[i].ctype].tlv)
13041304
s = 0;
13051305
else
13061306
{
@@ -1326,7 +1326,7 @@ int transfer_heat(int i, int surround[8])
13261326
{
13271327
if (parts[i].ctype>0&&parts[i].ctype<PT_NUM&&parts[i].ctype!=t)
13281328
{
1329-
if (ptransitions[parts[i].ctype].tlt==t&&pt<ptransitions[parts[i].ctype].tlv)
1329+
if ((ptransitions[parts[i].ctype].tlt==PT_ICEI || ptransitions[parts[i].ctype].tlt==PT_SNOW) && pt<ptransitions[parts[i].ctype].tlv)
13301330
s = 0;
13311331
else
13321332
{

src/simulation/Simulation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ bool Simulation::UpdateParticle(int i)
970970
clear_y = (int)(clear_yf+0.5f);
971971
break;
972972
}
973-
if (!eval_move(t, fin_x, fin_y, NULL) || (t == PT_PHOT && pmap[fin_y][fin_x]))
973+
if (!eval_move(t, fin_x, fin_y, NULL) || (t == PT_PHOT && pmap[fin_y][fin_x]) || bmap[fin_y/CELL][fin_x/CELL]==WL_DESTROYALL)
974974
{
975975
// found an obstacle
976976
clear_xf = fin_xf-dx;

src/simulation/elements/ACID.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ void ACID_init_element(ELEMENT_INIT_FUNC_ARGS)
127127
elem->Flammable = 40;
128128
elem->Explosive = 0;
129129
elem->Meltable = 0;
130-
elem->Hardness = 1;
130+
elem->Hardness = 0;
131131
elem->PhotonReflectWavelengths = 0x1FE001FE;
132132

133133
elem->Weight = 10;

src/simulation/elements/SNOW.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void SNOW_init_element(ELEMENT_INIT_FUNC_ARGS)
5858
elem->HighPressureTransitionElement = NT;
5959
elem->LowTemperatureTransitionThreshold = ITL;
6060
elem->LowTemperatureTransitionElement = NT;
61-
elem->HighTemperatureTransitionThreshold = 273.0f;
61+
elem->HighTemperatureTransitionThreshold = 252.05f;
6262
elem->HighTemperatureTransitionElement = ST;
6363

6464
elem->Update = &ICE_update;

0 commit comments

Comments
 (0)