merge v0.56.0

src/PersonObjects/IPlayer.ts

@@ -201,6 +201,7 @@ export interface IPlayer {
   inGang(): boolean;
   isQualified(company: Company, position: CompanyPosition): boolean;
   loseMoney(money: number): void;
+  process(router: IRouter, numCycles?: number): void;
   reapplyAllAugmentations(resetMultipliers?: boolean): void;
   reapplyAllSourceFiles(): void;
   regenerateHp(amt: number): void;

src/PersonObjects/Player/PlayerObject.ts

@@ -245,6 +245,7 @@ export class PlayerObject implements IPlayer {
   getIntelligenceBonus: (weight: number) => number;
   getCasinoWinnings: () => number;
   quitJob: (company: string) => void;
+  process: (router: IRouter, numCycles?: number) => void;
   createHacknetServer: () => HacknetServer;
   startCreateProgramWork: (router: IRouter, programName: string, time: number, reqLevel: number) => void;
   queueAugmentation: (augmentationName: string) => void;
@@ -507,6 +508,7 @@ export class PlayerObject implements IPlayer {
     this.getWorkAgiExpGain = generalMethods.getWorkAgiExpGain;
     this.getWorkChaExpGain = generalMethods.getWorkChaExpGain;
     this.getWorkRepGain = generalMethods.getWorkRepGain;
+    this.process = generalMethods.process;
     this.startCreateProgramWork = generalMethods.startCreateProgramWork;
     this.createProgramWork = generalMethods.createProgramWork;
     this.finishCreateProgramWork = generalMethods.finishCreateProgramWork;

src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx

@@ -77,7 +77,6 @@ export function init(this: IPlayer): void {
 }
 
 export function prestigeAugmentation(this: IPlayer): void {
-  const homeComp = this.getHomeComputer();
   this.currentServer = SpecialServers.Home;
 
   this.numPeopleKilled = 0;
@@ -453,6 +452,8 @@ export function gainIntelligenceExp(this: IPlayer, exp: number): void {
   if (SourceFileFlags[5] > 0 || this.intelligence > 0) {
     this.intelligence_exp += exp;
   }
+
+  this.intelligence = Math.floor(this.calculateSkill(this.intelligence_exp));
 }
 
 //Given a string expression like "str" or "strength", returns the given stat
@@ -574,6 +575,37 @@ export function startWork(this: IPlayer, router: IRouter, companyName: string):
   router.toWork();
 }
 
+export function process(this: IPlayer, router: IRouter, numCycles = 1): void {
+  // Working
+  if (this.isWorking) {
+    if (this.workType == CONSTANTS.WorkTypeFaction) {
+      if (this.workForFaction(numCycles)) {
+        router.toFaction();
+      }
+    } else if (this.workType == CONSTANTS.WorkTypeCreateProgram) {
+      if (this.createProgramWork(numCycles)) {
+        router.toTerminal();
+      }
+    } else if (this.workType == CONSTANTS.WorkTypeStudyClass) {
+      if (this.takeClass(numCycles)) {
+        router.toCity();
+      }
+    } else if (this.workType == CONSTANTS.WorkTypeCrime) {
+      if (this.commitCrime(numCycles)) {
+        router.toLocation(Locations[LocationName.Slums]);
+      }
+    } else if (this.workType == CONSTANTS.WorkTypeCompanyPartTime) {
+      if (this.workPartTime(numCycles)) {
+        router.toCity();
+      }
+    } else {
+      if (this.work(numCycles)) {
+        router.toCity();
+      }
+    }
+  }
+}
+
 export function cancelationPenalty(this: IPlayer): number {
   const server = GetServer(this.companyName);
   if (server instanceof Server) {

src/PersonObjects/Sleeve/Sleeve.ts

@@ -476,9 +476,9 @@ export class Sleeve extends Person {
       return null;
     }
 
-    let time = this.storedCycles * CONSTANTS.MilliPerCycle;
     let cyclesUsed = this.storedCycles;
     cyclesUsed = Math.min(cyclesUsed, 15);
+    let time = cyclesUsed * CONSTANTS.MilliPerCycle;
     if (this.currentTaskMaxTime !== 0 && this.currentTaskTime + time > this.currentTaskMaxTime) {
       time = this.currentTaskMaxTime - this.currentTaskTime;
       cyclesUsed = Math.floor(time / CONSTANTS.MilliPerCycle);
@@ -489,6 +489,7 @@ export class Sleeve extends Person {
         cyclesUsed = 0;
       }
     }
+
     this.currentTaskTime += time;
 
     // Shock gradually goes towards 100
@@ -846,7 +847,6 @@ export class Sleeve extends Person {
 
     this.currentTaskLocation = companyName;
     this.currentTask = SleeveTaskType.Company;
-    this.currentTaskMaxTime = CONSTANTS.MillisecondsPer8Hours;
 
     return true;
   }
@@ -906,7 +906,6 @@ export class Sleeve extends Person {
 
     this.currentTaskLocation = factionName;
     this.currentTask = SleeveTaskType.Faction;
-    this.currentTaskMaxTime = CONSTANTS.MillisecondsPer20Hours;
 
     return true;
   }