diff --git a/src/simulation/elements/BOMB.cpp b/src/simulation/elements/BOMB.cpp index 11272add4..3d1559ead 100644 --- a/src/simulation/elements/BOMB.cpp +++ b/src/simulation/elements/BOMB.cpp @@ -30,7 +30,7 @@ Element_BOMB::Element_BOMB() HeatConduct = 29; Description = "Bomb. Explodes and destroys all surrounding particles when it touches something."; - Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC|PROP_SPARKSETTLE; + Properties = TYPE_PART|PROP_SPARKSETTLE; LowPressure = IPL; LowPressureTransition = NT; diff --git a/src/simulation/elements/DMG.cpp b/src/simulation/elements/DMG.cpp index 3d63c533a..ea80cc29c 100644 --- a/src/simulation/elements/DMG.cpp +++ b/src/simulation/elements/DMG.cpp @@ -30,7 +30,7 @@ Element_DMG::Element_DMG() HeatConduct = 29; Description = "Generates damaging pressure and breaks any elements it hits."; - Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC|PROP_SPARKSETTLE; + Properties = TYPE_PART|PROP_SPARKSETTLE; LowPressure = IPL; LowPressureTransition = NT; diff --git a/src/simulation/elements/DUST.cpp b/src/simulation/elements/DUST.cpp index a02262b90..53105d8a1 100644 --- a/src/simulation/elements/DUST.cpp +++ b/src/simulation/elements/DUST.cpp @@ -30,7 +30,7 @@ Element_DUST::Element_DUST() HeatConduct = 70; Description = "Very light dust. Flammable."; - Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC; + Properties = TYPE_PART; LowPressure = IPL; LowPressureTransition = NT; diff --git a/src/simulation/elements/FRAY.cpp b/src/simulation/elements/FRAY.cpp index 5b7b016dc..7ca4e7fc3 100644 --- a/src/simulation/elements/FRAY.cpp +++ b/src/simulation/elements/FRAY.cpp @@ -30,7 +30,7 @@ Element_FRAY::Element_FRAY() HeatConduct = 0; Description = "Force Emitter. Pushes or pulls objects based on its temperature. Use like ARAY."; - Properties = TYPE_SOLID|PROP_LIFE_DEC; + Properties = TYPE_SOLID; LowPressure = IPL; LowPressureTransition = NT; diff --git a/src/simulation/elements/FRME.cpp b/src/simulation/elements/FRME.cpp index c9ae7bcdc..b94896a29 100644 --- a/src/simulation/elements/FRME.cpp +++ b/src/simulation/elements/FRME.cpp @@ -30,7 +30,7 @@ Element_FRME::Element_FRME() HeatConduct = 0; Description = "Frame, can be used with pistons to push many particles."; - Properties = TYPE_SOLID|PROP_LIFE_DEC; + Properties = TYPE_SOLID; LowPressure = IPL; LowPressureTransition = NT; diff --git a/src/simulation/elements/GLOW.cpp b/src/simulation/elements/GLOW.cpp index 664ab734f..2ca2c52e8 100644 --- a/src/simulation/elements/GLOW.cpp +++ b/src/simulation/elements/GLOW.cpp @@ -30,7 +30,7 @@ Element_GLOW::Element_GLOW() HeatConduct = 44; Description = "Glow, Glows under pressure."; - Properties = TYPE_LIQUID|PROP_LIFE_DEC; + Properties = TYPE_LIQUID; LowPressure = IPL; LowPressureTransition = NT; diff --git a/src/simulation/elements/SNOW.cpp b/src/simulation/elements/SNOW.cpp index bd57cfc3c..7db9355e5 100644 --- a/src/simulation/elements/SNOW.cpp +++ b/src/simulation/elements/SNOW.cpp @@ -30,7 +30,7 @@ Element_SNOW::Element_SNOW() HeatConduct = 46; Description = "Light particles. Created when ICE breaks under pressure."; - Properties = TYPE_PART|PROP_LIFE_DEC|PROP_NEUTPASS; + Properties = TYPE_PART|PROP_NEUTPASS; LowPressure = IPL; LowPressureTransition = NT;