Merge branch 'pregmod-dev' into 'pregmod-master'

mergeRules JS logic fix

See merge request pregmodfan/fc-pregmod!837

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;