From 9af553f63cb1380795550648b0134b608564fab8 Mon Sep 17 00:00:00 2001
From: Olivier Gagnon <oli.gagnon4418@gmail.com>
Date: Thu, 19 May 2022 02:09:00 -0400
Subject: [PATCH] Fix

---
 src/Locations/LocationsHelpers.tsx            | 19 +++++--------
 src/Locations/ui/RamButton.tsx                |  2 +-
 .../Player/PlayerObjectServerMethods.ts       |  2 +-
 src/SaveObject.tsx                            | 27 ++++++++++++++++++-
 src/Server/data/servers.ts                    |  8 ++++++
 5 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/src/Locations/LocationsHelpers.tsx b/src/Locations/LocationsHelpers.tsx
index ec94239ea..85d197ff1 100644
--- a/src/Locations/LocationsHelpers.tsx
+++ b/src/Locations/LocationsHelpers.tsx
@@ -2,11 +2,11 @@
  * Location and traveling-related helper functions.
  * Mostly used for UI
  */
+import { SpecialServers } from "../Server/data/SpecialServers";
 import { CONSTANTS } from "../Constants";
 
 import { IPlayer } from "../PersonObjects/IPlayer";
-import { AddToAllServers, createUniqueRandomIp } from "../Server/AllServers";
-import { safetlyCreateUniqueServer } from "../Server/ServerHelpers";
+import { GetServer } from "../Server/AllServers";
 
 import { dialogBoxCreate } from "../ui/React/DialogBox";
 
@@ -25,19 +25,14 @@ export function purchaseTorRouter(p: IPlayer): void {
   }
   p.loseMoney(CONSTANTS.TorRouterCost, "other");
 
-  const darkweb = safetlyCreateUniqueServer({
-    ip: createUniqueRandomIp(),
-    hostname: "darkweb",
-    organizationName: "",
-    isConnectedTo: false,
-    adminRights: false,
-    purchasedByPlayer: false,
-    maxRam: 1,
-  });
-  AddToAllServers(darkweb);
+  const darkweb = GetServer(SpecialServers.DarkWeb);
+  if (!darkweb) {
+    throw new Error("Dark web is not a server.");
+  }
 
   p.getHomeComputer().serversOnNetwork.push(darkweb.hostname);
   darkweb.serversOnNetwork.push(p.getHomeComputer().hostname);
+  console.log(darkweb);
   dialogBoxCreate(
     "You have purchased a TOR router!<br>" +
       "You now have access to the dark web from your home computer.<br>" +
diff --git a/src/Locations/ui/RamButton.tsx b/src/Locations/ui/RamButton.tsx
index aa1433d87..29fd6a187 100644
--- a/src/Locations/ui/RamButton.tsx
+++ b/src/Locations/ui/RamButton.tsx
@@ -32,7 +32,7 @@ export function RamButton(props: IProps): React.ReactElement {
   }
 
   const bnMult = BitNodeMultipliers.HomeComputerRamCost === 1 ? "" : `\\cdot ${BitNodeMultipliers.HomeComputerRamCost}`;
-  console.log(BitNodeMultipliers.HomeComputerRamCost);
+
   return (
     <Tooltip
       title={
diff --git a/src/PersonObjects/Player/PlayerObjectServerMethods.ts b/src/PersonObjects/Player/PlayerObjectServerMethods.ts
index 6c55a58c2..8f706fbdd 100644
--- a/src/PersonObjects/Player/PlayerObjectServerMethods.ts
+++ b/src/PersonObjects/Player/PlayerObjectServerMethods.ts
@@ -13,7 +13,7 @@ import { GetServer, AddToAllServers, createUniqueRandomIp } from "../../Server/A
 import { SpecialServers } from "../../Server/data/SpecialServers";
 
 export function hasTorRouter(this: IPlayer): boolean {
-  return !!GetServer(SpecialServers.DarkWeb);
+  return this.getHomeComputer().serversOnNetwork.includes(SpecialServers.DarkWeb);
 }
 
 export function getCurrentServer(this: IPlayer): BaseServer {
diff --git a/src/SaveObject.tsx b/src/SaveObject.tsx
index f6943d774..880a3c953 100755
--- a/src/SaveObject.tsx
+++ b/src/SaveObject.tsx
@@ -4,7 +4,14 @@ import { CONSTANTS } from "./Constants";
 import { Factions, loadFactions } from "./Faction/Factions";
 import { loadAllGangs, AllGangs } from "./Gang/AllGangs";
 import { Player, loadPlayer } from "./Player";
-import { saveAllServers, loadAllServers, GetAllServers } from "./Server/AllServers";
+import {
+  saveAllServers,
+  loadAllServers,
+  GetAllServers,
+  createUniqueRandomIp,
+  AddToAllServers,
+  GetServer,
+} from "./Server/AllServers";
 import { Settings } from "./Settings/Settings";
 import { loadStockMarket, StockMarket } from "./StockMarket/StockMarket";
 import { staneksGift, loadStaneksGift } from "./CotMG/Helper";
@@ -26,6 +33,8 @@ import { pushGameSaved } from "./Electron";
 import { defaultMonacoTheme } from "./ScriptEditor/ui/themes";
 import { FactionNames } from "./Faction/data/FactionNames";
 import { Faction } from "./Faction/Faction";
+import { safetlyCreateUniqueServer } from "./Server/ServerHelpers";
+import { SpecialServers } from "./Server/data/SpecialServers";
 
 /* SaveObject.js
  *  Defines the object used to save/load games
@@ -434,6 +443,22 @@ function evaluateVersionCompatibility(ver: string | number): void {
       Player.reapplyAllAugmentations(true);
       Player.reapplyAllSourceFiles();
     }
+    if (ver < 18) {
+      // Create the darkweb for everyone but it won't be linked
+      const dw = GetServer(SpecialServers.DarkWeb);
+      if (!dw) {
+        const darkweb = safetlyCreateUniqueServer({
+          ip: createUniqueRandomIp(),
+          hostname: SpecialServers.DarkWeb,
+          organizationName: "",
+          isConnectedTo: false,
+          adminRights: false,
+          purchasedByPlayer: false,
+          maxRam: 1,
+        });
+        AddToAllServers(darkweb);
+      }
+    }
   }
 }
 
diff --git a/src/Server/data/servers.ts b/src/Server/data/servers.ts
index 77c88c4c2..f5eee7b52 100644
--- a/src/Server/data/servers.ts
+++ b/src/Server/data/servers.ts
@@ -1565,4 +1565,12 @@ export const serverMetadata: IServerMetadata[] = [
     serverGrowth: 0,
     specialName: SpecialServers.WorldDaemon,
   },
+  {
+    hostname: SpecialServers.DarkWeb,
+    moneyAvailable: 0,
+    numOpenPortsRequired: 5,
+    organizationName: SpecialServers.DarkWeb,
+    requiredHackingSkill: 1,
+    specialName: SpecialServers.DarkWeb,
+  },
 ];