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

TPT: Prevent stacking from ELEC+NEUT, ELEC+water, and CO2 from BUBW ae5470ca78

Browse Source
This commit is contained in:
Simon Robertshaw 2012-07-25 15:55:42 +01:00
parent 08d1dd06ed
commit 6dc7eaf43e
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/simulation/elements/CO2.cpp
View File

@ -55,10 +55,10 @@ int Element_CO2::update(UPDATE_FUNC_ARGS)
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{
r = pmap[y+ry][x+rx];
if (20>(rand()%40000)&&parts[i].ctype==5)
if (parts[i].ctype==5 && 20>(rand()%40000))
{
parts[i].ctype = 0;
sim->create_part(-3, x, y, PT_WATR);
if (sim->create_part(-1, x+rx, y+ry, PT_WATR)>=0)
parts[i].ctype = 0;
}
if ((r>>8)>=NPART || !r)
continue;
@ -72,7 +72,10 @@ int Element_CO2::update(UPDATE_FUNC_ARGS)
if (((r&0xFF)==PT_WATR || (r&0xFF)==PT_DSTW) && 1>(rand()%250))
{
sim->part_change_type(i,x,y,PT_CBNW);
sim->kill_part(r>>8);
if (parts[i].ctype==5) //conserve number of water particles - ctype=5 means this CO2 hasn't released the water particle from BUBW yet
sim->create_part(r>>8, x+rx, y+ry, PT_CBNW);
else
sim->kill_part(r>>8);
}
}
if (parts[i].temp > 9773.15 && sim->pv[y/CELL][x/CELL] > 200.0f)

8
src/simulation/elements/ELEC.cpp
View File

@ -98,21 +98,15 @@ int Element_ELEC::update(UPDATE_FUNC_ARGS)
if(rand()%2)
{
sim->create_part(r>>8, x+rx, y+ry, PT_H2);
sim->part_change_type(i, x, y, PT_O2);
parts[i].life = 0;
parts[i].ctype = 0;
return 1;
}
else
{
sim->create_part(r>>8, x+rx, y+ry, PT_O2);
sim->part_change_type(i, x, y, PT_H2);
parts[i].life = 0;
parts[i].ctype = 0;
return 1;
}
}
if ((r&0xFF)==PT_NEUT)
if ((r&0xFF)==PT_NEUT && !pmap[y+ry][x+rx])
{
sim->part_change_type(r>>8, x+rx, y+ry, PT_H2);
parts[r>>8].life = 0;