summaryrefslogtreecommitdiff
path: root/src/simulation
diff options
context:
space:
mode:
Diffstat (limited to 'src/simulation')
-rw-r--r--src/simulation/Simulation.cpp5
-rw-r--r--src/simulation/elements/DEST.cpp2
-rw-r--r--src/simulation/elements/GLAS.cpp4
-rw-r--r--src/simulation/elements/LIGH.cpp1
-rw-r--r--src/simulation/elements/NEUT.cpp1
-rw-r--r--src/simulation/elements/NICE.cpp4
-rw-r--r--src/simulation/elements/SPLU.cpp60
-rw-r--r--src/simulation/elements/WAX.cpp4
8 files changed, 72 insertions, 9 deletions
diff --git a/src/simulation/Simulation.cpp b/src/simulation/Simulation.cpp
index 0a24539..e85b373 100644
--- a/src/simulation/Simulation.cpp
+++ b/src/simulation/Simulation.cpp
@@ -4065,7 +4065,7 @@ void Simulation::update_particles_i(int start, int inc)
parts[i].tmp = 0;
t = PT_BMTL;
}
- if (t == PT_PLUT)
+ if (t == PT_PLUT || t == PT_SPLU)
{
parts[i].tmp = 0;
t = PT_LAVA;
@@ -4126,7 +4126,7 @@ void Simulation::update_particles_i(int start, int inc)
parts[i].tmp--;
parts[i].temp = 3500;
}
- if (parts[i].ctype==PT_PLUT&&parts[i].tmp>0)
+ if ((parts[i].ctype==PT_PLUT || parts[i].ctype==PT_SPLU)&&parts[i].tmp>0)
{
parts[i].tmp--;
parts[i].temp = MAX_TEMP;
@@ -4449,6 +4449,7 @@ killed:
else if ((r & 0xFF) == PT_GOO) parts[i].ctype &= 0x3FFAAA00;
else if ((r & 0xFF) == PT_PLNT) parts[i].ctype &= 0x0007C000;
else if ((r & 0xFF) == PT_PLUT) parts[i].ctype &= 0x001FCE00;
+ else if ((r & 0xFF) == PT_SPLT) parts[i].ctype &= 0x001FCE00;
else if ((r & 0xFF) == PT_URAN) parts[i].ctype &= 0x003FC000;
else if ((r & 0xFF) == PT_GOLD) parts[i].ctype &= 0x3C038100;
diff --git a/src/simulation/elements/DEST.cpp b/src/simulation/elements/DEST.cpp
index d6f24f5..9072f31 100644
--- a/src/simulation/elements/DEST.cpp
+++ b/src/simulation/elements/DEST.cpp
@@ -64,7 +64,7 @@ int Element_DEST::update(UPDATE_FUNC_ARGS)
parts[i].life=30+rand()%20;
sim->pv[y/CELL][x/CELL]+=60.0f;
}
- if ((r&0xFF)==PT_PLUT || (r&0xFF)==PT_DEUT)
+ if ((r&0xFF)==PT_PLUT || r&0xFF)==PT_SPLU || (r&0xFF)==PT_DEUT)
{
sim->pv[y/CELL][x/CELL]+=20.0f;
if (rand()%2)
diff --git a/src/simulation/elements/GLAS.cpp b/src/simulation/elements/GLAS.cpp
index 109cad0..49c01d5 100644
--- a/src/simulation/elements/GLAS.cpp
+++ b/src/simulation/elements/GLAS.cpp
@@ -12,9 +12,9 @@ Element_GLAS::Element_GLAS()
Advection = 0.0f;
AirDrag = 0.00f * CFDS;
AirLoss = 0.90f;
- Loss = 0.00f;
+ Loss = 0.999f;
Collision = 0.0f;
- Gravity = 0.0f;
+ Gravity = 0.22f;
Diffusion = 0.00f;
HotAir = 0.000f * CFDS;
Falldown = 0;
diff --git a/src/simulation/elements/LIGH.cpp b/src/simulation/elements/LIGH.cpp
index 5d8a925..eb7003d 100644
--- a/src/simulation/elements/LIGH.cpp
+++ b/src/simulation/elements/LIGH.cpp
@@ -112,6 +112,7 @@ int Element_LIGH::update(UPDATE_FUNC_ARGS)
continue;
case PT_DEUT:
case PT_PLUT:
+ case PT_SPLU:
parts[r>>8].temp = restrict_flt(parts[r>>8].temp+powderful, MIN_TEMP, MAX_TEMP);
sim->pv[y/CELL][x/CELL] +=powderful/35;
if (!(rand()%3))
diff --git a/src/simulation/elements/NEUT.cpp b/src/simulation/elements/NEUT.cpp
index d61466c..2e798d4 100644
--- a/src/simulation/elements/NEUT.cpp
+++ b/src/simulation/elements/NEUT.cpp
@@ -67,6 +67,7 @@ int Element_NEUT::update(UPDATE_FUNC_ARGS)
parts[i].vy *= 0.995;
break;
case PT_PLUT:
+ case PT_SPLU:
if (pressureFactor>(rand()%1000))
{
if (!(rand()%3))
diff --git a/src/simulation/elements/NICE.cpp b/src/simulation/elements/NICE.cpp
index bd87de9..1c4193a 100644
--- a/src/simulation/elements/NICE.cpp
+++ b/src/simulation/elements/NICE.cpp
@@ -12,9 +12,9 @@ Element_NICE::Element_NICE()
Advection = 0.0f;
AirDrag = 0.00f * CFDS;
AirLoss = 0.90f;
- Loss = 0.00f;
+ Loss = 0.95f;
Collision = 0.0f;
- Gravity = 0.0f;
+ Gravity = 0.08f;
Diffusion = 0.00f;
HotAir = -0.0005f* CFDS;
Falldown = 0;
diff --git a/src/simulation/elements/SPLU.cpp b/src/simulation/elements/SPLU.cpp
new file mode 100644
index 0000000..a1279a2
--- /dev/null
+++ b/src/simulation/elements/SPLU.cpp
@@ -0,0 +1,60 @@
+#include "simulation/Elements.h"
+//#TPT-Directive ElementClass Element_SPLU PT_SPLU 177
+Element_SPLU::Element_SPLU()
+{
+ Identifier = "DEFAULT_PT_SPLU";
+ Name = "SPLU";
+ Colour = PIXPACK(0x407020);
+ MenuVisible = 1;
+ MenuSection = SC_NUCLEAR;
+ Enabled = 1;
+
+ Advection = 0.1f;
+ AirDrag = 0.01f * CFDS;
+ AirLoss = 0.99f;
+ Loss = 0.99f;
+ Collision = 0.0f;
+ Gravity = 0.4f;
+ Diffusion = 0.00f;
+ HotAir = 0.000f * CFDS;
+ Falldown = 1;
+
+ Flammable = 0;
+ Explosive = 0;
+ Meltable = 0;
+ Hardness = 0;
+
+ Weight = 90;
+
+ Temperature = R_TEMP+4.0f +273.15f;
+ HeatConduct = 251;
+ Description = "Heavy particles. Fissile. Generates neutrons under pressure.";
+
+ State = ST_SOLID;
+ Properties = TYPE_SOLID|PROP_NEUTPASS|PROP_RADIOACTIVE;
+
+ LowPressure = IPL;
+ LowPressureTransition = NT;
+ HighPressure = IPH;
+ HighPressureTransition = NT;
+ LowTemperature = ITL;
+ LowTemperatureTransition = NT;
+ HighTemperature = ITH;
+ HighTemperatureTransition = NT;
+
+ Update = &Element_SPLU::update;
+
+}
+
+//#TPT-Directive ElementHeader Element_SPLU static int update(UPDATE_FUNC_ARGS)
+int Element_SPLU::update(UPDATE_FUNC_ARGS)
+{
+ if (!(rand()%100) && ((int)(5.0f*sim->pv[y/CELL][x/CELL]))>(rand()%1000))
+ {
+ sim->create_part(i, x, y, PT_NEUT);
+ }
+ return 0;
+}
+
+
+Element_SPLU::~Element_SPLU() {}
diff --git a/src/simulation/elements/WAX.cpp b/src/simulation/elements/WAX.cpp
index 1873222..06f248b 100644
--- a/src/simulation/elements/WAX.cpp
+++ b/src/simulation/elements/WAX.cpp
@@ -12,9 +12,9 @@ Element_WAX::Element_WAX()
Advection = 0.0f;
AirDrag = 0.00f * CFDS;
AirLoss = 0.90f;
- Loss = 0.00f;
+ Loss = 0.98f;
Collision = 0.0f;
- Gravity = 0.0f;
+ Gravity = 0.15f;
Diffusion = 0.00f;
HotAir = 0.000f * CFDS;
Falldown = 0;