From cb75e1d924ee33251c65a8bc10288ddd9e978882 Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Sat, 3 Dec 2011 00:11:19 +0000 Subject: [PATCH] Fix spark effect on BOMB, another attempt at TNT (Explosive with more pressure) --- includes/powder.h | 15 ++++++++------- src/elements/bomb.c | 26 +++++++++++++++++++++++--- src/elements/elec.c | 2 +- src/elements/newgraphics.c | 11 ----------- 4 files changed, 32 insertions(+), 22 deletions(-) diff --git a/includes/powder.h b/includes/powder.h index c402dbe2e..db9cb0309 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -427,6 +427,7 @@ int update_FIGH(UPDATE_FUNC_ARGS); int update_ELEC(UPDATE_FUNC_ARGS); int update_ACEL(UPDATE_FUNC_ARGS); int update_DCEL(UPDATE_FUNC_ARGS); +int update_BANG(UPDATE_FUNC_ARGS); int update_MISC(UPDATE_FUNC_ARGS); int update_legacy_PYRO(UPDATE_FUNC_ARGS); @@ -631,7 +632,7 @@ static const part_type ptypes[PT_NUM] = {"ELEC", PIXPACK(0xDFEFFF), 0.0f, 0.00f * CFDS, 1.00f, 1.00f, -0.99f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 1, -1, SC_NUCLEAR, R_TEMP+200.0f+273.15f, 251, "Electrons", ST_GAS, TYPE_ENERGY|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC, &update_ELEC, &graphics_ELEC}, {"ACEL", PIXPACK(0x0099CC), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 1, 1, 1, 100, SC_POWERED, R_TEMP+0.0f +273.15f, 251, "Accelerator", ST_NONE, TYPE_SOLID, &update_ACEL, &graphics_ACEL}, {"DCEL", PIXPACK(0x99CC00), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 1, 1, 1, 100, SC_POWERED, R_TEMP+0.0f +273.15f, 251, "Decelerator", ST_NONE, TYPE_SOLID, &update_DCEL, &graphics_DCEL}, - /*FREE*/{"REPL", PIXPACK(0x259588), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 0, 0, 100, SC_LIFE, 9000.0f, 40, "B1357/S1357", ST_NONE, TYPE_SOLID|PROP_LIFE, NULL, NULL}, + {"TNT", PIXPACK(0xC05050), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 1, 1, 1, 100, SC_EXPLOSIVE, R_TEMP+0.0f +273.15f, 88, "Explosive.", ST_SOLID, TYPE_SOLID | PROP_NEUTPENETRATE, &update_BANG, NULL}, /*FREE*/{"MYST", PIXPACK(0x0C3C00), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 0, 0, 100, SC_LIFE, 9000.0f, 40, "B3458/S05678", ST_NONE, TYPE_SOLID|PROP_LIFE, NULL, NULL}, {"BOYL", PIXPACK(0x0A3200), 1.0f, 0.01f * CFDS, 0.99f, 0.30f, -0.1f, 0.0f, 0.18f, 0.000f * CFDS, 0, 0, 0, 0, 1, 1, 1, 1, SC_GAS, R_TEMP+2.0f +273.15f, 42, "Boyle, variable pressure gas. Expands when heated.", ST_GAS, TYPE_GAS, &update_BOYL, NULL}, /*FREE*/{"LOTE", PIXPACK(0xFF0000), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 0, 0, 100, SC_LIFE, 9000.0f, 40, "Behaves kinda like Living on the Edge S3458/B37/4", ST_NONE, TYPE_SOLID|PROP_LIFE, NULL, NULL}, @@ -800,12 +801,12 @@ static part_transition ptransitions[PT_NUM] = /* SING */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, /* QRTZ */ {IPL, NT, IPH, NT, ITL, NT, 2573.15f,PT_LAVA}, /* PQRT */ {IPL, NT, IPH, NT, ITL, NT, 2573.15f,PT_LAVA}, - /*FREE*//* GOL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, - /*FREE*//* GOL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, - /*FREE*//* GOL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, - /*FREE*//* GOL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, - /*FREE*//* GOL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, - /*FREE*//* GOL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, + /* EMP */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, + /* BREL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, + /* ELEC */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, + /* ACEL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, + /* DCEL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, + /* TNT */ {IPL, NT, IPH, NT, ITL, NT, 673.0f, PT_FIRE}, /*FREE*//* GOL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, /* BOYL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, /*FREE*//* GOL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, diff --git a/src/elements/bomb.c b/src/elements/bomb.c index 31f01abad..ee45624f2 100644 --- a/src/elements/bomb.c +++ b/src/elements/bomb.c @@ -3,14 +3,14 @@ int update_BOMB(UPDATE_FUNC_ARGS) { int r, rx, ry, nb; if (parts[i].tmp==1) { - for (rx=-2; rx<3; rx++) - for (ry=-2; ry<3; ry++) + for (rx=-1; rx<2; rx++) + for (ry=-1; ry<2; ry++) if (x+rx>=0 && y+ry>0 && x+rxtmp==0) { + //Normal bomb + *pixel_mode |= PMODE_FLARE; + } + else if(cpart->tmp==2) + { + //Flash + *pixel_mode = PMODE_FLAT | FIRE_ADD; + *colr = *colg = *colb = *firer = *fireg = *fireb = *firea = 255; + } + else + { + //Flying spark + *pixel_mode = PMODE_SPARK | PMODE_ADD; + *cola = 4*cpart->life; + } + return 0; +} diff --git a/src/elements/elec.c b/src/elements/elec.c index 4c3232e4f..a05410275 100644 --- a/src/elements/elec.c +++ b/src/elements/elec.c @@ -19,7 +19,7 @@ int update_ELEC(UPDATE_FUNC_ARGS) { continue; if ((r&0xFF)==PT_GLAS) { - fire_r[y/CELL][x/CELL] += rand()%200; //D: Doesn't work with OpenGL, also should be here + fire_r[y/CELL][x/CELL] += rand()%200; //D: Doesn't work with OpenGL, also shouldn't be here fire_g[y/CELL][x/CELL] += rand()%200; fire_b[y/CELL][x/CELL] += rand()%200; for (rrx=-2; rrx<=2; rrx++) diff --git a/src/elements/newgraphics.c b/src/elements/newgraphics.c index c846b94f3..9af28a128 100644 --- a/src/elements/newgraphics.c +++ b/src/elements/newgraphics.c @@ -483,17 +483,6 @@ int graphics_FIRW(GRAPHICS_FUNC_ARGS) } return 0; } -int graphics_BOMB(GRAPHICS_FUNC_ARGS) -{ - if (cpart->tmp==0) { - *pixel_mode |= PMODE_FLARE; - } - else - { - *pixel_mode |= PMODE_SPARK; - } - return 0; -} int graphics_GBMB(GRAPHICS_FUNC_ARGS) { if (cpart->life <= 0) {