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

Fixes to carbonated water explosions. Help from cracker with create_part making overlapping particles to fix CO2 emitting water (as a bit of a sneaky trick to make less overlapping water.) Carb water slowly increases pressure if sealed, causing explosions when released.

Browse Source
This commit is contained in:
Cate 2011-09-23 01:01:54 +08:00 committed by Simon Robertshaw
parent 3ac14d94e7
commit 39525e6ef0
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/elements/cbnw.c
View File

@ -3,9 +3,9 @@
int update_CBNW(UPDATE_FUNC_ARGS) { int update_CBNW(UPDATE_FUNC_ARGS) {
int r, rx, ry, oldt; int r, rx, ry, oldt;
oldt = parts[i].tmp; oldt = parts[i].tmp;
if (pv[y/CELL][x/CELL]<=1) if (pv[y/CELL][x/CELL]<=5)
{ {
if(20>(rand()%20000)) if(20>(rand()%80000))
{ {
part_change_type(i,x,y,PT_CO2); part_change_type(i,x,y,PT_CO2);
parts[i].ctype = 5; parts[i].ctype = 5;
@ -25,10 +25,9 @@ int update_CBNW(UPDATE_FUNC_ARGS) {
//Explode //Explode
if(rand()%4) if(rand()%4)
{ {
part_change_type(i,x,y,PT_WATR);
} else {
pv[y/CELL][x/CELL] += 0.5f;
part_change_type(i,x,y,PT_CO2); part_change_type(i,x,y,PT_CO2);
parts[i].ctype = 5;
pv[y/CELL][x/CELL] += 0.2f;
} }
} }
for (rx=-2; rx<3; rx++) for (rx=-2; rx<3; rx++)
@ -47,10 +46,9 @@ int update_CBNW(UPDATE_FUNC_ARGS) {
{ {
if(rand()%2) if(rand()%2)
{ {
part_change_type(i,x,y,PT_WATR);
} else {
pv[y/CELL][x/CELL] += 0.5f;
part_change_type(i,x,y,PT_CO2); part_change_type(i,x,y,PT_CO2);
parts[i].ctype = 5;
pv[y/CELL][x/CELL] += 0.2f;
} }
} }
if ((r&0xFF)==PT_CBNW) if ((r&0xFF)==PT_CBNW)

12
src/elements/co2.c
View File

@ -1,12 +1,17 @@
#include <element.h> #include <element.h>
int update_CO2(UPDATE_FUNC_ARGS) { int update_CO2(UPDATE_FUNC_ARGS) {
int r, rx, ry, np; int r, rx, ry;
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))
{ {
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
if (20>(rand()%40000)&&parts[i].ctype==5)
{
parts[i].ctype = 0;
create_part(-3, x, y, PT_WATR);
}
if ((r>>8)>=NPART || !r) if ((r>>8)>=NPART || !r)
continue; continue;
if ((r&0xFF)==PT_FIRE){ if ((r&0xFF)==PT_FIRE){
@ -16,11 +21,6 @@ int update_CO2(UPDATE_FUNC_ARGS) {
return 1; return 1;
} }
} }
if ((r)&&parts[i].ctype==5)
{
parts[i].ctype = 0;
create_part(-1, x+rand()%3-1, y+rand()%3-1, PT_WATR);
}
if (((r&0xFF)==PT_WATR || (r&0xFF)==PT_DSTW) && 1>(rand()%250)) if (((r&0xFF)==PT_WATR || (r&0xFF)==PT_DSTW) && 1>(rand()%250))
{ {
part_change_type(i,x,y,PT_CBNW); part_change_type(i,x,y,PT_CBNW);