From 1961b84ca2dd3ad23c49b0ca7313e05bb955c8b7 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 2 Mar 2020 22:46:31 -0500
Subject: [PATCH] move
---
.../003-data/gameVariableData.js | 24 +------------------
.../backwardsCompatibility.js | 23 ++++++++++++++++++
2 files changed, 24 insertions(+), 23 deletions(-)
rename src/init/storyInit.js => js/003-data/gameVariableData.js (98%)
diff --git a/src/init/storyInit.js b/js/003-data/gameVariableData.js
similarity index 98%
rename from src/init/storyInit.js
rename to js/003-data/gameVariableData.js
index 27d45c0fa10..a748375c08a 100644
--- a/src/init/storyInit.js
+++ b/js/003-data/gameVariableData.js
@@ -1,26 +1,4 @@
-App.Update.autoshred = function() {
- const defaultGameStateVariables = new Set(Object.getOwnPropertyNames(App.Data.defaultGameStateVariables));
-
- // instead of schredList:
- for (const v in V) {
- if (!defaultGameStateVariables.has(v)) {
- console.log("would have removed", v, V[v]);
- delete V[v];
- } else {
- // console.log("kept", v, V[v]);
- }
- }
-};
-
-App.Update.setNonexistantProperties = function(obj, props) {
- for (const p of Object.getOwnPropertyNames(props)) {
- if (typeof obj[p] === "undefined") {
- obj[p] = clone(props[p]);
- }
- }
- return console.log("done!");
-};
-
+// A whitelist for ingame variables. Used to init the game or fill in gaps. Also used as a whitelist. Anything not on this list will be removed on BC.
App.Data.defaultGameStateVariables = {
returnTo: "init",
nextButton: "Continue",
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index de0245286c5..810b3c6ed98 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -1,3 +1,26 @@
+App.Update.autoshred = function() {
+ const defaultGameStateVariables = new Set(Object.getOwnPropertyNames(App.Data.defaultGameStateVariables));
+
+ // instead of schredList:
+ for (const v in V) {
+ if (!defaultGameStateVariables.has(v)) {
+ console.log("would have removed", v, V[v]);
+ delete V[v];
+ } else {
+ // console.log("kept", v, V[v]);
+ }
+ }
+};
+
+App.Update.setNonexistantProperties = function(obj, props) {
+ for (const p of Object.getOwnPropertyNames(props)) {
+ if (typeof obj[p] === "undefined") {
+ obj[p] = clone(props[p]);
+ }
+ }
+ return console.log("done!");
+};
+
App.Update.globalVariables = function() {
let r = `Setting missing global variables... `;
if (Array.isArray(V.nationalities)) {
--
GitLab