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

ACEL and DCEL use life for strength value

Browse Source
This commit is contained in:
Simon Robertshaw 2013-02-24 11:50:10 +00:00
parent 934dbe3518
commit 8dfb1ecf87
3 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/simulation/Simulation.cpp
View File

@ -3089,15 +3089,10 @@ int Simulation::create_part(int p, int x, int y, int tv)
break; break;
case PT_DTEC: case PT_DTEC:
parts[i].tmp2 = 2; parts[i].tmp2 = 2;
break;
case PT_TSNS: case PT_TSNS:
parts[i].tmp2 = 2; parts[i].tmp2 = 2;
break; break;
case PT_ACEL:
parts[i].ctype = 10;
break;
case PT_DCEL:
parts[i].ctype = 9;
break;
default: default:
if (t==PT_FIGH) if (t==PT_FIGH)
{ {

34
src/simulation/elements/ACEL.cpp
View File

@ -50,23 +50,23 @@ Element_ACEL::Element_ACEL()
int Element_ACEL::update(UPDATE_FUNC_ARGS) int Element_ACEL::update(UPDATE_FUNC_ARGS)
{ {
int r, rx, ry; int r, rx, ry;
parts[i].tmp = 0; float change = parts[i].life > 1000 ? 1000 : (parts[i].life < 0 ? 0 : parts[i].life);
for (rx=-1; rx<2; rx++) parts[i].tmp = 0;
for (ry=-1; ry<2; ry++) for (rx=-1; rx<2; rx++)
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry) && !(rx && ry)) for (ry=-1; ry<2; ry++)
{ if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry) && !(rx && ry))
r = pmap[y+ry][x+rx]; {
if(!r) r = pmap[y+ry][x+rx];
r = sim->photons[y+ry][x+rx]; if(!r)
if ((r>>8)>=NPART || !r) r = sim->photons[y+ry][x+rx];
continue; if ((r>>8)>=NPART || !r)
if(sim->elements[r&0xFF].Properties & (TYPE_PART | TYPE_LIQUID | TYPE_GAS | TYPE_ENERGY)) continue;
{ if(sim->elements[r&0xFF].Properties & (TYPE_PART | TYPE_LIQUID | TYPE_GAS | TYPE_ENERGY))
if (parts[i].ctype) {
{ if (parts[i].life)
int change = parts[i].ctype > 1000 ? 1000 : parts[i].ctype < 0 ? 0 : parts[i].ctype; {
parts[r>>8].vx *= 1+change/100.0f; parts[r>>8].vx *= 1.0f+(change/100.0f);
parts[r>>8].vy *= 1+change/100.0f; parts[r>>8].vy *= 1.0f+(change/100.0f);
} }
else else
{ {

34
src/simulation/elements/dcel.cpp
View File

@ -50,23 +50,23 @@ Element_DCEL::Element_DCEL()
int Element_DCEL::update(UPDATE_FUNC_ARGS) int Element_DCEL::update(UPDATE_FUNC_ARGS)
{ {
int r, rx, ry; int r, rx, ry;
parts[i].tmp = 0; float change = parts[i].life > 100 ? 100 : (parts[i].life < 0 ? 0 : parts[i].life);
for (rx=-1; rx<2; rx++) parts[i].tmp = 0;
for (ry=-1; ry<2; ry++) for (rx=-1; rx<2; rx++)
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry) && !(rx && ry)) for (ry=-1; ry<2; ry++)
{ if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry) && !(rx && ry))
r = pmap[y+ry][x+rx]; {
if(!r) r = pmap[y+ry][x+rx];
r = sim->photons[y+ry][x+rx]; if(!r)
if ((r>>8)>=NPART || !r) r = sim->photons[y+ry][x+rx];
continue; if ((r>>8)>=NPART || !r)
if(sim->elements[r&0xFF].Properties & (TYPE_PART | TYPE_LIQUID | TYPE_GAS | TYPE_ENERGY)) continue;
{ if(sim->elements[r&0xFF].Properties & (TYPE_PART | TYPE_LIQUID | TYPE_GAS | TYPE_ENERGY))
if (parts[i].ctype) {
{ if (parts[i].life)
int change = parts[i].ctype > 100 ? 100 : parts[i].ctype < 0 ? 0 : parts[i].ctype; {
parts[r>>8].vx *= 1-change/100.0f; parts[r>>8].vx *= 1.0f-(change/100.0f);
parts[r>>8].vy *= 1-change/100.0f; parts[r>>8].vy *= 1.0f-(change/100.0f);
} }
else else
{ {