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

TPT: oxygen fusion, fix two small bugs

Browse Source
This commit is contained in:
Simon Robertshaw 2012-06-12 19:26:47 +01:00
parent a93caaa3c7
commit 780682c22d
4 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/GameSave.h
View File

@ -70,12 +70,14 @@ public:
{ {
particles[particlesCount++] = v; particles[particlesCount++] = v;
} }
return *this;
} }
inline GameSave& operator << (sign v) inline GameSave& operator << (sign v)
{ {
if(signs.size()<MAXSIGNS && v.text.length()) if(signs.size()<MAXSIGNS && v.text.length())
signs.push_back(v); signs.push_back(v);
return *this;
} }
private: private:

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

@ -84,10 +84,11 @@ int Element_CO2::update(UPDATE_FUNC_ARGS)
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); if (j != -1) parts[j].temp = 15000;
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); if (j != -1) parts[j].temp = 15000; j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); if (j != -1) parts[j].temp = 15000;
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_O2); if (j != -1) parts[j].temp = 15000; j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_O2); if (j != -1) parts[j].temp = 15000;
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_SING); if (j != -1) { parts[j].temp = 15000; parts[i].life = rand()%100+450; } if (rand()%1000 < 1) { j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_SING); if (j != -1) { parts[j].temp = 15000; parts[i].life = 3; } }
parts[i].temp += 15000; parts[i].temp += 15000;
sim->pv[y/CELL][x/CELL] += 100; sim->pv[y/CELL][x/CELL] += 100;
return 1;
} }
} }
return 0; return 0;

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

@ -127,7 +127,7 @@ int Element_ELEC::update(UPDATE_FUNC_ARGS)
sim->kill_part(i); sim->kill_part(i);
return 1; return 1;
} }
if ((sim->elements[r&0xFF].Properties & PROP_CONDUCTS) && ((r&0xFF)!=PT_H2||parts[i].temp<2273.15)) if ((sim->elements[r&0xFF].Properties & PROP_CONDUCTS) && ((r&0xFF)!=PT_NBLE||parts[i].temp<2273.15))
{ {
sim->create_part(-1, x+rx, y+ry, PT_SPRK); sim->create_part(-1, x+rx, y+ry, PT_SPRK);
sim->kill_part(i); sim->kill_part(i);

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

@ -48,9 +48,10 @@ Element_O2::Element_O2()
//#TPT-Directive ElementHeader Element_O2 static int update(UPDATE_FUNC_ARGS) //#TPT-Directive ElementHeader Element_O2 static int update(UPDATE_FUNC_ARGS)
int Element_O2::update(UPDATE_FUNC_ARGS) int Element_O2::update(UPDATE_FUNC_ARGS)
{ {
int r,rx,ry; int r,rx,ry;
if (parts[i].temp < 9773.15)
{
for (rx=-2; rx<3; rx++) for (rx=-2; rx<3; rx++)
for (ry=-2; ry<3; ry++) for (ry=-2; ry<3; ry++)
if (x+rx>=0 && y+ry>=0 && x+rx<XRES && y+ry<YRES && (rx || ry)) if (x+rx>=0 && y+ry>=0 && x+rx<XRES && y+ry<YRES && (rx || ry))
@ -74,6 +75,23 @@ int Element_O2::update(UPDATE_FUNC_ARGS)
} }
} }
}
else if (parts[i].temp > 9973.15 && sim->pv[y/CELL][x/CELL] > 250.0f && abs(sim->gravx[((y/CELL)*(XRES/CELL))+(x/CELL)]) + abs(sim->gravy[((y/CELL)*(XRES/CELL))+(x/CELL)]) > 50)
{
if (rand()%5 < 1)
{
int j;
sim->part_change_type(i,x,y,PT_PLSM);
parts[i].life = rand()%150+50;
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_PHOT); if (j != -1) parts[j].temp = 15000;
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_BRMT); if (j != -1) parts[j].temp = 15000;
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_SING); if (j != -1) { parts[j].temp = 15000; parts[i].life = rand()%25+50; }
parts[i].temp += 15000;
sim->pv[y/CELL][x/CELL] += 300;
}
}
return 0; return 0;
} }