diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js index fb1d09ee397096724d42d10f1a1fc13d952da78d..4dd0907ef0d37cbcafed245ed68aad649f92927e 100644 --- a/js/003-data/gameVariableData.js +++ b/js/003-data/gameVariableData.js @@ -225,6 +225,29 @@ App.Data.CorpInitData = { SpecRaces: [] }; +// Black Market +App.Data.FSWares = [ + "GenderRadicalistResearch", + "SlaveProfessionalismResearch", + "TransformationFetishistResearch", + "AssetExpansionistResearch", + "SlimnessEnthusiastResearch", + "YouthPreferentialistResearch", + "HedonisticDecadenceResearch" +]; + +App.Data.illegalWares = [ + "childhoodFertilityInducedNCS", + "UterineRestraintMesh", + "PGHack", + "BlackmarketPregAdaptation", + "RapidCellGrowthFormula", + "sympatheticOvaries", + "asexualReproduction", + // "AnimalOrgans" for future use +]; + + // The other half of the above whitelist. However, entries in this array will be forced to the values set here upon starting NG+. App.Data.resetOnNGPlus = { FCTV: {}, @@ -1400,8 +1423,8 @@ App.Data.resetOnNGPlus = { }, prosthetics: {}, - merchantFSWares: ["AssetExpansionistResearch", "GenderRadicalistResearch", "HedonisticDecadenceResearch", "SlaveProfessionalismResearch", "SlimnessEnthusiastResearch", "TransformationFetishistResearch", "YouthPreferentialistResearch"], - merchantIllegalWares: ["asexualReproduction", "childhoodFertilityInducedNCS", "PGHack", "RapidCellGrowthFormula", "sympatheticOvaries", "UterineRestraintMesh", "BlackmarketPregAdaptation"], /* "AnimalOrgans" for future use */ + merchantFSWares: App.Data.FSWares, + merchantIllegalWares: App.Data.illegalWares, RapidCellGrowthFormula: 0, UterineRestraintMesh: 0, PGHack: 0, diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js index 14d2598f56a6f06fd48a83baece67d834e92a287..2aff3afe4511ab089c609f0bef05ef855fcfe225 100644 --- a/src/data/backwardsCompatibility/backwardsCompatibility.js +++ b/src/data/backwardsCompatibility/backwardsCompatibility.js @@ -276,22 +276,10 @@ App.Update.globalVariables = function(node) { // Items/upgrades purchased { if (V.merchantFSWares.length === 0) { - V.merchantFSWares.push("AssetExpansionistResearch"); - V.merchantFSWares.push("GenderRadicalistResearch"); - V.merchantFSWares.push("HedonisticDecadenceResearch"); - V.merchantFSWares.push("SlaveProfessionalismResearch"); - V.merchantFSWares.push("SlimnessEnthusiastResearch"); - V.merchantFSWares.push("TransformationFetishistResearch"); - V.merchantFSWares.push("YouthPreferentialistResearch"); + V.merchantFSWares = Array.from(App.Data.FSWares); } if (V.merchantIllegalWares.length === 0) { - V.merchantIllegalWares.push("childhoodFertilityInducedNCS"); - V.merchantIllegalWares.push("UterineRestraintMesh"); - V.merchantIllegalWares.push("RapidCellGrowthFormula"); - V.merchantIllegalWares.push("PGHack"); - V.merchantIllegalWares.push("sympatheticOvaries"); - V.merchantIllegalWares.push("asexualReproduction"); - V.merchantIllegalWares.push("BlackmarketPregAdaptation"); + V.merchantIllegalWares = Array.from(App.Data.illegalWares); } if (typeof V.arcologies[0].childhoodFertilityInducedNCSResearch === "undefined") { V.arcologies[0].childhoodFertilityInducedNCSResearch = 0;