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

TPT: Fusion, step 1 446f773542

Browse Source
This commit is contained in:
Simon Robertshaw 2012-04-18 16:51:47 +01:00
parent 43ae47ba77
commit bc4a3355de
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/elements/h2.cpp
View File

@ -16,19 +16,44 @@ int update_H2(UPDATE_FUNC_ARGS)
sim->part_change_type(r>>8,x+rx,y+ry,PT_WATR); sim->part_change_type(r>>8,x+rx,y+ry,PT_WATR);
sim->part_change_type(i,x,y,PT_OIL); sim->part_change_type(i,x,y,PT_OIL);
} }
if ((r&0xFF)==PT_FIRE) if (parts[i].tmp != 1)
{ {
parts[r>>8].temp=2473.15; if ((r&0xFF)==PT_FIRE)
if(parts[r>>8].tmp&0x02) {
parts[r>>8].temp=3473; parts[r>>8].temp=2473.15;
parts[r>>8].tmp |= 1; if(parts[r>>8].tmp&0x02)
} parts[r>>8].temp=3473;
if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM || (r&0xFF)==PT_LAVA) parts[r>>8].tmp |= 1;
{ }
sim->create_part(i,x,y,PT_FIRE); if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM || (r&0xFF)==PT_LAVA)
parts[i].temp+=(rand()/(RAND_MAX/100)); {
parts[i].tmp |= 1; sim->create_part(i,x,y,PT_FIRE);
parts[i].temp+=(rand()/(RAND_MAX/100));
parts[i].tmp |= 1;
}
} }
if (parts[i].temp > 2273.15 && sim->pv[y/CELL][x/CELL] > 50.0f && (r&0xFF) == PT_H2)
parts[r>>8].tmp = 1;
} }
if (parts[i].temp > 2273.15 && sim->pv[y/CELL][x/CELL] > 50.0f)
{
parts[i].tmp = 1;
if (rand()%5 < 1)
{
int j;
sim->part_change_type(i,x,y,PT_PLSM);
sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT);
sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC);
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT);
if (j)
parts[j].ctype = 0xFFFF00;
sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NBLE);
if (rand()%2)
sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NBLE);
if (parts[i].temp < 4273.15)
parts[i].temp = 4273.15;
sim->pv[y/CELL][x/CELL] += 50;
}
}
return 0; return 0;
} }

1
src/elements/pyro.cpp
View File

@ -46,6 +46,7 @@ int update_PYRO(UPDATE_FUNC_ARGS) {
(t!=PT_SPRK || (rt!=PT_RBDM && rt!=PT_LRBD && rt!=PT_INSL)) && (t!=PT_SPRK || (rt!=PT_RBDM && rt!=PT_LRBD && rt!=PT_INSL)) &&
(t!=PT_PHOT || rt!=PT_INSL) && (t!=PT_PHOT || rt!=PT_INSL) &&
(rt!=PT_SPNG || parts[r>>8].life==0) && (rt!=PT_SPNG || parts[r>>8].life==0) &&
(rt!=PT_H2 || parts[r>>8].tmp!=1) &&
sim->ptypes[rt].flammable && (sim->ptypes[rt].flammable + (int)(sim->pv[(y+ry)/CELL][(x+rx)/CELL]*10.0f))>(rand()%1000)) sim->ptypes[rt].flammable && (sim->ptypes[rt].flammable + (int)(sim->pv[(y+ry)/CELL][(x+rx)/CELL]*10.0f))>(rand()%1000))
{ {
sim->part_change_type(r>>8,x+rx,y+ry,PT_FIRE); sim->part_change_type(r>>8,x+rx,y+ry,PT_FIRE);