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

New WTRV + BCOL -> OIL reaction in presence of PTNM

Browse Source 
Yes, Factorio is a good game.
This commit is contained in:
Tamás Bálint Misius 2022-05-01 19:20:55 +02:00
parent 20bdee33e2
commit b278eb4393
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/simulation/elements/PTNM.cpp
View File

@ -48,6 +48,31 @@ void Element::Element_PTNM()
Create = &create;
}
static void wtrv_reactions(int wtrv1_id, UPDATE_FUNC_ARGS)
{
for (int rx = -1; rx <= 1; rx++)
{
for (int ry = -1; ry <= 1; ry++)
{
if (BOUNDS_CHECK && (rx || ry))
{
int r = pmap[y + ry][x + rx];
if (!r || ID(r) == wtrv1_id)
continue;
int rt = TYP(r);
// WTRV + BCOL -> OIL
if (rt == PT_BCOL && parts[ID(r)].temp > 200.0f + 273.15f && parts[wtrv1_id].temp > 200.0f + 273.15f && sim->pv[(y + ry) / CELL][(x + rx) / CELL] > 7.f)
{
sim->part_change_type(ID(r), x + rx, y + ry, PT_OIL);
sim->kill_part(wtrv1_id);
return;
}
}
}
}
}
static void hygn_reactions(int hygn1_id, UPDATE_FUNC_ARGS)
{
for (int rx = -1; rx <= 1; rx++)
@ -116,6 +141,7 @@ static void hygn_reactions(int hygn1_id, UPDATE_FUNC_ARGS)
static int update(UPDATE_FUNC_ARGS)
{
int hygn1_id = -1; // Id of a hydrogen particle for hydrogen multi-particle reactions
int wtrv1_id = -1; // same but wtrv
// Fast conduction (like GOLD)
if (!parts[i].life)
@ -151,6 +177,9 @@ static int update(UPDATE_FUNC_ARGS)
if (rt == PT_H2 && hygn1_id < 0)
hygn1_id = ID(r);
if (rt == PT_WTRV && wtrv1_id < 0)
wtrv1_id = ID(r);
// These reactions will occur instantly in contact with PTNM
// --------------------------------------------------------
@ -219,6 +248,12 @@ static int update(UPDATE_FUNC_ARGS)
hygn_reactions(hygn1_id, UPDATE_FUNC_SUBCALL_ARGS);
}
// WTRV reactions
if (wtrv1_id >= 0)
{
wtrv_reactions(wtrv1_id, UPDATE_FUNC_SUBCALL_ARGS);
}
return 0;
}