From f40d6cd626a8c5da3bd6aec0ec5afaa3e217f341 Mon Sep 17 00:00:00 2001 From: "chaos.powdertoy.co.uk" Date: Thu, 5 Apr 2012 23:21:05 +0100 Subject: [PATCH 1/5] Version Increment --- includes/defines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/defines.h b/includes/defines.h index 013215a0d..cab0e24c1 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -10,7 +10,7 @@ //VersionInfoStart #define SAVE_VERSION 74 #define MINOR_VERSION 1 -#define BUILD_NUM 150 +#define BUILD_NUM 151 //VersionInfoEnd #define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter From e52f730969a4d1a551dd76d21c16068e05395dac Mon Sep 17 00:00:00 2001 From: savask Date: Sat, 7 Apr 2012 14:50:07 +0700 Subject: [PATCH 2/5] A fix for ice with ctype = 0. --- src/powder.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/powder.c b/src/powder.c index 95b833355..e9cf2ce41 100644 --- a/src/powder.c +++ b/src/powder.c @@ -1930,6 +1930,11 @@ void update_particles_i(pixel *vid, int start, int inc) || t==PT_WTRV) ctempl -= 2.0f*pv[y/CELL][x/CELL]; s = 1; + + //A fix for ice with ctype = 0 + if (t==PT_ICEI && parts[i].ctype==0) + parts[i].ctype = PT_WATR; + if (ctemph>ptransitions[t].thv&&ptransitions[t].tht>-1) { // particle type change due to high temperature #ifdef REALISTIC From e4729d61d85f748ffa7f5e4622ead5905a7806f8 Mon Sep 17 00:00:00 2001 From: "chaos.powdertoy.co.uk" Date: Sat, 7 Apr 2012 11:41:03 +0100 Subject: [PATCH 3/5] Version Increment --- includes/defines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/defines.h b/includes/defines.h index cab0e24c1..00db6c82c 100644 --- a/includes/defines.h +++ b/includes/defines.h @@ -10,7 +10,7 @@ //VersionInfoStart #define SAVE_VERSION 74 #define MINOR_VERSION 1 -#define BUILD_NUM 151 +#define BUILD_NUM 152 //VersionInfoEnd #define IDENT_VERSION "G" //Change this if you're not Simon! It should be a single letter From 76f49dd024d5fd3200d01e9662e0d378dc86ab55 Mon Sep 17 00:00:00 2001 From: jacksonmj Date: Tue, 10 Apr 2012 17:26:14 +0100 Subject: [PATCH 4/5] Stop walls next to pipe triggering automatic pattern generation --- src/elements/pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/elements/pipe.c b/src/elements/pipe.c index 1607a0bde..b387b7d1f 100644 --- a/src/elements/pipe.c +++ b/src/elements/pipe.c @@ -215,7 +215,7 @@ int update_PIPE(UPDATE_FUNC_ARGS) { for (ry=-1; ry<2; ry++) if (x+rx>=0 && y+ry>0 && x+rx Date: Wed, 11 Apr 2012 16:50:35 +0100 Subject: [PATCH 5/5] Use graphics function for BCOL --- src/elementdata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/elementdata.c b/src/elementdata.c index 08306f7c9..82e1a6740 100644 --- a/src/elementdata.c +++ b/src/elementdata.c @@ -87,7 +87,7 @@ part_type ptypes[PT_NUM] = {"FUSE", PIXPACK(0x0A5706), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.0f, 0.0f * CFDS, 0, 0, 0, 0, 20, 1, 1, 100, SC_SOLIDS, R_TEMP+0.0f +273.15f, 200, "Solid. Burns slowly. Ignites at somewhat high temperatures and electricity.", ST_SOLID, TYPE_SOLID, &update_FUSE, NULL}, {"FSEP", PIXPACK(0x63AD5F), 0.7f, 0.02f * CFDS, 0.96f, 0.80f, 0.0f, 0.1f, 0.00f, 0.000f * CFDS, 1, 0, 0, 0, 30, 1, 1, 70, SC_POWDERS, R_TEMP+0.0f +273.15f, 70, "Fuse Powder. See FUSE.", ST_SOLID, TYPE_PART, &update_FSEP, NULL}, {"AMTR", PIXPACK(0x808080), 0.7f, 0.02f * CFDS, 0.96f, 0.80f, 0.00f, 0.10f, 1.00f, 0.0000f * CFDS, 0, 0, 0, 0, 0, 1, 1, 100, SC_NUCLEAR, R_TEMP+0.0f +273.15f, 70, "Anti-Matter, Destroys a majority of particles", ST_NONE, TYPE_PART, &update_AMTR, NULL}, //Maybe TYPE_ENERGY? - {"BCOL", PIXPACK(0x333333), 0.4f, 0.04f * CFDS, 0.94f, 0.95f, -0.1f, 0.3f, 0.00f, 0.000f * CFDS, 1, 0, 0, 5, 2, 1, 1, 90, SC_POWDERS, R_TEMP+0.0f +273.15f, 150, "Broken Coal. Heavy particles. See COAL", ST_SOLID, TYPE_PART, &update_BCOL, NULL}, + {"BCOL", PIXPACK(0x333333), 0.4f, 0.04f * CFDS, 0.94f, 0.95f, -0.1f, 0.3f, 0.00f, 0.000f * CFDS, 1, 0, 0, 5, 2, 1, 1, 90, SC_POWDERS, R_TEMP+0.0f +273.15f, 150, "Broken Coal. Heavy particles. See COAL", ST_SOLID, TYPE_PART, &update_BCOL, &graphics_COAL}, {"PCLN", PIXPACK(0x3B3B0A), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, 0.000f * CFDS, 0, 0, 0, 0, 1, 1, 1, 100, SC_POWERED, R_TEMP+0.0f +273.15f, 251, "Solid. When activated, duplicates any particles it touches.", ST_NONE, TYPE_SOLID, &update_PCLN, &graphics_PCLN}, {"HSWC", PIXPACK(0x3B0A0A), 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_POWERED, R_TEMP+0.0f +273.15f, 251, "Heat switch. Conducts Heat only when activated", ST_NONE, TYPE_SOLID, &update_HSWC, &graphics_HSWC}, {"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, NULL},