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

See PR #271 description

src/PersonObjects/Grafting/ui/GraftingRoot.tsx

@@ -7,7 +7,7 @@ import { AugmentationNames } from "../../../Augmentation/data/AugmentationNames"
 import { StaticAugmentations } from "../../../Augmentation/StaticAugmentations";
 import { CONSTANTS } from "../../../Constants";
 import { hasAugmentationPrereqs } from "../../../Faction/FactionHelpers";
-import { LocationName } from "../../../utils/enums";
+import { LocationName } from "../../../Enums";
 import { Locations } from "../../../Locations/Locations";
 import { PurchaseAugmentationsOrderSetting } from "../../../Settings/SettingEnums";
 import { Settings } from "../../../Settings/Settings";

src/PersonObjects/Person.ts

@@ -1,11 +1,11 @@
 import * as personMethods from "./PersonMethods";
 import { PlayerOwnedAugmentation } from "../Augmentation/PlayerOwnedAugmentation";
-import { CityName } from "../Locations/data/CityNames";
+import { CityName } from "../Enums";
 import { calculateSkill } from "./formulas/skill";
 import { defaultMultipliers } from "./Multipliers";
 import { Skills } from "./Skills";
 import { HP } from "./HP";
-import { Person as IPerson } from "../ScriptEditor/NetscriptDefinitions";
+import { Person as IPerson } from "@nsdefs";
 import { IReviverValue } from "../utils/JSONReviver";
 
 // Base class representing a person-like object

src/PersonObjects/PersonMethods.ts

@@ -2,7 +2,7 @@ import { Person } from "./Person";
 import { calculateSkill } from "./formulas/skill";
 import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers";
 import { Player } from "@player";
-import { WorkStats } from "../ScriptEditor/NetscriptDefinitions";
+import { WorkStats } from "@nsdefs";
 
 export function gainHackingExp(this: Person, exp: number): void {
   if (isNaN(exp)) {

src/PersonObjects/Player/PlayerObject.ts

@@ -10,7 +10,7 @@ import { Sleeve } from "../Sleeve/Sleeve";
 import { PlayerOwnedSourceFile } from "../../SourceFile/PlayerOwnedSourceFile";
 import { Exploit } from "../../Exploits/Exploit";
 
-import { LocationName } from "../../utils/enums";
+import { LocationName } from "../../Enums";
 import { Corporation } from "../../Corporation/Corporation";
 import { Gang } from "../../Gang/Gang";
 import { Bladeburner } from "../../Bladeburner/Bladeburner";
@@ -26,7 +26,7 @@ import { getRandomInt } from "../../utils/helpers/getRandomInt";
 import { CONSTANTS } from "../../Constants";
 import { Work } from "src/Work/Work";
 import { Person } from "../Person";
-import { Player as IPlayer } from "../../ScriptEditor/NetscriptDefinitions";
+import { Player as IPlayer } from "@nsdefs";
 
 export class PlayerObject extends Person implements IPlayer {
   // Player-specific properties

src/PersonObjects/Player/PlayerObjectGeneralMethods.ts

@@ -10,7 +10,7 @@ import { getNextCompanyPositionHelper } from "../../Company/GetNextCompanyPositi
 import { getJobRequirementText } from "../../Company/GetJobRequirementText";
 import { CompanyPositions } from "../../Company/CompanyPositions";
 import { CompanyPosition } from "../../Company/CompanyPosition";
-import * as posNames from "../../Company/data/companypositionnames";
+import * as posNames from "../../Company/data/JobTracks";
 import { CONSTANTS } from "../../Constants";
 import { Programs } from "../../Programs/Programs";
 import { Exploit } from "../../Exploits/Exploit";
@@ -19,8 +19,7 @@ import { Factions } from "../../Faction/Factions";
 import { resetGangs } from "../../Gang/AllGangs";
 import { Cities } from "../../Locations/Cities";
 import { Locations } from "../../Locations/Locations";
-import { CityName } from "../../Locations/data/CityNames";
-import { LocationName } from "../../utils/enums";
+import { CityName, LocationName } from "../../Enums";
 import { Sleeve } from "../Sleeve/Sleeve";
 import { isSleeveCompanyWork } from "../Sleeve/Work/SleeveCompanyWork";
 import { calculateSkillProgress as calculateSkillProgressF, ISkillProgress } from "../formulas/skill";

src/PersonObjects/Sleeve/Sleeve.ts

@@ -18,16 +18,13 @@ import { CompanyPosition } from "../../Company/CompanyPosition";
 import { CompanyPositions } from "../../Company/CompanyPositions";
 import { Contracts } from "../../Bladeburner/data/Contracts";
 import { CONSTANTS } from "../../Constants";
-import { CrimeType, GymType, UniversityClassType } from "../../utils/enums";
-import { CityName } from "../../Locations/data/CityNames";
+import { CityName, CrimeType, GymType, LocationName, UniversityClassType } from "../../Enums";
 
 import { Factions } from "../../Faction/Factions";
 
-import { LocationName } from "../../utils/enums";
-
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../utils/JSONReviver";
 import { numeralWrapper } from "../../ui/numeralFormat";
-import { FactionWorkType } from "../../utils/enums";
+import { FactionWorkType } from "../../Enums";
 import { Work } from "./Work/Work";
 import { SleeveClassWork } from "./Work/SleeveClassWork";
 import { ClassType } from "../../Work/ClassWork";
@@ -40,7 +37,7 @@ import { SleeveSupportWork } from "./Work/SleeveSupportWork";
 import { SleeveBladeburnerWork } from "./Work/SleeveBladeburnerWork";
 import { SleeveCrimeWork } from "./Work/SleeveCrimeWork";
 import * as sleeveMethods from "./SleeveMethods";
-import { SleevePerson } from "../../ScriptEditor/NetscriptDefinitions";
+import { SleevePerson } from "@nsdefs";
 
 export class Sleeve extends Person implements SleevePerson {
   currentWork: Work | null = null;

src/PersonObjects/Sleeve/Work/SleeveClassWork.ts

@@ -1,11 +1,11 @@
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
 import { applySleeveGains, Work, WorkType } from "./Work";
 import { ClassType } from "../../../Work/ClassWork";
-import { LocationName } from "../../../utils/enums";
+import { LocationName } from "../../../Enums";
 import { calculateClassEarnings } from "../../../Work/Formulas";
 import { Sleeve } from "../Sleeve";
 import { scaleWorkStats, WorkStats } from "../../../Work/WorkStats";
-import { GymType, UniversityClassType } from "../../../utils/enums";
+import { GymType, UniversityClassType } from "../../../Enums";
 import { checkEnum } from "../../../utils/helpers/enum";
 
 export const isSleeveClassWork = (w: Work | null): w is SleeveClassWork => w !== null && w.type === WorkType.CLASS;

src/PersonObjects/Sleeve/Work/SleeveCompanyWork.ts

@@ -1,7 +1,7 @@
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
 import { Sleeve } from "../Sleeve";
 import { applySleeveGains, Work, WorkType } from "./Work";
-import { LocationName } from "../../../utils/enums";
+import { LocationName } from "../../../Enums";
 import { Companies } from "../../../Company/Companies";
 import { Company } from "../../../Company/Company";
 import { calculateCompanyWorkStats } from "../../../Work/Formulas";

src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts

@@ -2,7 +2,7 @@ import { Player } from "@player";
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
 import { Sleeve } from "../Sleeve";
 import { applySleeveGains, Work, WorkType } from "./Work";
-import { CrimeType } from "../../../utils/enums";
+import { CrimeType } from "../../../Enums";
 import { Crimes } from "../../../Crime/Crimes";
 import { Crime } from "../../../Crime/Crime";
 import { scaleWorkStats, WorkStats } from "../../../Work/WorkStats";

src/PersonObjects/Sleeve/Work/SleeveFactionWork.ts

@@ -2,7 +2,7 @@ import { Player } from "@player";
 import { Generic_fromJSON, Generic_toJSON, IReviverValue, Reviver } from "../../../utils/JSONReviver";
 import { Sleeve } from "../Sleeve";
 import { applySleeveGains, Work, WorkType } from "./Work";
-import { FactionWorkType } from "../../../utils/enums";
+import { FactionWorkType } from "../../../Enums";
 import { FactionNames } from "../../../Faction/data/FactionNames";
 import { Factions } from "../../../Faction/Factions";
 import { calculateFactionExp, calculateFactionRep } from "../../../Work/Formulas";

src/PersonObjects/Sleeve/Work/Work.ts

@@ -2,7 +2,7 @@ import { Player } from "@player";
 import { IReviverValue } from "../../../utils/JSONReviver";
 import { Sleeve } from "../Sleeve";
 import { applyWorkStatsExp, WorkStats } from "../../../Work/WorkStats";
-import { SleeveTask } from "src/ScriptEditor/NetscriptDefinitions";
+import { SleeveTask } from "@nsdefs";
 
 export const applySleeveGains = (sleeve: Sleeve, shockedStats: WorkStats, mult = 1): void => {
   applyWorkStatsExp(sleeve, shockedStats, mult);

src/PersonObjects/Sleeve/ui/SleeveElem.tsx

@@ -1,6 +1,6 @@
 import { Box, Button, Paper, Tooltip, Typography } from "@mui/material";
 import React, { useState } from "react";
-import { FactionWorkType } from "../../../utils/enums";
+import { FactionWorkType } from "../../../Enums";
 import { CONSTANTS } from "../../../Constants";
 import { Player } from "@player";
 import { numeralWrapper } from "../../../ui/numeralFormat";
@@ -21,7 +21,7 @@ import { isSleeveSupportWork } from "../Work/SleeveSupportWork";
 import { isSleeveBladeburnerWork } from "../Work/SleeveBladeburnerWork";
 import { isSleeveCrimeWork } from "../Work/SleeveCrimeWork";
 import { findCrime } from "../../../Crime/CrimeHelpers";
-import { CrimeType } from "../../../utils/enums";
+import { CrimeType } from "../../../Enums";
 
 interface IProps {
   sleeve: Sleeve;

src/PersonObjects/Sleeve/ui/TaskSelector.tsx

@@ -2,8 +2,7 @@ import React, { useState } from "react";
 import { Sleeve } from "../Sleeve";
 import { Player } from "@player";
 import { Crimes } from "../../../Crime/Crimes";
-import { LocationName } from "../../../utils/enums";
-import { CityName } from "../../../Locations/data/CityNames";
+import { CityName, LocationName } from "../../../Enums";
 import { Factions } from "../../../Faction/Factions";
 import Select, { SelectChangeEvent } from "@mui/material/Select";
 import MenuItem from "@mui/material/MenuItem";
@@ -17,7 +16,7 @@ import { isSleeveClassWork } from "../Work/SleeveClassWork";
 import { isSleeveInfiltrateWork } from "../Work/SleeveInfiltrateWork";
 import { isSleeveSupportWork } from "../Work/SleeveSupportWork";
 import { isSleeveCrimeWork } from "../Work/SleeveCrimeWork";
-import { CrimeType, FactionWorkType, GymType, UniversityClassType } from "../../../utils/enums";
+import { CrimeType, FactionWorkType, GymType, UniversityClassType } from "../../../Enums";
 import { checkEnum } from "../../../utils/helpers/enum";
 
 const universitySelectorOptions: string[] = [

src/PersonObjects/Sleeve/ui/TravelModal.tsx

@@ -3,7 +3,7 @@ import { Sleeve } from "../Sleeve";
 import { CONSTANTS } from "../../../Constants";
 import { Money } from "../../../ui/React/Money";
 import { WorldMap } from "../../../ui/React/WorldMap";
-import { CityName } from "../../../Locations/data/CityNames";
+import { CityName } from "../../../Enums";
 import { Settings } from "../../../Settings/Settings";
 import { dialogBoxCreate } from "../../../ui/React/DialogBox";
 import { Player } from "@player";

src/PersonObjects/formulas/reputation.ts

@@ -1,7 +1,7 @@
 import { CONSTANTS } from "../../Constants";
 import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
 import { CalculateShareMult } from "../../NetworkShare/Share";
-import { Person as IPerson } from "../../ScriptEditor/NetscriptDefinitions";
+import { Person as IPerson } from "@nsdefs";
 import { calculateIntelligenceBonus } from "./intelligence";
 
 function mult(favor: number): number {