From 79a13c3fcc6af97662e5ad039cb159a8ed0aaabc Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sat, 7 Mar 2020 19:21:22 -0800
Subject: [PATCH] Fix corp dissolution.
---
.../corporate-divisionAcquiring.js | 2 +-
src/Corporation/corporate-divisionBase.js | 2 +-
src/Corporation/corporate.js | 53 ++++++++++---------
3 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/src/Corporation/corporate-divisionAcquiring.js b/src/Corporation/corporate-divisionAcquiring.js
index 9b3dea70ccf..145c9a3bc16 100644
--- a/src/Corporation/corporate-divisionAcquiring.js
+++ b/src/Corporation/corporate-divisionAcquiring.js
@@ -51,7 +51,7 @@ App.Corporate.Init_DivisionAcquiring = function(shared) {
dissolve() {
App.Corporate.sellSlaves(this, this.heldSlaves);
super.dissolve();
- delete V[`${this._const.corpId}Slaves`];
+ delete V.corp[`${this._const.corpId}Slaves`];
}
getAutoBuyFromMarket() {
return false;
diff --git a/src/Corporation/corporate-divisionBase.js b/src/Corporation/corporate-divisionBase.js
index eb34760719e..021cc99ad67 100644
--- a/src/Corporation/corporate-divisionBase.js
+++ b/src/Corporation/corporate-divisionBase.js
@@ -189,7 +189,7 @@ App.Corporate.Init_DivisionBase = function(shared) {
this.setStored('', 0);
App.Corporate.sellDevelopment(this);
App.Corporate.dissolvedDivision();
- this.relatedDivisions.to.forEach(nextDep => delete V[`${this._const.corpId}To${nextDep.id}`]);
+ this.relatedDivisions.to.forEach(nextDep => delete V.corp[`${this._const.corpId}To${nextDep.id}`]);
}
// private helpers
diff --git a/src/Corporation/corporate.js b/src/Corporation/corporate.js
index aa2c8627d16..8e743336993 100644
--- a/src/Corporation/corporate.js
+++ b/src/Corporation/corporate.js
@@ -598,35 +598,38 @@ App.Corporate.Init = function() {
this.ledger.release();
// Some of these will need to be refactored into App.Corporate.Specialization
- const toDelete = [
- "corpCash",
+ const toDeleteGlobal = [
"personalShares",
"publicShares",
- "corpDividend",
"dividendTimer",
- "corpSpecAccent",
- "corpSpecAge",
- "corpSpecAmputee",
- "corpSpecBalls",
- "corpSpecDevotion",
- "corpSpecDick",
- "corpSpecEducation",
- "corpSpecGender",
- "corpSpecGenitalia",
- "corpSpecWeight",
- "corpSpecHeight",
- "corpSpecHormones",
- "corpSpecImplants",
- "corpSpecInjection",
- "corpSpecIntelligence",
- "corpSpecMilk",
- "corpSpecMuscle",
- "corpSpecPussy",
- "corpSpecSexEd",
- "corpSpecTrust",
- "corpSpecVirgin"
];
- toDelete.forEach(id => delete V[id]);
+ toDeleteGlobal.forEach(id => delete V[id]);
+ const toDeleteCorp = [
+ "Cash",
+ "Dividend",
+ "SpecAccent",
+ "SpecAge",
+ "SpecAmputee",
+ "SpecBalls",
+ "SpecDevotion",
+ "SpecDick",
+ "SpecEducation",
+ "SpecGender",
+ "SpecGenitalia",
+ "SpecWeight",
+ "SpecHeight",
+ "SpecHormones",
+ "SpecImplants",
+ "SpecInjection",
+ "SpecIntelligence",
+ "SpecMilk",
+ "SpecMuscle",
+ "SpecPussy",
+ "SpecSexEd",
+ "SpecTrust",
+ "SpecVirgin"
+ ];
+ toDeleteCorp.forEach(id => delete V.corp[ID]);
if(this.hasMarket) {
App.Arcology.cellUpgrade(V.building, App.Arcology.Cell.Market, "Corporate Market", "Markets");
--
GitLab