mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-09-02 20:42:36 +02:00
Code Issues Projects Releases Wiki Activity

Added 3 more life types

Browse Source
This commit is contained in:
Philip
2010-11-09 01:04:59 -05:00
parent 16265e3736
commit febd9be627
4 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/defines.h
View File

@@ -18,8 +18,6 @@
#define THUMB_CACHE_SIZE 256 #define THUMB_CACHE_SIZE 256
#define NGOL 10
#define IMGCONNS 3 #define IMGCONNS 3
#define TIMEOUT 100 #define TIMEOUT 100
#define HTTP_TIMEOUT 10 #define HTTP_TIMEOUT 10
@@ -58,6 +56,8 @@ extern unsigned char ZSIZE;
#define STAMP_Y 4 #define STAMP_Y 4
#define STAMP_MAX 120 #define STAMP_MAX 120
#define NGOL 13
#ifdef PIX16 #ifdef PIX16
typedef unsigned short pixel; typedef unsigned short pixel;
#else #else

33
includes/powder.h
View File

@@ -125,7 +125,10 @@
#define PT_MOVE 84 #define PT_MOVE 84
#define PT_PGOL 85 #define PT_PGOL 85
#define PT_DMOE 86 #define PT_DMOE 86
#define PT_NUM 87 #define PT_34 87
#define PT_LLIF 88
#define PT_STAN 89
#define PT_NUM 90
#define R_TEMP 22 #define R_TEMP 22
#define MAX_TEMP 9999 #define MAX_TEMP 9999
@@ -302,6 +305,9 @@ static const part_type ptypes[PT_NUM] =
{"MOVE", PIXPACK(0xFFFFFF), 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, "'Move' particles! Does not move things.. it is a life type(245/368)", TYPE_SOLID}, {"MOVE", PIXPACK(0xFFFFFF), 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, "'Move' particles! Does not move things.. it is a life type(245/368)", TYPE_SOLID},
{"PGOL", PIXPACK(0xE05010), 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, "Pseudo Life! (238/357)", TYPE_SOLID}, {"PGOL", PIXPACK(0xE05010), 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, "Pseudo Life! (238/357)", TYPE_SOLID},
{"DMOE", PIXPACK(0x500000), 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, "Diamoeba! (5678/35678)", TYPE_SOLID}, {"DMOE", PIXPACK(0x500000), 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, "Diamoeba! (5678/35678)", TYPE_SOLID},
{"34", PIXPACK(0x500050), 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, "34! (34/34)", TYPE_SOLID},
{"LLIF", PIXPACK(0x505050), 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, "Long Life! (5/345)", TYPE_SOLID},
{"STAN", PIXPACK(0x5000FF), 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, "Stains! (235678/3678)", 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 //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
}; };
@@ -386,19 +392,22 @@ static part_state pstates[PT_NUM] =
/* HSWC */ {ST_NONE, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f}, /* HSWC */ {ST_NONE, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f, PT_NONE, 0.0f},
/* IRON */ {ST_SOLID, PT_NONE, 0.0f, PT_LAVA, 1687.0f, PT_NONE, 0.0f, PT_NONE, 0.0f}, /* IRON */ {ST_SOLID, PT_NONE, 0.0f, PT_LAVA, 1687.0f, PT_NONE, 0.0f, PT_NONE, 0.0f},
}; };
static int grule[NGOL][10] = static int grule[NGOL][9] =
{ {
// 0,1,2,3,4,5,6,7,8,9 live=1 spawn=2 spawn&live=3 // 0,1,2,3,4,5,6,7,8,9 live=1 spawn=2 spawn&live=3
{0,0,0,0,0,0,0,0,0,0},//blank {0,0,0,0,0,0,0,0,0},//blank
{0,0,1,3,0,0,0,0,0,0},//GOL {0,0,1,3,0,0,0,0,0},//GOL
{0,0,1,3,0,0,2,0,0,0},//HLIF {0,0,1,3,0,0,2,0,0},//HLIF
{0,0,0,2,3,3,1,1,0,0},//ASIM {0,0,0,2,3,3,1,1,0},//ASIM
{0,1,1,2,0,1,2,0,0,0},//2x2 {0,1,1,2,0,1,2,0,0},//2x2
{0,0,0,3,1,0,3,3,3,0},//DANI {0,0,0,3,1,0,3,3,3},//DANI
{0,1,0,3,0,3,0,2,1,0},//AMOE {0,1,0,3,0,3,0,2,1},//AMOE
{0,0,1,2,1,1,2,0,2,0},//MOVE {0,0,1,2,1,1,2,0,2},//MOVE
{0,0,1,3,0,2,0,2,1,0},//PGOL {0,0,1,3,0,2,0,2,1},//PGOL
{0,0,0,2,0,3,3,3,3,0},//DMOE {0,0,0,2,0,3,3,3,3},//DMOE
{0,0,0,3,3,0,0,0,0},//34
{0,0,0,2,2,3,0,0,0},//LLIF
{0,0,1,3,0,1,3,3,3},//STAN
}; };
extern int isplayer; extern int isplayer;
extern float player[27]; extern float player[27];

4
src/main.c
View File

@@ -102,8 +102,8 @@ int death = 0, framerender = 0;
int amd = 1; int amd = 1;
int FPSB = 0; int FPSB = 0;
int MSIGN =-1; int MSIGN =-1;
int CGOL = 0; //int CGOL = 0;
int GSPEED = 1; //int GSPEED = 1;
sign signs[MAXSIGNS]; sign signs[MAXSIGNS];

4
src/powder.c
View File

@@ -824,7 +824,7 @@ void update_particles_i(pixel *vid, int start, int inc)
int starti = (start*-1); int starti = (start*-1);
if(sys_pause&&!framerender) if(sys_pause&&!framerender)
return; return;
if(ISGOL==1&&CGOL>=GSPEED)//GSPEED is frames per generation if(ISGOL==1&&CGOL>=1)//GSPEED is frames per generation
{ {
for(nx=4;nx<XRES-4;nx++) for(nx=4;nx<XRES-4;nx++)
for(ny=4;ny<YRES-4;ny++) for(ny=4;ny<YRES-4;ny++)
@@ -1874,7 +1874,7 @@ void update_particles_i(pixel *vid, int start, int inc)
else if(t==PT_MORT) { else if(t==PT_MORT) {
create_part(-1, x, y-1, PT_SMKE); create_part(-1, x, y-1, PT_SMKE);
} }
else if(t==PT_GOL||t==PT_HLIF||t==PT_ASIM||t==PT_2x2||t==PT_DANI||t==PT_AMOE||t==PT_MOVE||t==PT_PGOL||t==PT_DMOE) else if(t==PT_GOL||t==PT_HLIF||t==PT_ASIM||t==PT_2x2||t==PT_DANI||t==PT_AMOE||t==PT_MOVE||t==PT_PGOL||t==PT_DMOE||t==PT_34||t==PT_LLIF||t==PT_STAN)
{ {
if(parts[i].temp>0) if(parts[i].temp>0)
parts[i].temp -= 50.0f; parts[i].temp -= 50.0f;