From 0b09652f2a58bbcf92dbdcb9cc9a5f8e68e19687 Mon Sep 17 00:00:00 2001
From: pregmodfan <pregmodfan@cock.li>
Date: Thu, 28 Sep 2017 12:20:10 +0300
Subject: [PATCH] Some more tweaking for rules second level properties
---
src/js/storyJS.tw | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index a3073e82f3a..ecaf157acba 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -926,8 +926,10 @@ window.mergeRules = function(rules) {
);
if (applies)
- {
- combinedRule[prop] = rules[i][prop];
+ {
+
+ if ("object" != typeof combinedRule[prop])
+ 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])
--
GitLab