From ec846248193b88f41aa4301da0f3d7094a789bcc Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 2 Mar 2020 10:33:44 -0500
Subject: [PATCH] finally combine the two global var functions
---
.../backwardsCompatibility/backwardsCompatibility.js | 12 ++++++------
src/uncategorized/BackwardsCompatibility.tw | 7 -------
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 64fe6a9f098..150fc89c090 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -557,8 +557,8 @@ App.Update.shred = function() {
return r += "Done!";
};
-App.Update.generalBC = function() {
- let r = "";
+App.Update.globalVariables = function() {
+ let r = `Setting missing global variables... `;
if (Array.isArray(V.nationalities)) {
V.nationalities = weightedArray2HashMap(V.nationalities);
}
@@ -2172,11 +2172,11 @@ App.Update.generalBC = function() {
});
V.completedOrgans = _newOrgans;
- return r;
-};
+ // Clean up FS in player arcology
+ App.Update.FScheatDatatypeCleanup();
-App.Update.globalVariables = function() {
- let r = `Setting missing global variables... `;
+ // Clean up neighbor's arcologies
+ App.Update.neighborArcologyCheatDatatypeCleanup();
if (typeof V.assistant === "number") {
assistant.BC();
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 597c6ad7c49..cab9402d81d 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -7,13 +7,6 @@
<<= App.Update.oldVersions()>>
</div>
-<div>
- <<= App.Update.generalBC()>>
-</div>
-
-<<run App.Update.FScheatDatatypeCleanup()>>
-<<run App.Update.neighborArcologyCheatDatatypeCleanup()>>
-
<div>
<<= App.Update.globalVariables()>>
</div>
--
GitLab