mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-18 14:11:16 +02:00
Code Issues Projects Releases Wiki Activity

Make GLAS strengthening reaction more controllable and not so arbitrary (#856)

Browse Source
This commit is contained in:
Cracker1000
2022-12-23 08:06:50 +05:30
committed by GitHub
parent 87ba01d018
commit 81bd1fd9e7
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,9 +252,9 @@ int Element_FIRE_update(UPDATE_FUNC_ARGS)
if (rx > 1 || rx < -1) // Trend veins vertical if (rx > 1 || rx < -1) // Trend veins vertical
parts[i].tmp = 1; parts[i].tmp = 1;
} }
else if (parts[i].ctype == PT_SALT && rt == PT_GLAS) else if (parts[i].ctype == PT_SALT && rt == PT_GLAS && parts[ID(r)].life < 234 * 120)
{ {
parts[ID(r)].life = 10; parts[ID(r)].life++;
} }
} }

22
src/simulation/elements/GLAS.cpp
View File

@@ -52,28 +52,16 @@ static int update(UPDATE_FUNC_ARGS)
auto press = int(sim->pv[y/CELL][x/CELL] * 64); auto press = int(sim->pv[y/CELL][x/CELL] * 64);
auto diff = press - parts[i].tmp3; auto diff = press - parts[i].tmp3;
// Determine whether the GLAS is chemically strengthened via life setting. // Determine whether the GLAS is chemically strengthened via .life setting. (250 = Max., 16 = Min.)
if (parts[i].life > 0) int strength = (parts[i].life / 120) + 16;
{ if (strength < 16)
// determined to be strengthened GLAS, increase the pressure by which it shatters strength = 16;
// set to 160 because that's a value where the effect is noticable. the 3x increase didn't do much if (diff > strength || diff < -1 * strength)
if (diff > 160 || diff < -160)
{ {
sim->part_change_type(i, x, y, PT_BGLA); sim->part_change_type(i, x, y, PT_BGLA);
} }
}
else
{
// regular ol' GLAS
if (diff > 16 || diff < -16)
{
sim->part_change_type(i, x, y, PT_BGLA);
}
}
parts[i].tmp3 = press; parts[i].tmp3 = press;
return 0; return 0;
} }
static void create(ELEMENT_CREATE_FUNC_ARGS) static void create(ELEMENT_CREATE_FUNC_ARGS)