From e18303a103ed60f4876669e0f21ed7dee0c1b0f8 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 5 Mar 2020 17:57:10 -0500
Subject: [PATCH] more
---
js/003-data/gameVariableData.js | 8 +++++---
src/init/storyInit.tw | 8 +++++++-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 71028322364..f8447ba7b92 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -1303,7 +1303,7 @@ App.Data.resetOnNGPlus = {
revealFoodEffects: 0,
rations: 0,
- building: App.Arcology.defaultBuilding(),
+ building: {},
menials: 0,
fuckdolls: 0,
@@ -1409,10 +1409,10 @@ App.Data.resetOnNGPlus = {
customSlaveOrdered: 0,
/* I am not a slave object! Do not treat me like one! */
- customSlave: new App.Entity.CustomSlaveOrder(),
+ customSlave: {},
huskSlaveOrdered: 0,
- huskSlave: new App.Entity.CustomSlaveOrder(),
+ huskSlave: {},
/* non-vanilla shit*/
@@ -1485,6 +1485,8 @@ App.Data.resetOnNGPlus = {
},
DefaultBirthDestination: "individually decided fates",
abbreviateHormoneBalance: 2,
+ legendaryFacility: 0,
+ fcnn: [],
};
App.Data.ignoreGameStateVariables = [
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 36077c1b820..e79cefca0de 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -16,7 +16,13 @@ You should have received a copy of the GNU General Public License along with thi
<<run App.Update.setNonexistantProperties(V, App.Data.defaultGameStateVariables)>>
/* These variables must be created AND set to default values NG+ or not */
-<<run V.assign(App.Data.resetOnNGPlus)>>
+/*<<run V.assign(App.Data.resetOnNGPlus)>>*/
+<<set _NG = App.Data.resetOnNGPlus>>
+<script>
+for (let variable in App.Data.resetOnNGPlus) {
+ V[variable] = App.Data.resetOnNGPlus[variable];
+}
+</script>
<<set $ver = App.Version.base, $pmodVer = App.Version.pmod, $releaseID = App.Version.release>>
--
GitLab