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

change CRMC creation reaction from BREL + LAVA(CLST) to LAVA(QRTZ) + LAVA(CLST)

Browse Source 
BREL didn't make much sense, and this one is funner
This commit is contained in:
jacob1 2015-12-27 21:28:57 -05:00
parent c76ec2be43
commit 8630b0a926
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/simulation/elements/BREC.cpp
View File

@ -60,22 +60,6 @@ int Element_BREC::update(UPDATE_FUNC_ARGS)
} }
} }
for (int rx = -1; rx <= 1; rx++)
for (int ry = -1; ry <= 1; ry++)
{
if (rx || ry)
{
int r = pmap[y+ry][x+rx];
if (!r)
continue;
if ((r&0xFF) == PT_LAVA && parts[r>>8].ctype == PT_CLST)
{
float pres = std::max(sim->pv[y/CELL][x/CELL]*10.0f, 0.0f);
if (parts[r>>8].temp >= pres+sim->elements[PT_CRMC].HighTemperature+50.0f)
parts[r>>8].ctype = PT_CRMC;
}
}
}
return 0; return 0;
} }

11
src/simulation/elements/FIRE.cpp
View File

@ -128,6 +128,17 @@ int Element_FIRE::update(UPDATE_FUNC_ARGS)
} }
} }
// LAVA(CLST) + LAVA(PQRT) + high enough temp = LAVA(CRMC) + LAVA(CRMC)
if (t == PT_LAVA && parts[i].ctype == PT_QRTZ && rt == PT_LAVA && parts[r>>8].ctype == PT_CLST)
{
float pres = std::max(sim->pv[y/CELL][x/CELL]*10.0f, 0.0f);
if (parts[i].temp >= pres+sim->elements[PT_CRMC].HighTemperature+50.0f)
{
parts[i].ctype = PT_CRMC;
parts[r>>8].ctype = PT_CRMC;
}
}
if ((surround_space || sim->elements[rt].Explosive) && if ((surround_space || sim->elements[rt].Explosive) &&
sim->elements[rt].Flammable && (sim->elements[rt].Flammable + (int)(sim->pv[(y+ry)/CELL][(x+rx)/CELL] * 10.0f)) > (rand()%1000) && sim->elements[rt].Flammable && (sim->elements[rt].Flammable + (int)(sim->pv[(y+ry)/CELL][(x+rx)/CELL] * 10.0f)) > (rand()%1000) &&
//exceptions, t is the thing causing the spark and rt is what's burning //exceptions, t is the thing causing the spark and rt is what's burning