TYPESAFETY: Strict internal typing for AugmentationName (#608)

src/PersonObjects/Player/PlayerObject.ts

@@ -26,6 +26,7 @@ import { cyrb53 } from "../../utils/StringHelperFunctions";
 import { getRandomInt } from "../../utils/helpers/getRandomInt";
 import { CONSTANTS } from "../../Constants";
 import { Person } from "../Person";
+import { getEnumHelper } from "../../utils/EnumHelper";
 
 export class PlayerObject extends Person implements IPlayer {
   // Player-specific properties
@@ -167,9 +168,19 @@ export class PlayerObject extends Person implements IPlayer {
   /** Initializes a PlayerObject object from a JSON save state. */
   static fromJSON(value: IReviverValue): PlayerObject {
     const player = Generic_fromJSON(PlayerObject, value.data);
+    // Any statistics that could be infinite would be serialized as null (JSON.stringify(Infinity) is "null")
     player.hp = { current: player.hp?.current ?? 10, max: player.hp?.max ?? 10 };
     player.money ??= 0;
+    // Just remove from the save file any augs that have invalid name
+    player.augmentations = player.augmentations.filter((ownedAug) =>
+      getEnumHelper("AugmentationName").isMember(ownedAug.name),
+    );
+    player.queuedAugmentations = player.queuedAugmentations.filter((ownedAug) =>
+      getEnumHelper("AugmentationName").isMember(ownedAug.name),
+    );
     player.updateSkillLevels();
+    // Converstion code for Player.sourceFiles is here instead of normal save conversion area because it needs
+    // to happen earlier for use in the savegame comparison tool.
     if (Array.isArray(player.sourceFiles)) {
       // Expect pre-2.3 sourcefile format here.
       type OldSourceFiles = { n: number; lvl: number }[];

src/PersonObjects/Player/PlayerObjectGeneralMethods.ts

@@ -1,10 +1,11 @@
+import { AugmentationName, CityName, CompletedProgramName, FactionName, LocationName, ToastVariant } from "@enums";
+
 import type { PlayerObject } from "./PlayerObject";
 import type { ProgramFilePath } from "../../Paths/ProgramFilePath";
 
 import { applyAugmentation } from "../../Augmentation/AugmentationHelpers";
 import { PlayerOwnedAugmentation } from "../../Augmentation/PlayerOwnedAugmentation";
-import { AugmentationName, CityName, CompletedProgramName, FactionName, LocationName, ToastVariant } from "@enums";
-import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
+import { currentNodeMults } from "../../BitNode/BitNodeMultipliers";
 import { CodingContractRewardType, ICodingContractReward } from "../../CodingContracts";
 import { Company } from "../../Company/Company";
 import { Companies } from "../../Company/Companies";
@@ -548,22 +549,16 @@ export function reapplyAllAugmentations(this: PlayerObject, resetMultipliers = t
     this.resetMultipliers();
   }
 
-  for (let i = 0; i < this.augmentations.length; ++i) {
-    //Compatibility with new version
-    if (this.augmentations[i].name === "HacknetNode NIC Architecture Neural-Upload") {
-      this.augmentations[i].name = "Hacknet Node NIC Architecture Neural-Upload";
-    }
-
-    const playerAug = this.augmentations[i];
+  for (const playerAug of this.augmentations) {
     const augName = playerAug.name;
 
     if (augName == AugmentationName.NeuroFluxGovernor) {
-      for (let j = 0; j < playerAug.level; ++j) {
-        applyAugmentation(this.augmentations[i], true);
+      for (let i = 0; i < playerAug.level; ++i) {
+        applyAugmentation(playerAug, true);
       }
       continue;
     }
-    applyAugmentation(this.augmentations[i], true);
+    applyAugmentation(playerAug, true);
   }
 
   this.updateSkillLevels();
@@ -644,7 +639,7 @@ export function checkForFactionInvitations(this: PlayerObject): Faction[] {
     !daedalusFac.isBanned &&
     !daedalusFac.isMember &&
     !daedalusFac.alreadyInvited &&
-    numAugmentations >= BitNodeMultipliers.DaedalusAugsRequirement &&
+    numAugmentations >= currentNodeMults.DaedalusAugsRequirement &&
     this.money >= 100000000000 &&
     (this.skills.hacking >= 2500 ||
       (this.skills.strength >= 1500 &&
@@ -1080,7 +1075,7 @@ export function setBitNodeNumber(this: PlayerObject, n: number): void {
   this.bitNodeN = n;
 }
 
-export function queueAugmentation(this: PlayerObject, name: string): void {
+export function queueAugmentation(this: PlayerObject, name: AugmentationName): void {
   for (const aug of this.queuedAugmentations) {
     if (aug.name == name) {
       console.warn(`tried to queue ${name} twice, this may be a bug`);
@@ -1152,7 +1147,7 @@ export function gainCodingContractReward(
     }
     case CodingContractRewardType.Money:
     default: {
-      const moneyGain = CONSTANTS.CodingContractBaseMoneyGain * difficulty * BitNodeMultipliers.CodingContractMoney;
+      const moneyGain = CONSTANTS.CodingContractBaseMoneyGain * difficulty * currentNodeMults.CodingContractMoney;
       this.gainMoney(moneyGain, "codingcontract");
       return `Gained ${formatMoney(moneyGain)}`;
     }

src/PersonObjects/Player/PlayerObjectServerMethods.ts

@@ -1,7 +1,7 @@
 // Server and HacknetServer-related methods for the Player class (PlayerObject)
 import { CONSTANTS } from "../../Constants";
 
-import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
+import { currentNodeMults } from "../../BitNode/BitNodeMultipliers";
 import { Server } from "../../Server/Server";
 import { BaseServer } from "../../Server/BaseServer";
 import { HacknetServer } from "../../Hacknet/HacknetServer";
@@ -35,7 +35,7 @@ export function getUpgradeHomeRamCost(this: PlayerObject): number {
   //Calculate cost
   //Have cost increase by some percentage each time RAM has been upgraded
   const mult = Math.pow(1.58, numUpgrades);
-  const cost = currentRam * CONSTANTS.BaseCostFor1GBOfRamHome * mult * BitNodeMultipliers.HomeComputerRamCost;
+  const cost = currentRam * CONSTANTS.BaseCostFor1GBOfRamHome * mult * currentNodeMults.HomeComputerRamCost;
   return cost;
 }