Merge branch 'dev' into feature/add-back-api-export

This commit is contained in:
hydroflame
2022-09-23 00:34:19 -03:00
committed by GitHub
16 changed files with 66 additions and 37 deletions

View File

@@ -55,6 +55,7 @@ import { FactionWorkType } from "../Work/data/FactionWorkType";
import { CompanyWork } from "../Work/CompanyWork";
import { canGetBonus, onExport } from "../ExportBonus";
import { saveObject } from "../SaveObject";
import { calculateCrimeWorkStats } from "../Work/formulas/Crime";
export function NetscriptSingularity(): InternalAPI<ISingularity> {
const getAugmentation = function (ctx: NetscriptContext, name: string): Augmentation {
@@ -1210,7 +1211,19 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
throw helpers.makeRuntimeErrorMsg(ctx, `Invalid crime: ${crimeRoughName}`);
}
return Object.assign({}, crime);
const crimeStatsWithMultipliers = calculateCrimeWorkStats(crime);
return Object.assign({}, crime, {
money: crimeStatsWithMultipliers.money,
reputation: crimeStatsWithMultipliers.reputation,
hacking_exp: crimeStatsWithMultipliers.hackExp,
strength_exp: crimeStatsWithMultipliers.strExp,
defense_exp: crimeStatsWithMultipliers.defExp,
dexterity_exp: crimeStatsWithMultipliers.dexExp,
agility_exp: crimeStatsWithMultipliers.agiExp,
charisma_exp: crimeStatsWithMultipliers.chaExp,
intelligence_exp: crimeStatsWithMultipliers.intExp,
});
},
getDarkwebPrograms: (ctx: NetscriptContext) =>
function (): string[] {