diff --git a/src/NetscriptFunctions/Corporation.ts b/src/NetscriptFunctions/Corporation.ts index 27f9ab7a9..6d28ca518 100644 --- a/src/NetscriptFunctions/Corporation.ts +++ b/src/NetscriptFunctions/Corporation.ts @@ -705,7 +705,7 @@ export function NetscriptCorporation(player: IPlayer, workerScript: WorkerScript }, assignJob: (ctx: NetscriptContext) => - (_divisionName: unknown, _cityName: unknown, _employeeName: unknown, _job: unknown): Promise => { + (_divisionName: unknown, _cityName: unknown, _employeeName: unknown, _job: unknown): void => { checkAccess(ctx, 8); const divisionName = ctx.helper.string("divisionName", _divisionName); const cityName = ctx.helper.city("cityName", _cityName); @@ -715,14 +715,11 @@ export function NetscriptCorporation(player: IPlayer, workerScript: WorkerScript if (!Object.values(EmployeePositions).includes(job)) throw new Error(`'${job}' is not a valid job.`); const office = getOffice(divisionName, cityName); - return netscriptDelay(0, workerScript).then(function () { - return Promise.resolve(AssignJob(office, employeeName, job)); - }); - //return AssignJob(office, employeeName, job); + AssignJob(office, employeeName, job); }, setAutoJobAssignment: (ctx: NetscriptContext) => - (_divisionName: unknown, _cityName: unknown, _job: unknown, _amount: unknown): Promise => { + (_divisionName: unknown, _cityName: unknown, _job: unknown, _amount: unknown): boolean => { checkAccess(ctx, 8); const divisionName = ctx.helper.string("divisionName", _divisionName); const cityName = ctx.helper.city("cityName", _cityName); @@ -732,10 +729,7 @@ export function NetscriptCorporation(player: IPlayer, workerScript: WorkerScript if (!Object.values(EmployeePositions).includes(job)) throw new Error(`'${job}' is not a valid job.`); const office = getOffice(divisionName, cityName); - return netscriptDelay(0, workerScript).then(function () { - return Promise.resolve(AutoAssignJob(office, job, amount)); - }); - //return AutoAssignJob(office, job, amount); + return AutoAssignJob(office, job, amount); }, hireEmployee: (ctx: NetscriptContext) => diff --git a/src/ScriptEditor/NetscriptDefinitions.d.ts b/src/ScriptEditor/NetscriptDefinitions.d.ts index 01432f441..d8b5e575a 100644 --- a/src/ScriptEditor/NetscriptDefinitions.d.ts +++ b/src/ScriptEditor/NetscriptDefinitions.d.ts @@ -6618,9 +6618,8 @@ export interface OfficeAPI { * @param cityName - Name of the city * @param employeeName - name of the employee * @param job - Name of the job. - * @returns A promise that is fulfilled when the assignment is complete. */ - assignJob(divisionName: string, cityName: string, employeeName: string, job: string): Promise; + assignJob(divisionName: string, cityName: string, employeeName: string, job: string): void; /** * Hire an employee. * @param divisionName - Name of the division @@ -6708,9 +6707,9 @@ export interface OfficeAPI { * @param cityName - Name of the city * @param job - Name of the job * @param amount - Number of employees to assign to that job - * @returns A promise that is fulfilled when the assignment is complete. + * @returns true if the employee count reached the target amount, false if not */ - setAutoJobAssignment(divisionName: string, cityName: string, job: string, amount: number): Promise; + setAutoJobAssignment(divisionName: string, cityName: string, job: string, amount: number): boolean; /** * Cost to Upgrade office size. * @param divisionName - Name of the division