Merge pull request #3710 from danielyxie/dev

Fix blade error

src/Augmentation/ui/PurchasableAugmentations.tsx

@@ -219,7 +219,10 @@ export function PurchasableAugmentation(props: IPurchasableAugProps): React.Reac
                   textOverflow: "ellipsis",
                   whiteSpace: "nowrap",
                   overflow: "hidden",
-                  color: props.owned ? Settings.theme.disabled : Settings.theme.primary,
+                  color:
+                    props.owned || !props.parent.canPurchase(props.parent.player, aug)
+                      ? Settings.theme.disabled
+                      : Settings.theme.primary,
                 }}
               >
                 {aug.name}

src/Bladeburner/Bladeburner.tsx

@@ -1677,11 +1677,11 @@ export class Bladeburner implements IBladeburner {
     this.actionTimeOverflow = 0;
     if (this.actionTimeCurrent >= this.actionTimeToComplete) {
       this.actionTimeOverflow = this.actionTimeCurrent - this.actionTimeToComplete;
+      const action = this.getActionObject(this.action);
       const retValue = this.completeAction(player, player, this.action);
       player.gainMoney(retValue.money, "bladeburner");
       player.gainStats(retValue);
       // Operation Daedalus
-      const action = this.getActionObject(this.action);
       if (action == null) {
         throw new Error("Failed to get BlackOperation Object for: " + this.action.name);
       } else if (action.name === BlackOperationNames.OperationDaedalus && this.blackops[action.name]) {

src/Netscript/RamCostGenerator.ts

@@ -105,6 +105,7 @@ const hacknet: IMap<any> = {
   numHashes: 0,
   hashCost: 0,
   spendHashes: 0,
+  maxNumNodes: 0,
 };
 
 // Stock API

src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx

@@ -993,6 +993,7 @@ export function finishFactionWork(this: IPlayer, cancelled: boolean, sing = fals
   faction.playerReputation += this.workRepGained;
 
   this.updateSkillLevels();
+  let res = "";
 
   if (!sing) {
     dialogBoxCreate(
@@ -1013,12 +1014,8 @@ export function finishFactionWork(this: IPlayer, cancelled: boolean, sing = fals
         <br />
       </>,
     );
-  }
-
-  this.isWorking = false;
-  this.resetWorkStatus();
-  if (sing) {
-    const res =
+  } else {
+    res =
       "You worked for your faction " +
       faction.name +
       " for a total of " +
@@ -1039,10 +1036,11 @@ export function finishFactionWork(this: IPlayer, cancelled: boolean, sing = fals
       " agi exp, and " +
       numeralWrapper.formatExp(this.workChaExpGained) +
       " cha exp.";
-
-    return res;
   }
-  return "";
+
+  this.isWorking = false;
+  this.resetWorkStatus();
+  return res;
 }
 
 //Money gained per game cycle