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.

1 files changed, 8 insertions, 4 deletions

diff --git a/src/simulation/elements/WATR.cpp b/src/simulation/elements/WATR.cpp
index ab5b814..17289e0 100644
--- a/src/simulation/elements/WATR.cpp
+++ b/src/simulation/elements/WATR.cpp
@@ -57,14 +57,14 @@ int Element_WATR::update(UPDATE_FUNC_ARGS)
 				r = pmap[y+ry][x+rx];
 				if (!r)
 					continue;
-				if ((r&0xFF)==PT_SALT && !(rand()%83))
+				if ((r&0xFF)==PT_SALT && !(rand()%50))
 				{
 					sim->part_change_type(i,x,y,PT_SLTW);
 					// on average, convert 3 WATR to SLTW before SALT turns into SLTW
 					if (!(rand()%3))
 						sim->part_change_type(r>>8,x+rx,y+ry,PT_SLTW);
 				}
-				else if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && (sim->legacy_enable||parts[i].temp>(273.15f+12.0f)) && !(rand()%166))
+				else if (((r&0xFF)==PT_RBDM||(r&0xFF)==PT_LRBD) && (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;
@@ -72,12 +72,16 @@ int Element_WATR::update(UPDATE_FUNC_ARGS)
 				}
 				else if ((r&0xFF)==PT_FIRE && parts[r>>8].ctype!=PT_WATR){
 					sim->kill_part(r>>8);
-					if(!(rand()%50)){
+					if(!(rand()%30)){
 						sim->kill_part(i);
 						return 1;
 					}
 				}
-				/*if ((r&0xFF)==PT_CNCT && 1>(rand()%500))	Concrete+Water to paste, not very popular
+				else if ((r&0xFF)==PT_SLTW && !(rand()%2000))
+				{
+					sim->part_change_type(i,x,y,PT_SLTW);
+				}
+				/*if ((r&0xFF)==PT_CNCT && !(rand()%100))	Concrete+Water to paste, not very popular
 				 {
 				 part_change_type(i,x,y,PT_PSTE);
 				 sim.kill_part(r>>8);