From 2593f723c617c9e98f509a2f3fce7305d78805dc Mon Sep 17 00:00:00 2001
From: Vasileios Pasialiokis <whiterocket@outlook.com>
Date: Fri, 29 Jun 2018 15:17:09 +0300
Subject: [PATCH] better information for the user
---
src/js/rulesAssistantOptions.tw | 11 ++++++++---
src/uncategorized/BackwardsCompatibility.tw | 5 +++++
src/uncategorized/main.tw | 3 +++
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index e0073ac1e0c..c9410d4cc87 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -641,9 +641,14 @@ window.rulesAssistantOptions = (function() {
}
render(data) {
- const elem = document.createElement("textarea");
- elem.innerHTML = data;
- elem.onblur = () => current_rule.condition.data = elem.value;
+ const elem = document.createElement("div");
+ const textarea = document.createElement("textarea");
+ textarea.innerHTML = data;
+ textarea.onblur = () => current_rule.condition.data = elem.value;
+ elem.appendChild(textarea);
+ const explanation = document.createElement("div");
+ explanation.innerHTML = "Insert a valid <a target='_blank' class='link-external' href='https://www.w3schools.com/js/js_comparisons.asp'>JavaScript comparison and/or logical operation</a>.";
+ elem.appendChild(explanation);
return elem;
}
}
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index c5c6985ff84..2b9f041ecad 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2930,3 +2930,8 @@ Done!
<<if $brothelAdsSpending > 0 && $brothel == 0>>
<<set $brothelAdsSpending = 0>>
<</if>>
+
+<<run $defaultRules.filter(x => !([true, false, "no default setting"].includes(x.set.preg))).forEach(x => {
+ if (x.set.preg === -1) x.set.preg = true;
+ else x.set.preg = false;
+})>>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index c5f905e53f8..29742ce6149 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -14,6 +14,9 @@
''@@.red;INCOMPATIBLE SAVE WARNING:@@'' your saved game was created using version $ver and you are using later version which New Game Plus cannot reconcile. Please start a new game.
<br><br>
<</if>>
+<<if $defaultRules.length > 0 && $defaultRules[0].condition == undefined>>
+ ''@@.red;INCOMPATIBILITY WARNING:@@'' the rules assistant format has changed. In the Options Menu, please ''Reset RA Rules''
+<</if>>
<<if def $organsCompleted>>
<<unset $organsCompleted>>
--
GitLab