diff options
| author | jacob1 <jfu614@gmail.com> | 2013-05-30 00:36:34 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-05-30 00:36:34 (GMT) |
| commit | d6d20defdebf72c2b27244a6d4bc8a757a669a59 (patch) | |
| tree | a3802256a9377cf5b048a01a91a31a470be3c7c3 /src/simulation/elements/DSTW.cpp | |
| parent | cbc80de6522b5562f9490b0cdb620371f25be2f9 (diff) | |
| parent | 41e369e68eac7b05f8cda312f9668942dc688aa7 (diff) | |
| download | powder-d6d20defdebf72c2b27244a6d4bc8a757a669a59.zip powder-d6d20defdebf72c2b27244a6d4bc8a757a669a59.tar.gz | |
Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git
Diffstat (limited to 'src/simulation/elements/DSTW.cpp')
| -rw-r--r-- | src/simulation/elements/DSTW.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/simulation/elements/DSTW.cpp b/src/simulation/elements/DSTW.cpp index d077f25..b8b4124 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,20 @@ int Element_DSTW::update(UPDATE_FUNC_ARGS) } break; case PT_SLTW: - if (!(rand()%3333)) + 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 +88,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; } |