summaryrefslogtreecommitdiff
path: root/src/simulation/elements/SLTW.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-05-30 00:36:34 (GMT)
committer jacob1 <jfu614@gmail.com>2013-05-30 00:36:34 (GMT)
commitd6d20defdebf72c2b27244a6d4bc8a757a669a59 (patch)
treea3802256a9377cf5b048a01a91a31a470be3c7c3 /src/simulation/elements/SLTW.cpp
parentcbc80de6522b5562f9490b0cdb620371f25be2f9 (diff)
parent41e369e68eac7b05f8cda312f9668942dc688aa7 (diff)
downloadpowder-d6d20defdebf72c2b27244a6d4bc8a757a669a59.zip
powder-d6d20defdebf72c2b27244a6d4bc8a757a669a59.tar.gz
Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git
Diffstat (limited to 'src/simulation/elements/SLTW.cpp')
-rw-r--r--src/simulation/elements/SLTW.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/simulation/elements/SLTW.cpp b/src/simulation/elements/SLTW.cpp
index 7c38286..7575750 100644
--- a/src/simulation/elements/SLTW.cpp
+++ b/src/simulation/elements/SLTW.cpp
@@ -58,16 +58,16 @@ int Element_SLTW::update(UPDATE_FUNC_ARGS)
switch (r&0xFF)
{
case PT_SALT:
- if (!(rand()%3333))
+ if (!(rand()%2000))
sim->part_change_type(r>>8,x+rx,y+ry,PT_SLTW);
break;
case PT_PLNT:
- if (!(rand()%66))
+ if (!(rand()%40))
sim->kill_part(r>>8);
break;
case PT_RBDM:
case PT_LRBD:
- if ((sim->legacy_enable||parts[i].temp>(273.15f+12.0f)) && !(rand()%166))
+ if ((sim->legacy_enable||parts[i].temp>(273.15f+12.0f)) && !(rand()%100))
{
sim->part_change_type(i,x,y,PT_FIRE);
parts[i].life = 4;
@@ -78,7 +78,7 @@ int Element_SLTW::update(UPDATE_FUNC_ARGS)
if (parts[r>>8].ctype!=PT_WATR)
{
sim->kill_part(r>>8);
- if(!(rand()%150)){
+ if(!(rand()%30)){
sim->kill_part(i);
return 1;
}