Small sanitycheck fix, and fix for the mergeRules logic. (Now it merge second...

Small sanitycheck fix, and fix for the mergeRules logic. (Now it merge second level of rules properties correctly. Growth drugs setup for example)

src/js/storyJS.tw

@@ -926,8 +926,28 @@ window.mergeRules = function(rules) {
             );
 
             if (applies)
+            {
                 combinedRule[prop] = rules[i][prop];
+            
+            	/*Some properties of rules now have second level properties. We need to check it, and change ones in combinedRule. (Good example - growth drugs. Breasts, butt, etc...) */
+            	if ( "object" == typeof rules[i][prop])
+    	        {
+	            	for (var subprop in rules[i][prop])
+    	        	{
+    	           		var subapplies = (
+            	    	combinedRule[prop][subprop] === undefined           
+                			|| (rules[i][prop][subprop] !== "no default setting")
+	            		);
+
+		            	if (subapplies)
+    		            	combinedRule[prop][subprop] = rules[i][prop][subprop];
+    		        }
+
+            	}
+           	}
+
         }
+
     }
 
     return combinedRule;

src/pregmod/generateChild.tw

@@ -563,7 +563,7 @@
 	<<set $activeSlave.underArmHStyle = either("bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "bushy", "hairless")>>
 <</if>>
 <<if $activeSlave.fetish == "mindbroken">>
-	<<set $activeSlave.fetish = "none")>>
+	<<set $activeSlave.fetish = "none">>
 <</if>>
 <<if $incubatorImprintSetting == "terror">>
 	<<set $activeSlave.origin = "Shortly after birth, she was sealed in an aging tank until she was of age. She knows only of the terror that awaits her should she not obey her master.">>