mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-30 03:09:53 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
jacob1
2013-05-20 11:27:18 -04:00
parent 826b966668 d29b001d82
commit 35f84a0942
8 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -48,6 +48,10 @@ Makefile.me
*.settings *.settings
*.cbp *.cbp
*.layout *.layout
*.config
*.creator
*.files
*.includes
config.log config.log
*.sconsign.dblite *.sconsign.dblite
*.sconf_temp *.sconf_temp

2
src/simulation/elements/FIRW.cpp
View File

@@ -32,7 +32,7 @@ Element_FIRW::Element_FIRW()
Temperature = R_TEMP+0.0f +273.15f; Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 70; HeatConduct = 70;
Description = "Fireworks! Colorful, set off by fire"; Description = "Fireworks! Colorful, set off by fire.";
State = ST_SOLID; State = ST_SOLID;
Properties = TYPE_PART|PROP_LIFE_DEC; Properties = TYPE_PART|PROP_LIFE_DEC;

2
src/simulation/elements/FRAY.cpp
View File

@@ -28,7 +28,7 @@ Element_FRAY::Element_FRAY()
Temperature = 20.0f+0.0f +273.15f; Temperature = 20.0f+0.0f +273.15f;
HeatConduct = 0; 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 temperature. Use like ARAY.";
State = ST_SOLID; State = ST_SOLID;
Properties = TYPE_SOLID|PROP_LIFE_DEC; Properties = TYPE_SOLID|PROP_LIFE_DEC;

2
src/simulation/elements/METL.cpp
View File

@@ -28,7 +28,7 @@ Element_METL::Element_METL()
Temperature = R_TEMP+0.0f +273.15f; Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 251; HeatConduct = 251;
Description = "The basic conductor, meltable and breaks under pressure."; Description = "The basic conductor. Meltable.";
State = ST_SOLID; State = ST_SOLID;
Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW; Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;

2
src/simulation/elements/PRTI.cpp
View File

@@ -28,7 +28,7 @@ Element_PRTI::Element_PRTI()
Temperature = R_TEMP+0.0f +273.15f; Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 0; HeatConduct = 0;
Description = "Portal IN. Particles go in here. Also has temperature dependent channels (same as WIFI)"; Description = "Portal IN. Particles go in here. Also has temperature dependent channels. (same as WIFI)";
State = ST_SOLID; State = ST_SOLID;
Properties = TYPE_SOLID; Properties = TYPE_SOLID;

2
src/simulation/elements/PRTO.cpp
View File

@@ -28,7 +28,7 @@ Element_PRTO::Element_PRTO()
Temperature = R_TEMP+0.0f +273.15f; Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 0; HeatConduct = 0;
Description = "Portal OUT. Particles come out here. Also has temperature dependent channels (same as WIFI)"; Description = "Portal OUT. Particles come out here. Also has temperature dependent channels. (same as WIFI)";
State = ST_SOLID; State = ST_SOLID;
Properties = TYPE_SOLID; Properties = TYPE_SOLID;

2
src/simulation/elements/VIBR.cpp
View File

@@ -157,7 +157,7 @@ int Element_VIBR::update(UPDATE_FUNC_ARGS) {
{ {
if (!parts[r>>8].life) if (!parts[r>>8].life)
parts[r>>8].tmp += 45; parts[r>>8].tmp += 45;
else if (parts[i].tmp2 && rand()%2) else if (parts[i].tmp2 && parts[i].life > 75 && rand()%2)
{ {
parts[r>>8].tmp2 = 1; parts[r>>8].tmp2 = 1;
parts[i].tmp = 0; parts[i].tmp = 0;

2
src/simulation/elements/WIRE.cpp
View File

@@ -28,7 +28,7 @@ Element_WIRE::Element_WIRE()
Temperature = R_TEMP+0.0f +273.15f; Temperature = R_TEMP+0.0f +273.15f;
HeatConduct = 250; HeatConduct = 250;
Description = "WireWorld wires, conducts based on a set of GOL-like rules"; Description = "WireWorld wires, conducts based on a set of GOL-like rules.";
State = ST_SOLID; State = ST_SOLID;
Properties = TYPE_SOLID; Properties = TYPE_SOLID;