summaryrefslogtreecommitdiff
path: root/src/simulation/elements/DSTW.cpp
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2013-05-20 15:26:51 (GMT)
committer jacob1 <jfu614@gmail.com>2013-05-20 15:26:51 (GMT)
commit826b966668fe37d836de91cf29a6db0d1afee1f4 (patch)
treef617c944418a227769408b75b075d334df93417c /src/simulation/elements/DSTW.cpp
parent77bf649fb4482c86ac1fd9b3233f062b53226007 (diff)
downloadpowder-826b966668fe37d836de91cf29a6db0d1afee1f4.zip
powder-826b966668fe37d836de91cf29a6db0d1afee1f4.tar.gz
reduce rand() chances to 5x the old values in elements that were changed to 3x3 loop checks instead of 5x5. Also some other fixes I found when looking at what had been changed.
Diffstat (limited to 'src/simulation/elements/DSTW.cpp')
-rw-r--r--src/simulation/elements/DSTW.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/simulation/elements/DSTW.cpp b/src/simulation/elements/DSTW.cpp
index d077f25..d6b879f 100644
--- a/src/simulation/elements/DSTW.cpp
+++ b/src/simulation/elements/DSTW.cpp
@@ -58,7 +58,7 @@ int Element_DSTW::update(UPDATE_FUNC_ARGS)
switch (r&0xFF)
{
case PT_SALT:
- if (!(rand()%83))
+ if (!(rand()%50))
{
sim->part_change_type(i,x,y,PT_SLTW);
// on average, convert 3 DSTW to SLTW before SALT turns into SLTW
@@ -67,20 +67,24 @@ int Element_DSTW::update(UPDATE_FUNC_ARGS)
}
break;
case PT_SLTW:
- if (!(rand()%3333))
+ if (!(rand()%100))
+ {
+ sim->part_change_type(i,x,y,PT_WATR);
+ }
+ if (!(rand()%2000))
{
sim->part_change_type(i,x,y,PT_SLTW);
break;
}
case PT_WATR:
- if (!(rand()%166))
+ if (!(rand()%100))
{
sim->part_change_type(i,x,y,PT_WATR);
}
break;
case PT_RBDM:
case PT_LRBD:
- if ((sim->legacy_enable||parts[i].temp>12.0f) && !(rand()%166))
+ if ((sim->legacy_enable||parts[i].temp>12.0f) && !(rand()%100))
{
sim->part_change_type(i,x,y,PT_FIRE);
parts[i].life = 4;
@@ -88,7 +92,7 @@ int Element_DSTW::update(UPDATE_FUNC_ARGS)
break;
case PT_FIRE:
sim->kill_part(r>>8);
- if(!(rand()%50)){
+ if(!(rand()%30)){
sim->kill_part(i);
return 1;
}