VARIOUS: Various changes prior to release 2.2 (#271)

See PR #271 description

src/Locations/Cities.ts

@@ -1,7 +1,11 @@
-/**
- * Map of all Cities in the game
- * Key = City Name, Value = City object
- */
 import { City } from "./City";
+import { CityName } from "../Enums";
 
-export const Cities: Record<string, City> = {};
+export const Cities: Record<CityName, City> = {
+  [CityName.Aevum]: new City(CityName.Aevum),
+  [CityName.Chongqing]: new City(CityName.Chongqing),
+  [CityName.Ishima]: new City(CityName.Ishima),
+  [CityName.NewTokyo]: new City(CityName.NewTokyo),
+  [CityName.Sector12]: new City(CityName.Sector12),
+  [CityName.Volhaven]: new City(CityName.Volhaven),
+};

src/Locations/City.ts

@@ -1,5 +1,4 @@
-import { CityName } from "./data/CityNames";
-import { LocationName } from "../utils/enums";
+import { LocationName, CityName } from "../Enums";
 
 /** Class representing a City in the game */
 export class City {

src/Locations/Location.ts

@@ -1,5 +1,4 @@
-import { CityName } from "./data/CityNames";
-import { LocationName } from "../utils/enums";
+import { CityName, LocationName } from "../Enums";
 import { LocationType } from "./LocationTypeEnum";
 
 interface IInfiltrationMetadata {

src/Locations/Locations.ts

@@ -2,10 +2,9 @@
  * Map of all Locations in the game
  * Key = Location name, value = Location object
  */
-import { City } from "./City";
 import { Cities } from "./Cities";
 import { Location, IConstructorParams } from "./Location";
-import { CityName } from "./data/CityNames";
+import { CityName } from "../Enums";
 import { LocationsMetadata } from "./data/LocationsMetadata";
 
 export const Locations: Record<string, Location> = {};
@@ -29,13 +28,6 @@ function constructLocation(p: IConstructorParams): Location {
 }
 
 // First construct all cities
-Cities[CityName.Aevum] = new City(CityName.Aevum);
-Cities[CityName.Chongqing] = new City(CityName.Chongqing);
-Cities[CityName.Ishima] = new City(CityName.Ishima);
-Cities[CityName.NewTokyo] = new City(CityName.NewTokyo);
-Cities[CityName.Sector12] = new City(CityName.Sector12);
-Cities[CityName.Volhaven] = new City(CityName.Volhaven);
-
 Cities[CityName.Aevum].asciiArt = `
    [aevum police headquarters]       26                                         
                                    o                                            
@@ -218,7 +210,7 @@ for (const metadata of LocationsMetadata) {
   const cityName = loc.city;
   if (cityName === null) {
     // Generic location, add to all cities
-    for (const city of Object.keys(Cities)) {
+    for (const city of Object.values(CityName)) {
       Cities[city].addLocation(loc.name);
     }
   } else {

src/Locations/data/CityNames.ts

@@ -1,12 +0,0 @@
-/**
- * All possible Cities in the game. Names only, not actual "City" object
- * Implemented as an enum for typing purposes
- */
-export enum CityName {
-  Aevum = "Aevum",
-  Chongqing = "Chongqing",
-  Ishima = "Ishima",
-  NewTokyo = "New Tokyo",
-  Sector12 = "Sector-12",
-  Volhaven = "Volhaven",
-}

src/Locations/data/LocationsMetadata.ts

@@ -2,8 +2,7 @@
  * Metadata for constructing Location objects for all Locations
  * in the game
  */
-import { CityName } from "./CityNames";
-import { LocationName } from "../../utils/enums";
+import { CityName, LocationName } from "../../Enums";
 import { IConstructorParams } from "../Location";
 import { LocationType } from "../LocationTypeEnum";
 

src/Locations/ui/City.tsx

@@ -7,7 +7,7 @@ import * as React from "react";
 
 import { City } from "../City";
 import { Cities } from "../Cities";
-import { LocationName } from "../../utils/enums";
+import { LocationName } from "../../Enums";
 import { Locations } from "../Locations";
 import { Location } from "../Location";
 import { Settings } from "../../Settings/Settings";

src/Locations/ui/CompanyLocation.tsx

@@ -12,11 +12,11 @@ import Box from "@mui/material/Box";
 import { ApplyToJobButton } from "./ApplyToJobButton";
 
 import { Locations } from "../Locations";
-import { LocationName } from "../../utils/enums";
+import { LocationName } from "../../Enums";
 
 import { Companies } from "../../Company/Companies";
 import { CompanyPositions } from "../../Company/CompanyPositions";
-import * as posNames from "../../Company/data/companypositionnames";
+import * as posNames from "../../Company/data/JobTracks";
 
 import { Reputation } from "../../ui/React/Reputation";
 import { Favor } from "../../ui/React/Favor";

src/Locations/ui/GymLocation.tsx

@@ -16,7 +16,7 @@ import { Page } from "../../ui/Router";
 import { Box } from "@mui/material";
 import { ClassWork, Classes } from "../../Work/ClassWork";
 import { calculateCost } from "../../Work/Formulas";
-import { GymType } from "../../utils/enums";
+import { GymType } from "../../Enums";
 
 type IProps = {
   loc: Location;

src/Locations/ui/SpecialLocation.tsx

@@ -16,7 +16,7 @@ import Button from "@mui/material/Button";
 
 import { Location } from "../Location";
 import { CreateCorporationModal } from "../../Corporation/ui/modals/CreateCorporationModal";
-import { LocationName } from "../../utils/enums";
+import { LocationName } from "../../Enums";
 import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
 import { Factions } from "../../Faction/Factions";
 import { joinFaction } from "../../Faction/FactionHelpers";

src/Locations/ui/TravelAgencyRoot.tsx

@@ -5,7 +5,7 @@
  */
 import React, { useState, useEffect } from "react";
 
-import { CityName } from "../data/CityNames";
+import { CityName } from "../../Enums";
 import { TravelConfirmationModal } from "./TravelConfirmationModal";
 
 import { CONSTANTS } from "../../Constants";

src/Locations/ui/UniversityLocation.tsx

@@ -17,7 +17,7 @@ import { Box } from "@mui/material";
 
 import { ClassWork, Classes } from "../../Work/ClassWork";
 import { calculateCost } from "../../Work/Formulas";
-import { UniversityClassType } from "../../utils/enums";
+import { UniversityClassType } from "../../Enums";
 
 type IProps = {
   loc: Location;