diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2013-03-16 17:45:45 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2013-03-16 17:45:45 (GMT) |
| commit | b4564f212a17539604e9fa63d649e157f8888eb1 (patch) | |
| tree | 9ed998180f825d79eaa753c28b34136822a8c928 /src/simulation/elements/DSTW.cpp | |
| parent | f05044ab68e51ce9c374f6af09284051efcda449 (diff) | |
| parent | 3a738846a3e0c59ed02805f11f93678ae42a946e (diff) | |
| download | powder-b4564f212a17539604e9fa63d649e157f8888eb1.zip powder-b4564f212a17539604e9fa63d649e157f8888eb1.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/simulation/elements/DSTW.cpp')
| -rw-r--r-- | src/simulation/elements/DSTW.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/simulation/elements/DSTW.cpp b/src/simulation/elements/DSTW.cpp index 495748d..d077f25 100644 --- a/src/simulation/elements/DSTW.cpp +++ b/src/simulation/elements/DSTW.cpp @@ -50,15 +50,15 @@ Element_DSTW::Element_DSTW() int Element_DSTW::update(UPDATE_FUNC_ARGS) { int r, rx, ry, rt; - for (rx=-2; rx<3; rx++) - for (ry=-2; ry<3; ry++) + for (rx=-1; rx<2; rx++) + for (ry=-1; ry<2; ry++) if (BOUNDS_CHECK && (rx || ry)) { r = pmap[y+ry][x+rx]; switch (r&0xFF) { case PT_SALT: - if (!(rand()%250)) + if (!(rand()%83)) { sim->part_change_type(i,x,y,PT_SLTW); // on average, convert 3 DSTW to SLTW before SALT turns into SLTW @@ -67,20 +67,20 @@ int Element_DSTW::update(UPDATE_FUNC_ARGS) } break; case PT_SLTW: - if (!(rand()%10000)) + if (!(rand()%3333)) { sim->part_change_type(i,x,y,PT_SLTW); break; } case PT_WATR: - if (!(rand()%500)) + if (!(rand()%166)) { 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()%500)) + if ((sim->legacy_enable||parts[i].temp>12.0f) && !(rand()%166)) { sim->part_change_type(i,x,y,PT_FIRE); parts[i].life = 4; @@ -88,7 +88,7 @@ int Element_DSTW::update(UPDATE_FUNC_ARGS) break; case PT_FIRE: sim->kill_part(r>>8); - if(!(rand()%150)){ + if(!(rand()%50)){ sim->kill_part(i); return 1; } |