summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorAntB <Withheld>2011-03-29 20:35:14 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-04-04 15:18:26 (GMT)
commitdb406494bd32d46cfff71cf387c682c1e32d9601 (patch)
tree9851e5c1c61d8b0aa9c7810cf58445a6e11a1691 /includes
parent4d80abc399b0694eb602487058d7b5865f9b4eae (diff)
downloadpowder-db406494bd32d46cfff71cf387c682c1e32d9601.zip
powder-db406494bd32d46cfff71cf387c682c1e32d9601.tar.gz
Added H2:
Will reduce DESL to WATR and OIL under pressure Will fuse with O2 under pressure to make WATR
Diffstat (limited to 'includes')
-rw-r--r--includes/powder.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/includes/powder.h b/includes/powder.h
index b4b0d52..892b052 100644
--- a/includes/powder.h
+++ b/includes/powder.h
@@ -198,7 +198,8 @@
#define PT_FROG 145
#define PT_BRAN 146
#define PT_WIND 147
-#define PT_NUM 148
+#define PT_H2 148
+#define PT_NUM 149
#define R_TEMP 22
#define MAX_TEMP 9999
@@ -299,6 +300,7 @@ int update_WIFI(UPDATE_FUNC_ARGS);
int update_WTRV(UPDATE_FUNC_ARGS);
int update_YEST(UPDATE_FUNC_ARGS);
int update_O2(UPDATE_FUNC_ARGS);
+int update_H2(UPDATE_FUNC_ARGS);
int update_MISC(UPDATE_FUNC_ARGS);
int update_legacy_PYRO(UPDATE_FUNC_ARGS);
@@ -520,6 +522,7 @@ static const part_type ptypes[PT_NUM] =
{"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},
+ {"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},
//Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Weights Section H Ins Description
};
@@ -682,7 +685,8 @@ static part_transition ptransitions[PT_NUM] =
/* GOL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT},
/* GOL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT},
/* GOL */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT},
- /* WIND */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT},
+ /* WIND */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT},
+ /* H2 */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT},
};
#undef IPL
#undef IPH