From da2455b9302e59933b917f9712298e021c0395af Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Sat, 1 Aug 2020 02:35:52 -0400 Subject: [PATCH] some things are set up in initNationalisties too --- js/003-data/gameVariableData.js | 79 ++++----------------------- src/events/intro/initNationalities.js | 1 - 2 files changed, 11 insertions(+), 69 deletions(-) diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js index cd304aa7083..d734343e027 100644 --- a/js/003-data/gameVariableData.js +++ b/js/003-data/gameVariableData.js @@ -421,41 +421,13 @@ App.Data.resetOnNGPlus = { /* buildings */ secHQ: 0, secMenials: 0, - secUpgrades: { - nanoCams: 0, - cyberBots: 0, - eyeScan: 0, - cryptoAnalyzer: 0, - coldstorage: 0 - }, - crimeUpgrades: { - autoTrial: 0, - autoArchive: 0, - worldProfiler: 0, - advForensic: 0 - }, - intelUpgrades: { - sensors: 0, - radar: 0, - signalIntercept: 0 - }, - readinessUpgrades: { - earlyWarn: 0, - rapidPlatforms: 0, - pathways: 0, - rapidVehicles: 0 - }, + secUpgrades: {}, + crimeUpgrades: {}, + intelUpgrades: {}, + readinessUpgrades: {}, riotCenter: 0, - riotUpgrades: { - freeMedia: 0, - rapidUnit: 0, - rapidUnitSpeed: 0 - }, - fort: { - reactor: 0, - waterway: 0, - assistant: 0 - }, + riotUpgrades: {}, + fort: {}, sentUnitCooldown: 0, advancedRiotEquip: 0, brainImplant: -1, @@ -466,31 +438,10 @@ App.Data.resetOnNGPlus = { weapLab: 1, baseUpgradeTime: 10, weapUpgrades: [], - currentUpgrade: { - ID: 0, - name: " ", - unit: 0, - type: 0, - time: 0, - value: 0 - }, - droneUpgrades: { - attack: 0, - defense: 0, - hp: 0 - }, - humanUpgrade: { - attack: 0, - defense: 0, - hp: 0, - morale: 0 - }, - sellTo: { - citizen: 1, - raiders: 1, - oldWorld: 1, - FC: 1 - }, + currentUpgrade: {}, + droneUpgrades: {}, + humanUpgrade: {}, + sellTo: {}, completedUpgrades: [], transportHub: 0, airport: 1, @@ -517,15 +468,7 @@ App.Data.resetOnNGPlus = { irregulars: 0, repairTime: 3, arcRepairTime: 0, - garrison: { - penthouse: 0, - reactor: 0, - assistant: 0, - waterway: 0, - reactorTime: 0, - assistantTime: 0, - waterwayTime: 0 - }, + garrison: {}, rebellionsCount: 0, PCrebWon: 0, PCrebLoss: 0, diff --git a/src/events/intro/initNationalities.js b/src/events/intro/initNationalities.js index 5b5ce19c9cb..b34f9d8f003 100644 --- a/src/events/intro/initNationalities.js +++ b/src/events/intro/initNationalities.js @@ -27,7 +27,6 @@ App.Intro.initNationalities = function() { pathways: 0, rapidVehicles: 0 }; - V.riotCenter = 0; V.riotUpgrades = { freeMedia: 0, rapidUnit: 0, -- GitLab