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

Merge branch 'master' of github.com:FacialTurd/PowderToypp

Browse Source
This commit is contained in:
Simon Robertshaw 2012-08-21 01:09:37 +01:00
commit c9997f8aea
3 changed files with 91 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/simulation/elements/H2.cpp
View File

@ -66,9 +66,9 @@ int Element_H2::update(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 (parts[r>>8].temp > 2273.15)// && pv[y/CELL][x/CELL] > 50.0f) if (parts[r>>8].temp > 2273.15 && sim->pv[y/CELL][x/CELL] > 45)// && pv[y/CELL][x/CELL] > 50.0f)
continue; continue;
if (parts[i].temp < 2273.15) if (sim->pv[x/CELL][y/CELL]<45)
{ {
if (rt==PT_FIRE) if (rt==PT_FIRE)
{ {
@ -79,9 +79,12 @@ int Element_H2::update(UPDATE_FUNC_ARGS)
} }
if (rt==PT_FIRE || rt==PT_PLSM || rt==PT_LAVA) if (rt==PT_FIRE || rt==PT_PLSM || rt==PT_LAVA)
{ {
if(parts[r>>8].tmp&8&&rt==PT_PLSM)
continue;
sim->create_part(i,x,y,PT_FIRE); sim->create_part(i,x,y,PT_FIRE);
parts[i].temp+=(rand()/(RAND_MAX/100)); parts[i].temp+=(rand()%250);
parts[i].tmp |= 1; parts[i].tmp |= 1;
sim->pv[y/CELL][x/CELL] +=0.1f;
} }
} }
} }
@ -93,11 +96,27 @@ int Element_H2::update(UPDATE_FUNC_ARGS)
float temp = parts[i].temp; float temp = parts[i].temp;
sim->create_part(i,x,y,PT_NBLE); sim->create_part(i,x,y,PT_NBLE);
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT); if (j != -1) parts[j].temp = temp; j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT);
if (!(rand()%10)) { j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); if (j != -1) parts[j].temp = temp; } if (j != -1)
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); if (j != -1) { parts[j].ctype = 0xFFFF00; parts[j].temp = temp; } parts[j].temp = temp;
if (!(rand()%10))
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM); if (j != -1) parts[j].temp = temp; {
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC);
if (j != -1)
parts[j].temp = temp;
}
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT);
if (j != -1)
{
parts[j].ctype = 0xFFFF00;
parts[j].temp = temp;
}
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM);
if (j != -1)
{
parts[j].temp = temp;
parts[j].tmp |=8;
}
parts[i].temp = temp+750+rand()%500; parts[i].temp = temp+750+rand()%500;
sim->pv[y/CELL][x/CELL] += 30; sim->pv[y/CELL][x/CELL] += 30;

7
src/simulation/elements/NBLE.cpp
View File

@ -63,7 +63,12 @@ int Element_NBLE::update(UPDATE_FUNC_ARGS)
if (!(rand()%25)) { j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); if (j != -1) parts[j].temp = temp; } if (!(rand()%25)) { j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); if (j != -1) parts[j].temp = temp; }
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); if (j != -1) { parts[j].ctype = 0xFF0000; parts[j].temp = temp; } j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); if (j != -1) { parts[j].ctype = 0xFF0000; parts[j].temp = temp; }
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM); if (j != -1) parts[j].temp = temp; j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM);
if (j != -1)
{
parts[j].temp = temp;
parts[j].tmp |=8;
}
parts[i].temp = temp+1750+rand()%500; parts[i].temp = temp+1750+rand()%500;
sim->pv[y/CELL][x/CELL] += 50; sim->pv[y/CELL][x/CELL] += 50;

17
src/simulation/elements/O2.cpp
View File

@ -69,6 +69,8 @@ int Element_O2::update(UPDATE_FUNC_ARGS)
} }
if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM) if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM)
{ {
if((r&0xFF)==PT_PLSM && parts[r>>8].tmp&8)
continue;
sim->create_part(i,x,y,PT_FIRE); sim->create_part(i,x,y,PT_FIRE);
parts[i].temp+=(rand()/(RAND_MAX/100)); parts[i].temp+=(rand()/(RAND_MAX/100));
parts[i].tmp |= 2; parts[i].tmp |= 2;
@ -83,9 +85,18 @@ int Element_O2::update(UPDATE_FUNC_ARGS)
int j; int j;
sim->create_part(i,x,y,PT_BRMT); sim->create_part(i,x,y,PT_BRMT);
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT); if (j != -1) parts[j].temp = 15000; j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NEUT);
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT); if (j != -1) parts[j].temp = 15000; if (j != -1)
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM); if (j != -1) parts[j].temp = 15000; parts[j].temp = 15000;
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT);
if (j != -1)
parts[j].temp = 15000;
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PLSM);
if (j != -1)
{
parts[j].temp = 15000;
parts[j].tmp |= 8;
}
parts[i].temp = 15000; parts[i].temp = 15000;
sim->pv[y/CELL][x/CELL] += 300; sim->pv[y/CELL][x/CELL] += 300;