summaryrefslogtreecommitdiff
path: root/src/simulation/elements
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-05-17 16:44:25 (GMT)
committer jacob1 <jfu614@gmail.com>2013-05-17 16:44:25 (GMT)
commit981f6984c2c0f87d54a9c90f4518c69c9ef02ae0 (patch)
tree757bd699a23c1fad61e60700265a25feb1a3042c /src/simulation/elements
parentcbd402d8cb6aa699ffde83a1b5b3c2f4fc51baaf (diff)
parent77bf649fb4482c86ac1fd9b3233f062b53226007 (diff)
downloadpowder-981f6984c2c0f87d54a9c90f4518c69c9ef02ae0.zip
powder-981f6984c2c0f87d54a9c90f4518c69c9ef02ae0.tar.gz
Merge branch 'HEAD' of git@github.com:FacialTurd/The-Powder-Toy.git
Diffstat (limited to 'src/simulation/elements')
-rw-r--r--src/simulation/elements/116.cpp2
-rw-r--r--src/simulation/elements/146.cpp2
-rw-r--r--src/simulation/elements/ANAR.cpp2
-rw-r--r--src/simulation/elements/BCOL.cpp2
-rw-r--r--src/simulation/elements/BGLA.cpp2
-rw-r--r--src/simulation/elements/BHOL.cpp2
-rw-r--r--src/simulation/elements/BIZR.cpp1
-rw-r--r--src/simulation/elements/BMTL.cpp2
-rw-r--r--src/simulation/elements/BRAY.cpp2
-rw-r--r--src/simulation/elements/BRCK.cpp2
-rw-r--r--src/simulation/elements/BREC.cpp2
-rw-r--r--src/simulation/elements/BRMT.cpp4
-rw-r--r--src/simulation/elements/BVBR.cpp2
-rw-r--r--src/simulation/elements/CAUS.cpp2
-rw-r--r--src/simulation/elements/CFLM.cpp2
-rw-r--r--src/simulation/elements/CNCT.cpp2
-rw-r--r--src/simulation/elements/CRAY.cpp2
-rw-r--r--src/simulation/elements/DESL.cpp2
-rw-r--r--src/simulation/elements/DMG.cpp4
-rw-r--r--src/simulation/elements/DMND.cpp2
-rw-r--r--src/simulation/elements/DRIC.cpp2
-rw-r--r--src/simulation/elements/DUST.cpp2
-rw-r--r--src/simulation/elements/DYST.cpp2
-rw-r--r--src/simulation/elements/ETRD.cpp2
-rw-r--r--src/simulation/elements/EXOT.cpp19
-rw-r--r--src/simulation/elements/FRAY.cpp2
-rw-r--r--src/simulation/elements/FRME.cpp2
-rw-r--r--src/simulation/elements/GEL.cpp1
-rw-r--r--src/simulation/elements/GLAS.cpp2
-rw-r--r--src/simulation/elements/GOO.cpp2
-rw-r--r--src/simulation/elements/GUNP.cpp4
-rw-r--r--src/simulation/elements/H2.cpp2
-rw-r--r--src/simulation/elements/INSL.cpp2
-rw-r--r--src/simulation/elements/INST.cpp2
-rw-r--r--src/simulation/elements/INVIS.cpp2
-rw-r--r--src/simulation/elements/INWR.cpp2
-rw-r--r--src/simulation/elements/ISOZ.cpp2
-rw-r--r--src/simulation/elements/LIFE.cpp2
-rw-r--r--src/simulation/elements/LNTG.cpp2
-rw-r--r--src/simulation/elements/LO2.cpp2
-rw-r--r--src/simulation/elements/LOLZ.cpp2
-rw-r--r--src/simulation/elements/LOVE.cpp2
-rw-r--r--src/simulation/elements/LRBD.cpp2
-rw-r--r--src/simulation/elements/METL.cpp2
-rw-r--r--src/simulation/elements/MORT.cpp2
-rw-r--r--src/simulation/elements/MWAX.cpp2
-rw-r--r--src/simulation/elements/NICE.cpp4
-rw-r--r--src/simulation/elements/NITR.cpp2
-rw-r--r--src/simulation/elements/NONE.cpp2
-rw-r--r--src/simulation/elements/NSCN.cpp2
-rw-r--r--src/simulation/elements/NTCT.cpp2
-rw-r--r--src/simulation/elements/NWHL.cpp2
-rw-r--r--src/simulation/elements/PLEX.cpp2
-rw-r--r--src/simulation/elements/PLSM.cpp2
-rw-r--r--src/simulation/elements/PQRT.cpp2
-rw-r--r--src/simulation/elements/PRTI.cpp2
-rw-r--r--src/simulation/elements/PRTO.cpp2
-rw-r--r--src/simulation/elements/PSCN.cpp2
-rw-r--r--src/simulation/elements/PSNS.cpp2
-rw-r--r--src/simulation/elements/PSTE.cpp2
-rw-r--r--src/simulation/elements/PSTS.cpp2
-rw-r--r--src/simulation/elements/PTCT.cpp2
-rw-r--r--src/simulation/elements/RBDM.cpp2
-rw-r--r--src/simulation/elements/REPL.cpp2
-rw-r--r--src/simulation/elements/SALT.cpp2
-rw-r--r--src/simulation/elements/SAND.cpp2
-rw-r--r--src/simulation/elements/SMKE.cpp2
-rw-r--r--src/simulation/elements/SOAP.cpp2
-rw-r--r--src/simulation/elements/SPAWN.cpp2
-rw-r--r--src/simulation/elements/SPAWN2.cpp2
-rw-r--r--src/simulation/elements/SPRK.cpp4
-rw-r--r--src/simulation/elements/STKM.cpp12
-rw-r--r--src/simulation/elements/STKM2.cpp2
-rw-r--r--src/simulation/elements/STNE.cpp2
-rw-r--r--src/simulation/elements/STOR.cpp2
-rw-r--r--src/simulation/elements/SWCH.cpp2
-rw-r--r--src/simulation/elements/TESC.cpp4
-rw-r--r--src/simulation/elements/THDR.cpp2
-rw-r--r--src/simulation/elements/TRON.cpp2
-rw-r--r--src/simulation/elements/TTAN.cpp2
-rw-r--r--src/simulation/elements/TUNG.cpp (renamed from src/simulation/elements/TUGN.cpp)27
-rw-r--r--src/simulation/elements/URAN.cpp2
-rw-r--r--src/simulation/elements/VOID.cpp2
-rw-r--r--src/simulation/elements/WAX.cpp2
-rw-r--r--src/simulation/elements/WHOL.cpp2
-rw-r--r--src/simulation/elements/WIFI.cpp2
-rw-r--r--src/simulation/elements/WOOD.cpp2
-rw-r--r--src/simulation/elements/WTRV.cpp2
88 files changed, 128 insertions, 110 deletions
diff --git a/src/simulation/elements/116.cpp b/src/simulation/elements/116.cpp
index e99f0cf..7e52557 100644
--- a/src/simulation/elements/116.cpp
+++ b/src/simulation/elements/116.cpp
@@ -46,4 +46,4 @@ Element_116::Element_116()
}
-Element_116::~Element_116() {} \ No newline at end of file
+Element_116::~Element_116() {}
diff --git a/src/simulation/elements/146.cpp b/src/simulation/elements/146.cpp
index 173d435..df2b7bc 100644
--- a/src/simulation/elements/146.cpp
+++ b/src/simulation/elements/146.cpp
@@ -46,4 +46,4 @@ Element_146::Element_146()
}
-Element_146::~Element_146() {} \ No newline at end of file
+Element_146::~Element_146() {}
diff --git a/src/simulation/elements/ANAR.cpp b/src/simulation/elements/ANAR.cpp
index 16d619d..5a5ea33 100644
--- a/src/simulation/elements/ANAR.cpp
+++ b/src/simulation/elements/ANAR.cpp
@@ -28,7 +28,7 @@ Element_ANAR::Element_ANAR()
Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 70;
- Description = "Very light dust. Behaves opposite gravity";
+ Description = "Anti-air. Very light dust, which behaves opposite gravity.";
State = ST_SOLID;
Properties = TYPE_PART;
diff --git a/src/simulation/elements/BCOL.cpp b/src/simulation/elements/BCOL.cpp
index d6e1612..9c90ff3 100644
--- a/src/simulation/elements/BCOL.cpp
+++ b/src/simulation/elements/BCOL.cpp
@@ -28,7 +28,7 @@ Element_BCOL::Element_BCOL()
Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 150;
- Description = "Broken Coal. Heavy particles. See COAL";
+ Description = "Broken Coal. Heavy particles, burns slowly.";
State = ST_SOLID;
Properties = TYPE_PART;
diff --git a/src/simulation/elements/BGLA.cpp b/src/simulation/elements/BGLA.cpp
index 3c7e9ba..e514c90 100644
--- a/src/simulation/elements/BGLA.cpp
+++ b/src/simulation/elements/BGLA.cpp
@@ -46,4 +46,4 @@ Element_BGLA::Element_BGLA()
}
-Element_BGLA::~Element_BGLA() {} \ No newline at end of file
+Element_BGLA::~Element_BGLA() {}
diff --git a/src/simulation/elements/BHOL.cpp b/src/simulation/elements/BHOL.cpp
index 8139e7d..7fc73ec 100644
--- a/src/simulation/elements/BHOL.cpp
+++ b/src/simulation/elements/BHOL.cpp
@@ -46,4 +46,4 @@ Element_BHOL::Element_BHOL()
}
-Element_BHOL::~Element_BHOL() {} \ No newline at end of file
+Element_BHOL::~Element_BHOL() {}
diff --git a/src/simulation/elements/BIZR.cpp b/src/simulation/elements/BIZR.cpp
index 8b61543..0352c26 100644
--- a/src/simulation/elements/BIZR.cpp
+++ b/src/simulation/elements/BIZR.cpp
@@ -117,6 +117,7 @@ int Element_BIZR::graphics(GRAPHICS_FUNC_ARGS)
*firer = *colr/5 * fabs(cpart->vx)+fabs(cpart->vy);
*pixel_mode |= FIRE_ADD;
}
+ *pixel_mode |= PMODE_BLUR;
return 0;
}
diff --git a/src/simulation/elements/BMTL.cpp b/src/simulation/elements/BMTL.cpp
index 65a76b7..1d91e82 100644
--- a/src/simulation/elements/BMTL.cpp
+++ b/src/simulation/elements/BMTL.cpp
@@ -28,7 +28,7 @@ Element_BMTL::Element_BMTL()
Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 251;
- Description = "Breakable metal.";
+ Description = "Breakable metal. Common conductive building material, can melt and break under pressure.";
State = ST_SOLID;
Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
diff --git a/src/simulation/elements/BRAY.cpp b/src/simulation/elements/BRAY.cpp
index 5030020..285c065 100644
--- a/src/simulation/elements/BRAY.cpp
+++ b/src/simulation/elements/BRAY.cpp
@@ -106,4 +106,4 @@ int Element_BRAY::graphics(GRAPHICS_FUNC_ARGS)
}
-Element_BRAY::~Element_BRAY() {} \ No newline at end of file
+Element_BRAY::~Element_BRAY() {}
diff --git a/src/simulation/elements/BRCK.cpp b/src/simulation/elements/BRCK.cpp
index da96b87..a375207 100644
--- a/src/simulation/elements/BRCK.cpp
+++ b/src/simulation/elements/BRCK.cpp
@@ -62,4 +62,4 @@ int Element_BRCK::graphics(GRAPHICS_FUNC_ARGS)
return 0;
}
-Element_BRCK::~Element_BRCK() {} \ No newline at end of file
+Element_BRCK::~Element_BRCK() {}
diff --git a/src/simulation/elements/BREC.cpp b/src/simulation/elements/BREC.cpp
index 1c09c64..b7a5857 100644
--- a/src/simulation/elements/BREC.cpp
+++ b/src/simulation/elements/BREC.cpp
@@ -28,7 +28,7 @@ Element_BREC::Element_BREC()
Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 211;
- Description = "Broken electronics";
+ Description = "Broken electronics. Formed from EMP blasts, and when constantly sparked while under pressure, turns to EXOT.";
State = ST_SOLID;
Properties = TYPE_PART|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
diff --git a/src/simulation/elements/BRMT.cpp b/src/simulation/elements/BRMT.cpp
index cf4f99d..4bc5910 100644
--- a/src/simulation/elements/BRMT.cpp
+++ b/src/simulation/elements/BRMT.cpp
@@ -28,7 +28,7 @@ Element_BRMT::Element_BRMT()
Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 211;
- Description = "Broken metal.";
+ Description = "Broken metal. Created when iron rusts or when when metals break from pressure.";
State = ST_SOLID;
Properties = TYPE_PART|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
@@ -40,7 +40,7 @@ Element_BRMT::Element_BRMT()
LowTemperature = ITL;
LowTemperatureTransition = NT;
HighTemperature = 1273.0f;
- HighTemperatureTransition = PT_LAVA;
+ HighTemperatureTransition = ST;
Update = &Element_BRMT::update;
diff --git a/src/simulation/elements/BVBR.cpp b/src/simulation/elements/BVBR.cpp
index 1a2cc41..4e86782 100644
--- a/src/simulation/elements/BVBR.cpp
+++ b/src/simulation/elements/BVBR.cpp
@@ -47,4 +47,4 @@ Element_BVBR::Element_BVBR()
}
-Element_BVBR::~Element_BVBR() {} \ No newline at end of file
+Element_BVBR::~Element_BVBR() {}
diff --git a/src/simulation/elements/CAUS.cpp b/src/simulation/elements/CAUS.cpp
index 0118fad..520784e 100644
--- a/src/simulation/elements/CAUS.cpp
+++ b/src/simulation/elements/CAUS.cpp
@@ -83,4 +83,4 @@ int Element_CAUS::update(UPDATE_FUNC_ARGS)
}
-Element_CAUS::~Element_CAUS() {} \ No newline at end of file
+Element_CAUS::~Element_CAUS() {}
diff --git a/src/simulation/elements/CFLM.cpp b/src/simulation/elements/CFLM.cpp
index d19f9f0..53cb0a7 100644
--- a/src/simulation/elements/CFLM.cpp
+++ b/src/simulation/elements/CFLM.cpp
@@ -72,4 +72,4 @@ int Element_CFLM::graphics(GRAPHICS_FUNC_ARGS)
}
-Element_CFLM::~Element_CFLM() {} \ No newline at end of file
+Element_CFLM::~Element_CFLM() {}
diff --git a/src/simulation/elements/CNCT.cpp b/src/simulation/elements/CNCT.cpp
index 4fa0808..5734791 100644
--- a/src/simulation/elements/CNCT.cpp
+++ b/src/simulation/elements/CNCT.cpp
@@ -46,4 +46,4 @@ Element_CNCT::Element_CNCT()
}
-Element_CNCT::~Element_CNCT() {} \ No newline at end of file
+Element_CNCT::~Element_CNCT() {}
diff --git a/src/simulation/elements/CRAY.cpp b/src/simulation/elements/CRAY.cpp
index 20e3f92..2933dcf 100644
--- a/src/simulation/elements/CRAY.cpp
+++ b/src/simulation/elements/CRAY.cpp
@@ -28,7 +28,7 @@ Element_CRAY::Element_CRAY()
Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 0;
- Description = "Particle Ray Emitter. Creates a beam of particles set by its ctype, range is set by tmp.";
+ Description = "Particle Ray Emitter. Creates a beam of particles set by its ctype, with a range set by tmp.";
State = ST_SOLID;
Properties = TYPE_SOLID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/DESL.cpp b/src/simulation/elements/DESL.cpp
index dc34dc8..53267f5 100644
--- a/src/simulation/elements/DESL.cpp
+++ b/src/simulation/elements/DESL.cpp
@@ -46,4 +46,4 @@ Element_DESL::Element_DESL()
}
-Element_DESL::~Element_DESL() {} \ No newline at end of file
+Element_DESL::~Element_DESL() {}
diff --git a/src/simulation/elements/DMG.cpp b/src/simulation/elements/DMG.cpp
index 4f1daaf..e805370 100644
--- a/src/simulation/elements/DMG.cpp
+++ b/src/simulation/elements/DMG.cpp
@@ -28,7 +28,7 @@ Element_DMG::Element_DMG()
Temperature = R_TEMP-2.0f +273.15f;
HeatConduct = 29;
- Description = "Generates damaging pressure and breaks elements it hits.";
+ Description = "Generates damaging pressure and breaks any elements it hits.";
State = ST_NONE;
Properties = TYPE_PART|PROP_LIFE_DEC|PROP_LIFE_KILL_DEC|PROP_SPARKSETTLE;
@@ -92,7 +92,7 @@ int Element_DMG::update(UPDATE_FUNC_ARGS)
sim->part_change_type(rr>>8, x+nxi, y+nxj, PT_BCOL);
else if(t == PT_QRTZ)
sim->part_change_type(rr>>8, x+nxi, y+nxj, PT_PQRT);
- else if(t == PT_TUGN)
+ else if(t == PT_TUNG)
sim->part_change_type(rr>>8, x+nxi, y+nxj, PT_BRMT);
}
}
diff --git a/src/simulation/elements/DMND.cpp b/src/simulation/elements/DMND.cpp
index 71321f6..9b86a84 100644
--- a/src/simulation/elements/DMND.cpp
+++ b/src/simulation/elements/DMND.cpp
@@ -46,4 +46,4 @@ Element_DMND::Element_DMND()
}
-Element_DMND::~Element_DMND() {} \ No newline at end of file
+Element_DMND::~Element_DMND() {}
diff --git a/src/simulation/elements/DRIC.cpp b/src/simulation/elements/DRIC.cpp
index f1e37ec..8809fbb 100644
--- a/src/simulation/elements/DRIC.cpp
+++ b/src/simulation/elements/DRIC.cpp
@@ -46,4 +46,4 @@ Element_DRIC::Element_DRIC()
}
-Element_DRIC::~Element_DRIC() {} \ No newline at end of file
+Element_DRIC::~Element_DRIC() {}
diff --git a/src/simulation/elements/DUST.cpp b/src/simulation/elements/DUST.cpp
index 7b4cf8c..5c80789 100644
--- a/src/simulation/elements/DUST.cpp
+++ b/src/simulation/elements/DUST.cpp
@@ -46,4 +46,4 @@ Element_DUST::Element_DUST()
Graphics = NULL;
}
-Element_DUST::~Element_DUST() {} \ No newline at end of file
+Element_DUST::~Element_DUST() {}
diff --git a/src/simulation/elements/DYST.cpp b/src/simulation/elements/DYST.cpp
index 14cfc27..6a04158 100644
--- a/src/simulation/elements/DYST.cpp
+++ b/src/simulation/elements/DYST.cpp
@@ -46,4 +46,4 @@ Element_DYST::Element_DYST()
}
-Element_DYST::~Element_DYST() {} \ No newline at end of file
+Element_DYST::~Element_DYST() {}
diff --git a/src/simulation/elements/ETRD.cpp b/src/simulation/elements/ETRD.cpp
index 3447f07..72825ab 100644
--- a/src/simulation/elements/ETRD.cpp
+++ b/src/simulation/elements/ETRD.cpp
@@ -46,4 +46,4 @@ Element_ETRD::Element_ETRD()
}
-Element_ETRD::~Element_ETRD() {} \ No newline at end of file
+Element_ETRD::~Element_ETRD() {}
diff --git a/src/simulation/elements/EXOT.cpp b/src/simulation/elements/EXOT.cpp
index 2746695..df075e0 100644
--- a/src/simulation/elements/EXOT.cpp
+++ b/src/simulation/elements/EXOT.cpp
@@ -70,11 +70,22 @@ int Element_EXOT::update(UPDATE_FUNC_ARGS) {
}
else if (rt == PT_LAVA)
{
- if ((parts[r>>8].ctype == PT_TTAN || parts[r>>8].ctype == PT_GOLD) && !(rand()%10))
+ if (parts[r>>8].ctype == PT_TTAN || parts[r>>8].ctype == PT_GOLD)
{
- parts[r>>8].ctype = PT_VIBR;
- sim->kill_part(i);
- return 1;
+ if (!(rand()%10))
+ {
+ parts[r>>8].ctype = PT_VIBR;
+ sim->kill_part(i);
+ return 1;
+ }
+ }
+ else if (parts[r>>8].ctype == PT_VIBR)
+ {
+ if (1>rand()%1000)
+ {
+ sim->kill_part(i);
+ return 1;
+ }
}
}
if ((parts[i].tmp>245) && (parts[i].life>1000))
diff --git a/src/simulation/elements/FRAY.cpp b/src/simulation/elements/FRAY.cpp
index c529b87..8eed23c 100644
--- a/src/simulation/elements/FRAY.cpp
+++ b/src/simulation/elements/FRAY.cpp
@@ -28,7 +28,7 @@ Element_FRAY::Element_FRAY()
Temperature = 20.0f+0.0f +273.15f;
HeatConduct = 0;
- Description = "Force Emitter. Pushes or pulls objects based on its temp value, use like ARAY.";
+ Description = "Force Emitter. Pushes or pulls objects based on its temp value. Use like ARAY.";
State = ST_SOLID;
Properties = TYPE_SOLID|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/FRME.cpp b/src/simulation/elements/FRME.cpp
index c1d3a79..1382265 100644
--- a/src/simulation/elements/FRME.cpp
+++ b/src/simulation/elements/FRME.cpp
@@ -57,4 +57,4 @@ int Element_FRME::graphics(GRAPHICS_FUNC_ARGS)
return 0;
}
-Element_FRME::~Element_FRME() {} \ No newline at end of file
+Element_FRME::~Element_FRME() {}
diff --git a/src/simulation/elements/GEL.cpp b/src/simulation/elements/GEL.cpp
index 8ea7f0f..462fe83 100644
--- a/src/simulation/elements/GEL.cpp
+++ b/src/simulation/elements/GEL.cpp
@@ -158,6 +158,7 @@ int Element_GEL::graphics(GRAPHICS_FUNC_ARGS)
*colr = q*(32-255)/120+255;
*colg = q*(48-186)/120+186;
*colb = q*208/120;
+ *pixel_mode |= PMODE_BLUR;
return 0;
}
diff --git a/src/simulation/elements/GLAS.cpp b/src/simulation/elements/GLAS.cpp
index 347e809..109cad0 100644
--- a/src/simulation/elements/GLAS.cpp
+++ b/src/simulation/elements/GLAS.cpp
@@ -59,4 +59,4 @@ int Element_GLAS::update(UPDATE_FUNC_ARGS)
}
-Element_GLAS::~Element_GLAS() {} \ No newline at end of file
+Element_GLAS::~Element_GLAS() {}
diff --git a/src/simulation/elements/GOO.cpp b/src/simulation/elements/GOO.cpp
index f23360d..6592eed 100644
--- a/src/simulation/elements/GOO.cpp
+++ b/src/simulation/elements/GOO.cpp
@@ -61,4 +61,4 @@ int Element_GOO::update(UPDATE_FUNC_ARGS)
}
-Element_GOO::~Element_GOO() {} \ No newline at end of file
+Element_GOO::~Element_GOO() {}
diff --git a/src/simulation/elements/GUNP.cpp b/src/simulation/elements/GUNP.cpp
index 7dc78db..625feeb 100644
--- a/src/simulation/elements/GUNP.cpp
+++ b/src/simulation/elements/GUNP.cpp
@@ -28,7 +28,7 @@ Element_GUNP::Element_GUNP()
Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 97;
- Description = "Gunpowder. Light dust, explosive.";
+ Description = "Gunpowder. Light dust, explodes on contact with fire or spark.";
State = ST_SOLID;
Properties = TYPE_PART;
@@ -46,4 +46,4 @@ Element_GUNP::Element_GUNP()
}
-Element_GUNP::~Element_GUNP() {} \ No newline at end of file
+Element_GUNP::~Element_GUNP() {}
diff --git a/src/simulation/elements/H2.cpp b/src/simulation/elements/H2.cpp
index f652d59..b9d8cd9 100644
--- a/src/simulation/elements/H2.cpp
+++ b/src/simulation/elements/H2.cpp
@@ -28,7 +28,7 @@ Element_H2::Element_H2()
Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 251;
- Description = "Hydrogen. Combusts with OXYG to make WATR. Undergoes fusion at high temperature and pressure";
+ Description = "Hydrogen. Combusts with OXYG to make WATR. Undergoes fusion at high temperature and pressure.";
State = ST_GAS;
Properties = TYPE_GAS;
diff --git a/src/simulation/elements/INSL.cpp b/src/simulation/elements/INSL.cpp
index 4be5020..7fe5dff 100644
--- a/src/simulation/elements/INSL.cpp
+++ b/src/simulation/elements/INSL.cpp
@@ -46,4 +46,4 @@ Element_INSL::Element_INSL()
}
-Element_INSL::~Element_INSL() {} \ No newline at end of file
+Element_INSL::~Element_INSL() {}
diff --git a/src/simulation/elements/INST.cpp b/src/simulation/elements/INST.cpp
index dcf1c11..8340011 100644
--- a/src/simulation/elements/INST.cpp
+++ b/src/simulation/elements/INST.cpp
@@ -46,4 +46,4 @@ Element_INST::Element_INST()
}
-Element_INST::~Element_INST() {} \ No newline at end of file
+Element_INST::~Element_INST() {}
diff --git a/src/simulation/elements/INVIS.cpp b/src/simulation/elements/INVIS.cpp
index 5e7f87d..e73c9bf 100644
--- a/src/simulation/elements/INVIS.cpp
+++ b/src/simulation/elements/INVIS.cpp
@@ -6,7 +6,7 @@ Element_INVIS::Element_INVIS()
Name = "INVS";
Colour = PIXPACK(0x00CCCC);
MenuVisible = 1;
- MenuSection = SC_SOLIDS;
+ MenuSection = SC_SENSOR;
Enabled = 1;
Advection = 0.0f;
diff --git a/src/simulation/elements/INWR.cpp b/src/simulation/elements/INWR.cpp
index 3e438be..0356304 100644
--- a/src/simulation/elements/INWR.cpp
+++ b/src/simulation/elements/INWR.cpp
@@ -46,4 +46,4 @@ Element_INWR::Element_INWR()
}
-Element_INWR::~Element_INWR() {} \ No newline at end of file
+Element_INWR::~Element_INWR() {}
diff --git a/src/simulation/elements/ISOZ.cpp b/src/simulation/elements/ISOZ.cpp
index d3d6e6e..9f01495 100644
--- a/src/simulation/elements/ISOZ.cpp
+++ b/src/simulation/elements/ISOZ.cpp
@@ -28,7 +28,7 @@ Element_ISOZ::Element_ISOZ()
Temperature = R_TEMP-2.0f +273.15f;
HeatConduct = 29;
- Description = "Radioactive liquid. Decays into photons when touching PHOT or under negative pressure.";
+ Description = "Isotope-Z. Radioactive liquid, decays into photons when touching PHOT or under negative pressure.";
State = ST_LIQUID;
Properties = TYPE_LIQUID|PROP_NEUTPENETRATE;
diff --git a/src/simulation/elements/LIFE.cpp b/src/simulation/elements/LIFE.cpp
index 9c5bdf8..d442310 100644
--- a/src/simulation/elements/LIFE.cpp
+++ b/src/simulation/elements/LIFE.cpp
@@ -128,4 +128,4 @@ int Element_LIFE::graphics(GRAPHICS_FUNC_ARGS)
}
-Element_LIFE::~Element_LIFE() {} \ No newline at end of file
+Element_LIFE::~Element_LIFE() {}
diff --git a/src/simulation/elements/LNTG.cpp b/src/simulation/elements/LNTG.cpp
index da3199f..8b6e29a 100644
--- a/src/simulation/elements/LNTG.cpp
+++ b/src/simulation/elements/LNTG.cpp
@@ -46,4 +46,4 @@ Element_LNTG::Element_LNTG()
}
-Element_LNTG::~Element_LNTG() {} \ No newline at end of file
+Element_LNTG::~Element_LNTG() {}
diff --git a/src/simulation/elements/LO2.cpp b/src/simulation/elements/LO2.cpp
index 41a5053..abf08a4 100644
--- a/src/simulation/elements/LO2.cpp
+++ b/src/simulation/elements/LO2.cpp
@@ -46,4 +46,4 @@ Element_LO2::Element_LO2()
}
-Element_LO2::~Element_LO2() {} \ No newline at end of file
+Element_LO2::~Element_LO2() {}
diff --git a/src/simulation/elements/LOLZ.cpp b/src/simulation/elements/LOLZ.cpp
index 301e99a..9017211 100644
--- a/src/simulation/elements/LOLZ.cpp
+++ b/src/simulation/elements/LOLZ.cpp
@@ -61,4 +61,4 @@ int Element_LOLZ::RuleTable[9][9] =
//#TPT-Directive ElementHeader Element_LOLZ static int lolz[XRES/9][YRES/9];
int Element_LOLZ::lolz[XRES/9][YRES/9];
-Element_LOLZ::~Element_LOLZ() {} \ No newline at end of file
+Element_LOLZ::~Element_LOLZ() {}
diff --git a/src/simulation/elements/LOVE.cpp b/src/simulation/elements/LOVE.cpp
index f3b476a..f346635 100644
--- a/src/simulation/elements/LOVE.cpp
+++ b/src/simulation/elements/LOVE.cpp
@@ -61,4 +61,4 @@ int Element_LOVE::RuleTable[9][9] =
//#TPT-Directive ElementHeader Element_LOVE static int love[XRES/9][YRES/9];
int Element_LOVE::love[XRES/9][YRES/9];
-Element_LOVE::~Element_LOVE() {} \ No newline at end of file
+Element_LOVE::~Element_LOVE() {}
diff --git a/src/simulation/elements/LRBD.cpp b/src/simulation/elements/LRBD.cpp
index faf57cd..1b40fd3 100644
--- a/src/simulation/elements/LRBD.cpp
+++ b/src/simulation/elements/LRBD.cpp
@@ -46,4 +46,4 @@ Element_LRBD::Element_LRBD()
}
-Element_LRBD::~Element_LRBD() {} \ No newline at end of file
+Element_LRBD::~Element_LRBD() {}
diff --git a/src/simulation/elements/METL.cpp b/src/simulation/elements/METL.cpp
index a194793..d504e57 100644
--- a/src/simulation/elements/METL.cpp
+++ b/src/simulation/elements/METL.cpp
@@ -46,4 +46,4 @@ Element_METL::Element_METL()
}
-Element_METL::~Element_METL() {} \ No newline at end of file
+Element_METL::~Element_METL() {}
diff --git a/src/simulation/elements/MORT.cpp b/src/simulation/elements/MORT.cpp
index 768fddc..e5ef6ea 100644
--- a/src/simulation/elements/MORT.cpp
+++ b/src/simulation/elements/MORT.cpp
@@ -54,4 +54,4 @@ int Element_MORT::update(UPDATE_FUNC_ARGS)
}
-Element_MORT::~Element_MORT() {} \ No newline at end of file
+Element_MORT::~Element_MORT() {}
diff --git a/src/simulation/elements/MWAX.cpp b/src/simulation/elements/MWAX.cpp
index cb0cfbd..0a75013 100644
--- a/src/simulation/elements/MWAX.cpp
+++ b/src/simulation/elements/MWAX.cpp
@@ -46,4 +46,4 @@ Element_MWAX::Element_MWAX()
}
-Element_MWAX::~Element_MWAX() {} \ No newline at end of file
+Element_MWAX::~Element_MWAX() {}
diff --git a/src/simulation/elements/NICE.cpp b/src/simulation/elements/NICE.cpp
index 0c121c6..bd87de9 100644
--- a/src/simulation/elements/NICE.cpp
+++ b/src/simulation/elements/NICE.cpp
@@ -28,7 +28,7 @@ Element_NICE::Element_NICE()
Temperature = 35.0f;
HeatConduct = 46;
- Description = "Nitrogen Ice.";
+ Description = "Nitrogen Ice. Very cold, will melt into LN2 when heated only slightly.";
State = ST_SOLID;
Properties = TYPE_SOLID;
@@ -46,4 +46,4 @@ Element_NICE::Element_NICE()
}
-Element_NICE::~Element_NICE() {} \ No newline at end of file
+Element_NICE::~Element_NICE() {}
diff --git a/src/simulation/elements/NITR.cpp b/src/simulation/elements/NITR.cpp
index d4bce87..c61d2d1 100644
--- a/src/simulation/elements/NITR.cpp
+++ b/src/simulation/elements/NITR.cpp
@@ -46,4 +46,4 @@ Element_NITR::Element_NITR()
}
-Element_NITR::~Element_NITR() {} \ No newline at end of file
+Element_NITR::~Element_NITR() {}
diff --git a/src/simulation/elements/NONE.cpp b/src/simulation/elements/NONE.cpp
index 5dd02af..b2bcd12 100644
--- a/src/simulation/elements/NONE.cpp
+++ b/src/simulation/elements/NONE.cpp
@@ -63,4 +63,4 @@ VideoBuffer * Element_NONE::iconGen(int wallID, int width, int height)
}
-Element_NONE::~Element_NONE() {} \ No newline at end of file
+Element_NONE::~Element_NONE() {}
diff --git a/src/simulation/elements/NSCN.cpp b/src/simulation/elements/NSCN.cpp
index 1e71f10..36d0a06 100644
--- a/src/simulation/elements/NSCN.cpp
+++ b/src/simulation/elements/NSCN.cpp
@@ -46,4 +46,4 @@ Element_NSCN::Element_NSCN()
}
-Element_NSCN::~Element_NSCN() {} \ No newline at end of file
+Element_NSCN::~Element_NSCN() {}
diff --git a/src/simulation/elements/NTCT.cpp b/src/simulation/elements/NTCT.cpp
index 24a190b..7aa2969 100644
--- a/src/simulation/elements/NTCT.cpp
+++ b/src/simulation/elements/NTCT.cpp
@@ -55,4 +55,4 @@ int Element_NTCT::update(UPDATE_FUNC_ARGS)
}
-Element_NTCT::~Element_NTCT() {} \ No newline at end of file
+Element_NTCT::~Element_NTCT() {}
diff --git a/src/simulation/elements/NWHL.cpp b/src/simulation/elements/NWHL.cpp
index b1c10e5..ed39c56 100644
--- a/src/simulation/elements/NWHL.cpp
+++ b/src/simulation/elements/NWHL.cpp
@@ -54,4 +54,4 @@ int Element_NWHL::update(UPDATE_FUNC_ARGS)
}
-Element_NWHL::~Element_NWHL() {} \ No newline at end of file
+Element_NWHL::~Element_NWHL() {}
diff --git a/src/simulation/elements/PLEX.cpp b/src/simulation/elements/PLEX.cpp
index a4bd63e..2b8c867 100644
--- a/src/simulation/elements/PLEX.cpp
+++ b/src/simulation/elements/PLEX.cpp
@@ -46,4 +46,4 @@ Element_PLEX::Element_PLEX()
}
-Element_PLEX::~Element_PLEX() {} \ No newline at end of file
+Element_PLEX::~Element_PLEX() {}
diff --git a/src/simulation/elements/PLSM.cpp b/src/simulation/elements/PLSM.cpp
index 6d39a6b..a9e5728 100644
--- a/src/simulation/elements/PLSM.cpp
+++ b/src/simulation/elements/PLSM.cpp
@@ -67,4 +67,4 @@ int Element_PLSM::graphics(GRAPHICS_FUNC_ARGS)
}
-Element_PLSM::~Element_PLSM() {} \ No newline at end of file
+Element_PLSM::~Element_PLSM() {}
diff --git a/src/simulation/elements/PQRT.cpp b/src/simulation/elements/PQRT.cpp
index e70377c..665f5a4 100644
--- a/src/simulation/elements/PQRT.cpp
+++ b/src/simulation/elements/PQRT.cpp
@@ -28,7 +28,7 @@ Element_PQRT::Element_PQRT()
Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 3;
- Description = "Broken quartz.";
+ Description = "Powdered quartz, broken form of QRTZ.";
State = ST_SOLID;
Properties = TYPE_PART| PROP_HOT_GLOW;
diff --git a/src/simulation/elements/PRTI.cpp b/src/simulation/elements/PRTI.cpp
index ce91087..2d629a6 100644
--- a/src/simulation/elements/PRTI.cpp
+++ b/src/simulation/elements/PRTI.cpp
@@ -28,7 +28,7 @@ Element_PRTI::Element_PRTI()
Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 0;
- Description = "Portal IN. Things go in here, now with temperature dependent channels (same as WIFI)";
+ Description = "Portal IN. Particles go in here. Also has temperature dependent channels (same as WIFI)";
State = ST_SOLID;
Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/PRTO.cpp b/src/simulation/elements/PRTO.cpp
index af3e7f8..218ce78 100644
--- a/src/simulation/elements/PRTO.cpp
+++ b/src/simulation/elements/PRTO.cpp
@@ -28,7 +28,7 @@ Element_PRTO::Element_PRTO()
Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 0;
- Description = "Portal OUT. Things come out here, now with temperature dependent channels (same as WIFI)";
+ Description = "Portal OUT. Particles come out here. Also has temperature dependent channels (same as WIFI)";
State = ST_SOLID;
Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/PSCN.cpp b/src/simulation/elements/PSCN.cpp
index 5456eaf..8e0a3d4 100644
--- a/src/simulation/elements/PSCN.cpp
+++ b/src/simulation/elements/PSCN.cpp
@@ -46,4 +46,4 @@ Element_PSCN::Element_PSCN()
}
-Element_PSCN::~Element_PSCN() {} \ No newline at end of file
+Element_PSCN::~Element_PSCN() {}
diff --git a/src/simulation/elements/PSNS.cpp b/src/simulation/elements/PSNS.cpp
index 033150d..1ab8de3 100644
--- a/src/simulation/elements/PSNS.cpp
+++ b/src/simulation/elements/PSNS.cpp
@@ -28,7 +28,7 @@ Element_PSNS::Element_PSNS()
Temperature = 277.15f;
HeatConduct = 0;
- Description = "Pressure sensor, creates spark when the pressure is greater than its temperature.";
+ Description = "Pressure sensor, creates a spark when the pressure is greater than its temperature.";
State = ST_SOLID;
Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/PSTE.cpp b/src/simulation/elements/PSTE.cpp
index add4370..0857bff 100644
--- a/src/simulation/elements/PSTE.cpp
+++ b/src/simulation/elements/PSTE.cpp
@@ -46,4 +46,4 @@ Element_PSTE::Element_PSTE()
}
-Element_PSTE::~Element_PSTE() {} \ No newline at end of file
+Element_PSTE::~Element_PSTE() {}
diff --git a/src/simulation/elements/PSTS.cpp b/src/simulation/elements/PSTS.cpp
index 06a8c1e..e309ed1 100644
--- a/src/simulation/elements/PSTS.cpp
+++ b/src/simulation/elements/PSTS.cpp
@@ -46,4 +46,4 @@ Element_PSTS::Element_PSTS()
}
-Element_PSTS::~Element_PSTS() {} \ No newline at end of file
+Element_PSTS::~Element_PSTS() {}
diff --git a/src/simulation/elements/PTCT.cpp b/src/simulation/elements/PTCT.cpp
index be3c231..e78c453 100644
--- a/src/simulation/elements/PTCT.cpp
+++ b/src/simulation/elements/PTCT.cpp
@@ -55,4 +55,4 @@ int Element_PTCT::update(UPDATE_FUNC_ARGS)
}
-Element_PTCT::~Element_PTCT() {} \ No newline at end of file
+Element_PTCT::~Element_PTCT() {}
diff --git a/src/simulation/elements/RBDM.cpp b/src/simulation/elements/RBDM.cpp
index 9e08bc3..b1aed85 100644
--- a/src/simulation/elements/RBDM.cpp
+++ b/src/simulation/elements/RBDM.cpp
@@ -46,4 +46,4 @@ Element_RBDM::Element_RBDM()
}
-Element_RBDM::~Element_RBDM() {} \ No newline at end of file
+Element_RBDM::~Element_RBDM() {}
diff --git a/src/simulation/elements/REPL.cpp b/src/simulation/elements/REPL.cpp
index d0e2aaf..e0823ec 100644
--- a/src/simulation/elements/REPL.cpp
+++ b/src/simulation/elements/REPL.cpp
@@ -28,7 +28,7 @@ Element_REPL::Element_REPL()
Temperature = 20.0f+0.0f +273.15f;
HeatConduct = 0;
- Description = "Repels or attracts particles based on its temp value.";
+ Description = "Repels or attracts particles based on its temperature.";
State = ST_NONE;
Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/SALT.cpp b/src/simulation/elements/SALT.cpp
index 4e21f1b..6772c2b 100644
--- a/src/simulation/elements/SALT.cpp
+++ b/src/simulation/elements/SALT.cpp
@@ -46,4 +46,4 @@ Element_SALT::Element_SALT()
}
-Element_SALT::~Element_SALT() {} \ No newline at end of file
+Element_SALT::~Element_SALT() {}
diff --git a/src/simulation/elements/SAND.cpp b/src/simulation/elements/SAND.cpp
index dade4f1..3a99e0e 100644
--- a/src/simulation/elements/SAND.cpp
+++ b/src/simulation/elements/SAND.cpp
@@ -46,4 +46,4 @@ Element_SAND::Element_SAND()
}
-Element_SAND::~Element_SAND() {} \ No newline at end of file
+Element_SAND::~Element_SAND() {}
diff --git a/src/simulation/elements/SMKE.cpp b/src/simulation/elements/SMKE.cpp
index b4572d0..4a993a3 100644
--- a/src/simulation/elements/SMKE.cpp
+++ b/src/simulation/elements/SMKE.cpp
@@ -65,4 +65,4 @@ int Element_SMKE::graphics(GRAPHICS_FUNC_ARGS)
return 1;
}
-Element_SMKE::~Element_SMKE() {} \ No newline at end of file
+Element_SMKE::~Element_SMKE() {}
diff --git a/src/simulation/elements/SOAP.cpp b/src/simulation/elements/SOAP.cpp
index 472dbd7..79434e9 100644
--- a/src/simulation/elements/SOAP.cpp
+++ b/src/simulation/elements/SOAP.cpp
@@ -246,7 +246,7 @@ int Element_SOAP::update(UPDATE_FUNC_ARGS)
int Element_SOAP::graphics(GRAPHICS_FUNC_ARGS)
{
- *pixel_mode |= EFFECT_LINES;
+ *pixel_mode |= EFFECT_LINES|PMODE_BLUR;
return 1;
}
diff --git a/src/simulation/elements/SPAWN.cpp b/src/simulation/elements/SPAWN.cpp
index 517c712..db12b2f 100644
--- a/src/simulation/elements/SPAWN.cpp
+++ b/src/simulation/elements/SPAWN.cpp
@@ -57,4 +57,4 @@ int Element_SPAWN::update(UPDATE_FUNC_ARGS)
-Element_SPAWN::~Element_SPAWN() {} \ No newline at end of file
+Element_SPAWN::~Element_SPAWN() {}
diff --git a/src/simulation/elements/SPAWN2.cpp b/src/simulation/elements/SPAWN2.cpp
index 4ce0ceb..96a50da 100644
--- a/src/simulation/elements/SPAWN2.cpp
+++ b/src/simulation/elements/SPAWN2.cpp
@@ -57,4 +57,4 @@ int Element_SPAWN2::update(UPDATE_FUNC_ARGS)
-Element_SPAWN2::~Element_SPAWN2() {} \ No newline at end of file
+Element_SPAWN2::~Element_SPAWN2() {}
diff --git a/src/simulation/elements/SPRK.cpp b/src/simulation/elements/SPRK.cpp
index 15fd0e4..e289798 100644
--- a/src/simulation/elements/SPRK.cpp
+++ b/src/simulation/elements/SPRK.cpp
@@ -85,7 +85,7 @@ int Element_SPRK::update(UPDATE_FUNC_ARGS)
nearp = sim->nearest_part(i, PT_ETRD, -1);
if (nearp!=-1 && sim->parts_avg(i, nearp, PT_INSL)!=PT_INSL)
{
- sim->CreateLine(x, y, (int)(parts[nearp].x+0.5f), (int)(parts[nearp].y+0.5f), 0, 0, PT_PLSM, 0);
+ sim->CreateLine(x, y, (int)(parts[nearp].x+0.5f), (int)(parts[nearp].y+0.5f), PT_PLSM);
sim->part_change_type(i,x,y,ct);
ct = parts[i].ctype = PT_NONE;
parts[i].life = 20;
@@ -158,7 +158,7 @@ int Element_SPRK::update(UPDATE_FUNC_ARGS)
}
}
break;
- case PT_TUGN:
+ case PT_TUNG:
if(parts[i].temp < 3595.0){
parts[i].temp += (rand()%20)-4;
}
diff --git a/src/simulation/elements/STKM.cpp b/src/simulation/elements/STKM.cpp
index 55fac92..7767266 100644
--- a/src/simulation/elements/STKM.cpp
+++ b/src/simulation/elements/STKM.cpp
@@ -90,7 +90,7 @@ int Element_STKM::run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) {
parts[i].temp += 1;
//Death
- if (parts[i].life<1 || (sim->pv[y/CELL][x/CELL]>=4.5f && playerp->elem != SPC_AIR) ) //If his HP is less that 0 or there is very big wind...
+ if (parts[i].life<1 || (sim->pv[y/CELL][x/CELL]>=4.5f && playerp->elem != SPC_AIR) ) //If his HP is less than 0 or there is very big wind...
{
for (r=-2; r<=1; r++)
{
@@ -130,13 +130,13 @@ int Element_STKM::run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) {
float rbx = gvx;
float rby = gvy;
bool rbLowGrav = false;
- float tmp = fmaxf(fabsf(rbx), fabsf(rby));
+ float tmp = fabsf(rbx) > fabsf(rby)?fabsf(rbx):fabsf(rby);
if (tmp < 0.001f)
{
rbLowGrav = true;
rbx = -parts[i].vx;
rby = -parts[i].vy;
- tmp = fmaxf(fabsf(rbx), fabsf(rby));
+ tmp = fabsf(rbx) > fabsf(rby)?fabsf(rbx):fabsf(rby);
}
if (tmp < 0.001f)
{
@@ -421,7 +421,11 @@ int Element_STKM::run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) {
{
int np = -1;
if (playerp->elem == SPC_AIR)
- sim->CreateParts(rx + 3*((((int)playerp->pcomm)&0x02) == 0x02) - 3*((((int)playerp->pcomm)&0x01) == 0x01), ry, 4, 4, SPC_AIR, 0);
+ {
+ for(int j = -4; j < 5; j++)
+ for (int k = -4; k < 5; k++)
+ sim->create_part(-2, rx + 3*((((int)playerp->pcomm)&0x02) == 0x02) - 3*((((int)playerp->pcomm)&0x01) == 0x01)+j, ry+k, SPC_AIR);
+ }
else if (playerp->elem==PT_LIGH && playerp->frames<30)//limit lightning creation rate
np = -1;
else
diff --git a/src/simulation/elements/STKM2.cpp b/src/simulation/elements/STKM2.cpp
index 943cac9..ee94adb 100644
--- a/src/simulation/elements/STKM2.cpp
+++ b/src/simulation/elements/STKM2.cpp
@@ -53,4 +53,4 @@ int Element_STKM2::update(UPDATE_FUNC_ARGS)
return 0;
}
-Element_STKM2::~Element_STKM2() {} \ No newline at end of file
+Element_STKM2::~Element_STKM2() {}
diff --git a/src/simulation/elements/STNE.cpp b/src/simulation/elements/STNE.cpp
index c2197c5..c0354db 100644
--- a/src/simulation/elements/STNE.cpp
+++ b/src/simulation/elements/STNE.cpp
@@ -46,4 +46,4 @@ Element_STNE::Element_STNE()
}
-Element_STNE::~Element_STNE() {} \ No newline at end of file
+Element_STNE::~Element_STNE() {}
diff --git a/src/simulation/elements/STOR.cpp b/src/simulation/elements/STOR.cpp
index 92dd80f..a09096f 100644
--- a/src/simulation/elements/STOR.cpp
+++ b/src/simulation/elements/STOR.cpp
@@ -28,7 +28,7 @@ Element_STOR::Element_STOR()
Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 0;
- Description = "Stores a single particle, releases when charged with PSCN, also passes to PIPE.";
+ Description = "Captures and stores a single particle. releases when charged with PSCN, also passes to PIPE.";
State = ST_NONE;
Properties = TYPE_SOLID;
diff --git a/src/simulation/elements/SWCH.cpp b/src/simulation/elements/SWCH.cpp
index 824929d..893ce9e 100644
--- a/src/simulation/elements/SWCH.cpp
+++ b/src/simulation/elements/SWCH.cpp
@@ -110,4 +110,4 @@ int Element_SWCH::graphics(GRAPHICS_FUNC_ARGS)
}
-Element_SWCH::~Element_SWCH() {} \ No newline at end of file
+Element_SWCH::~Element_SWCH() {}
diff --git a/src/simulation/elements/TESC.cpp b/src/simulation/elements/TESC.cpp
index 0ad7e00..00ae151 100644
--- a/src/simulation/elements/TESC.cpp
+++ b/src/simulation/elements/TESC.cpp
@@ -28,7 +28,7 @@ Element_TESC::Element_TESC()
Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 251;
- Description = "Tesla coil!";
+ Description = "Tesla coil! Creates lightning when sparked.";
State = ST_SOLID;
Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;
@@ -46,4 +46,4 @@ Element_TESC::Element_TESC()
}
-Element_TESC::~Element_TESC() {} \ No newline at end of file
+Element_TESC::~Element_TESC() {}
diff --git a/src/simulation/elements/THDR.cpp b/src/simulation/elements/THDR.cpp
index 3c9f0c9..507db2d 100644
--- a/src/simulation/elements/THDR.cpp
+++ b/src/simulation/elements/THDR.cpp
@@ -28,7 +28,7 @@ Element_THDR::Element_THDR()
Temperature = 9000.0f +273.15f;
HeatConduct = 1;
- Description = "Lightning! Very hot, inflicts damage upon most materials, transfers current to metals.";
+ Description = "Lightning! Very hot, inflicts damage upon most materials, and transfers current to metals.";
State = ST_NONE;
Properties = TYPE_PART;
diff --git a/src/simulation/elements/TRON.cpp b/src/simulation/elements/TRON.cpp
index 8ad0b4d..62378c6 100644
--- a/src/simulation/elements/TRON.cpp
+++ b/src/simulation/elements/TRON.cpp
@@ -28,7 +28,7 @@ Element_TRON::Element_TRON()
Temperature = 0.0f;
HeatConduct = 40;
- Description = "Smart particles, Travels in straight lines and avoids obstacles. Grows with time.";
+ Description = "Smart particles, Travels in straight lines and avoids obstacles. Grows with time.";
State = ST_NONE;
Properties = TYPE_SOLID|PROP_LIFE_DEC|PROP_LIFE_KILL;
diff --git a/src/simulation/elements/TTAN.cpp b/src/simulation/elements/TTAN.cpp
index 919c2b1..3f997f7 100644
--- a/src/simulation/elements/TTAN.cpp
+++ b/src/simulation/elements/TTAN.cpp
@@ -29,7 +29,7 @@ Element_TTAN::Element_TTAN()
Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 251;
- Description = "Titanium, Higher melting temperature than other metals, blocks all air pressure";
+ Description = "Titanium. Higher melting temperature than most other metals, blocks all air pressure.";
State = ST_SOLID;
Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_HOT_GLOW|PROP_LIFE_DEC;
diff --git a/src/simulation/elements/TUGN.cpp b/src/simulation/elements/TUNG.cpp
index 4fb8032..1666346 100644
--- a/src/simulation/elements/TUGN.cpp
+++ b/src/simulation/elements/TUNG.cpp
@@ -1,10 +1,10 @@
#include "simulation/Elements.h"
#include "simulation/Air.h"
-//#TPT-Directive ElementClass Element_TUGN PT_TUGN 171
-Element_TUGN::Element_TUGN()
+//#TPT-Directive ElementClass Element_TUNG PT_TUNG 171
+Element_TUNG::Element_TUNG()
{
- Identifier = "DEFAULT_PT_TUGN";
- Name = "TUGN";
+ Identifier = "DEFAULT_PT_TUNG";
+ Name = "TUNG";
Colour = PIXPACK(0x505050);
MenuVisible = 1;
MenuSection = SC_ELEC;
@@ -29,7 +29,7 @@ Element_TUGN::Element_TUGN()
Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 251;
- Description = "Brittle metal with a very high melting point.";
+ Description = "Tungsten. Brittle metal with a very high melting point.";
State = ST_SOLID;
Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC;
@@ -45,15 +45,15 @@ Element_TUGN::Element_TUGN()
/*HighTemperature = 3895.0f;
HighTemperatureTransition = PT_LAVA;*/
- Update = &Element_TUGN::update;
- Graphics = &Element_TUGN::graphics;
+ Update = &Element_TUNG::update;
+ Graphics = &Element_TUNG::graphics;
}
#define MELTING_POINT 3695.0
-//#TPT-Directive ElementHeader Element_TUGN static int update(UPDATE_FUNC_ARGS)
-int Element_TUGN::update(UPDATE_FUNC_ARGS)
+//#TPT-Directive ElementHeader Element_TUNG static int update(UPDATE_FUNC_ARGS)
+int Element_TUNG::update(UPDATE_FUNC_ARGS)
{
bool splode = false;
if(parts[i].temp > 2400.0)
@@ -85,7 +85,7 @@ int Element_TUGN::update(UPDATE_FUNC_ARGS)
else
{
sim->part_change_type(i, x, y, PT_LAVA);
- parts[i].ctype = PT_TUGN;
+ parts[i].ctype = PT_TUNG;
return 1;
}
if(splode)
@@ -101,13 +101,14 @@ int Element_TUGN::update(UPDATE_FUNC_ARGS)
if (parts[i].pavg[1]-parts[i].pavg[0] > 0.50f || parts[i].pavg[1]-parts[i].pavg[0] < -0.50f)
{
sim->part_change_type(i,x,y,PT_BRMT);
+ parts[i].ctype = PT_TUNG;
}
return 0;
}
-//#TPT-Directive ElementHeader Element_TUGN static int graphics(GRAPHICS_FUNC_ARGS)
-int Element_TUGN::graphics(GRAPHICS_FUNC_ARGS)
+//#TPT-Directive ElementHeader Element_TUNG static int graphics(GRAPHICS_FUNC_ARGS)
+int Element_TUNG::graphics(GRAPHICS_FUNC_ARGS)
{
double startTemp = (MELTING_POINT - 1500.0);
double tempOver = (((cpart->temp - startTemp)/1500.0)*M_PI) - (M_PI/2.0);
@@ -129,4 +130,4 @@ int Element_TUGN::graphics(GRAPHICS_FUNC_ARGS)
return 0;
}
-Element_TUGN::~Element_TUGN() {}
+Element_TUNG::~Element_TUNG() {}
diff --git a/src/simulation/elements/URAN.cpp b/src/simulation/elements/URAN.cpp
index 3ced8fe..61d5add 100644
--- a/src/simulation/elements/URAN.cpp
+++ b/src/simulation/elements/URAN.cpp
@@ -58,4 +58,4 @@ int Element_URAN::update(UPDATE_FUNC_ARGS)
}
-Element_URAN::~Element_URAN() {} \ No newline at end of file
+Element_URAN::~Element_URAN() {}
diff --git a/src/simulation/elements/VOID.cpp b/src/simulation/elements/VOID.cpp
index a21413a..ee95179 100644
--- a/src/simulation/elements/VOID.cpp
+++ b/src/simulation/elements/VOID.cpp
@@ -46,4 +46,4 @@ Element_VOID::Element_VOID()
}
-Element_VOID::~Element_VOID() {} \ No newline at end of file
+Element_VOID::~Element_VOID() {}
diff --git a/src/simulation/elements/WAX.cpp b/src/simulation/elements/WAX.cpp
index 2203b61..1873222 100644
--- a/src/simulation/elements/WAX.cpp
+++ b/src/simulation/elements/WAX.cpp
@@ -46,4 +46,4 @@ Element_WAX::Element_WAX()
}
-Element_WAX::~Element_WAX() {} \ No newline at end of file
+Element_WAX::~Element_WAX() {}
diff --git a/src/simulation/elements/WHOL.cpp b/src/simulation/elements/WHOL.cpp
index aba4e19..41a34bb 100644
--- a/src/simulation/elements/WHOL.cpp
+++ b/src/simulation/elements/WHOL.cpp
@@ -46,4 +46,4 @@ Element_WHOL::Element_WHOL()
}
-Element_WHOL::~Element_WHOL() {} \ No newline at end of file
+Element_WHOL::~Element_WHOL() {}
diff --git a/src/simulation/elements/WIFI.cpp b/src/simulation/elements/WIFI.cpp
index a20e6de..81d4e60 100644
--- a/src/simulation/elements/WIFI.cpp
+++ b/src/simulation/elements/WIFI.cpp
@@ -98,4 +98,4 @@ int Element_WIFI::graphics(GRAPHICS_FUNC_ARGS)
}
-Element_WIFI::~Element_WIFI() {} \ No newline at end of file
+Element_WIFI::~Element_WIFI() {}
diff --git a/src/simulation/elements/WOOD.cpp b/src/simulation/elements/WOOD.cpp
index 589aa2f..4676790 100644
--- a/src/simulation/elements/WOOD.cpp
+++ b/src/simulation/elements/WOOD.cpp
@@ -72,4 +72,4 @@ int Element_WOOD::graphics(GRAPHICS_FUNC_ARGS)
return 0;
}
-Element_WOOD::~Element_WOOD() {} \ No newline at end of file
+Element_WOOD::~Element_WOOD() {}
diff --git a/src/simulation/elements/WTRV.cpp b/src/simulation/elements/WTRV.cpp
index 11ff088..b49ef67 100644
--- a/src/simulation/elements/WTRV.cpp
+++ b/src/simulation/elements/WTRV.cpp
@@ -28,7 +28,7 @@ Element_WTRV::Element_WTRV()
Temperature = R_TEMP+100.0f+273.15f;
HeatConduct = 48;
- Description = "Steam, heats up air, produced from hot water.";
+ Description = "Steam. Produced from hot water.";
State = ST_GAS;
Properties = TYPE_GAS;