Fix #1889: Add skill progress to overview

Adds a progress bar for each stat to show how close to level up you are.

src/PersonObjects/IPlayer.ts

@@ -29,6 +29,7 @@ import { ICodingContractReward } from "../CodingContracts";
 import { IRouter } from "../ui/Router";
 import { WorkerScript } from "../Netscript/WorkerScript";
 import { HacknetServer } from "../Hacknet/HacknetServer";
+import { ISkillProgress } from "./formulas/skill";
 
 export interface IPlayer {
   // Class members
@@ -259,6 +260,7 @@ export interface IPlayer {
   prestigeAugmentation(): void;
   prestigeSourceFile(): void;
   calculateSkill(exp: number, mult?: number): number;
+  calculateSkillProgress(exp: number, mult?: number): ISkillProgress;
   resetWorkStatus(generalType?: string, group?: string, workType?: string): void;
   getWorkHackExpGain(): number;
   getWorkStrExpGain(): number;

src/PersonObjects/Player/PlayerObject.ts

@@ -34,6 +34,7 @@ import { CityName } from "../../Locations/data/CityNames";
 
 import { MoneySourceTracker } from "../../utils/MoneySourceTracker";
 import { Reviver, Generic_toJSON, Generic_fromJSON } from "../../utils/JSONReviver";
+import { ISkillProgress } from "../formulas/skill";
 
 export class PlayerObject implements IPlayer {
   // Class members
@@ -265,6 +266,7 @@ export class PlayerObject implements IPlayer {
   prestigeAugmentation: () => void;
   prestigeSourceFile: () => void;
   calculateSkill: (exp: number, mult?: number) => number;
+  calculateSkillProgress: (exp: number, mult?: number) => ISkillProgress;
   resetWorkStatus: (generalType?: string, group?: string, workType?: string) => void;
   getWorkHackExpGain: () => number;
   getWorkStrExpGain: () => number;
@@ -470,6 +472,7 @@ export class PlayerObject implements IPlayer {
     this.prestigeSourceFile = generalMethods.prestigeSourceFile;
     this.receiveInvite = generalMethods.receiveInvite;
     this.calculateSkill = generalMethods.calculateSkill;
+    this.calculateSkillProgress = generalMethods.calculateSkillProgress;
     this.updateSkillLevels = generalMethods.updateSkillLevels;
     this.resetMultipliers = generalMethods.resetMultipliers;
     this.hasProgram = generalMethods.hasProgram;

src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx

@@ -26,7 +26,7 @@ import { Locations } from "../../Locations/Locations";
 import { CityName } from "../../Locations/data/CityNames";
 import { LocationName } from "../../Locations/data/LocationNames";
 import { Sleeve } from "../../PersonObjects/Sleeve/Sleeve";
-import { calculateSkill as calculateSkillF } from "../formulas/skill";
+import { calculateSkill as calculateSkillF, calculateSkillProgress as calculateSkillProgressF, getEmptySkillProgress, ISkillProgress } from "../formulas/skill";
 import { calculateIntelligenceBonus } from "../formulas/intelligence";
 import {
   getHackingWorkRepGain,
@@ -226,6 +226,11 @@ export function calculateSkill(this: IPlayer, exp: number, mult = 1): number {
   return calculateSkillF(exp, mult);
 }
 
+//Calculates skill level progress based on experience. The same formula will be used for every skill
+export function calculateSkillProgress(this: IPlayer, exp: number, mult = 1): ISkillProgress {
+  return calculateSkillProgressF(exp, mult);
+}
+
 export function updateSkillLevels(this: IPlayer): void {
   this.hacking = Math.max(
     1,

src/PersonObjects/formulas/skill.ts

@@ -5,3 +5,37 @@ export function calculateSkill(exp: number, mult = 1): number {
 export function calculateExp(skill: number, mult = 1): number {
   return Math.exp((skill / mult + 200) / 32) - 534.6;
 }
+
+export function calculateSkillProgress(exp: number, mult = 1): ISkillProgress {
+  const currentSkill = calculateSkill(exp, mult);
+  const nextSkill = currentSkill + 1;
+  let baseExperience = calculateExp(currentSkill, mult);
+  if (baseExperience < 0) baseExperience = 0;
+  const nextExperience = calculateExp(nextSkill, mult)
+
+  return {
+    currentSkill,
+    nextSkill,
+    baseExperience,
+    experience: exp,
+    nextExperience,
+    progress: exp / nextExperience,
+  }
+}
+
+export interface ISkillProgress {
+  currentSkill: number;
+  nextSkill: number;
+  baseExperience: number;
+  experience: number;
+  nextExperience: number;
+  progress: number;
+}
+
+export function getEmptySkillProgress() {
+  return {
+    currentSkill: 0, nextSkill: 0,
+    baseExperience: 0, experience: 0, nextExperience: 0,
+    progress: 0,
+  };
+}