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

Tweaks to glow colors. EXOT now mimicks Heat View's color scale, and its irradiated color scheme uses tmp2 instead of temp so it appears to cycle.

Browse Source
This commit is contained in:
Catelite 2012-06-06 21:12:37 -04:00 committed by Simon Robertshaw
parent 3dabc63ff7
commit a717f67f62
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/elements/exot.c
View File

@ -33,7 +33,7 @@ int update_EXOT(UPDATE_FUNC_ARGS) {
} }
} }
if (parts[i].tmp>245) if (parts[i].tmp>245)
if (1>rand()%1000) if (1>rand()%500)
if ((r&0xFF)!=PT_EXOT && (r&0xFF)!=PT_BREL && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PRTI && (r&0xFF)!=PT_PRTO && (r&0xFF)!=PT_PCLN && (r&0xFF)!=PT_PHOT && (r&0xFF)!=PT_VOID && (r&0xFF)!=PT_NBHL && (r&0xFF)!=PT_WARP) if ((r&0xFF)!=PT_EXOT && (r&0xFF)!=PT_BREL && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_CLNE && (r&0xFF)!=PT_PRTI && (r&0xFF)!=PT_PRTO && (r&0xFF)!=PT_PCLN && (r&0xFF)!=PT_PHOT && (r&0xFF)!=PT_VOID && (r&0xFF)!=PT_NBHL && (r&0xFF)!=PT_WARP)
create_part(i, x, y, parts[r>>8].type); create_part(i, x, y, parts[r>>8].type);
} }
@ -86,18 +86,27 @@ int update_EXOT(UPDATE_FUNC_ARGS) {
} }
} }
} }
if (parts[i].temp<273.15f)
{
parts[i].vx = 0;
parts[i].vy = 0;
pv[y/CELL][x/CELL] -= 0.01;
parts[i].tmp--;
}
return 0; return 0;
} }
int graphics_EXOT(GRAPHICS_FUNC_ARGS) int graphics_EXOT(GRAPHICS_FUNC_ARGS)
{ {
int q = cpart->temp; int q = cpart->temp;
int b = cpart->tmp; int b = cpart->tmp;
int c = cpart->tmp2;
if ((cpart->tmp2 - 1)>rand()%1000) if ((cpart->tmp2 - 1)>rand()%1000)
{ {
float frequency = 0.90045; float frequency = 0.04045;
*colr = (sin(frequency*q + 0) * 127 + 255); *colr = (sin(frequency*c + 4) * 127 + 150);
*colg = (sin(frequency*q + 2) * 127 + 255); *colg = (sin(frequency*c + 6) * 127 + 150);
*colb = (sin(frequency*q + 4) * 127 + 255); *colb = (sin(frequency*c + 8) * 127 + 150);
*firea = 100; *firea = 100;
*firer = 0; *firer = 0;
*fireg = 0; *fireg = 0;
@ -109,9 +118,9 @@ int graphics_EXOT(GRAPHICS_FUNC_ARGS)
else else
{ {
float frequency = 0.00045; float frequency = 0.00045;
*colr = (sin(frequency*q + 0) * 127 + (b/1.7)); *colr = (sin(frequency*q + 4) * 127 + (b/1.7));
*colg = (sin(frequency*q + 2) * 127 + (b/1.7)); *colg = (sin(frequency*q + 6) * 127 + (b/1.7));
*colb = (sin(frequency*q + 4) * 127 + (b/1.7)); *colb = (sin(frequency*q + 8) * 127 + (b/1.7));
*cola = cpart->tmp / 6; *cola = cpart->tmp / 6;
*firea = *cola; *firea = *cola;
*firer = *colr; *firer = *colr;