From 417671ecb88034a654f796cc493580d2e9a5b6e7 Mon Sep 17 00:00:00 2001
From: Jesse Clark <jjclark1982@gmail.com>
Date: Sat, 16 Dec 2023 01:56:57 -0800
Subject: [PATCH] CORPORATION: Account for CapEx and Cap Gains differently
 (#977)

---
 src/Corporation/Actions.ts          | 4 ++--
 src/Corporation/Corporation.ts      | 9 ++++++---
 src/Corporation/data/FundsSource.ts | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Corporation/Actions.ts b/src/Corporation/Actions.ts
index 8fb6d49a9..e77d44014 100644
--- a/src/Corporation/Actions.ts
+++ b/src/Corporation/Actions.ts
@@ -74,7 +74,7 @@ export function purchaseOffice(corporation: Corporation, division: Division, cit
   if (division.offices[city]) {
     throw new Error(`You have already expanded into ${city} for ${division.name}`);
   }
-  corporation.loseFunds(corpConstants.officeInitialCost, "office");
+  corporation.loseFunds(corpConstants.officeInitialCost, "division");
   division.offices[city] = new OfficeSpace({
     city: city,
     size: corpConstants.officeInitialSize,
@@ -391,7 +391,7 @@ export function ThrowParty(corp: Corporation, office: OfficeSpace, costPerEmploy
 export function purchaseWarehouse(corp: Corporation, division: Division, city: CityName): void {
   if (corp.funds < corpConstants.warehouseInitialCost) return;
   if (division.warehouses[city]) return;
-  corp.loseFunds(corpConstants.warehouseInitialCost, "warehouse");
+  corp.loseFunds(corpConstants.warehouseInitialCost, "division");
   division.warehouses[city] = new Warehouse({
     division: division,
     loc: city,
diff --git a/src/Corporation/Corporation.ts b/src/Corporation/Corporation.ts
index f9872091c..1131c1f76 100644
--- a/src/Corporation/Corporation.ts
+++ b/src/Corporation/Corporation.ts
@@ -5,7 +5,6 @@ import { CorporationState } from "./CorporationState";
 import { CorpUnlocks } from "./data/CorporationUnlocks";
 import { CorpUpgrades } from "./data/CorporationUpgrades";
 import * as corpConstants from "./data/Constants";
-import { IndustriesData } from "./data/IndustryData";
 import { FundsSource, LongTermFundsSources } from "./data/FundsSource";
 import { Division } from "./Division";
 import { calculateUpgradeCost } from "./helpers";
@@ -84,7 +83,11 @@ export class Corporation {
       return;
     }
     if (LongTermFundsSources.has(source)) {
-      this.totalAssets += amt;
+      // This cycle's assets include the purchase price of a capital expenditure.
+      // (It will likely depreciate in the following cycle.)
+      // Or the value of some non-accounted item (equity, hashes) that was sold for a capital gain.
+      // (It will remain as funds, with no effect on assetDelta.)
+      this.totalAssets += Math.abs(amt);
     }
     this.funds += amt;
   }
@@ -225,7 +228,7 @@ export class Corporation {
   updateTotalAssets(): void {
     let assets = this.funds;
     this.divisions.forEach((ind) => {
-      assets += IndustriesData[ind.type].startingCost;
+      assets += ind.calculateRecoupableValue();
       for (const warehouse of getRecordValues(ind.warehouses)) {
         for (const mat of getRecordValues(warehouse.materials)) {
           assets += mat.stored * mat.averagePrice;
diff --git a/src/Corporation/data/FundsSource.ts b/src/Corporation/data/FundsSource.ts
index b76cb4f91..bc28332a2 100644
--- a/src/Corporation/data/FundsSource.ts
+++ b/src/Corporation/data/FundsSource.ts
@@ -2,7 +2,6 @@
 // This includes capital expenditures (which may be recoupable), time-limited actions, and transfers to/from other game mechanics.
 const FundsSourceLongTerm = [
   "product development",
-  "division",
   "office",
   "warehouse",
   "upgrades",
@@ -16,6 +15,7 @@ const FundsSourceLongTerm = [
 // Funds transactions which should be included in earnings projections for valuation.
 // This includes all automatic or indefinetly-repeatable income and operating expenses.
 type FundsSourceShortTerm =
+  | "division"
   | "operating expenses"
   | "operating revenue"
   | "dividends"