From c2af87a769c5bd9455dcef9a5356bd944851c07c Mon Sep 17 00:00:00 2001 From: Snarling <84951833+Snarling@users.noreply.github.com> Date: Mon, 29 Aug 2022 04:02:38 -0400 Subject: [PATCH 1/2] sleevesQuitToo --- src/PersonObjects/Player/PlayerObjectGeneralMethods.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts b/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts index 1f46cb368..046591c21 100644 --- a/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts +++ b/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts @@ -23,6 +23,7 @@ import { Locations } from "../../Locations/Locations"; import { CityName } from "../../Locations/data/CityNames"; import { LocationName } from "../../Locations/data/LocationNames"; import { Sleeve } from "../Sleeve/Sleeve"; +import { SleeveCompanyWork } from "../Sleeve/Work/SleeveCompanyWork"; import { calculateSkill as calculateSkillF, calculateSkillProgress as calculateSkillProgressF, @@ -593,6 +594,11 @@ export function quitJob(this: IPlayer, company: string): void { if (isCompanyWork(this.currentWork) && this.currentWork.companyName === company) { this.finishWork(true); } + for (const sleeve of this.sleeves) { + if (sleeve.currentWork instanceof SleeveCompanyWork && sleeve.currentWork.companyName === company){ + sleeve.currentWork.finish(this); + } + } delete this.jobs[company]; } From 9d942f339359b5f5fa524cbab64239c336f68231 Mon Sep 17 00:00:00 2001 From: Snarling <84951833+Snarling@users.noreply.github.com> Date: Mon, 29 Aug 2022 04:12:02 -0400 Subject: [PATCH 2/2] sleevesActuallyQuitToo --- src/PersonObjects/Player/PlayerObjectGeneralMethods.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts b/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts index 046591c21..b8fc21335 100644 --- a/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts +++ b/src/PersonObjects/Player/PlayerObjectGeneralMethods.ts @@ -596,7 +596,8 @@ export function quitJob(this: IPlayer, company: string): void { } for (const sleeve of this.sleeves) { if (sleeve.currentWork instanceof SleeveCompanyWork && sleeve.currentWork.companyName === company){ - sleeve.currentWork.finish(this); + sleeve.stopWork(this); + dialogBoxCreate(`You quit ${company} while one of your sleeves was working there. The sleeve is now idle.`) } } delete this.jobs[company];