post-grafting changes

src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx

@@ -180,7 +180,7 @@ export function prestigeAugmentation(this: PlayerObject): void {
 }
 
 export function prestigeSourceFile(this: IPlayer): void {
-  this.entropyStacks = 0;
+  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)
@@ -528,12 +528,12 @@ export function resetWorkStatus(this: IPlayer, generalType?: string, group?: str
 
   this.timeWorked = 0;
   this.timeWorkedCreateProgram = 0;
-  this.timeWorkedCraftAugmentation = 0;
+  this.timeWorkedGraftAugmentation = 0;
 
   this.currentWorkFactionName = "";
   this.currentWorkFactionDescription = "";
   this.createProgramName = "";
-  this.craftAugmentationName = "";
+  this.graftAugmentationName = "";
   this.className = "";
   this.workType = "";
 }
@@ -610,8 +610,8 @@ export function process(this: IPlayer, router: IRouter, numCycles = 1): void {
       if (this.workPartTime(numCycles)) {
         router.toCity();
       }
-    } else if (this.workType === CONSTANTS.WorkTypeCraftAugmentation) {
-      if (this.craftAugmentationWork(numCycles)) {
+    } else if (this.workType === CONSTANTS.WorkTypeGraftAugmentation) {
+      if (this.graftAugmentationWork(numCycles)) {
         router.toGrafting();
       }
     } else if (this.work(numCycles)) {
@@ -1335,17 +1335,13 @@ export function finishCreateProgramWork(this: IPlayer, cancelled: boolean): stri
   return "You've finished creating " + programName + "! The new program can be found on your home computer.";
 }
 
-export function startCraftAugmentationWork(
-  this: IPlayer,
-  augmentationName: string,
-  time: number,
-): void {
-  this.resetWorkStatus()
+export function startGraftAugmentationWork(this: IPlayer, augmentationName: string, time: number): void {
+  this.resetWorkStatus();
   this.isWorking = true;
-  this.workType = CONSTANTS.WorkTypeCraftAugmentation;
+  this.workType = CONSTANTS.WorkTypeGraftAugmentation;
 
   this.timeNeededToCompleteWork = time;
-  this.craftAugmentationName = augmentationName;
+  this.graftAugmentationName = augmentationName;
 }
 
 export function craftAugmentationWork(this: IPlayer, numCycles: number): boolean {
@@ -1358,35 +1354,37 @@ export function craftAugmentationWork(this: IPlayer, numCycles: number): boolean
   skillMult *= focusBonus;
 
   this.timeWorked += CONSTANTS._idleSpeed * numCycles;
-  this.timeWorkedCraftAugmentation += CONSTANTS._idleSpeed * numCycles * skillMult;
+  this.timeWorkedGraftAugmentation += CONSTANTS._idleSpeed * numCycles * skillMult;
 
-  if (this.timeWorkedCraftAugmentation >= this.timeNeededToCompleteWork) {
-    this.finishCraftAugmentationWork(false);
+  if (this.timeWorkedGraftAugmentation >= this.timeNeededToCompleteWork) {
+    this.finishGraftAugmentationWork(false);
     return true;
   }
   return false;
 }
 
-export function finishCraftAugmentationWork(this: IPlayer, cancelled: boolean): string {
-  const augName = this.craftAugmentationName;
+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.`)
+    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.entropyStacks += 1;
-    this.applyEntropy(this.entropyStacks);
+    this.entropy += 1;
+    this.applyEntropy(this.entropy);
   } else {
-    dialogBoxCreate(`You cancelled the crafting of ${augName}.<br>Your money was not returned to you.`)
+    dialogBoxCreate(`You cancelled the crafting of ${augName}.<br>Your money was not returned to you.`);
   }
 
   // Intelligence gain
   if (!cancelled) {
-    this.gainIntelligenceExp((CONSTANTS.IntelligenceCraftBaseExpGain * this.timeWorked) / 10000);
+    this.gainIntelligenceExp((CONSTANTS.IntelligenceGraftBaseExpGain * this.timeWorked) / 10000);
   }
 
   this.isWorking = false;
   this.resetWorkStatus();
-  return `Crafting of ${augName} has ended.`
+  return `Grafting of ${augName} has ended.`;
 }
 
 /* Studying/Taking Classes */
@@ -1567,20 +1565,20 @@ export function finishCrime(this: IPlayer, cancelled: boolean): string {
         if (ws.disableLogs.ALL == null && ws.disableLogs.commitCrime == null) {
           ws.scriptRef.log(
             "SUCCESS: Crime successful! Gained " +
-            numeralWrapper.formatMoney(this.workMoneyGained) +
-            ", " +
-            numeralWrapper.formatExp(this.workHackExpGained) +
-            " hack exp, " +
-            numeralWrapper.formatExp(this.workStrExpGained) +
-            " str exp, " +
-            numeralWrapper.formatExp(this.workDefExpGained) +
-            " def exp, " +
-            numeralWrapper.formatExp(this.workDexExpGained) +
-            " dex exp, " +
-            numeralWrapper.formatExp(this.workAgiExpGained) +
-            " agi exp, " +
-            numeralWrapper.formatExp(this.workChaExpGained) +
-            " cha exp.",
+              numeralWrapper.formatMoney(this.workMoneyGained) +
+              ", " +
+              numeralWrapper.formatExp(this.workHackExpGained) +
+              " hack exp, " +
+              numeralWrapper.formatExp(this.workStrExpGained) +
+              " str exp, " +
+              numeralWrapper.formatExp(this.workDefExpGained) +
+              " def exp, " +
+              numeralWrapper.formatExp(this.workDexExpGained) +
+              " dex exp, " +
+              numeralWrapper.formatExp(this.workAgiExpGained) +
+              " agi exp, " +
+              numeralWrapper.formatExp(this.workChaExpGained) +
+              " cha exp.",
           );
         }
       } else {
@@ -1619,18 +1617,18 @@ export function finishCrime(this: IPlayer, cancelled: boolean): string {
         if (ws.disableLogs.ALL == null && ws.disableLogs.commitCrime == null) {
           ws.scriptRef.log(
             "FAIL: Crime failed! Gained " +
-            numeralWrapper.formatExp(this.workHackExpGained) +
-            " hack exp, " +
-            numeralWrapper.formatExp(this.workStrExpGained) +
-            " str exp, " +
-            numeralWrapper.formatExp(this.workDefExpGained) +
-            " def exp, " +
-            numeralWrapper.formatExp(this.workDexExpGained) +
-            " dex exp, " +
-            numeralWrapper.formatExp(this.workAgiExpGained) +
-            " agi exp, " +
-            numeralWrapper.formatExp(this.workChaExpGained) +
-            " cha exp.",
+              numeralWrapper.formatExp(this.workHackExpGained) +
+              " hack exp, " +
+              numeralWrapper.formatExp(this.workStrExpGained) +
+              " str exp, " +
+              numeralWrapper.formatExp(this.workDefExpGained) +
+              " def exp, " +
+              numeralWrapper.formatExp(this.workDexExpGained) +
+              " dex exp, " +
+              numeralWrapper.formatExp(this.workAgiExpGained) +
+              " agi exp, " +
+              numeralWrapper.formatExp(this.workChaExpGained) +
+              " cha exp.",
           );
         }
       } else {