diff --git a/src/NetscriptFunctions/CodingContract.ts b/src/NetscriptFunctions/CodingContract.ts index 93cd1b7b2..a95dbe0ec 100644 --- a/src/NetscriptFunctions/CodingContract.ts +++ b/src/NetscriptFunctions/CodingContract.ts @@ -37,7 +37,7 @@ export function NetscriptCodingContract(): InternalAPI { throw new Error("The answer provided was not a number, string, or array"); // Convert answer to string. - const answerStr = typeof answer === 'string' ? answer : JSON.stringify(answer); + const answerStr = typeof answer === "string" ? answer : JSON.stringify(answer); const creward = contract.reward; if (creward === null) throw new Error("Somehow solved a contract that didn't have a reward"); diff --git a/src/PersonObjects/Sleeve/Work/SleeveBladeburnerWork.ts b/src/PersonObjects/Sleeve/Work/SleeveBladeburnerWork.ts index f99af453c..c4478e361 100644 --- a/src/PersonObjects/Sleeve/Work/SleeveBladeburnerWork.ts +++ b/src/PersonObjects/Sleeve/Work/SleeveBladeburnerWork.ts @@ -5,8 +5,6 @@ import { applySleeveGains, Work, WorkType } from "./Work"; import { CONSTANTS } from "../../../Constants"; import { GeneralActions } from "../../../Bladeburner/data/GeneralActions"; import { WorkStats } from "../../../Work/WorkStats"; -import { Contract } from "src/Bladeburner/Contract"; -import { Contracts } from "src/Bladeburner/data/Contracts"; interface SleeveBladeburnerWorkParams { type: string; @@ -38,20 +36,20 @@ export class SleeveBladeburnerWork extends Work { this.cyclesWorked += cycles; const actionIdent = player.bladeburner.getActionIdFromTypeAndName(this.actionType, this.actionName); if (!actionIdent) throw new Error(`Error getting ${this.actionName} action`); - if (this.actionType === "Contracts"){ - const action=player.bladeburner.getActionObject(actionIdent); + if (this.actionType === "Contracts") { + const action = player.bladeburner.getActionObject(actionIdent); if (!action) throw new Error(`Error getting ${this.actionName} action object`); - if (action.count<=0){ + if (action.count <= 0) { sleeve.stopWork(player); return 0; } } while (this.cyclesWorked > this.cyclesNeeded(player, sleeve)) { - if (this.actionType === "Contracts"){ - const action=player.bladeburner.getActionObject(actionIdent); + if (this.actionType === "Contracts") { + const action = player.bladeburner.getActionObject(actionIdent); if (!action) throw new Error(`Error getting ${this.actionName} action object`); - if (action.count<=0){ + if (action.count <= 0) { sleeve.stopWork(player); return 0; } @@ -63,7 +61,7 @@ export class SleeveBladeburnerWork extends Work { if (!exp) throw new Error(`Somehow there was no exp for action ${this.actionType} ${this.actionName}`); applySleeveGains(player, sleeve, exp, 1); } - if (retValue.money>0)player.gainMoney(retValue.money,"sleeves") + if (retValue.money > 0) player.gainMoney(retValue.money, "sleeves"); this.cyclesWorked -= this.cyclesNeeded(player, sleeve); } return 0; diff --git a/src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts b/src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts index 3c4dc435a..000f7b881 100644 --- a/src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts +++ b/src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts @@ -64,7 +64,7 @@ export class SleeveCrimeWork extends Work { APICopy(): Record { return { type: this.type, - name: this.crimeType + crimeType : this.crimeType, }; } diff --git a/src/PersonObjects/Sleeve/Work/SleeveFactionWork.ts b/src/PersonObjects/Sleeve/Work/SleeveFactionWork.ts index a18793e25..398374f37 100644 --- a/src/PersonObjects/Sleeve/Work/SleeveFactionWork.ts +++ b/src/PersonObjects/Sleeve/Work/SleeveFactionWork.ts @@ -44,7 +44,11 @@ export class SleeveFactionWork extends Work { [FactionWorkType.FIELD]: getFactionFieldWorkRepGain, [FactionWorkType.SECURITY]: getFactionSecurityWorkRepGain, }; - return repFormulas[this.factionWorkType](sleeve, faction.favor) * sleeve.shockBonus(); + return ( + repFormulas[this.factionWorkType](sleeve, faction.favor) * + sleeve.shockBonus() * + BitNodeMultipliers.FactionWorkRepGain + ); } getFaction(): Faction { diff --git a/src/PersonObjects/Sleeve/ui/StatsElement.tsx b/src/PersonObjects/Sleeve/ui/StatsElement.tsx index 34abeb3d0..542988092 100644 --- a/src/PersonObjects/Sleeve/ui/StatsElement.tsx +++ b/src/PersonObjects/Sleeve/ui/StatsElement.tsx @@ -101,7 +101,7 @@ export function EarningsElement(props: IProps): React.ReactElement { if (isSleeveCrimeWork(props.sleeve.currentWork)) { const gains = props.sleeve.currentWork.getExp(); data = [ - [`Money:`, ], + [`Money:`, ], [`Hacking Exp:`, `${numeralWrapper.formatExp(5 * gains.hackExp * BitNodeMultipliers.CrimeExpGain)}`], [`Strength Exp:`, `${numeralWrapper.formatExp(5 * gains.strExp * BitNodeMultipliers.CrimeExpGain)}`], [`Defense Exp:`, `${numeralWrapper.formatExp(5 * gains.defExp * BitNodeMultipliers.CrimeExpGain)}`], @@ -114,25 +114,25 @@ export function EarningsElement(props: IProps): React.ReactElement { const rates = props.sleeve.currentWork.calculateRates(player, props.sleeve); data = [ [`Money:`, ], - [`Hacking Exp:`, `${numeralWrapper.formatExp(5 * rates.hackExp * BitNodeMultipliers.ClassGymExpGain)} / sec`], - [`Strength Exp:`, `${numeralWrapper.formatExp(5 * rates.strExp * BitNodeMultipliers.ClassGymExpGain)} / sec`], - [`Defense Exp:`, `${numeralWrapper.formatExp(5 * rates.defExp * BitNodeMultipliers.ClassGymExpGain)} / sec`], - [`Dexterity Exp:`, `${numeralWrapper.formatExp(5 * rates.dexExp * BitNodeMultipliers.ClassGymExpGain)} / sec`], - [`Agility Exp:`, `${numeralWrapper.formatExp(5 * rates.agiExp * BitNodeMultipliers.ClassGymExpGain)} / sec`], - [`Charisma Exp:`, `${numeralWrapper.formatExp(5 * rates.chaExp * BitNodeMultipliers.ClassGymExpGain)} / sec`], + [`Hacking Exp:`, `${numeralWrapper.formatExp(5 * rates.hackExp)} / sec`], + [`Strength Exp:`, `${numeralWrapper.formatExp(5 * rates.strExp)} / sec`], + [`Defense Exp:`, `${numeralWrapper.formatExp(5 * rates.defExp)} / sec`], + [`Dexterity Exp:`, `${numeralWrapper.formatExp(5 * rates.dexExp)} / sec`], + [`Agility Exp:`, `${numeralWrapper.formatExp(5 * rates.agiExp)} / sec`], + [`Charisma Exp:`, `${numeralWrapper.formatExp(5 * rates.chaExp)} / sec`], ]; } if (isSleeveFactionWork(props.sleeve.currentWork)) { const rates = props.sleeve.currentWork.getExpRates(props.sleeve); const repGain = props.sleeve.currentWork.getReputationRate(props.sleeve); data = [ - [`Hacking Exp:`, `${numeralWrapper.formatExp(5 * rates.hackExp * BitNodeMultipliers.FactionWorkExpGain)} / sec`], - [`Strength Exp:`, `${numeralWrapper.formatExp(5 * rates.strExp * BitNodeMultipliers.FactionWorkExpGain)} / sec`], - [`Defense Exp:`, `${numeralWrapper.formatExp(5 * rates.defExp * BitNodeMultipliers.FactionWorkExpGain)} / sec`], - [`Dexterity Exp:`, `${numeralWrapper.formatExp(5 * rates.dexExp * BitNodeMultipliers.FactionWorkExpGain)} / sec`], - [`Agility Exp:`, `${numeralWrapper.formatExp(5 * rates.agiExp * BitNodeMultipliers.FactionWorkExpGain)} / sec`], - [`Charisma Exp:`, `${numeralWrapper.formatExp(5 * rates.chaExp * BitNodeMultipliers.FactionWorkExpGain)} / sec`], - [`Reputation:`, ], + [`Hacking Exp:`, `${numeralWrapper.formatExp(5 * rates.hackExp)} / sec`], + [`Strength Exp:`, `${numeralWrapper.formatExp(5 * rates.strExp)} / sec`], + [`Defense Exp:`, `${numeralWrapper.formatExp(5 * rates.defExp)} / sec`], + [`Dexterity Exp:`, `${numeralWrapper.formatExp(5 * rates.dexExp)} / sec`], + [`Agility Exp:`, `${numeralWrapper.formatExp(5 * rates.agiExp)} / sec`], + [`Charisma Exp:`, `${numeralWrapper.formatExp(5 * rates.chaExp)} / sec`], + [`Reputation:`, ], ]; } @@ -140,12 +140,12 @@ export function EarningsElement(props: IProps): React.ReactElement { const rates = props.sleeve.currentWork.getGainRates(player, props.sleeve); data = [ [`Money:`, ], - [`Hacking Exp:`, `${numeralWrapper.formatExp(5 * rates.hackExp * BitNodeMultipliers.CompanyWorkExpGain)} / sec`], - [`Strength Exp:`, `${numeralWrapper.formatExp(5 * rates.strExp * BitNodeMultipliers.CompanyWorkExpGain)} / sec`], - [`Defense Exp:`, `${numeralWrapper.formatExp(5 * rates.defExp * BitNodeMultipliers.CompanyWorkExpGain)} / sec`], - [`Dexterity Exp:`, `${numeralWrapper.formatExp(5 * rates.dexExp * BitNodeMultipliers.CompanyWorkExpGain)} / sec`], - [`Agility Exp:`, `${numeralWrapper.formatExp(5 * rates.agiExp * BitNodeMultipliers.CompanyWorkExpGain)} / sec`], - [`Charisma Exp:`, `${numeralWrapper.formatExp(5 * rates.chaExp * BitNodeMultipliers.CompanyWorkExpGain)} / sec`], + [`Hacking Exp:`, `${numeralWrapper.formatExp(5 * rates.hackExp)} / sec`], + [`Strength Exp:`, `${numeralWrapper.formatExp(5 * rates.strExp)} / sec`], + [`Defense Exp:`, `${numeralWrapper.formatExp(5 * rates.defExp)} / sec`], + [`Dexterity Exp:`, `${numeralWrapper.formatExp(5 * rates.dexExp)} / sec`], + [`Agility Exp:`, `${numeralWrapper.formatExp(5 * rates.agiExp)} / sec`], + [`Charisma Exp:`, `${numeralWrapper.formatExp(5 * rates.chaExp)} / sec`], [`Reputation:`, ], ]; }