summaryrefslogtreecommitdiff
path: root/src/simulation/elements/GEL.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-08-28 11:48:50 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-28 11:48:50 (GMT)
commit99b2d8d67dfd74a727b2778091ab61ef98f3935f (patch)
treef069bee30b1e32ead3a37d584088bef76beed13d /src/simulation/elements/GEL.cpp
parent5ded005b0c17d8e4c1799733ee63810c9e9f7976 (diff)
downloadpowder-99b2d8d67dfd74a727b2778091ab61ef98f3935f.zip
powder-99b2d8d67dfd74a727b2778091ab61ef98f3935f.tar.gz
Limit SPNG saturation and reduce absorbtion rate for GEL and SPNG with some elements
Diffstat (limited to 'src/simulation/elements/GEL.cpp')
-rw-r--r--src/simulation/elements/GEL.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/simulation/elements/GEL.cpp b/src/simulation/elements/GEL.cpp
index a51eddd..01fa829 100644
--- a/src/simulation/elements/GEL.cpp
+++ b/src/simulation/elements/GEL.cpp
@@ -50,8 +50,10 @@ Element_GEL::Element_GEL()
int Element_GEL::update(UPDATE_FUNC_ARGS)
{
int r, rx, ry;
+ int absorbChanceDenom;
if (parts[i].tmp>100) parts[i].tmp = 100;
if (parts[i].tmp<0) parts[i].tmp = 0;
+ absorbChanceDenom = parts[i].tmp*10 + 500;
for (rx=-2; rx<3; rx++)
for (ry=-2; ry<3; ry++)
if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
@@ -61,17 +63,17 @@ int Element_GEL::update(UPDATE_FUNC_ARGS)
continue;
//Desaturation
- if (((r&0xFF)==PT_WATR || (r&0xFF)==PT_DSTW || (r&0xFF)==PT_FRZW) && parts[i].tmp<100)
+ if (((r&0xFF)==PT_WATR || (r&0xFF)==PT_DSTW || (r&0xFF)==PT_FRZW) && parts[i].tmp<100 && 500>rand()%absorbChanceDenom)
{
parts[i].tmp++;
sim->kill_part(r>>8);
}
- if (((r&0xFF)==PT_PSTE) && parts[i].tmp<100)
+ if (((r&0xFF)==PT_PSTE) && parts[i].tmp<100 && 20>rand()%absorbChanceDenom)
{
parts[i].tmp++;
sim->create_part(r>>8, x+rx, y+ry, PT_CLST);
}
- if (((r&0xFF)==PT_SLTW) && parts[i].tmp<100)
+ if (((r&0xFF)==PT_SLTW) && parts[i].tmp<100 && 50>rand()%absorbChanceDenom)
{
parts[i].tmp++;
if (rand()%4)
@@ -79,7 +81,7 @@ int Element_GEL::update(UPDATE_FUNC_ARGS)
else
sim->part_change_type(r>>8, x+rx, y+ry, PT_SALT);
}
- if (((r&0xFF)==PT_CBNW) && parts[i].tmp<100)
+ if (((r&0xFF)==PT_CBNW) && parts[i].tmp<100 && 100>rand()%absorbChanceDenom)
{
parts[i].tmp++;
sim->part_change_type(r>>8, x+rx, y+ry, PT_CO2);