diff options
| author | Philip <philip@philip-linuxlaptop.(none)> | 2010-11-06 21:13:43 (GMT) |
|---|---|---|
| committer | Philip <philip@philip-linuxlaptop.(none)> | 2010-11-06 21:13:43 (GMT) |
| commit | a2c8443c369daaa693e7a820500465acd8334df9 (patch) | |
| tree | e1fed014ed4cd68b71da25f5542ac17199608755 /includes | |
| parent | 5c91fde92e7321f9b3a56eaf90b5d288545472c3 (diff) | |
| download | powder-a2c8443c369daaa693e7a820500465acd8334df9.zip powder-a2c8443c369daaa693e7a820500465acd8334df9.tar.gz | |
Added high life, assimilation, and 2x2 to life particles, and put it in its own menu section.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/defines.h | 5 | ||||
| -rw-r--r-- | includes/interface.h | 4 | ||||
| -rw-r--r-- | includes/powder.h | 10 |
3 files changed, 14 insertions, 5 deletions
diff --git a/includes/defines.h b/includes/defines.h index 26a2f76..7763f75 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -18,6 +18,8 @@ #define THUMB_CACHE_SIZE 256 +#define NGOL 5 + #define IMGCONNS 3 #define TIMEOUT 100 #define HTTP_TIMEOUT 10 @@ -104,11 +106,10 @@ struct stamp typedef struct stamp stamp; int MSIGN; -int NGOL; int CGOL; int GSPEED; int gol[XRES][YRES]; -int gol2[XRES][YRES]; +int gol2[XRES][YRES][NGOL]; extern sign signs[MAXSIGNS]; extern stamp stamps[STAMP_MAX]; extern int stamp_count; diff --git a/includes/interface.h b/includes/interface.h index ddc260d..2ec807d 100644 --- a/includes/interface.h +++ b/includes/interface.h @@ -50,7 +50,8 @@ static menu_wall mwalls[] = #define SC_GAS 3 #define SC_LIQUID 4 #define SC_NUCLEAR 7 -#define SC_TOTAL 9 +#define SC_LIFE 9 +#define SC_TOTAL 10 static menu_section msections[] = { @@ -63,6 +64,7 @@ static menu_section msections[] = {"\xD1", "Solids", 0}, {"\xC6", "Radioactive", 0}, {"\xCC", "Special", 0}, + {"\xC8", "Life", 0}, }; struct ui_edit diff --git a/includes/powder.h b/includes/powder.h index 0529161..8729b86 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -117,7 +117,10 @@ #define PT_IRON 76 #define PT_MORT 77 #define PT_GOL 78 -#define PT_NUM 79 +#define PT_HLIF 79 +#define PT_ASIM 80 +#define PT_2x2 81 +#define PT_NUM 82 #define R_TEMP 22 #define MAX_TEMP 9999 @@ -285,7 +288,10 @@ static const part_type ptypes[PT_NUM] = {"HSWC", PIXPACK(0x3B1010), 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, "Heat switch. Conducts Heat only when activated", TYPE_SOLID}, {"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, 0, 100, SC_SOLIDS, R_TEMP+0.0f +273.15f, 251, "Rusts with salt, can be used for electrlosis of WATR", TYPE_SOLID}, {"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, 0, -1, SC_NUCLEAR, R_TEMP+4.0f +273.15f, 60, "Steam Train.", TYPE_PART}, - {"GOL", 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, 1, 100, SC_SPECIAL, 9000.0f, 40, "Game Of Life!", TYPE_SOLID}, + {"GOL", 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, 1, 100, SC_LIFE, 9000.0f, 40, "Game Of Life!", TYPE_SOLID}, + {"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, 1, 100, SC_LIFE, 9000.0f, 40, "High Life! (like GOL)", TYPE_SOLID}, + {"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, 1, 100, SC_LIFE, 9000.0f, 40, "Assimilation! (like GOL)", TYPE_SOLID}, + {"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, 1, 100, SC_LIFE, 9000.0f, 40, "2x2! (like GOL)", TYPE_SOLID}, //Name Colour Advec Airdrag Airloss Loss Collid Grav Diffus Hotair Fal Burn Exp Mel Hrd M Weights Section H Ins(real world, by triclops200) Description }; |