diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-07-27 12:07:41 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-07-27 12:07:41 (GMT) |
| commit | 58d96de4ce2eacbda5b63ed1ac6ee19d17f03d39 (patch) | |
| tree | c63592d68617b69a99543122d84db00dd5eef17b /includes | |
| parent | eecf5ad352a7c3d13dd030f59b3c37c002fc160e (diff) | |
| download | powder-58d96de4ce2eacbda5b63ed1ac6ee19d17f03d39.zip powder-58d96de4ce2eacbda5b63ed1ac6ee19d17f03d39.tar.gz | |
Revert "DLAY element"
This reverts commit 7338545ab43b1871cea0f91a15746e534d7a9e9b.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/powder.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/includes/powder.h b/includes/powder.h index 7e95ec2..dd618fd 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -131,8 +131,7 @@ #define PT_IRON 76 #define PT_MORT 77 #define PT_LIFE 78 -#define PT_DLAY 79 -// 80 - 89 Free + #define PT_SPNG 90 #define PT_RIME 91 #define PT_FOG 92 @@ -208,8 +207,9 @@ #define ST_SOLID 1 #define ST_LIQUID 2 #define ST_GAS 3 - - +/* + TODO: We should start to implement these. +*/ #define TYPE_PART 0x0001 //1 Powders #define TYPE_LIQUID 0x0002 //2 Liquids #define TYPE_SOLID 0x0004 //4 Solids @@ -465,7 +465,7 @@ static const part_type ptypes[PT_NUM] = {"IRON", PIXPACK(0x707070), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 1, 50, 1, 1, 100, SC_SOLIDS, R_TEMP+0.0f +273.15f, 251, "Rusts with salt, can be used for electrolysis of WATR", ST_SOLID, TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW, &update_IRON}, {"MORT", PIXPACK(0xE0E0E0), 0.0f, 0.00f * CFDS, 1.00f, 1.00f, -0.99f, 0.0f, 0.01f, 0.002f * CFDS, 0, 0, 0, 0, 0, 1, 1, -1, SC_CRACKER2, R_TEMP+4.0f +273.15f, 60, "Steam Train.", ST_NONE, TYPE_PART, &update_MORT}, {"LIFE", PIXPACK(0x0CAC00), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 0, 0, 1, 100, SC_LIFE, 9000.0f, 40, "Game Of Life! B3/S23", ST_NONE, TYPE_SOLID|PROP_LIFE, NULL}, - {"DLAY", PIXPACK(0x753590), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 1, 1, 1, 1, 100, SC_ELEC, 4.0f+273.15f, 0, "Conducts with temperature-dependent delay. (use HEAT/COOL).", ST_SOLID, TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC, NULL}, + /*FREE*/{"HLIF", 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, "High Life! B36/S23", ST_NONE, TYPE_SOLID|PROP_LIFE, NULL}, /*FREE*/{"ASIM", 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, 0, 0, 100, SC_LIFE, 9000.0f, 40, "Assimilation! B345/S4567", ST_NONE, TYPE_SOLID|PROP_LIFE, NULL}, /*FREE*/{"2x2", PIXPACK(0xFFFF00), 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, "2x2! B36/S125", ST_NONE, TYPE_SOLID|PROP_LIFE, NULL}, /*FREE*/{"DANI", PIXPACK(0x00FFFF), 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, "Day and Night! B3678/S34678", ST_NONE, TYPE_SOLID|PROP_LIFE, NULL}, @@ -713,7 +713,6 @@ static part_transition ptransitions[PT_NUM] = /* PBCN */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, /* GPMP */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, /* CLST */ {IPL, NT, IPH, NT, ITL, NT, 1256.0f, PT_LAVA}, - /* DLAY */ {IPL, NT, IPH, NT, ITL, NT, ITH, NT}, }; #undef IPL #undef IPH |