diff --git a/src/Bladeburner.js b/src/Bladeburner.js
index f7526523e..c69f8f793 100644
--- a/src/Bladeburner.js
+++ b/src/Bladeburner.js
@@ -4,7 +4,7 @@ import {CONSTANTS} from "./Constants";
import {Engine} from "./engine";
import {Faction, Factions, factionExists,
joinFaction, displayFactionContent} from "./Faction";
-import {Locations} from "./Location";
+import {Locations} from "./Locations";
import {Player} from "./Player";
import {hackWorldDaemon, redPillFlag} from "./RedPill";
import {KEY} from "../utils/helpers/keyCodes";
diff --git a/src/Company.js b/src/Company.js
index 7f93f433e..4e784e07d 100644
--- a/src/Company.js
+++ b/src/Company.js
@@ -1,6 +1,5 @@
import {CONSTANTS} from "./Constants";
-import {Locations} from "./Location";
-import {Player} from "./Player";
+import {Locations} from "./Locations";
import {Reviver, Generic_toJSON,
Generic_fromJSON} from "../utils/JSONReviver";
diff --git a/src/CompanyManagement.js b/src/CompanyManagement.js
index 5fd402059..381d003e7 100644
--- a/src/CompanyManagement.js
+++ b/src/CompanyManagement.js
@@ -1,7 +1,7 @@
import {BitNodeMultipliers} from "./BitNode";
import {Factions} from "./Faction";
import {showLiterature} from "./Literature";
-import {Locations} from "./Location";
+import {Locations} from "./Locations";
import {Player} from "./Player";
import Decimal from "decimal.js";
diff --git a/src/Location.js b/src/Location.js
index e3dadc339..69047d88a 100644
--- a/src/Location.js
+++ b/src/Location.js
@@ -7,6 +7,7 @@ import {Crimes} from "./Crimes";
import {Engine} from "./engine";
import {beginInfiltration} from "./Infiltration";
import {hasBladeburnerSF} from "./NetscriptFunctions";
+import {Locations} from "./Locations";
import {Player} from "./Player";
import {Server, AllServers, AddToAllServers} from "./Server";
import {purchaseServer,
@@ -25,95 +26,8 @@ import {yesNoBoxCreate, yesNoTxtInpBoxCreate,
yesNoTxtInpBoxGetInput, yesNoBoxClose,
yesNoTxtInpBoxClose} from "../utils/YesNoBox";
-/* Display Location Content when visiting somewhere in the World*/
-var Locations = {
- //Cities
- Aevum: "Aevum",
- //AevumDesc: ""
- Chongqing: "Chongqing",
- Sector12: "Sector-12",
- NewTokyo: "New Tokyo",
- Ishima: "Ishima",
- Volhaven: "Volhaven",
-
- //Aevum Locations
- AevumTravelAgency: "Aevum Travel Agency",
- AevumSummitUniversity: "Summit University",
- AevumECorp: "ECorp",
- AevumBachmanAndAssociates: "Bachman & Associates",
- AevumClarkeIncorporated: "Clarke Incorporated",
- AevumFulcrumTechnologies: "Fulcrum Technologies",
- AevumAeroCorp: "AeroCorp",
- AevumGalacticCybersystems: "Galactic Cybersystems",
- AevumWatchdogSecurity: "Watchdog Security",
- AevumRhoConstruction: "Rho Construction",
- AevumPolice: "Aevum Police Headquarters",
- AevumNetLinkTechnologies: "NetLink Technologies",
- AevumCrushFitnessGym: "Crush Fitness Gym",
- AevumSnapFitnessGym: "Snap Fitness Gym",
- AevumSlums: "Aevum Slums",
-
- //Chongqing locations
- ChongqingTravelAgency: "Chongqing Travel Agency",
- ChongqingKuaiGongInternational: "KuaiGong International",
- ChongqingSolarisSpaceSystems: "Solaris Space Systems",
- ChongqingSlums: "Chongqing Slums",
-
- //Sector 12
- Sector12TravelAgency: "Sector-12 Travel Agency",
- Sector12RothmanUniversity: "Rothman University",
- Sector12MegaCorp: "MegaCorp",
- Sector12BladeIndustries: "Blade Industries",
- Sector12FourSigma: "Four Sigma",
- Sector12IcarusMicrosystems: "Icarus Microsystems",
- Sector12UniversalEnergy: "Universal Energy",
- Sector12DeltaOne: "DeltaOne",
- Sector12CIA: "Central Intelligence Agency",
- Sector12NSA: "National Security Agency",
- Sector12AlphaEnterprises: "Alpha Enterprises",
- Sector12CarmichaelSecurity: "Carmichael Security",
- Sector12FoodNStuff: "FoodNStuff",
- Sector12JoesGuns: "Joe's Guns",
- Sector12IronGym: "Iron Gym",
- Sector12PowerhouseGym: "Powerhouse Gym",
- Sector12Slums: "Sector-12 Slums",
- Sector12CityHall: "Sector-12 City Hall",
-
- //New Tokyo
- NewTokyoTravelAgency: "New Tokyo Travel Agency",
- NewTokyoDefComm: "DefComm",
- NewTokyoVitaLife: "VitaLife",
- NewTokyoGlobalPharmaceuticals: "Global Pharmaceuticals",
- NewTokyoNoodleBar: "Noodle Bar",
- NewTokyoSlums: "New Tokyo Slums",
-
- //Ishima
- IshimaTravelAgency: "Ishima Travel Agency",
- IshimaStormTechnologies: "Storm Technologies",
- IshimaNovaMedical: "Nova Medical",
- IshimaOmegaSoftware: "Omega Software",
- IshimaSlums: "Ishima Slums",
-
- //Volhaven
- VolhavenTravelAgency: "Volhaven Travel Agency",
- VolhavenZBInstituteOfTechnology: "ZB Institute of Technology",
- VolhavenOmniTekIncorporated: "OmniTek Incorporated",
- VolhavenNWO: "NWO",
- VolhavenHeliosLabs: "Helios Labs",
- VolhavenOmniaCybersystems: "Omnia Cybersystems",
- VolhavenLexoCorp: "LexoCorp",
- VolhavenSysCoreSecurities: "SysCore Securities",
- VolhavenCompuTek: "CompuTek",
- VolhavenMilleniumFitnessGym: "Millenium Fitness Gym",
- VolhavenSlums: "Volhaven Slums",
-
- //Generic locations
- Hospital: "Hospital",
- WorldStockExchange: "World Stock Exchange",
-}
-
function displayLocationContent() {
- if (Engine.debug) {
+ if (Engine.Debug) {
console.log("displayLocationContent() called with location " + Player.location)
}
@@ -2199,4 +2113,4 @@ function purchaseServerBoxCreate(ram, cost) {
"Please enter the server hostname below:
");
}
-export {Locations, displayLocationContent, initLocationButtons};
+export {displayLocationContent, initLocationButtons};
diff --git a/src/Locations.ts b/src/Locations.ts
new file mode 100644
index 000000000..35477941e
--- /dev/null
+++ b/src/Locations.ts
@@ -0,0 +1,90 @@
+import { IMap } from "./types";
+
+/**
+ * Display Location Content when visiting somewhere in the World
+ */
+// tslint:disable-next-line:variable-name
+export const Locations: IMap = {
+ // Cities
+ Aevum: "Aevum",
+ Chongqing: "Chongqing",
+ Ishima: "Ishima",
+ NewTokyo: "New Tokyo",
+ Sector12: "Sector-12",
+ Volhaven: "Volhaven",
+
+ // Aevum Locations
+ AevumAeroCorp: "AeroCorp",
+ AevumBachmanAndAssociates: "Bachman & Associates",
+ AevumClarkeIncorporated: "Clarke Incorporated",
+ AevumCrushFitnessGym: "Crush Fitness Gym",
+ AevumECorp: "ECorp",
+ AevumFulcrumTechnologies: "Fulcrum Technologies",
+ AevumGalacticCybersystems: "Galactic Cybersystems",
+ AevumNetLinkTechnologies: "NetLink Technologies",
+ AevumPolice: "Aevum Police Headquarters",
+ AevumRhoConstruction: "Rho Construction",
+ AevumSlums: "Aevum Slums",
+ AevumSnapFitnessGym: "Snap Fitness Gym",
+ AevumSummitUniversity: "Summit University",
+ AevumTravelAgency: "Aevum Travel Agency",
+ AevumWatchdogSecurity: "Watchdog Security",
+
+ // Chongqing locations
+ ChongqingKuaiGongInternational: "KuaiGong International",
+ ChongqingSlums: "Chongqing Slums",
+ ChongqingSolarisSpaceSystems: "Solaris Space Systems",
+ ChongqingTravelAgency: "Chongqing Travel Agency",
+
+ // Sector 12
+ Sector12AlphaEnterprises: "Alpha Enterprises",
+ Sector12BladeIndustries: "Blade Industries",
+ Sector12CIA: "Central Intelligence Agency",
+ Sector12CarmichaelSecurity: "Carmichael Security",
+ Sector12CityHall: "Sector-12 City Hall",
+ Sector12DeltaOne: "DeltaOne",
+ Sector12FoodNStuff: "FoodNStuff",
+ Sector12FourSigma: "Four Sigma",
+ Sector12IcarusMicrosystems: "Icarus Microsystems",
+ Sector12IronGym: "Iron Gym",
+ Sector12JoesGuns: "Joe's Guns",
+ Sector12MegaCorp: "MegaCorp",
+ Sector12NSA: "National Security Agency",
+ Sector12PowerhouseGym: "Powerhouse Gym",
+ Sector12RothmanUniversity: "Rothman University",
+ Sector12Slums: "Sector-12 Slums",
+ Sector12TravelAgency: "Sector-12 Travel Agency",
+ Sector12UniversalEnergy: "Universal Energy",
+
+ // New Tokyo
+ NewTokyoDefComm: "DefComm",
+ NewTokyoGlobalPharmaceuticals: "Global Pharmaceuticals",
+ NewTokyoNoodleBar: "Noodle Bar",
+ NewTokyoSlums: "New Tokyo Slums",
+ NewTokyoTravelAgency: "New Tokyo Travel Agency",
+ NewTokyoVitaLife: "VitaLife",
+
+ // Ishima
+ IshimaNovaMedical: "Nova Medical",
+ IshimaOmegaSoftware: "Omega Software",
+ IshimaSlums: "Ishima Slums",
+ IshimaStormTechnologies: "Storm Technologies",
+ IshimaTravelAgency: "Ishima Travel Agency",
+
+ // Volhaven
+ VolhavenCompuTek: "CompuTek",
+ VolhavenHeliosLabs: "Helios Labs",
+ VolhavenLexoCorp: "LexoCorp",
+ VolhavenMilleniumFitnessGym: "Millenium Fitness Gym",
+ VolhavenNWO: "NWO",
+ VolhavenOmniTekIncorporated: "OmniTek Incorporated",
+ VolhavenOmniaCybersystems: "Omnia Cybersystems",
+ VolhavenSlums: "Volhaven Slums",
+ VolhavenSysCoreSecurities: "SysCore Securities",
+ VolhavenTravelAgency: "Volhaven Travel Agency",
+ VolhavenZBInstituteOfTechnology: "ZB Institute of Technology",
+
+ // Generic locations
+ Hospital: "Hospital",
+ WorldStockExchange: "World Stock Exchange",
+};
diff --git a/src/NetscriptFunctions.js b/src/NetscriptFunctions.js
index 913ef2352..2cf82d53e 100644
--- a/src/NetscriptFunctions.js
+++ b/src/NetscriptFunctions.js
@@ -17,7 +17,7 @@ import {AllGangs} from "./Gang";
import {Factions, Faction, joinFaction,
factionExists, purchaseAugmentation} from "./Faction";
import {getCostOfNextHacknetNode, purchaseHacknet} from "./HacknetNode";
-import {Locations} from "./Location";
+import {Locations} from "./Locations";
import {Message, Messages} from "./Message";
import {inMission} from "./Missions";
import {Player} from "./Player";
diff --git a/src/Player.js b/src/Player.js
index 0475afecd..18ab3ba3b 100644
--- a/src/Player.js
+++ b/src/Player.js
@@ -13,7 +13,7 @@ import {Engine} from "./engine";
import {Factions, Faction,
displayFactionContent} from "./Faction";
import {Gang, resetGangs} from "./Gang";
-import {Locations} from "./Location";
+import {Locations} from "./Locations";
import {hasBn11SF, hasWallStreetSF,hasAISF} from "./NetscriptFunctions";
import {AllServers, Server, AddToAllServers} from "./Server";
import {SpecialServerIps, SpecialServerNames} from "./SpecialServerIps";
diff --git a/src/StockMarket.js b/src/StockMarket.js
index 3e1f2f11f..65fa60c19 100644
--- a/src/StockMarket.js
+++ b/src/StockMarket.js
@@ -1,5 +1,5 @@
import {CONSTANTS} from "./Constants";
-import {Locations} from "./Location";
+import {Locations} from "./Locations";
import {hasWallStreetSF, wallStreetSFLvl} from "./NetscriptFunctions";
import {WorkerScript} from "./NetscriptWorker";
import {Player} from "./Player";
diff --git a/src/engine.js b/src/engine.js
index 4a8ca11a1..3a057443c 100644
--- a/src/engine.js
+++ b/src/engine.js
@@ -32,8 +32,9 @@ import {displayFactionContent, joinFaction,
processPassiveFactionRepGain, Factions,
inviteToFaction, initFactions} from "./Faction";
import {FconfSettings} from "./Fconf";
-import {Locations, displayLocationContent,
+import {displayLocationContent,
initLocationButtons} from "./Location";
+import {Locations} from "./Locations";
import {displayGangContent, updateGangContent,
Gang} from "./Gang";
import {displayHacknetNodesContent, processAllHacknetNodeEarnings,