diff --git a/src/simulation/elements/PSNS.cpp b/src/simulation/elements/PSNS.cpp new file mode 100644 index 000000000..3dffd1666 --- /dev/null +++ b/src/simulation/elements/PSNS.cpp @@ -0,0 +1,80 @@ +#include "simulation/Elements.h" +//#TPT-Directive ElementClass Element_PSNS PT_TSNS 172 +Element_PSNS::Element_PSNS() +{ + Identifier = "DEFAULT_PT_PSNS"; + Name = "PSNS"; + Colour = PIXPACK(0xDB2020); + MenuVisible = 1; + MenuSection = SC_SENSOR; + Enabled = 1; + + Advection = 0.0f; + AirDrag = 0.00f * CFDS; + AirLoss = 0.96f; + Loss = 0.00f; + Collision = 0.0f; + Gravity = 0.0f; + Diffusion = 0.00f; + HotAir = 0.000f * CFDS; + Falldown = 0; + + Flammable = 0; + Explosive = 0; + Meltable = 0; + Hardness = 1; + + Weight = 100; + + Temperature = 277.15f; + HeatConduct = 0; + Description = "Pressure sensor, creates spark when the pressure is greater than its temperature."; + + State = ST_SOLID; + Properties = TYPE_SOLID; + + LowPressure = IPL; + LowPressureTransition = NT; + HighPressure = IPH; + HighPressureTransition = NT; + LowTemperature = ITL; + LowTemperatureTransition = NT; + HighTemperature = ITH; + HighTemperatureTransition = NT; + + Update = &Element_PSNS::update; + +} + +//#TPT-Directive ElementHeader Element_PSNS static int update(UPDATE_FUNC_ARGS) +int Element_PSNS::update(UPDATE_FUNC_ARGS) +{ + int r, rx, ry, rt; + if (sim->pv[y/CELL][x/CELL] > parts[i].temp-273.15f) + { + parts[i].life = 0; + for (rx=-2; rx<3; rx++) + for (ry=-2; ry<3; ry++) + if (BOUNDS_CHECK && (rx || ry)) + { + r = pmap[y+ry][x+rx]; + if (!r) + continue; + rt = r&0xFF; + if (sim->parts_avg(i,r>>8,PT_INSL) != PT_INSL) + { + if ((sim->elements[rt].Properties&PROP_CONDUCTS) && !(rt==PT_WATR||rt==PT_SLTW||rt==PT_NTCT||rt==PT_PTCT||rt==PT_INWR) && parts[r>>8].life==0) + { + parts[r>>8].life = 4; + parts[r>>8].ctype = rt; + sim->part_change_type(r>>8,x+rx,y+ry,PT_SPRK); + } + } + } + } + return 0; +} + + + +Element_PSNS::~Element_PSNS() {} diff --git a/src/simulation/elements/STKM2.cpp b/src/simulation/elements/STKM2.cpp index 6583b701b..943cac92e 100644 --- a/src/simulation/elements/STKM2.cpp +++ b/src/simulation/elements/STKM2.cpp @@ -28,7 +28,7 @@ Element_STKM2::Element_STKM2() Temperature = R_TEMP+14.6f+273.15f; HeatConduct = 0; - Description = "second stickman. Don't kill him! Control with wasd."; + Description = "Second stickman. Don't kill him! Control with wasd."; State = ST_NONE; Properties = 0; diff --git a/src/simulation/elements/TSNS.cpp b/src/simulation/elements/TSNS.cpp index 97fd7a211..7bb72d18c 100644 --- a/src/simulation/elements/TSNS.cpp +++ b/src/simulation/elements/TSNS.cpp @@ -4,7 +4,7 @@ Element_TSNS::Element_TSNS() { Identifier = "DEFAULT_PT_TSNS"; Name = "TSNS"; - Colour = PIXPACK(0xFD9D18); + Colour = PIXPACK(0xFD00D5); MenuVisible = 1; MenuSection = SC_SENSOR; Enabled = 1;