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

GEL and SPNG absorb water from more elements and leave behind what the water was mixed width

Browse Source
This commit is contained in:
Simon Robertshaw 2012-08-28 12:38:18 +01:00
parent 86fc8e1eb3
commit 91ec4d1125
2 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/simulation/elements/GEL.cpp
View File

@ -61,12 +61,32 @@ int Element_GEL::update(UPDATE_FUNC_ARGS)
continue; continue;
//Desaturation //Desaturation
if (((r&0xFF)==PT_WATR || (r&0xFF)==PT_DSTW || (r&0xFF)==PT_SLTW || (r&0xFF)==PT_CBNW) if (((r&0xFF)==PT_WATR || (r&0xFF)==PT_DSTW || (r&0xFF)==PT_FRZW) && parts[i].tmp<100)
&& parts[i].tmp<100)
{ {
parts[i].tmp++; parts[i].tmp++;
sim->kill_part(r>>8); sim->kill_part(r>>8);
} }
if (((r&0xFF)==PT_PSTE) && parts[i].tmp<100)
{
parts[i].tmp++;
sim->create_part(r>>8, x+rx, y+ry, PT_CLST);
}
if (((r&0xFF)==PT_SLTW) && parts[i].tmp<100)
{
parts[i].tmp++;
if (rand()%4)
sim->kill_part(r>>8);
else
sim->part_change_type(r>>8, x+rx, y+ry, PT_SALT);
}
if (((r&0xFF)==PT_CBNW) && parts[i].tmp<100)
{
parts[i].tmp++;
if (rand()%4)
sim->kill_part(r>>8);
else
sim->part_change_type(r>>8, x+rx, y+ry, PT_CO2);
}
if ((r&0xFF)==PT_SPNG && parts[i].tmp<100 && ((parts[r>>8].life+1)>parts[i].tmp)) if ((r&0xFF)==PT_SPNG && parts[i].tmp<100 && ((parts[r>>8].life+1)>parts[i].tmp))
{ {

23
src/simulation/elements/SPNG.cpp
View File

@ -59,11 +59,32 @@ int Element_SPNG::update(UPDATE_FUNC_ARGS)
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
if (!r) if (!r)
continue; continue;
if ((r&0xFF)==PT_WATR&&33>=rand()/(RAND_MAX/100)+1) if (((r&0xFF)==PT_WATR || (r&0xFF)==PT_DSTW || (r&0xFF)==PT_FRZW)&&33>=rand()/(RAND_MAX/100)+1)
{ {
parts[i].life++; parts[i].life++;
sim->kill_part(r>>8); sim->kill_part(r>>8);
} }
if ((r&0xFF)==PT_SLTW&&33>=rand()/(RAND_MAX/100)+1)
{
parts[i].life++;
if (rand()%4)
sim->kill_part(r>>8);
else
sim->part_change_type(r>>8, x+rx, y+ry, PT_SALT);
}
if ((r&0xFF)==PT_CBNW&&33>=rand()/(RAND_MAX/100)+1)
{
parts[i].life++;
if (rand()%4)
sim->kill_part(r>>8);
else
sim->part_change_type(r>>8, x+rx, y+ry, PT_CO2);
}
if ((r&0xFF)==PT_PSTE&&33>=rand()/(RAND_MAX/100)+1)
{
parts[i].life++;
sim->create_part(r>>8, x+rx, y+ry, PT_CLST);
}
} }
} }
else else