mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-15 12:54:07 +02:00
Code Issues Projects Releases Wiki Activity

Don't eat broken/brekable metal when it's sparked. Balance concentration ranges.

Browse Source
This commit is contained in:
Saveliy Skresanov
2025-07-02 12:51:17 +07:00
parent b80c7c20a6
commit e12cd4fd85
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/simulation/elements/BASE.cpp
View File

@@ -43,7 +43,7 @@ void Element::Element_BASE()
HighTemperature = ITH; HighTemperature = ITH;
HighTemperatureTransition = NT; HighTemperatureTransition = NT;
DefaultProperties.life = 75; DefaultProperties.life = 76;
Update = &update; Update = &update;
Graphics = &graphics; Graphics = &graphics;
@@ -110,9 +110,11 @@ static int update(UPDATE_FUNC_ARGS)
continue; continue;
int rt = TYP(r); int rt = TYP(r);
//Don't react with some elements
if (rt != PT_BASE && rt != PT_SALT && rt != PT_SLTW && rt != PT_BOYL && rt != PT_MERC && if (rt != PT_BASE && rt != PT_SALT && rt != PT_SLTW && rt != PT_BOYL && rt != PT_MERC &&
rt != PT_BMTL && rt != PT_BRMT && rt != PT_SOAP && rt != PT_CLNE && rt != PT_PCLN && rt != PT_BMTL && rt != PT_BRMT && rt != PT_SOAP && rt != PT_CLNE && rt != PT_PCLN &&
!(rt == PT_ICEI && parts[ID(r)].ctype == PT_BASE) && !(rt == PT_SNOW && parts[ID(r)].ctype == PT_BASE)) !(rt == PT_ICEI && parts[ID(r)].ctype == PT_BASE) && !(rt == PT_SNOW && parts[ID(r)].ctype == PT_BASE) &&
!(rt == PT_SPRK && parts[ID(r)].ctype == PT_BMTL) && !(rt == PT_SPRK && parts[ID(r)].ctype == PT_BRMT))
{ {
//Base is diluted by water //Base is diluted by water
if (parts[i].life > 1 && (rt == PT_WATR || rt == PT_DSTW || rt == PT_CBNW)) if (parts[i].life > 1 && (rt == PT_WATR || rt == PT_DSTW || rt == PT_CBNW))
@@ -214,19 +216,19 @@ static int graphics(GRAPHICS_FUNC_ARGS)
{ {
int s = cpart->life; int s = cpart->life;
if (s < 25) if (s <= 25)
{ {
*colr = 0x33; *colr = 0x33;
*colg = 0x4C; *colg = 0x4C;
*colb = 0xD8; *colb = 0xD8;
} }
else if (s < 50) else if (s <= 50)
{ {
*colr = 0x58; *colr = 0x58;
*colg = 0x83; *colg = 0x83;
*colb = 0xE8; *colb = 0xE8;
} }
else if (s < 75) else if (s <= 75)
{ {
*colr = 0x7D; *colr = 0x7D;
*colg = 0xBA; *colg = 0xBA;