Merge branch 'dev' into bugfix/2877-2

src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx

@@ -608,11 +608,9 @@ export function process(this: IPlayer, router: IRouter, numCycles = 1): void {
       if (this.workPartTime(numCycles)) {
         router.toCity();
       }
-    } else {
-      if (this.work(numCycles)) {
+    } else if (this.work(numCycles)) {
         router.toCity();
       }
-    }
   }
 }
 
@@ -1315,9 +1313,7 @@ export function createProgramWork(this: IPlayer, numCycles: number): boolean {
 export function finishCreateProgramWork(this: IPlayer, cancelled: boolean): string {
   const programName = this.createProgramName;
   if (cancelled === false) {
-    dialogBoxCreate(
-      "You've finished creating " + programName + "!<br>" + "The new program can be found on your home computer.",
-    );
+    dialogBoxCreate(`You've finished creating ${programName}!<br>The new program can be found on your home computer.`);
 
     this.getHomeComputer().programs.push(programName);
   } else {
@@ -2244,8 +2240,7 @@ export function checkForFactionInvitations(this: IPlayer): Faction[] {
   if (!(fulcrumSecretServer instanceof Server)) throw new Error("Fulcrum Secret Technologies should be normal server");
   if (fulcrumSecretServer == null) {
     console.error("Could not find Fulcrum Secret Technologies Server");
-  } else {
-    if (
+  } else if (
       !fulcrumsecrettechonologiesFac.isBanned &&
       !fulcrumsecrettechonologiesFac.isMember &&
       !fulcrumsecrettechonologiesFac.alreadyInvited &&
@@ -2254,7 +2249,6 @@ export function checkForFactionInvitations(this: IPlayer): Faction[] {
     ) {
       invitedFactions.push(fulcrumsecrettechonologiesFac);
     }
-  }
 
   //BitRunners
   const bitrunnersFac = Factions["BitRunners"];

src/PersonObjects/Sleeve/SleeveHelpers.ts

@@ -34,7 +34,32 @@ export function findSleevePurchasableAugs(sleeve: Sleeve, p: IPlayer): Augmentat
       return false;
     }
 
-    return true;
+    const validMults = [
+      "hacking_mult",
+      "strength_mult",
+      "defense_mult",
+      "dexterity_mult",
+      "agility_mult",
+      "charisma_mult",
+      "hacking_exp_mult",
+      "strength_exp_mult",
+      "defense_exp_mult",
+      "dexterity_exp_mult",
+      "agility_exp_mult",
+      "charisma_exp_mult",
+      "company_rep_mult",
+      "faction_rep_mult",
+      "crime_money_mult",
+      "crime_success_mult",
+      "work_money_mult",
+    ];
+    for (const mult of Object.keys(aug.mults)) {
+      if (validMults.includes(mult)) {
+        return true;
+      }
+    }
+
+    return false;
   }
 
   // If player is in a gang, then we return all augs that the player