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

TPT: Consistent proportions of WATR and SALT in SLTW (1 SALT + 3 WATR = 4 SLTW)

Browse Source
This commit is contained in:
Simon Robertshaw 2012-08-20 13:55:11 +01:00
parent 7fc8d5f388
commit 29283b038c
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/simulation/Simulation.cpp
View File

@ -3626,7 +3626,7 @@ void Simulation::update_particles_i(int start, int inc)
{ {
pt = (c_heat - elements[t].Enthalpy)/c_Cm; pt = (c_heat - elements[t].Enthalpy)/c_Cm;
if (1>rand()%6) t = PT_SALT; if (rand()%4==0) t = PT_SALT;
else t = PT_WTRV; else t = PT_WTRV;
} }
else else

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

@ -58,7 +58,7 @@ int Element_SLTW::update(UPDATE_FUNC_ARGS)
if (!r) if (!r)
continue; continue;
if ((r&0xFF)==PT_SALT && 1>(rand()%10000)) if ((r&0xFF)==PT_SALT && 1>(rand()%10000))
sim->kill_part(r>>8); sim->part_change_type(r>>8,x+rx,y+ry,PT_SLTW);
if ((r&0xFF)==PT_PLNT&&5>(rand()%1000)) if ((r&0xFF)==PT_PLNT&&5>(rand()%1000))
sim->kill_part(r>>8); sim->kill_part(r>>8);
if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && !sim->legacy_enable && parts[i].temp>(273.15f+12.0f) && 1>(rand()%500)) if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && !sim->legacy_enable && parts[i].temp>(273.15f+12.0f) && 1>(rand()%500))

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

@ -61,7 +61,9 @@ int Element_WATR::update(UPDATE_FUNC_ARGS)
if ((r&0xFF)==PT_SALT && 1>(rand()%250)) if ((r&0xFF)==PT_SALT && 1>(rand()%250))
{ {
sim->part_change_type(i,x,y,PT_SLTW); sim->part_change_type(i,x,y,PT_SLTW);
sim->part_change_type(r>>8,x+rx,y+ry,PT_SLTW); // on average, convert 3 WATR to SLTW before SALT turns into SLTW
if (rand()%3==0)
sim->part_change_type(r>>8,x+rx,y+ry,PT_SLTW);
} }
if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && (sim->legacy_enable||parts[i].temp>(273.15f+12.0f)) && 1>(rand()%500)) if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && (sim->legacy_enable||parts[i].temp>(273.15f+12.0f)) && 1>(rand()%500))
{ {