mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-03-28 10:03:34 +01:00
Code Issues Projects Releases Wiki Activity

file renaming / deletion, code cleanup

Browse Source
This commit is contained in:
jacob1 2017-06-03 18:07:39 -04:00
parent 649133ff41
commit 53bb1f4802
2 changed files with 25 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
src/simulation/elements/182.cpp
View File

@ -1,111 +0,0 @@
#include "simulation/Elements.h"
//#TPT-Directive ElementClass Element_E182 PT_E182 182
/*
TODO:
- Molten version
- "muted version" a powder created by mixing E182 with ? that is weaker
*/
Element_E182::Element_E182()
{
Identifier = "DEFAULT_PT_E182";
Name = "E182";
Colour = PIXPACK(0x506030);
MenuVisible = 1;
MenuSection = SC_NUCLEAR;
#if (defined(DEBUG) || defined(SNAPSHOT)) && MOD_ID == 0
Enabled = 1;
#else
Enabled = 0;
#endif
Advection = 0.4f;
AirDrag = 0.01f * CFDS;
AirLoss = 0.99f;
Loss = 0.95f;
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 = "Experimental element. Some kind of nuclear fuel";
Properties = PROP_NEUTPASS|PROP_RADIOACTIVE|PROP_LIFE_DEC;
LowPressure = IPL;
LowPressureTransition = NT;
HighPressure = IPH;
HighPressureTransition = NT;
LowTemperature = ITL;
LowTemperatureTransition = NT;
HighTemperature = ITH;
HighTemperatureTransition = NT;
Update = &Element_E182::update;
Graphics = &Element_E182::graphics;
}
//#TPT-Directive ElementHeader Element_E182 static int update(UPDATE_FUNC_ARGS)
int Element_E182::update(UPDATE_FUNC_ARGS)
{
const int cooldown = 15;
const int limit = 5;
int r, s;
if(parts[i].tmp < limit && !parts[i].life)
{
if (!(rand()%10000) && !parts[i].tmp)
{
s = sim->create_part(-3, x, y, PT_NEUT);
if(s >= 0) {
parts[i].life = cooldown;
parts[i].tmp ++;
parts[i].temp = ((parts[i].temp + parts[s].temp) + 600.0f) / 2.0f;
parts[s].temp = parts[i].temp;
}
}
r = sim->photons[y][x];
if (r && !(rand()%100)) {
s = sim->create_part(-3, x, y, PT_NEUT);
if(s >= 0) {
parts[i].temp = ((parts[i].temp + parts[r>>8].temp + parts[r>>8].temp) + 600.0f) / 3.0f;
parts[i].life = cooldown;
parts[i].tmp ++;
parts[r>>8].temp = parts[i].temp;
parts[s].temp = parts[i].temp;
parts[s].vx = parts[r>>8].vx;
parts[s].vy = parts[r>>8].vy;
}
}
}
return 0;
}
//#TPT-Directive ElementHeader Element_E182 static int graphics(GRAPHICS_FUNC_ARGS)
int Element_E182::graphics(GRAPHICS_FUNC_ARGS)
{
if(cpart->tmp >= 5) {
*colr = 0x70;
*colg = 0x70;
*colb = 0x70;
}
return 0;
}
Element_E182::~Element_E182() {}

41
src/simulation/elements/polo.cpp → src/simulation/elements/POLO.cpp
View File

@ -51,14 +51,14 @@ int Element_POLO::update(UPDATE_FUNC_ARGS)
const int cooldown = 15;
const int limit = 5;
int r, s;
r = sim->photons[y][x];
if(parts[i].tmp < limit && !parts[i].life)
int r = sim->photons[y][x];
if (parts[i].tmp < limit && !parts[i].life)
{
if (!(rand()%1000) &&!parts[i].tmp)
{
s = sim->create_part(-3, x, y, PT_NEUT);
if(s >= 0) {
int s = sim->create_part(-3, x, y, PT_NEUT);
if (s >= 0)
{
parts[i].life = cooldown;
parts[i].tmp ++;
@ -68,9 +68,11 @@ int Element_POLO::update(UPDATE_FUNC_ARGS)
}
if (!(rand()%10000)) {
s = sim->create_part(-3, x, y, PT_NEUT);
if(s >= 0) {
if (!(rand()%10000))
{
int s = sim->create_part(-3, x, y, PT_NEUT);
if (s >= 0)
{
parts[i].temp = ((parts[i].temp + parts[r>>8].temp + parts[r>>8].temp) + 600.0f) / 3.0f;
parts[i].life = cooldown;
parts[i].tmp ++;
@ -83,30 +85,37 @@ int Element_POLO::update(UPDATE_FUNC_ARGS)
}
}
}
if (parts[i].tmp2 >= 20) {
if (parts[i].tmp2 >= 20)
{
sim->part_change_type(i,x,y,PT_PLUT);
parts[i].temp = (parts[i].temp+600.0f)/2.0f;
return 1;
}
if (parts[r>>8].type == PT_PROT) {
if (parts[r>>8].type == PT_PROT)
{
parts[i].tmp2 ++;
sim->kill_part(r>>8);
}
if (parts[i].temp <388.15f) {
if (388.15f-parts[i].temp >= 0.2f) {
if (parts[i].temp < 388.15f)
{
if (parts[i].temp >= 388.15f-0.2f)
{
parts[i].temp += 0.2f;
} else {
parts[i].temp += 388.15f-parts[i].temp; //no overheating!
}
else
{
//no overheating!
parts[i].temp += 388.15f-parts[i].temp;
}
}
return 0;
}
//#TPT-Directive ElementHeader Element_POLO static int graphics(GRAPHICS_FUNC_ARGS)
int Element_POLO::graphics(GRAPHICS_FUNC_ARGS)
{
if(cpart->tmp >= 5) {
if (cpart->tmp >= 5)
{
*colr = 0x70;
*colg = 0x70;
*colb = 0x70;