diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js index 53cf33077773b5c93eb67cd0659f2dc01760f2cb..b9b6e89b88c1d04206758f5baf80f57665257972 100644 --- a/src/data/backwardsCompatibility/backwardsCompatibility.js +++ b/src/data/backwardsCompatibility/backwardsCompatibility.js @@ -1,6 +1,4 @@ -App.Utils.BC = {}; - -App.Utils.BC.generalBC = function() { +App.Update.generalBC = function() { let r = ""; if (Array.isArray(V.nationalities)) { V.nationalities = weightedArray2HashMap(V.nationalities); @@ -1936,7 +1934,7 @@ App.Utils.BC.generalBC = function() { return r; }; -App.Utils.BC.globalVariables = function() { +App.Update.globalVariables = function() { let r = `Setting missing global variables... `; if (typeof V.assistant === "number") { @@ -3068,7 +3066,7 @@ App.Utils.BC.globalVariables = function() { return r; }; -App.Utils.BC.slaveVariables = function() { +App.Update.slaveVariables = function() { let r = `Setting missing slave variables... `; /* Adding a new variable? Consider putting it in datatypeCleanupJS.tw instead of here */ for (let _bci = 0; _bci < V.slaves.length; _bci++) { @@ -3087,7 +3085,7 @@ App.Utils.BC.slaveVariables = function() { return r; }; -App.Utils.BC.slaveRecords = function() { +App.Update.slaveRecords = function() { let r = `Checking and fixing slave records...`; V.slaves.forEach((_Slave) => { App.Entity.Utils.SlaveDataSchemeCleanup(_Slave); @@ -3151,7 +3149,7 @@ App.Utils.BC.slaveRecords = function() { return r; }; -App.Utils.BC.specialSlaveRecords = function() { +App.Update.specialSlaveRecords = function() { let r = ""; if (V.heroSlaves.length > 0) { r += `Checking and fixing special slave records... `; @@ -3164,7 +3162,7 @@ App.Utils.BC.specialSlaveRecords = function() { return r; }; -App.Utils.BC.genePoolRecords = function() { +App.Update.genePoolRecords = function() { let r = `Updating gene pool records... `; for (let _bci = 0; _bci < V.genePool.length; _bci++) { let _Slave = V.genePool[_bci]; @@ -3274,14 +3272,14 @@ App.Utils.BC.genePoolRecords = function() { return r; }; -App.Utils.BC.RAassistantData = function() { +App.Update.RAassistantData = function() { let r = `Updating Rules Assistant data...`; V.defaultRules = V.defaultRules.map(rule => App.Entity.Utils.RARuleDatatypeCleanup(rule)); r += ` Done!<br>`; return r; }; -App.Utils.BC.oldVersions = function() { +App.Update.oldVersions = function() { if (V.releaseID === 1021 || V.releaseID === 1020 || V.releaseID === 1019 || V.releaseID === 2022) { V.releaseID = 1022; } @@ -3981,7 +3979,7 @@ App.Utils.BC.oldVersions = function() { return r; }; -App.Utils.BC.HeroSlavesCleanup = function() { +App.Update.HeroSlavesCleanup = function() { V.heroSlaves.forEach(function(s) { /* Nationalities, races, surnames random fill */ if(!s.nationality) { @@ -4022,7 +4020,7 @@ App.Utils.BC.HeroSlavesCleanup = function() { }; -App.Utils.BC.cleanUp = function() { +App.Update.cleanUp = function() { /* leave this at the bottom of BC */ if (V.releaseID < App.Version.release) { V.releaseID = App.Version.release; diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw index 7763dd976836802aa109a2b81b1c8199fd2a66cf..1028b627a72b89cba7a9ec07331e7b92c6ae7056 100644 --- a/src/events/intro/initNationalities.tw +++ b/src/events/intro/initNationalities.tw @@ -841,7 +841,7 @@ <<include "DF Slaves Database">> <</if>> <<include "custom Slaves Database">> -<<= App.Utils.BC.HeroSlavesCleanup>> +<<= App.Update.HeroSlavesCleanup>> <<set $activeSlave = 0>> <<set $activeChild = 0>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index f94f5cf2fe4fb23da6c9ce18a3b8108de9520bad..2483e037978fc0fe9b9455b6e35a4a7956c01231 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -4,11 +4,11 @@ <<set $nextButton = "Continue", $nextLink = "Main", $returnTo = "Main">> <div> - <<= App.Utils.BC.oldVersions()>> + <<= App.Update.oldVersions()>> </div> <div> - <<= App.Utils.BC.generalBC()>> + <<= App.Update.generalBC()>> </div> <<silently>> @@ -17,7 +17,7 @@ <</silently>> <div> - <<= App.Utils.BC.globalVariables()>> + <<= App.Update.globalVariables()>> </div> <<if ndef $lastWeeksCashIncome>> @@ -28,30 +28,30 @@ <</if>> <div> - <<= App.Utils.BC.slaveVariables()>> + <<= App.Update.slaveVariables()>> </div> <div> - <<= App.Utils.BC.slaveRecords()>> + <<= App.Update.slaveRecords()>> </div> <div> - <<= App.Utils.BC.specialSlaveRecords>> + <<= App.Update.specialSlaveRecords>> </div> <div> - <<= App.Utils.BC.specialSlaveRecords()>> + <<= App.Update.specialSlaveRecords()>> </div> <div> - <<= App.Utils.BC.HeroSlavesCleanup>> + <<= App.Update.HeroSlavesCleanup>> <<run $heroSlaves.forEach(function(s) {if (s.pregType > 0 && Array.isArray(s.womb)) delete s.womb;})>> <<set $activeSlave = BaseSlave()>> <<set $baseHeroSlave = clone($activeSlave)>> </div> <div> - <<= App.Utils.BC.RAassistantData()>> + <<= App.Update.RAassistantData()>> </div> /* Sec Exp */ @@ -64,5 +64,5 @@ /* leave this at the bottom of BC */ <div> - <<= App.Utils.BC.cleanUp()>> + <<= App.Update.cleanUp()>> </div>