Merge branch 'dev' of github.com:danielyxie/bitburner into improvement/purchase-augs-ui

src/PersonObjects/Person.ts

@@ -97,6 +97,13 @@ export abstract class Person {
   bladeburner_analysis_mult = 1;
   bladeburner_success_chance_mult = 1;
 
+  infiltration_base_rep_increase = 0;
+  infiltration_rep_mult = 1;
+  infiltration_trade_mult = 1;
+  infiltration_sell_mult = 1;
+  infiltration_timer_mult = 1;
+  infiltration_damage_reduction_mult = 1;
+
   /**
    * Augmentations
    */
@@ -195,6 +202,24 @@ export abstract class Person {
     this.crime_success_mult = 1;
 
     this.work_money_mult = 1;
+
+    this.hacknet_node_money_mult = 1;
+    this.hacknet_node_purchase_cost_mult = 1;
+    this.hacknet_node_ram_cost_mult = 1;
+    this.hacknet_node_core_cost_mult = 1;
+    this.hacknet_node_level_cost_mult = 1;
+
+    this.bladeburner_max_stamina_mult = 1;
+    this.bladeburner_stamina_gain_mult = 1;
+    this.bladeburner_analysis_mult = 1;
+    this.bladeburner_success_chance_mult = 1;
+
+    this.infiltration_base_rep_increase = 0;
+    this.infiltration_rep_mult = 1;
+    this.infiltration_trade_mult = 1;
+    this.infiltration_sell_mult = 1;
+    this.infiltration_timer_mult = 1;
+    this.infiltration_damage_reduction_mult = 1;
   }
 
   /**

src/PersonObjects/Player/PlayerObjectAugmentationMethods.ts

@@ -7,7 +7,7 @@ import { Augmentation } from "../../Augmentation/Augmentation";
 
 import { calculateEntropy } from "../Grafting/EntropyAccumulation";
 
-export function hasAugmentation(this: IPlayer, aug: string | Augmentation, includeQueued = false): boolean {
+export function hasAugmentation(this: IPlayer, aug: string | Augmentation, ignoreQueued = false): boolean {
   const augName: string = aug instanceof Augmentation ? aug.name : aug;
 
   for (const owned of this.augmentations) {
@@ -16,7 +16,7 @@ export function hasAugmentation(this: IPlayer, aug: string | Augmentation, inclu
     }
   }
 
-  if (!includeQueued) {
+  if (!ignoreQueued) {
     for (const owned of this.queuedAugmentations) {
       if (owned.name === augName) {
         return true;

src/PersonObjects/Sleeve/ui/TaskSelector.tsx

@@ -56,7 +56,7 @@ function possibleJobs(player: IPlayer, sleeve: Sleeve): string[] {
 
 function possibleFactions(player: IPlayer, sleeve: Sleeve): string[] {
   // Array of all factions that other sleeves are working for
-  const forbiddenFactions = [FactionNames.Bladeburners as string];
+  const forbiddenFactions = [FactionNames.Bladeburners as string, FactionNames.ShadowsOfAnarchy as string];
   if (player.gang) {
     forbiddenFactions.push(player.gang.facName);
   }