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

Awesome QRTZ from Cate

Browse Source
This commit is contained in:
Simon 2011-03-24 20:06:22 +00:00
parent 635ad0afdc
commit 82d0d63be9
2 changed files with 64 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/elements/qrtz.c
View File

@ -1,11 +1,74 @@
#include <element.h>
int update_QRTZ(UPDATE_FUNC_ARGS) {
int r, tmp, trade, rx, ry;
parts[i].pavg[0] = parts[i].pavg[1];
parts[i].pavg[1] = pv[y/CELL][x/CELL];
if (parts[i].pavg[1]-parts[i].pavg[0] > 0.05*(parts[i].temp/3) || parts[i].pavg[1]-parts[i].pavg[0] < -0.05*(parts[i].temp/3))
{
part_change_type(i,x,y,PT_PQRT);
}
for (rx=-2; rx<3; rx++)
for (ry=-2; ry<3; ry++)
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{
r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || !r)
continue;
else if ((r&0xFF)==PT_SLTW && (1>rand()%5000))
{
kill_part(r>>8);
parts[i].life = 1;
}
}
if (parts[i].life==1)
{
for (rx=-1; rx<2; rx++)
for (ry=-1; ry<2; ry++)
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{
r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || r)
continue;
create_part(-1,x+rx,y+ry,PT_QRTZ);
parts[i].life = 0;
}
}
for ( trade = 0; trade<9; trade ++)
{
rx = rand()%5-2;
ry = rand()%5-2;
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{
r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || !r)
continue;
if ((r&0xFF)==PT_QRTZ&&(parts[i].life>parts[r>>8].life)&&parts[i].life>0)//diffusion
{
tmp = parts[i].life - parts[r>>8].life;
if (tmp ==1)
{
parts[r>>8].life ++;
parts[i].life --;
trade = 9;
}
if (tmp>0)
{
parts[r>>8].life += tmp/2;
parts[i].life -= tmp/2;
trade = 9;
}
}
}
}
return 0;
}

3
src/powder.c
View File

@ -1369,8 +1369,7 @@ void update_particles_i(pixel *vid, int start, int inc)
t = parts[i].type;
//printf("parts[%d].type: %d\n", i, parts[i].type);
if (parts[i].life && t!=PT_ACID && t!=PT_COAL && t!=PT_WOOD && t!=PT_STKM && t!=PT_STKM2 && t!=PT_FUSE && t!=PT_FSEP && t!=PT_BCOL && t!=PT_GOL && t!=PT_SPNG && t!=PT_DEUT && t!=PT_PRTO && t!=PT_PRTI)
if (parts[i].life && t!=PT_ACID && t!=PT_COAL && t!=PT_WOOD && t!=PT_STKM && t!=PT_STKM2 && t!=PT_FUSE && t!=PT_FSEP && t!=PT_BCOL && t!=PT_GOL && t!=PT_SPNG && t!=PT_QRTZ && t!=PT_DEUT && t!=PT_PRTO && t!=PT_PRTI)
{
if (!(parts[i].life==10&&(t==PT_SWCH||t==PT_LCRY||t==PT_PCLN||t==PT_HSWC||t==PT_PUMP)))
parts[i].life--;