From cb7c75a3ceaf6c1b1048c062c715c9431ec35cc8 Mon Sep 17 00:00:00 2001
From: deansvendsen <dean.svendsen@gmail.com>
Date: Wed, 24 Jan 2024 10:18:56 +1100
Subject: [PATCH] MISC: Gang Expenses category in MoneySource (#1043)

---
 src/Gang/GangMember.ts                        | 2 +-
 src/ScriptEditor/NetscriptDefinitions.d.ts    | 1 +
 src/ui/CharacterStats.tsx                     | 3 +++
 src/utils/MoneySourceTracker.ts               | 1 +
 test/jest/__snapshots__/FullSave.test.ts.snap | 2 ++
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Gang/GangMember.ts b/src/Gang/GangMember.ts
index f3fc64bb8..f0a780f23 100644
--- a/src/Gang/GangMember.ts
+++ b/src/Gang/GangMember.ts
@@ -311,7 +311,7 @@ export class GangMember {
     if (this.augmentations.includes(upg.name) || this.upgrades.includes(upg.name)) return false;
 
     if (Player.money < Player.gang.getUpgradeCost(upg)) return false;
-    Player.loseMoney(Player.gang.getUpgradeCost(upg), "gang");
+    Player.loseMoney(Player.gang.getUpgradeCost(upg), "gang_expenses");
     if (upg.type === "g") {
       this.augmentations.push(upg.name);
     } else {
diff --git a/src/ScriptEditor/NetscriptDefinitions.d.ts b/src/ScriptEditor/NetscriptDefinitions.d.ts
index a719cd720..76925c36a 100644
--- a/src/ScriptEditor/NetscriptDefinitions.d.ts
+++ b/src/ScriptEditor/NetscriptDefinitions.d.ts
@@ -89,6 +89,7 @@ interface MoneySource {
   corporation: number;
   crime: number;
   gang: number;
+  gang_expenses: number;
   hacking: number;
   hacknet: number;
   hacknet_expenses: number;
diff --git a/src/ui/CharacterStats.tsx b/src/ui/CharacterStats.tsx
index 5e23c18d0..a5e61cb5f 100644
--- a/src/ui/CharacterStats.tsx
+++ b/src/ui/CharacterStats.tsx
@@ -151,6 +151,9 @@ function MoneyModal({ open, onClose }: IMoneyModalProps): React.ReactElement {
     if (src.gang) {
       parts.push([`Gang:`, <Money key="gang" money={src.gang} />]);
     }
+    if (src.gang_expenses) {
+      parts.push([`Gang Expenses:`, <Money key="gang-expenses" money={src.gang_expenses} />]);
+    }
     if (src.hacking) {
       parts.push([`Hacking:`, <Money key="hacking" money={src.hacking} />]);
     }
diff --git a/src/utils/MoneySourceTracker.ts b/src/utils/MoneySourceTracker.ts
index 4ff2609da..45ae07b44 100644
--- a/src/utils/MoneySourceTracker.ts
+++ b/src/utils/MoneySourceTracker.ts
@@ -12,6 +12,7 @@ export class MoneySourceTracker {
   corporation = 0;
   crime = 0;
   gang = 0;
+  gang_expenses = 0;
   hacking = 0;
   hacknet = 0;
   hacknet_expenses = 0;
diff --git a/test/jest/__snapshots__/FullSave.test.ts.snap b/test/jest/__snapshots__/FullSave.test.ts.snap
index ee83930da..d454d5368 100644
--- a/test/jest/__snapshots__/FullSave.test.ts.snap
+++ b/test/jest/__snapshots__/FullSave.test.ts.snap
@@ -1698,6 +1698,7 @@ exports[`Check Save File Continuity PlayerSave continuity 1`] = `
         "corporation": 0,
         "crime": 0,
         "gang": 0,
+        "gang_expenses": 0,
         "hacking": 0,
         "hacknet": 0,
         "hacknet_expenses": 0,
@@ -1722,6 +1723,7 @@ exports[`Check Save File Continuity PlayerSave continuity 1`] = `
         "corporation": 0,
         "crime": 0,
         "gang": 0,
+        "gang_expenses": 0,
         "hacking": 0,
         "hacknet": 0,
         "hacknet_expenses": 0,