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 with

Browse Source
This commit is contained in:
jacob1 2012-08-07 15:34:47 -04:00 committed by jacksonmj
parent 2adea2f7e3
commit 8d6e0a835e
3 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/elements/clst.c
View File

@ -27,7 +27,7 @@ int update_CLST(UPDATE_FUNC_ARGS) {
continue;
if ((r&0xFF)==PT_WATR && 1>(rand()%1500))
{
part_change_type(i,x,y,PT_PSTS);
part_change_type(i,x,y,PT_PSTS);
kill_part(r>>8);
}
if ((r&0xFF)==PT_NITR)

24
src/elements/gel.c
View File

@ -30,12 +30,32 @@ int update_GEL(UPDATE_FUNC_ARGS) {
continue;
//Desaturation
if (((r&0xFF)==PT_WATR || (r&0xFF)==PT_DSTW || (r&0xFF)==PT_SLTW || (r&0xFF)==PT_CBNW)
&& parts[i].tmp<100)
if (((r&0xFF)==PT_WATR || (r&0xFF)==PT_DSTW || (r&0xFF)==PT_FRZW) && parts[i].tmp<100)
{
parts[i].tmp++;
kill_part(r>>8);
}
if (((r&0xFF)==PT_PSTE) && parts[i].tmp<100)
{
parts[i].tmp++;
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)
kill_part(r>>8);
else
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)
kill_part(r>>8);
else
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))
{

23
src/elements/spng.c
View File

@ -26,11 +26,32 @@ int update_SPNG(UPDATE_FUNC_ARGS) {
r = pmap[y+ry][x+rx];
if (!r)
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++;
kill_part(r>>8);
}
if ((r&0xFF)==PT_SLTW&&33>=rand()/(RAND_MAX/100)+1)
{
parts[i].life++;
if (rand()%4)
kill_part(r>>8);
else
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)
kill_part(r>>8);
else
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++;
create_part(r>>8, x+rx, y+ry, PT_CLST);
}
}
}
else