diff options
| author | Cracker64 <cracker642@gmail.com> | 2010-12-24 20:00:59 (GMT) |
|---|---|---|
| committer | Cracker64 <cracker642@gmail.com> | 2010-12-24 20:00:59 (GMT) |
| commit | 65a60b3812b708620b4ff4b13c3521fa5e4547ab (patch) | |
| tree | 2bb37a97351e5069f550ddebec49bee5644e67f4 /includes | |
| parent | 41d9dca73fd5f29bfd30927ec5429d050718f68c (diff) | |
| download | powder-65a60b3812b708620b4ff4b13c3521fa5e4547ab.zip powder-65a60b3812b708620b4ff4b13c3521fa5e4547ab.tar.gz | |
updated with BOMB
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/powder.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/includes/powder.h b/includes/powder.h index 150262b..3b03aa3 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -176,7 +176,8 @@ #define PT_ARAY 126 #define PT_BRAY 127 #define PT_STKM2 128 -#define PT_NUM 129 +#define PT_BOMB 129 +#define PT_NUM 130 #define R_TEMP 22 #define MAX_TEMP 9999 @@ -202,6 +203,7 @@ #define PROP_NEUTABSORB 0x0100 //256 Absorbs neutrons, reflect is default #define PROP_NEUTPASS 0x0200 //512 Neutrons pass through, such as with glass #define PROP_DEADLY 0x0400 //1024 Is deadly for stickman. +#define PROP_HOT_GLOW 0x0800 //2048 Hot Metal Glow #define FLAG_STAGNANT 1 struct particle @@ -397,8 +399,8 @@ static const part_type ptypes[PT_NUM] = {"ARAY", PIXPACK(0xFFBB00), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 1, 1, 1, 100, SC_ELEC, R_TEMP+0.0f +273.15f, 251, "Ray Emmitter. Rays create points when they collide", TYPE_SOLID, NULL}, {"BRAY", PIXPACK(0xFFFFFF), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 1, 1, 0, 100, SC_ELEC, R_TEMP+0.0f +273.15f, 251, "Ray Point. Rays create points when they collide", TYPE_SOLID, NULL}, {"STK2", PIXPACK(0x000000), 0.5f, 0.00f * CFDS, 0.2f, 1.0f, 0.0f, 0.0f, 0.0f, 0.00f * CFDS, 0, 0, 0, 0, 0, 1, 50, SC_SPECIAL, R_TEMP+14.6f+273.15f, 0, "Stickman. Don't kill him!", 0, NULL}, - - //Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Weights Section H Ins Description + {"BOMB", PIXPACK(0xFFF288), 0.6f, 0.01f * CFDS, 0.98f, 0.95f, 0.0f, 0.1f, 0.00f, 0.000f * CFDS, 1, 0, 0, 0, 20, 1, 30, SC_EXPLOSIVE, R_TEMP-2.0f +273.15f, 29, "Bomb.", TYPE_PART, NULL}, + //Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Weights Section H Ins Description }; static part_state pstates[PT_NUM] = @@ -533,6 +535,7 @@ static part_state pstates[PT_NUM] = /* ARAY */ {ST_SOLID, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f}, /* BRAY */ {ST_SOLID, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f}, /* STKM2*/ {ST_NONE, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_FIRE, 620.0f}, + /* BOMB */ {ST_NONE, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f}, }; static int grule[NGOL][9] = |