diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-05-11 20:29:35 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-05-14 12:43:51 (GMT) |
| commit | cbfc73d8d60421c5d64a8cca0961c87bc33146d0 (patch) | |
| tree | 6e6bd56693a9be3e65dd265aee09ee5ee82dda75 /includes | |
| parent | 26dbf70709bbbcfddc5563d2d263ea3e1a98b4ef (diff) | |
| download | powder-cbfc73d8d60421c5d64a8cca0961c87bc33146d0.zip powder-cbfc73d8d60421c5d64a8cca0961c87bc33146d0.tar.gz | |
Turn WIND into a tool
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/powder.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/includes/powder.h b/includes/powder.h index aded05f..70b94a1 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -23,7 +23,7 @@ #define UI_WALLSTART 222 #define UI_ACTUALSTART 122 -#define UI_WALLCOUNT 19 +#define UI_WALLCOUNT 20 #define WL_WALLELEC 122 #define WL_EWALL 123 @@ -45,6 +45,7 @@ #define SPC_HEAT 237 #define SPC_COOL 238 #define SPC_VACUUM 239 +#define SPC_WIND 241 #define WL_ALLOWGAS 140 @@ -197,7 +198,7 @@ #define PT_STAR 144 #define PT_FROG 145 #define PT_BRAN 146 -#define PT_WIND 147 +#define OLD_PT_WIND 147 #define PT_H2 148 #define PT_SOAP 149 #define PT_NUM 150 @@ -529,7 +530,7 @@ static const part_type ptypes[PT_NUM] = {"STAR", PIXPACK(0x0000FF), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE, 9000.0f, 40, "Like Star Wars rule S3456/B278/6", ST_NONE, TYPE_SOLID|PROP_LIFE, NULL}, {"FROG", PIXPACK(0x00AA00), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE, 9000.0f, 40, "Frogs S12/B34/3", ST_NONE, TYPE_SOLID|PROP_LIFE, NULL}, {"BRAN", PIXPACK(0xCCCC00), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_LIFE, 9000.0f, 40, "Brian 6 S6/B246/3", ST_NONE, TYPE_SOLID|PROP_LIFE, NULL}, - {"WIND", PIXPACK(0x000000), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 100, SC_SPECIAL, 0.0f, 40, "Drag tool", ST_NONE, ST_NONE, NULL}, + {"WIND", PIXPACK(0x101010), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 0, 100, SC_SPECIAL, 0.0f, 40, "", ST_NONE, ST_NONE, NULL}, {"H2", PIXPACK(0x5070FF), 2.0f, 0.00f * CFDS, 0.99f, 0.30f, -0.10f, 0.00f, 3.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 1, SC_GAS, R_TEMP+0.0f +273.15f, 251, "Combines with O2 to make WATR", ST_GAS, TYPE_GAS, &update_H2}, {"SOAP", PIXPACK(0xF5F5DC), 0.6f, 0.01f * CFDS, 0.98f, 0.95f, 0.0f, 0.1f, 0.00f, 0.000f * CFDS, 2, 0, 0, 0, 20, 1, 35, SC_LIQUID, R_TEMP-2.0f +273.15f, 29, "Soap. Creates bubbles.", ST_LIQUID, TYPE_LIQUID|PROP_NEUTPENETRATE, &update_SOAP}, //Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Weights Section H Ins Description @@ -817,6 +818,7 @@ static wall_type wtypes[] = {PIXPACK(0x00BBFF), PIXPACK(0x000000), -1, "Cools the targetted element."}, {PIXPACK(0x303030), PIXPACK(0x000000), -1, "Vacuum, reduces air pressure."}, {PIXPACK(0x579777), PIXPACK(0x000000), 1, "Wall. Indestructible. Blocks liquids and solids, allows gasses"}, + {PIXPACK(0x000000), PIXPACK(0x000000), -1, "Drag tool"}, }; #define CHANNELS ((int)(MAX_TEMP-73.15f)/100+2) |