diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw index c3f73be4d06c774ac79aa4af05c3649a5feb31ec..a3073e82f3a152129ffbdb8bb83a82d6425458ed 100644 --- a/src/js/storyJS.tw +++ b/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;