From 6d8685296946476c3b5c3cf1b0a345a55f9df1ca Mon Sep 17 00:00:00 2001 From: borisflagell Date: Sat, 8 Oct 2022 17:19:20 +0300 Subject: [PATCH] FIX crime by sleeve Bitnode multiplier was applied twice in th UI. Sleeve's multiplier weren't applied (neither in UI, nor engine). --- .../Sleeve/Work/SleeveCrimeWork.ts | 18 +++++++++--------- src/PersonObjects/Sleeve/ui/StatsElement.tsx | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts b/src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts index 75d315452..e2b686c2d 100644 --- a/src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts +++ b/src/PersonObjects/Sleeve/Work/SleeveCrimeWork.ts @@ -25,16 +25,16 @@ export class SleeveCrimeWork extends Work { return crime; } - getExp(): WorkStats { + getExp(sleeve: Sleeve): WorkStats { const crime = this.getCrime(); return newWorkStats({ - money: crime.money * BitNodeMultipliers.CrimeMoney, - hackExp: crime.hacking_exp * BitNodeMultipliers.CrimeExpGain, - strExp: crime.strength_exp * BitNodeMultipliers.CrimeExpGain, - defExp: crime.defense_exp * BitNodeMultipliers.CrimeExpGain, - dexExp: crime.dexterity_exp * BitNodeMultipliers.CrimeExpGain, - agiExp: crime.agility_exp * BitNodeMultipliers.CrimeExpGain, - chaExp: crime.charisma_exp * BitNodeMultipliers.CrimeExpGain, + money: crime.money * BitNodeMultipliers.CrimeMoney * sleeve.mults.crime_money, + hackExp: crime.hacking_exp * BitNodeMultipliers.CrimeExpGain * sleeve.mults.hacking_exp, + strExp: crime.strength_exp * BitNodeMultipliers.CrimeExpGain * sleeve.mults.strength_exp, + defExp: crime.defense_exp * BitNodeMultipliers.CrimeExpGain * sleeve.mults.defense_exp, + dexExp: crime.dexterity_exp * BitNodeMultipliers.CrimeExpGain * sleeve.mults.dexterity_exp, + agiExp: crime.agility_exp * BitNodeMultipliers.CrimeExpGain * sleeve.mults.agility_exp, + chaExp: crime.charisma_exp * BitNodeMultipliers.CrimeExpGain * sleeve.mults.charisma_exp, intExp: crime.intelligence_exp * BitNodeMultipliers.CrimeExpGain, }); } @@ -47,7 +47,7 @@ export class SleeveCrimeWork extends Work { this.cyclesWorked += cycles; const crime = this.getCrime(); - let gains = this.getExp(); + let gains = this.getExp(sleeve); if (this.cyclesWorked >= this.cyclesNeeded()) { if (Math.random() < crime.successRate(sleeve)) { Player.karma -= crime.karma * sleeve.syncBonus(); diff --git a/src/PersonObjects/Sleeve/ui/StatsElement.tsx b/src/PersonObjects/Sleeve/ui/StatsElement.tsx index b257491fc..d9086fea3 100644 --- a/src/PersonObjects/Sleeve/ui/StatsElement.tsx +++ b/src/PersonObjects/Sleeve/ui/StatsElement.tsx @@ -97,15 +97,15 @@ export function EarningsElement(props: IProps): React.ReactElement { let data: (string | JSX.Element)[][] = []; if (isSleeveCrimeWork(props.sleeve.currentWork)) { - const gains = props.sleeve.currentWork.getExp(); + const gains = props.sleeve.currentWork.getExp(props.sleeve); data = [ [`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)}`], - [`Dexterity Exp:`, `${numeralWrapper.formatExp(5 * gains.dexExp * BitNodeMultipliers.CrimeExpGain)}`], - [`Agility Exp:`, `${numeralWrapper.formatExp(5 * gains.agiExp * BitNodeMultipliers.CrimeExpGain)}`], - [`Charisma Exp:`, `${numeralWrapper.formatExp(5 * gains.chaExp * BitNodeMultipliers.CrimeExpGain)}`], + [`Hacking Exp:`, `${numeralWrapper.formatExp(5 * gains.hackExp)}`], + [`Strength Exp:`, `${numeralWrapper.formatExp(5 * gains.strExp)}`], + [`Defense Exp:`, `${numeralWrapper.formatExp(5 * gains.defExp)}`], + [`Dexterity Exp:`, `${numeralWrapper.formatExp(5 * gains.dexExp)}`], + [`Agility Exp:`, `${numeralWrapper.formatExp(5 * gains.agiExp)}`], + [`Charisma Exp:`, `${numeralWrapper.formatExp(5 * gains.chaExp)}`], ]; } if (isSleeveClassWork(props.sleeve.currentWork)) {