mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-11 19:04:05 +02:00
Code Issues Projects Releases Wiki Activity

TPT: prevent ionizing NBLE and burning H2 during fusion 83d4658589

Browse Source
This commit is contained in:
Simon Robertshaw
2012-04-18 18:33:34 +01:00
parent bc4a3355de
commit 4ddf723167
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/elements/elec.cpp
View File

@@ -79,7 +79,7 @@ int update_ELEC(UPDATE_FUNC_ARGS) {
sim->kill_part(i); sim->kill_part(i);
return 1; return 1;
} }
if (sim->ptypes[r&0xFF].properties & PROP_CONDUCTS) if ((sim->ptypes[r&0xFF].properties & PROP_CONDUCTS) && ((r&0xFF)!=PT_H2||parts[i].tmp!=1))
{ {
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);

23
src/elements/h2.cpp
View File

@@ -3,6 +3,8 @@
int update_H2(UPDATE_FUNC_ARGS) int update_H2(UPDATE_FUNC_ARGS)
{ {
int r,rx,ry,rt; int r,rx,ry,rt;
if (parts[i].temp > 2273.15 && sim->pv[y/CELL][x/CELL] > 50.0f)
parts[i].tmp = 1;
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))
@@ -16,24 +18,24 @@ 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 (parts[r>>8].temp > 2273.15)// && pv[y/CELL][x/CELL] > 50.0f)
continue;
if (parts[i].tmp != 1) if (parts[i].tmp != 1)
{ {
if ((r&0xFF)==PT_FIRE) if (rt==PT_FIRE)
{ {
parts[r>>8].temp=2473.15; parts[r>>8].temp=2473.15;
if(parts[r>>8].tmp&0x02) if(parts[r>>8].tmp&0x02)
parts[r>>8].temp=3473; parts[r>>8].temp=3473;
parts[r>>8].tmp |= 1; parts[r>>8].tmp |= 1;
} }
if ((r&0xFF)==PT_FIRE || (r&0xFF)==PT_PLSM || (r&0xFF)==PT_LAVA) if (rt==PT_FIRE || rt==PT_PLSM || rt==PT_LAVA)
{ {
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 |= 1; 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) if (parts[i].temp > 2273.15 && sim->pv[y/CELL][x/CELL] > 50.0f)
{ {
@@ -42,14 +44,19 @@ int update_H2(UPDATE_FUNC_ARGS)
{ {
int j; int j;
sim->part_change_type(i,x,y,PT_PLSM); sim->part_change_type(i,x,y,PT_PLSM);
parts[i].life = rand()%150+50;
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_NEUT);
sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_ELEC); 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); j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_PHOT);
if (j) if (j) parts[j].ctype = 0xFFFF00;
parts[j].ctype = 0xFFFF00;
sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NBLE); j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NBLE);
if (j) parts[j].tmp = 1;
if (rand()%2) if (rand()%2)
sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NBLE); {
j = sim->create_part(-3,x+rand()%3-1,y+rand()%3-1,PT_NBLE);
if (j) parts[j].tmp = 1;
}
if (parts[i].temp < 4273.15) if (parts[i].temp < 4273.15)
parts[i].temp = 4273.15; parts[i].temp = 4273.15;
sim->pv[y/CELL][x/CELL] += 50; sim->pv[y/CELL][x/CELL] += 50;

2
src/elements/pyro.cpp
View File

@@ -46,7 +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) && (rt!=PT_H2 || (parts[r>>8].temp < 2273.15 && sim->pv[y/CELL][x/CELL] < 50.0f)) &&
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);

4
src/elements/sprk.cpp
View File

@@ -44,7 +44,7 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
parts[nearp].ctype = PT_ETRD; parts[nearp].ctype = PT_ETRD;
} }
} }
else if (ct==PT_NBLE&&parts[i].life<=1) else if (ct==PT_NBLE&&parts[i].life<=1&&parts[i].tmp!=1)
{ {
parts[i].life = rand()%150+50; parts[i].life = rand()%150+50;
sim->part_change_type(i,x,y,PT_PLSM); sim->part_change_type(i,x,y,PT_PLSM);
@@ -179,6 +179,8 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
conduct_sprk = 0; conduct_sprk = 0;
if (rt==PT_INST&&ct!=PT_PSCN) if (rt==PT_INST&&ct!=PT_PSCN)
conduct_sprk = 0; conduct_sprk = 0;
if (rt == PT_NBLE && parts[r>>8].tmp == 1)
conduct_sprk = 0;
if (conduct_sprk) { if (conduct_sprk) {
if (rt==PT_WATR||rt==PT_SLTW) { if (rt==PT_WATR||rt==PT_SLTW) {