Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
remove extra spacing in all the element files
  • Loading branch information
jacob1 committed Dec 18, 2015
1 parent b9c3eea commit 07be209
Show file tree
Hide file tree
Showing 181 changed files with 1,129 additions and 1,412 deletions.
14 changes: 6 additions & 8 deletions src/simulation/elements/116.cpp
Expand Up @@ -8,7 +8,7 @@ Element_116::Element_116()
MenuVisible = 0;
MenuSection = SC_CRACKER2;
Enabled = 1;

Advection = 0.7f;
AirDrag = 0.02f * CFDS;
AirLoss = 0.96f;
Expand All @@ -18,21 +18,20 @@ Element_116::Element_116()
Diffusion = 0.00f;
HotAir = 0.000f * CFDS;
Falldown = 1;

Flammable = 0;
Explosive = 0;
Meltable = 0;
Hardness = 30;

Weight = 85;

Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 70;
Description = "A failed shared velocity test.";


Properties = TYPE_PART;

LowPressure = IPL;
LowPressureTransition = NT;
HighPressure = IPH;
Expand All @@ -41,9 +40,8 @@ Element_116::Element_116()
LowTemperatureTransition = NT;
HighTemperature = ITH;
HighTemperatureTransition = NT;

Update = NULL;

}

Element_116::~Element_116() {}
14 changes: 6 additions & 8 deletions src/simulation/elements/146.cpp
Expand Up @@ -8,7 +8,7 @@ Element_146::Element_146()
MenuVisible = 0;
MenuSection = SC_LIFE;
Enabled = 0;

Advection = 0.0f;
AirDrag = 0.00f * CFDS;
AirLoss = 0.90f;
Expand All @@ -18,21 +18,20 @@ Element_146::Element_146()
Diffusion = 0.00f;
HotAir = 0.000f * CFDS;
Falldown = 0;

Flammable = 0;
Explosive = 0;
Meltable = 0;
Hardness = 0;

Weight = 100;

Temperature = 9000.0f;
HeatConduct = 40;
Description = "Brian 6 S6/B246/3";


Properties = TYPE_SOLID|PROP_LIFE;

LowPressure = IPL;
LowPressureTransition = NT;
HighPressure = IPH;
Expand All @@ -41,9 +40,8 @@ Element_146::Element_146()
LowTemperatureTransition = NT;
HighTemperature = ITH;
HighTemperatureTransition = NT;

Update = NULL;

}

Element_146::~Element_146() {}
15 changes: 7 additions & 8 deletions src/simulation/elements/ACEL.cpp
Expand Up @@ -8,7 +8,7 @@ Element_ACEL::Element_ACEL()
MenuVisible = 1;
MenuSection = SC_FORCE;
Enabled = 1;

Advection = 0.0f;
AirDrag = 0.00f * CFDS;
AirLoss = 0.90f;
Expand All @@ -18,21 +18,20 @@ Element_ACEL::Element_ACEL()
Diffusion = 0.00f;
HotAir = 0.000f * CFDS;
Falldown = 0;

Flammable = 0;
Explosive = 0;
Meltable = 0;
Hardness = 1;

Weight = 100;

Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 251;
Description = "Accelerator, speeds up nearby elements.";


Properties = TYPE_SOLID;

LowPressure = IPL;
LowPressureTransition = NT;
HighPressure = IPH;
Expand All @@ -41,14 +40,14 @@ Element_ACEL::Element_ACEL()
LowTemperatureTransition = NT;
HighTemperature = ITH;
HighTemperatureTransition = NT;

Update = &Element_ACEL::update;
Graphics = &Element_ACEL::graphics;
}

//#TPT-Directive ElementHeader Element_ACEL static int update(UPDATE_FUNC_ARGS)
int Element_ACEL::update(UPDATE_FUNC_ARGS)
{
{
int r, rx, ry;
float multiplier;
if (parts[i].life!=0)
Expand Down
13 changes: 6 additions & 7 deletions src/simulation/elements/ACID.cpp
Expand Up @@ -8,7 +8,7 @@ Element_ACID::Element_ACID()
MenuVisible = 1;
MenuSection = SC_LIQUID;
Enabled = 1;

Advection = 0.6f;
AirDrag = 0.01f * CFDS;
AirLoss = 0.98f;
Expand All @@ -18,21 +18,20 @@ Element_ACID::Element_ACID()
Diffusion = 0.00f;
HotAir = 0.000f * CFDS;
Falldown = 2;

Flammable = 40;
Explosive = 0;
Meltable = 0;
Hardness = 0;

Weight = 10;

Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 34;
Description = "Dissolves almost everything.";


Properties = TYPE_LIQUID|PROP_DEADLY;

LowPressure = IPL;
LowPressureTransition = NT;
HighPressure = IPH;
Expand All @@ -41,7 +40,7 @@ Element_ACID::Element_ACID()
LowTemperatureTransition = NT;
HighTemperature = ITH;
HighTemperatureTransition = NT;

Update = &Element_ACID::update;
Graphics = &Element_ACID::graphics;
}
Expand Down
14 changes: 6 additions & 8 deletions src/simulation/elements/AMTR.cpp
Expand Up @@ -8,7 +8,7 @@ Element_AMTR::Element_AMTR()
MenuVisible = 1;
MenuSection = SC_NUCLEAR;
Enabled = 1;

Advection = 0.7f;
AirDrag = 0.02f * CFDS;
AirLoss = 0.96f;
Expand All @@ -18,21 +18,20 @@ Element_AMTR::Element_AMTR()
Diffusion = 1.00f;
HotAir = 0.0000f * CFDS;
Falldown = 0;

Flammable = 0;
Explosive = 0;
Meltable = 0;
Hardness = 0;

Weight = 100;

Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 70;
Description = "Anti-Matter, destroys a majority of particles.";


Properties = TYPE_GAS;

LowPressure = IPL;
LowPressureTransition = NT;
HighPressure = IPH;
Expand All @@ -41,9 +40,8 @@ Element_AMTR::Element_AMTR()
LowTemperatureTransition = NT;
HighTemperature = ITH;
HighTemperatureTransition = NT;

Update = &Element_AMTR::update;

}

//#TPT-Directive ElementHeader Element_AMTR static int update(UPDATE_FUNC_ARGS)
Expand Down
16 changes: 7 additions & 9 deletions src/simulation/elements/ANAR.cpp
Expand Up @@ -8,7 +8,7 @@ Element_ANAR::Element_ANAR()
MenuVisible = 1;
MenuSection = SC_POWDERS;
Enabled = 1;

Advection = -0.7f;
AirDrag = -0.02f * CFDS;
AirLoss = 0.96f;
Expand All @@ -18,21 +18,20 @@ Element_ANAR::Element_ANAR()
Diffusion = 0.00f;
HotAir = 0.000f * CFDS;
Falldown = 1;

Flammable = 0;
Explosive = 0;
Meltable = 0;
Hardness = 30;

Weight = 85;

Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 70;
Description = "Anti-air. Very light dust, which behaves opposite gravity.";


Properties = TYPE_PART;

LowPressure = IPL;
LowPressureTransition = NT;
HighPressure = IPH;
Expand All @@ -41,14 +40,13 @@ Element_ANAR::Element_ANAR()
LowTemperatureTransition = NT;
HighTemperature = ITH;
HighTemperatureTransition = NT;

Update = &Element_ANAR::update;

}

//#TPT-Directive ElementHeader Element_ANAR static int update(UPDATE_FUNC_ARGS)
int Element_ANAR::update(UPDATE_FUNC_ARGS)
{
{
int r, rx, ry;

//if (parts[i].temp >= 0.23)
Expand Down
16 changes: 7 additions & 9 deletions src/simulation/elements/ARAY.cpp
Expand Up @@ -8,7 +8,7 @@ Element_ARAY::Element_ARAY()
MenuVisible = 1;
MenuSection = SC_ELEC;
Enabled = 1;

Advection = 0.0f;
AirDrag = 0.00f * CFDS;
AirLoss = 0.90f;
Expand All @@ -18,21 +18,20 @@ Element_ARAY::Element_ARAY()
Diffusion = 0.00f;
HotAir = 0.000f * CFDS;
Falldown = 0;

Flammable = 0;
Explosive = 0;
Meltable = 0;
Hardness = 1;

Weight = 100;

Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 0;
Description = "Ray Emitter. Rays create points when they collide.";


Properties = TYPE_SOLID|PROP_LIFE_DEC;

LowPressure = IPL;
LowPressureTransition = NT;
HighPressure = IPH;
Expand All @@ -41,14 +40,13 @@ Element_ARAY::Element_ARAY()
LowTemperatureTransition = NT;
HighTemperature = ITH;
HighTemperatureTransition = NT;

Update = &Element_ARAY::update;

}

//#TPT-Directive ElementHeader Element_ARAY static int update(UPDATE_FUNC_ARGS)
int Element_ARAY::update(UPDATE_FUNC_ARGS)
{
{
if (!parts[i].life)
{
for (int rx = -1; rx <= 1; rx++)
Expand Down
18 changes: 8 additions & 10 deletions src/simulation/elements/BANG.cpp
Expand Up @@ -8,7 +8,7 @@ Element_BANG::Element_BANG()
MenuVisible = 1;
MenuSection = SC_EXPLOSIVE;
Enabled = 1;

Advection = 0.0f;
AirDrag = 0.00f * CFDS;
AirLoss = 0.90f;
Expand All @@ -18,21 +18,20 @@ Element_BANG::Element_BANG()
Diffusion = 0.00f;
HotAir = 0.000f * CFDS;
Falldown = 0;

Flammable = 0;
Explosive = 0;
Meltable = 0;
Hardness = 1;

Weight = 100;

Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 88;
Description = "TNT, explodes all at once.";


Properties = TYPE_SOLID | PROP_NEUTPENETRATE;

LowPressure = IPL;
LowPressureTransition = NT;
HighPressure = IPH;
Expand All @@ -41,14 +40,13 @@ Element_BANG::Element_BANG()
LowTemperatureTransition = NT;
HighTemperature = ITH;
HighTemperatureTransition = NT;

Update = &Element_BANG::update;

}

//#TPT-Directive ElementHeader Element_BANG static int update(UPDATE_FUNC_ARGS)
int Element_BANG::update(UPDATE_FUNC_ARGS)
{
{
int r, rx, ry;
if(parts[i].tmp==0)
{
Expand All @@ -67,7 +65,7 @@ int Element_BANG::update(UPDATE_FUNC_ARGS)
parts[i].tmp = 1;
}
}

}
else if(parts[i].tmp==1)
{
Expand Down

0 comments on commit 07be209

Please sign in to comment.