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/CBNW.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/CBNW.cpp')
| -rw-r--r-- | src/simulation/elements/CBNW.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/simulation/elements/CBNW.cpp b/src/simulation/elements/CBNW.cpp index 2fd257a..36e3a08 100644 --- a/src/simulation/elements/CBNW.cpp +++ b/src/simulation/elements/CBNW.cpp @@ -84,19 +84,19 @@ int Element_CBNW::update(UPDATE_FUNC_ARGS) } parts[i].tmp--; } - 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]; if (!r) continue; - if ((sim->elements[r&0xFF].Properties&TYPE_PART) && parts[i].tmp == 0 && !(rand()%250)) + if ((sim->elements[r&0xFF].Properties&TYPE_PART) && parts[i].tmp == 0 && !(rand()%83)) { //Start explode parts[i].tmp = rand()%25;//(rand()%100)+50; } - else if((sim->elements[r&0xFF].Properties&TYPE_SOLID) && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_GLAS && parts[i].tmp == 0 && (2-sim->pv[y/CELL][x/CELL])>(rand()%40000)) + else if((sim->elements[r&0xFF].Properties&TYPE_SOLID) && (r&0xFF)!=PT_DMND && (r&0xFF)!=PT_GLAS && parts[i].tmp == 0 && (2-sim->pv[y/CELL][x/CELL])>(rand()%13333)) { sim->part_change_type(i,x,y,PT_CO2); parts[i].ctype = 5; @@ -122,7 +122,7 @@ int Element_CBNW::update(UPDATE_FUNC_ARGS) } else if ((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) { - if ((sim->legacy_enable||parts[i].temp>(273.15f+12.0f)) && !(rand()%500)) + if ((sim->legacy_enable||parts[i].temp>(273.15f+12.0f)) && !(rand()%166)) { sim->part_change_type(i,x,y,PT_FIRE); parts[i].life = 4; @@ -131,7 +131,7 @@ int Element_CBNW::update(UPDATE_FUNC_ARGS) } else if ((r&0xFF)==PT_FIRE && parts[r>>8].ctype!=PT_WATR){ sim->kill_part(r>>8); - if(1>(rand()%150)){ + if(1>(rand()%50)){ sim->kill_part(i); return 1; } |