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

TPT: Fix salt/water proportions when dissolving into DSTW as well

Browse Source
This commit is contained in:
Simon Robertshaw 2012-08-20 14:08:27 +01:00
parent 29283b038c
commit fb02d57aca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,13 +60,15 @@ int Element_DSTW::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);
// on average, convert 3 DSTW to SLTW before SALT turns into SLTW
if (rand()%3==0)
sim->part_change_type(r>>8,x+rx,y+ry,PT_SLTW); sim->part_change_type(r>>8,x+rx,y+ry,PT_SLTW);
} }
if (((r&0xFF)==PT_WATR||(r&0xFF)==PT_SLTW) && 1>(rand()%500)) if (((r&0xFF)==PT_WATR||(r&0xFF)==PT_SLTW) && 1>(rand()%500))
{ {
sim->part_change_type(i,x,y,PT_WATR); sim->part_change_type(i,x,y,PT_WATR);
} }
if ((r&0xFF)==PT_SLTW && 1>(rand()%500)) if ((r&0xFF)==PT_SLTW && 1>(rand()%10000))
{ {
sim->part_change_type(i,x,y,PT_SLTW); sim->part_change_type(i,x,y,PT_SLTW);
} }