From 780682c22d6215e655d53c0adb167d9064947928 Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Tue, 12 Jun 2012 19:26:47 +0100 Subject: [PATCH] TPT: oxygen fusion, fix two small bugs --- src/client/GameSave.h | 2 ++ src/simulation/elements/CO2.cpp | 5 +-- src/simulation/elements/ELEC.cpp | 2 +- src/simulation/elements/O2.cpp | 62 ++++++++++++++++++++------------ 4 files changed, 46 insertions(+), 25 deletions(-) diff --git a/src/client/GameSave.h b/src/client/GameSave.h index ffb7c6d2e..1e5b5149a 100644 --- a/src/client/GameSave.h +++ b/src/client/GameSave.h @@ -70,12 +70,14 @@ public: { particles[particlesCount++] = v; } + return *this; } inline GameSave& operator << (sign v) { if(signs.size()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_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; sim->pv[y/CELL][x/CELL] += 100; + return 1; } } return 0; } -Element_CO2::~Element_CO2() {} \ No newline at end of file +Element_CO2::~Element_CO2() {} diff --git a/src/simulation/elements/ELEC.cpp b/src/simulation/elements/ELEC.cpp index c0f92dba0..4081f83c1 100644 --- a/src/simulation/elements/ELEC.cpp +++ b/src/simulation/elements/ELEC.cpp @@ -127,7 +127,7 @@ int Element_ELEC::update(UPDATE_FUNC_ARGS) sim->kill_part(i); 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->kill_part(i); diff --git a/src/simulation/elements/O2.cpp b/src/simulation/elements/O2.cpp index 385d1f3f2..fdc8b98a0 100644 --- a/src/simulation/elements/O2.cpp +++ b/src/simulation/elements/O2.cpp @@ -48,34 +48,52 @@ Element_O2::Element_O2() //#TPT-Directive ElementHeader Element_O2 static int update(UPDATE_FUNC_ARGS) int Element_O2::update(UPDATE_FUNC_ARGS) - { int r,rx,ry; - for (rx=-2; rx<3; rx++) - for (ry=-2; ry<3; ry++) - if (x+rx>=0 && y+ry>=0 && x+rx=0 && y+ry>=0 && x+rx>8].temp+=(rand()/(RAND_MAX/100)); - if(parts[r>>8].tmp&0x01) + r = pmap[y+ry][x+rx]; + if (!r) + continue; + + if ((r&0xFF)==PT_FIRE) + { + parts[r>>8].temp+=(rand()/(RAND_MAX/100)); + if(parts[r>>8].tmp&0x01) parts[r>>8].temp=3473; - parts[r>>8].tmp |= 2; - } - if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM) - { - sim->create_part(i,x,y,PT_FIRE); - parts[i].temp+=(rand()/(RAND_MAX/100)); - parts[i].tmp |= 2; - } + parts[r>>8].tmp |= 2; + } + if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM) + { + sim->create_part(i,x,y,PT_FIRE); + parts[i].temp+=(rand()/(RAND_MAX/100)); + parts[i].tmp |= 2; + } - } + } + } + 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; } -Element_O2::~Element_O2() {} \ No newline at end of file +Element_O2::~Element_O2() {}