merge dev

src/PersonObjects/Player/PlayerObject.ts

@@ -6,7 +6,6 @@ import * as generalMethods from "./PlayerObjectGeneralMethods";
 import * as serverMethods from "./PlayerObjectServerMethods";
 
 import { IMap } from "../../types";
-import { Resleeve } from "../Resleeving/Resleeve";
 import { Sleeve } from "../Sleeve/Sleeve";
 import { IPlayerOwnedSourceFile } from "../../SourceFile/PlayerOwnedSourceFile";
 import { Exploit } from "../../Exploits/Exploit";
@@ -72,7 +71,6 @@ export class PlayerObject implements IPlayer {
   playtimeSinceLastBitnode: number;
   purchasedServers: any[];
   queuedAugmentations: IPlayerOwnedAugmentation[];
-  resleeves: Resleeve[];
   scriptProdSinceLastAug: number;
   sleeves: Sleeve[];
   sleevesFromCovenant: number;
@@ -146,6 +144,8 @@ export class PlayerObject implements IPlayer {
   factionWorkType: string;
   createProgramName: string;
   timeWorkedCreateProgram: number;
+  graftAugmentationName: string;
+  timeWorkedGraftAugmentation: number;
   crimeType: string;
   committingCrimeThruSingFn: boolean;
   singFnCrimeWorkerScript: WorkerScript | null;
@@ -176,6 +176,8 @@ export class PlayerObject implements IPlayer {
   workChaExpGainRate: number;
   workMoneyLossRate: number;
 
+  entropy: number;
+
   // Methods
   work: (numCycles: number) => boolean;
   workPartTime: (numCycles: number) => boolean;
@@ -197,7 +199,7 @@ export class PlayerObject implements IPlayer {
   canAccessBladeburner: () => boolean;
   canAccessCorporation: () => boolean;
   canAccessGang: () => boolean;
-  canAccessResleeving: () => boolean;
+  canAccessGrafting: () => boolean;
   canAfford: (cost: number) => boolean;
   gainHackingExp: (exp: number) => void;
   gainStrengthExp: (exp: number) => void;
@@ -303,6 +305,10 @@ export class PlayerObject implements IPlayer {
   setMult: (name: string, mult: number) => void;
   canAccessCotMG: () => boolean;
   sourceFileLvl: (n: number) => number;
+  startGraftAugmentationWork: (augmentationName: string, time: number) => void;
+  graftAugmentationWork: (numCycles: number) => boolean;
+  finishGraftAugmentationWork: (cancelled: boolean) => string;
+  applyEntropy: (stacks?: number) => void;
 
   constructor() {
     //Skills and stats
@@ -426,6 +432,9 @@ export class PlayerObject implements IPlayer {
     this.createProgramName = "";
     this.createProgramReqLvl = 0;
 
+    this.graftAugmentationName = "";
+    this.timeWorkedGraftAugmentation = 0;
+
     this.className = "";
 
     this.crimeType = "";
@@ -471,11 +480,12 @@ export class PlayerObject implements IPlayer {
 
     // Sleeves & Re-sleeving
     this.sleeves = [];
-    this.resleeves = [];
     this.sleevesFromCovenant = 0; // # of Duplicate sleeves purchased from the covenan;
     //bitnode
     this.bitNodeN = 1;
 
+    this.entropy = 0;
+
     //Used to store the last update time.
     this.lastUpdate = 0;
     this.lastSave = 0;
@@ -556,6 +566,9 @@ export class PlayerObject implements IPlayer {
     this.startCreateProgramWork = generalMethods.startCreateProgramWork;
     this.createProgramWork = generalMethods.createProgramWork;
     this.finishCreateProgramWork = generalMethods.finishCreateProgramWork;
+    this.startGraftAugmentationWork = generalMethods.startGraftAugmentationWork;
+    this.graftAugmentationWork = generalMethods.craftAugmentationWork;
+    this.finishGraftAugmentationWork = generalMethods.finishGraftAugmentationWork;
     this.startClass = generalMethods.startClass;
     this.takeClass = generalMethods.takeClass;
     this.finishClass = generalMethods.finishClass;
@@ -592,7 +605,7 @@ export class PlayerObject implements IPlayer {
     this.gainCodingContractReward = generalMethods.gainCodingContractReward;
     this.travel = generalMethods.travel;
     this.gotoLocation = generalMethods.gotoLocation;
-    this.canAccessResleeving = generalMethods.canAccessResleeving;
+    this.canAccessGrafting = generalMethods.canAccessGrafting;
     this.giveExploit = generalMethods.giveExploit;
     this.giveAchievement = generalMethods.giveAchievement;
     this.getIntelligenceBonus = generalMethods.getIntelligenceBonus;
@@ -626,6 +639,8 @@ export class PlayerObject implements IPlayer {
 
     this.canAccessCotMG = generalMethods.canAccessCotMG;
     this.sourceFileLvl = generalMethods.sourceFileLvl;
+
+    this.applyEntropy = augmentationMethods.applyEntropy;
   }
 
   /**

src/PersonObjects/Player/PlayerObjectAugmentationMethods.ts

@@ -5,6 +5,8 @@ import { IPlayer } from "../IPlayer";
 
 import { Augmentation } from "../../Augmentation/Augmentation";
 
+import { calculateEntropy } from "../Grafting/EntropyAccumulation";
+
 export function hasAugmentation(this: IPlayer, aug: string | Augmentation, installed = false): boolean {
   const augName: string = aug instanceof Augmentation ? aug.name : aug;
 
@@ -24,3 +26,14 @@ export function hasAugmentation(this: IPlayer, aug: string | Augmentation, insta
 
   return false;
 }
+
+export function applyEntropy(this: IPlayer, stacks = 1): void {
+  // Re-apply all multipliers
+  this.reapplyAllAugmentations();
+  this.reapplyAllSourceFiles();
+
+  const newMultipliers = calculateEntropy(this, stacks);
+  for (const [mult, val] of Object.entries(newMultipliers)) {
+    this.setMult(mult, val);
+  }
+}

src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx

@@ -121,8 +121,6 @@ export function prestigeAugmentation(this: PlayerObject): void {
 
   this.queuedAugmentations = [];
 
-  this.resleeves = [];
-
   const numSleeves = Math.min(3, SourceFileFlags[10] + (this.bitNodeN === 10 ? 1 : 0)) + this.sleevesFromCovenant;
   if (this.sleeves.length > numSleeves) this.sleeves.length = numSleeves;
   for (let i = this.sleeves.length; i < numSleeves; i++) {
@@ -183,6 +181,7 @@ export function prestigeAugmentation(this: PlayerObject): void {
 }
 
 export function prestigeSourceFile(this: IPlayer): void {
+  this.entropy = 0;
   this.prestigeAugmentation();
   this.karma = 0;
   // Duplicate sleeves are reset to level 1 every Bit Node (but the number of sleeves you have persists)
@@ -537,10 +536,12 @@ export function resetWorkStatus(this: IPlayer, generalType?: string, group?: str
 
   this.timeWorked = 0;
   this.timeWorkedCreateProgram = 0;
+  this.timeWorkedGraftAugmentation = 0;
 
   this.currentWorkFactionName = "";
   this.currentWorkFactionDescription = "";
   this.createProgramName = "";
+  this.graftAugmentationName = "";
   this.className = "";
   this.workType = "";
 }
@@ -617,6 +618,10 @@ export function process(this: IPlayer, router: IRouter, numCycles = 1): void {
       if (this.workPartTime(numCycles)) {
         router.toCity();
       }
+    } else if (this.workType === CONSTANTS.WorkTypeGraftAugmentation) {
+      if (this.graftAugmentationWork(numCycles)) {
+        router.toGrafting();
+      }
     } else if (this.work(numCycles)) {
       router.toCity();
     }
@@ -1337,6 +1342,59 @@ export function finishCreateProgramWork(this: IPlayer, cancelled: boolean): stri
   this.resetWorkStatus();
   return "You've finished creating " + programName + "! The new program can be found on your home computer.";
 }
+
+export function startGraftAugmentationWork(this: IPlayer, augmentationName: string, time: number): void {
+  this.resetWorkStatus();
+  this.isWorking = true;
+  this.workType = CONSTANTS.WorkTypeGraftAugmentation;
+
+  this.timeNeededToCompleteWork = time;
+  this.graftAugmentationName = augmentationName;
+}
+
+export function craftAugmentationWork(this: IPlayer, numCycles: number): boolean {
+  let focusBonus = 1;
+  if (!this.hasAugmentation(AugmentationNames.NeuroreceptorManager)) {
+    focusBonus = this.focus ? 1 : CONSTANTS.BaseFocusBonus;
+  }
+
+  let skillMult = 1 + (this.getIntelligenceBonus(3) - 1) / 3;
+  skillMult *= focusBonus;
+
+  this.timeWorked += CONSTANTS._idleSpeed * numCycles;
+  this.timeWorkedGraftAugmentation += CONSTANTS._idleSpeed * numCycles * skillMult;
+
+  if (this.timeWorkedGraftAugmentation >= this.timeNeededToCompleteWork) {
+    this.finishGraftAugmentationWork(false);
+    return true;
+  }
+  return false;
+}
+
+export function finishGraftAugmentationWork(this: IPlayer, cancelled: boolean): string {
+  const augName = this.graftAugmentationName;
+  if (cancelled === false) {
+    dialogBoxCreate(
+      `You've finished crafting ${augName}.<br>The augmentation has been grafted to your body, but you feel a bit off.`,
+    );
+
+    applyAugmentation(Augmentations[augName]);
+    this.entropy += 1;
+    this.applyEntropy(this.entropy);
+  } else {
+    dialogBoxCreate(`You cancelled the crafting of ${augName}.<br>Your money was not returned to you.`);
+  }
+
+  // Intelligence gain
+  if (!cancelled) {
+    this.gainIntelligenceExp((CONSTANTS.IntelligenceGraftBaseExpGain * this.timeWorked) / 10000);
+  }
+
+  this.isWorking = false;
+  this.resetWorkStatus();
+  return `Grafting of ${augName} has ended.`;
+}
+
 /* Studying/Taking Classes */
 export function startClass(this: IPlayer, costMult: number, expMult: number, className: string): void {
   this.resetWorkStatus();
@@ -2654,7 +2712,7 @@ export function gotoLocation(this: IPlayer, to: LocationName): boolean {
   return true;
 }
 
-export function canAccessResleeving(this: IPlayer): boolean {
+export function canAccessGrafting(this: IPlayer): boolean {
   return this.bitNodeN === 10 || SourceFileFlags[10] > 0;
 }