matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some work on DEST, EMP, LIGH

Browse Source 
Change indentation to tabs, respect temperature limit (if a hotter
reaction is required, should raise temp limit instead of ignoring it).

DEST: fix TYPE_SOLID check, and prevent it displacing DMND
EMP: randomise DLAY delay instead of heating it (since DLAY does not melt
and does not transfer heat)

Fix nearest_part so that t=-1 does not include dead particles
This commit is contained in:
jacksonmj 2011-10-12 00:11:20 +08:00 committed by Simon Robertshaw
parent 107e77a1a1
commit 2f46dca7c1
6 changed files with 336 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/powder.h
View File

@ -465,7 +465,7 @@ static const part_type ptypes[PT_NUM] =
{"PTCT", PIXPACK(0x405050), 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, R_TEMP+0.0f +273.15f, 251, "Semi-conductor. Only conducts electricity when cold (Less than 100C)", ST_SOLID, TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC, &update_NPTCT}, {"PTCT", PIXPACK(0x405050), 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, R_TEMP+0.0f +273.15f, 251, "Semi-conductor. Only conducts electricity when cold (Less than 100C)", ST_SOLID, TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC, &update_NPTCT},
{"BGLA", PIXPACK(0x606060), 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 Glass, Heavy particles. Meltable. Bagels.", ST_SOLID, TYPE_PART | PROP_HOT_GLOW, NULL}, {"BGLA", PIXPACK(0x606060), 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 Glass, Heavy particles. Meltable. Bagels.", ST_SOLID, TYPE_PART | PROP_HOT_GLOW, NULL},
{"THDR", PIXPACK(0xFFFFA0), 0.0f, 0.00f * CFDS, 1.0f, 0.30f, -0.99f, 0.6f, 0.62f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 1, 1, SC_EXPLOSIVE, 9000.0f +273.15f, 1, "Lightning! Very hot, inflicts damage upon most materials, transfers current to metals.", ST_NONE, TYPE_ENERGY, &update_THDR}, {"THDR", PIXPACK(0xFFFFA0), 0.0f, 0.00f * CFDS, 1.0f, 0.30f, -0.99f, 0.6f, 0.62f, 0.000f * CFDS, 0, 0, 0, 0, 0, 1, 1, 1, SC_EXPLOSIVE, 9000.0f +273.15f, 1, "Lightning! Very hot, inflicts damage upon most materials, transfers current to metals.", ST_NONE, TYPE_ENERGY, &update_THDR},
{"PLSM", PIXPACK(0xBB99FF), 0.9f, 0.04f * CFDS, 0.97f, 0.20f, 0.0f, -0.1f, 0.30f, 0.001f * CFDS, 0, 0, 0, 0, 0, 1, 1, 1, SC_GAS, 10000.0f +273.15f, 5, "Plasma, extremely hot.", ST_NONE, TYPE_GAS|PROP_LIFE_DEC|PROP_LIFE_KILL, &update_PYRO}, {"PLSM", PIXPACK(0xBB99FF), 0.9f, 0.04f * CFDS, 0.97f, 0.20f, 0.0f, -0.1f, 0.30f, 0.001f * CFDS, 0, 0, 0, 0, 0, 1, 1, 1, SC_GAS, 9999.0f, 5, "Plasma, extremely hot.", ST_NONE, TYPE_GAS|PROP_LIFE_DEC|PROP_LIFE_KILL, &update_PYRO},
{"ETRD", PIXPACK(0x404040), 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, R_TEMP+0.0f +273.15f, 251, "Electrode. Creates a surface that allows Plasma arcs. (Use sparingly)", ST_NONE, TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC, NULL}, {"ETRD", PIXPACK(0x404040), 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, R_TEMP+0.0f +273.15f, 251, "Electrode. Creates a surface that allows Plasma arcs. (Use sparingly)", ST_NONE, TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC, NULL},
{"NICE", PIXPACK(0xC0E0FF), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, -0.0005f* CFDS, 0, 0, 0, 0, 20, 1, 1, 100, SC_SOLIDS, 35.0f, 46, "Nitrogen Ice.", ST_SOLID, TYPE_SOLID, NULL}, {"NICE", PIXPACK(0xC0E0FF), 0.0f, 0.00f * CFDS, 0.90f, 0.00f, 0.0f, 0.0f, 0.00f, -0.0005f* CFDS, 0, 0, 0, 0, 20, 1, 1, 100, SC_SOLIDS, 35.0f, 46, "Nitrogen Ice.", ST_SOLID, TYPE_SOLID, NULL},
{"NBLE", PIXPACK(0xEB4917), 1.0f, 0.01f * CFDS, 0.99f, 0.30f, -0.1f, 0.0f, 0.75f, 0.001f * CFDS, 0, 0, 0, 0, 1, 1, 1, 1, SC_GAS, R_TEMP+2.0f +273.15f, 106, "Noble Gas. Diffuses. Conductive. Ionizes into plasma when introduced to electricity", ST_GAS, TYPE_GAS|PROP_CONDUCTS|PROP_LIFE_DEC, NULL}, {"NBLE", PIXPACK(0xEB4917), 1.0f, 0.01f * CFDS, 0.99f, 0.30f, -0.1f, 0.0f, 0.75f, 0.001f * CFDS, 0, 0, 0, 0, 1, 1, 1, 1, SC_GAS, R_TEMP+2.0f +273.15f, 106, "Noble Gas. Diffuses. Conductive. Ionizes into plasma when introduced to electricity", ST_GAS, TYPE_GAS|PROP_CONDUCTS|PROP_LIFE_DEC, NULL},

97
src/elements/dest.c
View File

@ -5,55 +5,50 @@ int update_DEST(UPDATE_FUNC_ARGS) {
rx=rand()%5-2; rx=rand()%5-2;
ry=rand()%5-2; ry=rand()%5-2;
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || !r) if (!r || (r&0xFF)==PT_DEST || (r&0xFF)==PT_DMND)
return 0; return 0;
if ((r&0xFF)!=PT_DEST && (r&0xFF)!=PT_DMND)
{ if (parts[i].life<=0 || parts[i].life>37)
if (parts[i].life<=0 || parts[i].life>37) {
{ parts[i].life=30+rand()%20;
parts[i].life=30+rand()%20; parts[i].temp+=20000;
parts[i].temp+=20000; pv[y/CELL][x/CELL]+=60.0f;
pv[y/CELL][x/CELL]+=60.0f; }
} parts[i].temp+=10000;
parts[i].temp+=10000; if ((r&0xFF)==PT_PLUT || (r&0xFF)==PT_DEUT)
if ((r&0xFF)==PT_PLUT || (r&0xFF)==PT_DEUT) {
{ pv[y/CELL][x/CELL]+=20.0f;
pv[y/CELL][x/CELL]+=20.0f; parts[i].temp+=18000;
parts[i].temp+=18000; if (rand()%2==0)
if (rand()%2==0) {
{ float orig_temp = parts[r>>8].temp;
part_change_type(r>>8, x+rx, y+ry, PT_NEUT); create_part(r>>8, x+rx, y+ry, PT_NEUT);
float rad = (rand()%128+128)/127.0f; parts[r>>8].temp = restrict_flt(orig_temp+40000.0f, MIN_TEMP, MAX_TEMP);
float a = (rand()%360)*M_PI/180.0f; pv[y/CELL][x/CELL] += 10.0f;
parts[r>>8].vx = rad*cosf(a); parts[i].life-=4;
parts[r>>8].vy = rad*sinf(a); }
parts[r>>8].temp+=40000; }
pv[y/CELL][x/CELL]+=10.0f; else if ((r&0xFF)==PT_INSL)
parts[i].life-=4; {
} create_part(r>>8, x+rx, y+ry, PT_PLSM);
} }
if ((r&0xFF)==PT_INSL) else if (rand()%3==0)
{ {
create_part(r>>8, x+rx, y+ry, PT_FIRE); kill_part(r>>8);
parts[r>>8].temp=10000; parts[i].life -= 4*((ptypes[r&0xFF].properties&TYPE_SOLID)?3:1);
} if (parts[i].life<=0)
else if (rand()%3==0) parts[i].life=1;
{ parts[i].temp+=10000;
kill_part(r>>8); }
parts[i].life-=4*(ptypes[r&0xFF].properties==TYPE_SOLID?3:1); else
if (parts[i].life<=0) {
parts[i].life=1; parts[r>>8].temp = restrict_flt(parts[r>>8].temp+10000.0f, MIN_TEMP, MAX_TEMP);
parts[i].temp+=10000; }
} int topv=pv[y/CELL][x/CELL]/9+parts[r>>8].temp/900;
else if (topv>40.0f)
{ topv=40.0f;
parts[r>>8].temp+=10000; pv[y/CELL][x/CELL]+=40.0f+topv;
} parts[i].temp = restrict_flt(parts[i].temp, MIN_TEMP, MAX_TEMP);
int topv=pv[y/CELL][x/CELL]/9+parts[r>>8].temp/900; return 0;
if (topv>40.0f)
topv=40.0f;
pv[y/CELL][x/CELL]+=40.0f+topv;
}
return 0;
} }

180
src/elements/emp.c
View File

@ -3,100 +3,108 @@
int update_EMP(UPDATE_FUNC_ARGS) { int update_EMP(UPDATE_FUNC_ARGS) {
int r,rx,ry,ok=0,t; int r,rx,ry,ok=0,t;
if (parts[i].life) if (parts[i].life)
return 0; return 0;
for (rx=-2; rx<3; rx++) for (rx=-2; rx<3; rx++)
for (ry=-2; ry<3; ry++) for (ry=-2; ry<3; ry++)
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) if (x+rx>=0 && y+ry>=0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{ {
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || !r) if (!r)
continue; continue;
if ((r&0xFF)==PT_SPRK) if ((r&0xFF)==PT_SPRK)
{ {
ok=1; ok=1;
break; break;
} }
} }
if (!ok) if (!ok)
return 0; return 0;
parts[i].life=220; parts[i].life=220;
emp_decor+=7; emp_decor+=7;
if (emp_decor>100) if (emp_decor>100)
emp_decor=100; emp_decor=100;
for (r=0; r<=parts_lastActiveIndex; r++) for (r=0; r<=parts_lastActiveIndex; r++)
{ {
t=parts[r].type; t=parts[r].type;
rx=parts[r].x; rx=parts[r].x;
ry=parts[r].y; ry=parts[r].y;
if (t==PT_SPRK || (t==PT_SWCH && parts[r].life!=0 && parts[r].life!=10) || (t==PT_WIRE && parts[r].ctype>0)) if (t==PT_SPRK || (t==PT_SWCH && parts[r].life!=0 && parts[r].life!=10) || (t==PT_WIRE && parts[r].ctype>0))
{ {
int is_elec=0; int is_elec=0;
if ((parts[r].ctype==PT_PSCN || parts[r].ctype==PT_NSCN || parts[r].ctype==PT_PTCT || if ((parts[r].ctype==PT_PSCN || parts[r].ctype==PT_NSCN || parts[r].ctype==PT_PTCT ||
parts[r].ctype==PT_NTCT || parts[r].ctype==PT_INST || parts[r].ctype==PT_SWCH) || t==PT_WIRE || t==PT_SWCH) parts[r].ctype==PT_NTCT || parts[r].ctype==PT_INST || parts[r].ctype==PT_SWCH) || t==PT_WIRE || t==PT_SWCH)
{ {
is_elec=1; is_elec=1;
if (rand()%100==0) if (rand()%100==0)
parts[r].temp+=3000; parts[r].temp = restrict_flt(parts[r].temp+3000.0f, MIN_TEMP, MAX_TEMP);
if (rand()%80==0) if (rand()%80==0)
part_change_type(r, rx, ry, PT_BREC); part_change_type(r, rx, ry, PT_BREC);
else if (rand()%120==0) else if (rand()%120==0)
part_change_type(r, rx, ry, PT_NTCT); part_change_type(r, rx, ry, PT_NTCT);
} }
int n,nx,ny; int n,nx,ny;
for (nx=-2; nx<3; nx++) for (nx=-2; nx<3; nx++)
for (ny=-2; ny<3; ny++) for (ny=-2; ny<3; ny++)
if (rx+nx>=0 && ry+ny>0 && rx+nx<XRES && ry+ny<YRES && (rx || ry)) if (rx+nx>=0 && ry+ny>=0 && rx+nx<XRES && ry+ny<YRES && (rx || ry))
{ {
n = pmap[ry+ny][rx+nx]; n = pmap[ry+ny][rx+nx];
if ((n>>8)>=NPART || !n) if (!n)
continue; continue;
/*if ((n&0xFF)==PT_BTRY && rand()%60==0) /*if ((n&0xFF)==PT_BTRY && rand()%60==0)
{ {
part_change_type(n>>8, rx+nx, ry+ny, PT_PLSM); part_change_type(n>>8, rx+nx, ry+ny, PT_PLSM);
parts[n>>8].life=rand()%100+70; parts[n>>8].life=rand()%100+70;
parts[n>>8].temp+=3000; parts[n>>8].temp+=3000;
}*/ }*/
if (is_elec && ((n&0xFF)==PT_METL || (n&0xFF)==PT_BMTL) && rand()%280==0)
{ //Some elements should only be affected by wire/swch, or by a spark on inst/semiconductor
parts[n>>8].temp+=3000; //So not affected by spark on metl, watr etc
} if (is_elec)
if (is_elec && (n&0xFF)==PT_BMTL && rand()%160==0) {
{ if (((n&0xFF)==PT_METL || (n&0xFF)==PT_BMTL) && rand()%280==0)
part_change_type(n>>8, rx+nx, ry+ny, PT_BMTL); {
parts[n>>8].temp+=1000; parts[n>>8].temp = restrict_flt(parts[n>>8].temp+3000.0f, MIN_TEMP, MAX_TEMP);
} }
if (is_elec && (n&0xFF)==PT_METL && rand()%300==0) if ((n&0xFF)==PT_BMTL && rand()%160==0)
{ {
part_change_type(n>>8, rx+nx, ry+ny, PT_BMTL); part_change_type(n>>8, rx+nx, ry+ny, PT_BMTL);//TODO: Redundant, was this meant to be BRMT or something?
} parts[n>>8].temp = restrict_flt(parts[n>>8].temp+1000.0f, MIN_TEMP, MAX_TEMP);
if ((t==PT_PSCN || t==PT_NSCN) && (n&0xFF)==PT_SWCH && rand()%100==0) }
{ if ((n&0xFF)==PT_METL && rand()%300==0)
part_change_type(n>>8, rx+nx, ry+ny, PT_BREC); {
} part_change_type(n>>8, rx+nx, ry+ny, PT_BMTL);
if ((t==PT_PSCN || t==PT_NSCN) && (n&0xFF)==PT_SWCH && rand()%100==0) }
{ if ((n&0xFF)==PT_WIFI && rand()%8==0)
parts[n>>8].temp+=2000; {
} //Randomise channel
if (is_elec && (n&0xFF)==PT_WIFI && rand()%8==0) parts[n>>8].temp = rand()%MAX_TEMP;
{ }
parts[n>>8].temp=rand()%10000; if ((n&0xFF)==PT_WIFI && rand()%16==0)
} {
if (is_elec && (n&0xFF)==PT_WIFI && rand()%16==0) create_part(n>>8, rx+nx, ry+ny, PT_BREC);
{ parts[n>>8].temp = restrict_flt(parts[n>>8].temp+1000.0f, MIN_TEMP, MAX_TEMP);
create_part(n>>8, rx+nx, ry+ny, PT_BREC); }
parts[n>>8].temp+=1000; }
} if ((n&0xFF)==PT_SWCH && rand()%100==0)
if ((n&0xFF)==PT_ARAY && rand()%60==0) {
{ part_change_type(n>>8, rx+nx, ry+ny, PT_BREC);
create_part(n>>8, rx+nx, ry+ny, PT_BREC); }
parts[n>>8].temp+=1000; if ((n&0xFF)==PT_SWCH && rand()%100==0)
} {
if (t==PT_DLAY && rand()%70==0) parts[n>>8].temp = restrict_flt(parts[n>>8].temp+2000.0f, MIN_TEMP, MAX_TEMP);
{ }
parts[n>>8].temp+=2000; if ((n&0xFF)==PT_ARAY && rand()%60==0)
} {
} create_part(n>>8, rx+nx, ry+ny, PT_BREC);
} parts[n>>8].temp = restrict_flt(parts[n>>8].temp+1000.0f, MIN_TEMP, MAX_TEMP);
}
if (t==PT_DLAY && rand()%70==0)
{
//Randomise delay
parts[n>>8].temp = (rand()%256) + 273.15f;
}
}
}
} }
return 0; return 0;
} }

337
src/elements/ligh.c
View File

@ -4,26 +4,26 @@
int contact_part(int i, int tp) int contact_part(int i, int tp)
{ {
int x=parts[i].x, y=parts[i].y; int x=parts[i].x, y=parts[i].y;
int r,rx,ry; int r,rx,ry;
for (rx=-2; rx<3; rx++) for (rx=-2; rx<3; rx++)
for (ry=-2; ry<3; ry++) for (ry=-2; ry<3; ry++)
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) if (x+rx>=0 && y+ry>=0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{ {
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || !r) if (!r)
continue; continue;
if ((r&0xFF)==tp) if ((r&0xFF)==tp)
return r>>8; return r>>8;
} }
return -1; return -1;
} }
void create_line_par(int x1, int y1, int x2, int y2, int c, int temp, int life, int tmp, int tmp2) void create_line_par(int x1, int y1, int x2, int y2, int c, int temp, int life, int tmp, int tmp2)
{ {
if (c==WL_EHOLE || c==WL_ALLOWGAS || c==WL_ALLOWALLELEC || c==WL_ALLOWSOLID || c==WL_ALLOWAIR || c==WL_WALL || c==WL_DESTROYALL || c==WL_ALLOWLIQUID || c==WL_FAN || c==WL_STREAM || c==WL_DETECT || c==WL_EWALL || c==WL_WALLELEC) if (c==WL_EHOLE || c==WL_ALLOWGAS || c==WL_ALLOWALLELEC || c==WL_ALLOWSOLID || c==WL_ALLOWAIR || c==WL_WALL || c==WL_DESTROYALL || c==WL_ALLOWLIQUID || c==WL_FAN || c==WL_STREAM || c==WL_DETECT || c==WL_EWALL || c==WL_WALLELEC)
return; // this function only for particles, no walls return; // this function only for particles, no walls
int cp=abs(y2-y1)>abs(x2-x1), x, y, dx, dy, sy; int cp=abs(y2-y1)>abs(x2-x1), x, y, dx, dy, sy;
float e, de; float e, de;
if (cp) if (cp)
{ {
@ -54,18 +54,18 @@ void create_line_par(int x1, int y1, int x2, int y2, int c, int temp, int life,
sy = (y1<y2) ? 1 : -1; sy = (y1<y2) ? 1 : -1;
for (x=x1; x<=x2; x++) for (x=x1; x<=x2; x++)
{ {
int p; int p;
if (cp) if (cp)
p=create_part(-1, y, x, c); p=create_part(-1, y, x, c);
else else
p=create_part(-1, x, y,c); p=create_part(-1, x, y,c);
if (p!=-1) if (p!=-1)
{ {
parts[p].life=life; parts[p].life=life;
parts[p].temp=temp; parts[p].temp=temp;
parts[p].tmp=tmp; parts[p].tmp=tmp;
parts[p].tmp2=tmp2; parts[p].tmp2=tmp2;
} }
e += de; e += de;
if (e >= 0.5f) if (e >= 0.5f)
{ {
@ -77,136 +77,137 @@ void create_line_par(int x1, int y1, int x2, int y2, int c, int temp, int life,
int update_LIGH(UPDATE_FUNC_ARGS) int update_LIGH(UPDATE_FUNC_ARGS)
{ {
/* /*
* *
* tmp2: * tmp2:
* -1 - part will be removed * -1 - part will be removed
* 0 - "branches" of the lightning * 0 - "branches" of the lightning
* 1 - bending * 1 - bending
* 2 - branching * 2 - branching
* 3 - transfer spark or make destruction * 3 - transfer spark or make destruction
* 4 - first pixel * 4 - first pixel
* *
* life - "thickness" of lighting (but anyway one pixel) * life - "thickness" of lighting (but anyway one pixel)
* *
* tmp - angle of lighting * tmp - angle of lighting
* *
*/ */
int r,rx,ry, multipler, powderful=parts[i].temp*(1+parts[i].life/40)*LIGHTING_POWER; int r,rx,ry, multipler, powderful=parts[i].temp*(1+parts[i].life/40)*LIGHTING_POWER;
hv[y/CELL][x/CELL]+=powderful/40; hv[y/CELL][x/CELL]+=powderful/40;
if (hv[y/CELL][x/CELL]>MAX_TEMP) if (hv[y/CELL][x/CELL]>MAX_TEMP)
hv[y/CELL][x/CELL]=MAX_TEMP; hv[y/CELL][x/CELL]=MAX_TEMP;
for (rx=-2; rx<3; rx++) // destruction for (rx=-2; rx<3; rx++) // destruction
for (ry=-2; ry<3; ry++) for (ry=-2; ry<3; ry++)
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) if (x+rx>=0 && y+ry>=0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{ {
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || !r) if (!r)
continue; continue;
if ((r&0xFF)!=PT_LIGH && (r&0xFF)!=PT_TESC) if ((r&0xFF)!=PT_LIGH && (r&0xFF)!=PT_TESC)
{ {
if (parts[i].tmp2==3) if (parts[i].tmp2==3)
{ {
if ((ptypes[r&0xFF].properties&PROP_CONDUCTS) && parts[r>>8].life==0 && parts[r>>8].ctype!=PT_SPRK) if ((ptypes[r&0xFF].properties&PROP_CONDUCTS) && parts[r>>8].life==0)
{ {
parts[r>>8].ctype = parts[r>>8].type; parts[r>>8].ctype = parts[r>>8].type;
part_change_type(r>>8,x+rx,y+ry,PT_SPRK); create_part(r>>8,x+rx,y+ry,PT_SPRK);
parts[r>>8].life = 4; parts[r>>8].life = 4;
pv[y/CELL][x/CELL] += powderful/1200; pv[y/CELL][x/CELL] += powderful/1200;
parts[r>>8].temp+=powderful/20; parts[r>>8].temp = restrict_flt(parts[r>>8].temp+powderful/20, MIN_TEMP, MAX_TEMP);
} }
else if ((r&0xFF)!=PT_CLNE&&(r&0xFF)!=PT_THDR&&(r&0xFF)!=PT_SPRK&&(r&0xFF)!=PT_DMND&&(r&0xFF)!=PT_FIRE&&(r&0xFF)!=PT_NEUT&&(r&0xFF)!=PT_PHOT) else if ((r&0xFF)!=PT_CLNE&&(r&0xFF)!=PT_THDR&&(r&0xFF)!=PT_SPRK&&(r&0xFF)!=PT_DMND&&(r&0xFF)!=PT_FIRE&&(r&0xFF)!=PT_NEUT&&(r&0xFF)!=PT_PHOT)
{ {
pv[y/CELL][x/CELL] += powderful/110; pv[y/CELL][x/CELL] += powderful/110;
parts[r>>8].temp+=powderful/1.5; parts[r>>8].temp = restrict_flt(parts[r>>8].temp+powderful/1.5, MIN_TEMP, MAX_TEMP);
} }
if ((r&0xFF)==PT_DEUT || (r&0xFF)==PT_PLUT) if ((r&0xFF)==PT_DEUT || (r&0xFF)==PT_PLUT)
{ {
parts[r>>8].temp+=powderful; parts[r>>8].temp = restrict_flt(parts[r>>8].temp+powderful, MIN_TEMP, MAX_TEMP);
pv[y/CELL][x/CELL] +=powderful/35; pv[y/CELL][x/CELL] +=powderful/35;
if (rand()%3==0) if (rand()%3==0)
{ {
part_change_type(r>>8,x+rx,y+ry,PT_NEUT); part_change_type(r>>8,x+rx,y+ry,PT_NEUT);
parts[r>>8].vx=rand()%10-5; parts[r>>8].life = rand()%480+480;
parts[r>>8].vy=rand()%10-5; parts[r>>8].vx=rand()%10-5;
} parts[r>>8].vy=rand()%10-5;
} }
} }
if ((r&0xFF)!=PT_CLNE&&(r&0xFF)!=PT_THDR&&(r&0xFF)!=PT_SPRK&&(r&0xFF)!=PT_DMND&&(r&0xFF)!=PT_FIRE&&(r&0xFF)!=PT_NEUT&&(r&0xFF)!=PT_PHOT) }
parts[r>>8].temp+=powderful/16; if ((r&0xFF)!=PT_CLNE&&(r&0xFF)!=PT_THDR&&(r&0xFF)!=PT_SPRK&&(r&0xFF)!=PT_DMND&&(r&0xFF)!=PT_FIRE&&(r&0xFF)!=PT_NEUT&&(r&0xFF)!=PT_PHOT)
else parts[r>>8].temp = restrict_flt(parts[r>>8].temp+powderful/16, MIN_TEMP, MAX_TEMP);
parts[r>>8].temp+=powderful/70; else
parts[r>>8].temp = restrict_flt(parts[r>>8].temp+powderful/70, MIN_TEMP, MAX_TEMP);
} }
} }
if (parts[i].tmp2==3) if (parts[i].tmp2==3)
{ {
//if (rand()&1) //if (rand()&1)
parts[i].tmp2=1; parts[i].tmp2=1;
/*else /*else
parts[i].tmp2=0;*/ parts[i].tmp2=0;*/
return 1; return 1;
} }
if (parts[i].tmp2==-1) if (parts[i].tmp2==-1)
{ {
kill_part(i); kill_part(i);
return 0; return 1;
} }
if (parts[i].tmp2<=0 || parts[i].life<=1) if (parts[i].tmp2<=0 || parts[i].life<=1)
{ {
/*if (parts[i].tmp2!=3 && rand()%3000<400/(parts[i].life+1)) /*if (parts[i].tmp2!=3 && rand()%3000<400/(parts[i].life+1))
{ {
parts[i].tmp2=1; parts[i].tmp2=1;
return 1; return 1;
}*/ }*/
if (parts[i].tmp2>0) if (parts[i].tmp2>0)
parts[i].tmp2=0; parts[i].tmp2=0;
parts[i].tmp2--; parts[i].tmp2--;
return 1; return 1;
} }
if (parts[i].tmp2<=-2) if (parts[i].tmp2<=-2)
{ {
kill_part(i); kill_part(i);
return 0; return 1;
} }
float angle, angle2=-1; float angle, angle2=-1;
int near=nearest_part(i, -1, parts[i].life*3.5); int near=nearest_part(i, -1, parts[i].life*3.5);
if (near!=-1 && (parts[near].type==PT_LIGH || parts[near].type==PT_THDR || parts[near].type==PT_NEUT)) if (near!=-1 && (parts[near].type==PT_LIGH || parts[near].type==PT_THDR || parts[near].type==PT_NEUT))
near=-1; near=-1;
if (near!=-1) if (near!=-1)
{ {
int t=parts[near].type; int t=parts[near].type;
rx=parts[near].x-x; rx=parts[near].x-x;
ry=parts[near].y-y; ry=parts[near].y-y;
if (asin(ry-sqrt(rx*rx+ry*ry))<M_PI*2/3) if (asin(ry-sqrt(rx*rx+ry*ry))<M_PI*2/3)
{ {
create_line_par(x, y, x+rx, y+ry, PT_LIGH, parts[i].temp, parts[i].life, parts[i].tmp-90, 0); create_line_par(x, y, x+rx, y+ry, PT_LIGH, parts[i].temp, parts[i].life, parts[i].tmp-90, 0);
/*if (t!=PT_DMND && t!=PT_UDMT && t!=PT_TESC && parts[i].temp-300>rand()%2000) /*if (t!=PT_DMND && t!=PT_UDMT && t!=PT_TESC && parts[i].temp-300>rand()%2000)
{ {
part_change_type(near, x+rx, y+ry, PT_LIGH); part_change_type(near, x+rx, y+ry, PT_LIGH);
parts[near].tmp2=3; parts[near].tmp2=3;
parts[near].life=(int)(1.0*parts[i].life/2-1); parts[near].life=(int)(1.0*parts[i].life/2-1);
parts[near].tmp=parts[i].tmp-180; parts[near].tmp=parts[i].tmp-180;
parts[near].temp=parts[i].temp; parts[near].temp=parts[i].temp;
}*/ }*/
if (t!=PT_TESC) if (t!=PT_TESC)
{ {
near=contact_part(near, PT_LIGH); near=contact_part(near, PT_LIGH);
if (near!=-1) if (near!=-1)
{ {
parts[near].tmp2=3; parts[near].tmp2=3;
parts[near].life=(int)(1.0*parts[i].life/2-1); parts[near].life=(int)(1.0*parts[i].life/2-1);
parts[near].tmp=parts[i].tmp-180; parts[near].tmp=parts[i].tmp-180;
parts[near].temp=parts[i].temp; parts[near].temp=parts[i].temp;
} }
} }
} }
else near=-1; else near=-1;
} }
//if (parts[i].tmp2==1/* || near!=-1*/) //if (parts[i].tmp2==1/* || near!=-1*/)
@ -222,66 +223,66 @@ int update_LIGH(UPDATE_FUNC_ARGS)
case 2: case 2:
angle = atan2(x-XCNTR, y-YCNTR)*(180.0f/M_PI)+90; angle = atan2(x-XCNTR, y-YCNTR)*(180.0f/M_PI)+90;
} }
//angle=0;//parts[i].tmp-30+rand()%60; //angle=0;//parts[i].tmp-30+rand()%60;
if (angle<0) if (angle<0)
angle+=360; angle+=360;
if (angle>=360) if (angle>=360)
angle-=360; angle-=360;
if (parts[i].tmp2==2) if (parts[i].tmp2==2)
{ {
angle2=angle+100-rand()%200; angle2=angle+100-rand()%200;
if (angle2<0) if (angle2<0)
angle2+=360; angle2+=360;
if (angle2>=360) if (angle2>=360)
angle-=360; angle-=360;
/*angle=parts[i].tmp-70+rand()%50; /*angle=parts[i].tmp-70+rand()%50;
if (angle<0) if (angle<0)
angle+=360; angle+=360;
if (angle>=360) if (angle>=360)
angle-=360;*/ angle-=360;*/
} }
multipler=parts[i].life*1.5+rand()%((int)(parts[i].life+1)); multipler=parts[i].life*1.5+rand()%((int)(parts[i].life+1));
rx=cos(angle*M_PI/180)*multipler; rx=cos(angle*M_PI/180)*multipler;
ry=-sin(angle*M_PI/180)*multipler; ry=-sin(angle*M_PI/180)*multipler;
create_line_par(x, y, x+rx, y+ry, PT_LIGH, parts[i].temp, parts[i].life, angle, 0); create_line_par(x, y, x+rx, y+ry, PT_LIGH, parts[i].temp, parts[i].life, angle, 0);
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) if (x+rx>=0 && y+ry>=0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{ {
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
/*if ((r&0xFF)!=PT_LIGH && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_UDMT && (r&0xFF)!=PT_TESC) /*if ((r&0xFF)!=PT_LIGH && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_UDMT && (r&0xFF)!=PT_TESC)
part_change_type(r>>8, x+rx, y+ry, PT_LIGH);*/ part_change_type(r>>8, x+rx, y+ry, PT_LIGH);*/
if ((r&0xFF)==PT_LIGH && !((r>>8)>=NPART || !r)) if ((r&0xFF)==PT_LIGH)
{ {
parts[r>>8].tmp2=1+(rand()%200>parts[i].tmp2*parts[i].tmp2/10+60); parts[r>>8].tmp2=1+(rand()%200>parts[i].tmp2*parts[i].tmp2/10+60);
parts[r>>8].life=(int)(1.0*parts[i].life/1.5-rand()%2); parts[r>>8].life=(int)(1.0*parts[i].life/1.5-rand()%2);
parts[r>>8].tmp=angle; parts[r>>8].tmp=angle;
parts[r>>8].temp=parts[i].temp; parts[r>>8].temp=parts[i].temp;
} }
} }
if (angle2!=-1) if (angle2!=-1)
{ {
multipler=parts[i].life*1.5+rand()%((int)(parts[i].life+1)); multipler=parts[i].life*1.5+rand()%((int)(parts[i].life+1));
rx=cos(angle2*M_PI/180)*multipler; rx=cos(angle2*M_PI/180)*multipler;
ry=-sin(angle2*M_PI/180)*multipler; ry=-sin(angle2*M_PI/180)*multipler;
create_line_par(x, y, x+rx, y+ry, PT_LIGH, parts[i].temp, parts[i].life, angle2, 0); create_line_par(x, y, x+rx, y+ry, PT_LIGH, parts[i].temp, parts[i].life, angle2, 0);
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{ {
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
/*if ((r&0xFF)!=PT_LIGH && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_UDMT && (r&0xFF)!=PT_TESC) /*if ((r&0xFF)!=PT_LIGH && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_UDMT && (r&0xFF)!=PT_TESC)
part_change_type(r>>8, x+rx, y+ry, PT_LIGH);*/ part_change_type(r>>8, x+rx, y+ry, PT_LIGH);*/
if ((r&0xFF)==PT_LIGH && !((r>>8)>=NPART || !r)) if ((r&0xFF)==PT_LIGH && !((r>>8)>=NPART || !r))
{ {
parts[r>>8].tmp2=1+(rand()%200>parts[i].tmp2*parts[i].tmp2/10+40); parts[r>>8].tmp2=1+(rand()%200>parts[i].tmp2*parts[i].tmp2/10+40);
parts[r>>8].life=(int)(1.0*parts[i].life/1.5-rand()%2); parts[r>>8].life=(int)(1.0*parts[i].life/1.5-rand()%2);
parts[r>>8].tmp=angle; parts[r>>8].tmp=angle;
parts[r>>8].temp=parts[i].temp; parts[r>>8].temp=parts[i].temp;
} }
} }
} }
parts[i].tmp2=-1; parts[i].tmp2=-1;
return 1; return 1;
} }

48
src/elements/sprk.c
View File

@ -54,38 +54,38 @@ int update_SPRK(UPDATE_FUNC_ARGS) {
} }
else if (ct==PT_TESC) // tesla coil code else if (ct==PT_TESC) // tesla coil code
{ {
if (parts[i].tmp>300) if (parts[i].tmp>300)
parts[i].tmp=300; parts[i].tmp=300;
for (rx=-1; rx<2; rx++) for (rx=-1; rx<2; rx++)
for (ry=-1; ry<2; ry++) for (ry=-1; ry<2; ry++)
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
{ {
r = pmap[y+ry][x+rx]; r = pmap[y+ry][x+rx];
if ((r>>8)>=NPART || r) if ((r>>8)>=NPART || r)
continue; continue;
if (rand()%(parts[i].tmp*parts[i].tmp/20+6)==0) if (rand()%(parts[i].tmp*parts[i].tmp/20+6)==0)
{ {
int p=create_part(-1, x+rx*2, y+ry*2, PT_LIGH); int p=create_part(-1, x+rx*2, y+ry*2, PT_LIGH);
if (p!=-1) if (p!=-1)
{ {
if(parts[i].tmp<=4) //Prevent Arithmetic errors with zero values if(parts[i].tmp<=4) //Prevent Arithmetic errors with zero values
continue; continue;
parts[p].life=rand()%(2+parts[i].tmp/15)+4+parts[i].tmp/7; parts[p].life=rand()%(2+parts[i].tmp/15)+4+parts[i].tmp/7;
if (parts[i].life>60) if (parts[i].life>60)
parts[i].life=60; parts[i].life=60;
parts[p].temp=parts[p].life*parts[i].tmp/2.5; parts[p].temp=parts[p].life*parts[i].tmp/2.5;
parts[p].tmp2=1; parts[p].tmp2=1;
parts[p].tmp=acos(1.0*rx/sqrt(rx*rx+ry*ry))/M_PI*360; parts[p].tmp=acos(1.0*rx/sqrt(rx*rx+ry*ry))/M_PI*360;
parts[i].temp-=parts[i].tmp*2+parts[i].temp/5; // slight self-cooling parts[i].temp-=parts[i].tmp*2+parts[i].temp/5; // slight self-cooling
if (fabs(pv[y/CELL][x/CELL])!=0.0f) if (fabs(pv[y/CELL][x/CELL])!=0.0f)
{ {
if (fabs(pv[y/CELL][x/CELL])<=0.5f) if (fabs(pv[y/CELL][x/CELL])<=0.5f)
pv[y/CELL][x/CELL]=0; pv[y/CELL][x/CELL]=0;
else else
pv[y/CELL][x/CELL]-=(pv[y/CELL][x/CELL]>0)?0.5:-0.5; pv[y/CELL][x/CELL]-=(pv[y/CELL][x/CELL]>0)?0.5:-0.5;
} }
} }
} }
} }
} }
else if (ct==PT_IRON) { else if (ct==PT_IRON) {

3
src/powder.c
View File

@ -98,6 +98,7 @@ void init_can_move()
can_move[t][rt] = 2; can_move[t][rt] = 2;
} }
} }
can_move[PT_DEST][PT_DMND] = 0;
can_move[PT_BIZR][PT_FILT] = 2; can_move[PT_BIZR][PT_FILT] = 2;
can_move[PT_BIZRG][PT_FILT] = 2; can_move[PT_BIZRG][PT_FILT] = 2;
for (t=0;t<PT_NUM;t++) for (t=0;t<PT_NUM;t++)
@ -1276,7 +1277,7 @@ int nearest_part(int ci, int t, int max_d)
int cy = (int)parts[ci].y; int cy = (int)parts[ci].y;
for (i=0; i<=parts_lastActiveIndex; i++) for (i=0; i<=parts_lastActiveIndex; i++)
{ {
if ((parts[i].type==t||t==-1)&&!parts[i].life&&i!=ci) if ((parts[i].type==t||(t==-1&&parts[i].type))&&!parts[i].life&&i!=ci)
{ {
ndistance = abs(cx-parts[i].x)+abs(cy-parts[i].y);// Faster but less accurate Older: sqrt(pow(cx-parts[i].x, 2)+pow(cy-parts[i].y, 2)); ndistance = abs(cx-parts[i].x)+abs(cy-parts[i].y);// Faster but less accurate Older: sqrt(pow(cx-parts[i].x, 2)+pow(cy-parts[i].y, 2));
if (ndistance<distance) if (ndistance<distance)