470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup of handleQTEEventOutcome()

Browse Source
This commit is contained in:
Dev 2024-10-15 12:55:00 +01:00
parent 4a1c4be0e9
commit 51bafeebfc
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
project/src/controllers/HideoutController.ts
View File

@ -24,7 +24,7 @@ import { IHideoutTakeItemOutRequestData } from "@spt/models/eft/hideout/IHideout
import { IHideoutTakeProductionRequestData } from "@spt/models/eft/hideout/IHideoutTakeProductionRequestData"; import { IHideoutTakeProductionRequestData } from "@spt/models/eft/hideout/IHideoutTakeProductionRequestData";
import { IHideoutToggleAreaRequestData } from "@spt/models/eft/hideout/IHideoutToggleAreaRequestData"; import { IHideoutToggleAreaRequestData } from "@spt/models/eft/hideout/IHideoutToggleAreaRequestData";
import { IHideoutUpgradeRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeRequestData"; import { IHideoutUpgradeRequestData } from "@spt/models/eft/hideout/IHideoutUpgradeRequestData";
import { IQteData } from "@spt/models/eft/hideout/IQteData"; import { IQteData, IQteResult } from "@spt/models/eft/hideout/IQteData";
import { IRecordShootingRangePoints } from "@spt/models/eft/hideout/IRecordShootingRangePoints"; import { IRecordShootingRangePoints } from "@spt/models/eft/hideout/IRecordShootingRangePoints";
import { IAddItemDirectRequest } from "@spt/models/eft/inventory/IAddItemDirectRequest"; import { IAddItemDirectRequest } from "@spt/models/eft/inventory/IAddItemDirectRequest";
import { IAddItemsDirectRequest } from "@spt/models/eft/inventory/IAddItemsDirectRequest"; import { IAddItemsDirectRequest } from "@spt/models/eft/inventory/IAddItemsDirectRequest";
@ -1175,11 +1175,6 @@ export class HideoutController {
} }
} }
const hasMildPain = !!pmcData.Health.BodyParts.Chest.Effects?.MildMusclePain;
// Should never happen
const hasSeverePain = !!pmcData.Health.BodyParts.Chest.Effects?.SevereMusclePain;
if (pmcData.Health.Energy.Current < 1) { if (pmcData.Health.Energy.Current < 1) {
pmcData.Health.Energy.Current = 1; pmcData.Health.Energy.Current = 1;
} }
@ -1188,12 +1183,26 @@ export class HideoutController {
pmcData.Health.Hydration.Current = 1; pmcData.Health.Hydration.Current = 1;
} }
this.handleMusclePain(pmcData, relevantQte.results.finishEffect);
}
/**
* Apply mild/severe muscle pain after gym use
* @param pmcData Profile to apply effect to
* @param finishEffect Effect data to apply after completing QTE gym event
*/
protected handleMusclePain(pmcData: IPmcData, finishEffect: IQteResult): void {
const hasMildPain = !!pmcData.Health.BodyParts.Chest.Effects?.MildMusclePain;
// Should never happen
const hasSeverePain = !!pmcData.Health.BodyParts.Chest.Effects?.SevereMusclePain;
// Has no muscle pain at all, add mild // Has no muscle pain at all, add mild
if (!hasMildPain && !hasSeverePain) { if (!hasMildPain && !hasSeverePain) {
// nullguard // nullguard
pmcData.Health.BodyParts.Chest.Effects ||= {}; pmcData.Health.BodyParts.Chest.Effects ||= {};
pmcData.Health.BodyParts.Chest.Effects.MildMusclePain = { pmcData.Health.BodyParts.Chest.Effects.MildMusclePain = {
Time: relevantQte.results.finishEffect.rewardsRange[0].time, // TODO - remove hard coded access, get value properly Time: finishEffect.rewardsRange[0].time, // TODO - remove hard coded access, get value properly
}; };
} }
@ -1202,7 +1211,7 @@ export class HideoutController {
delete pmcData.Health.BodyParts.Chest.Effects.MildMusclePain; delete pmcData.Health.BodyParts.Chest.Effects.MildMusclePain;
pmcData.Health.BodyParts.Chest.Effects.SevereMusclePain = { pmcData.Health.BodyParts.Chest.Effects.SevereMusclePain = {
Time: relevantQte.results.finishEffect.rewardsRange[0].time, Time: finishEffect.rewardsRange[0].time,
}; };
} }
} }