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

Further improvements to cultist circle

Browse Source
This commit is contained in:
Dev 2024-08-22 16:32:27 +01:00
parent c5793f1724
commit eccf4ee969
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
project/src/helpers/HideoutHelper.ts
View File

@ -32,6 +32,7 @@ import { inject, injectable } from "tsyringe";
@injectable() @injectable()
export class HideoutHelper { export class HideoutHelper {
public static bitcoinFarm = "5d5c205bd582a50d042a3c0e"; public static bitcoinFarm = "5d5c205bd582a50d042a3c0e";
public static cultistCircleCraftId = "66827062405f392b203a44cf";
public static bitcoinProductionId = "5d5c205bd582a50d042a3c0e"; public static bitcoinProductionId = "5d5c205bd582a50d042a3c0e";
public static waterCollector = "5d5589c1f934db045e6c5492"; public static waterCollector = "5d5589c1f934db045e6c5492";
public static maxSkillPoint = 5000; public static maxSkillPoint = 5000;
@ -283,8 +284,11 @@ export class HideoutHelper {
craft.Progress = 0; craft.Progress = 0;
} }
// Craft complete, skip processing (Don't skip continious crafts like bitcoin farm) // Craft complete, skip processing (Don't skip continious crafts like bitcoin farm or cultist circle)
if (craft.Progress >= craft.ProductionTime && prodId !== HideoutHelper.bitcoinFarm) { if (
craft.Progress >= craft.ProductionTime &&
![HideoutHelper.bitcoinFarm, HideoutHelper.cultistCircleCraftId].includes(prodId)
) {
continue; continue;
} }
@ -378,18 +382,29 @@ export class HideoutHelper {
} }
} }
protected updateCultistCircleCraftProgress(pmcData: IPmcData, prodId: string) { protected updateCultistCircleCraftProgress(pmcData: IPmcData, prodId: string): void {
// Production is complete, no need to do any calculations const production = pmcData.Hideout.Production[prodId];
if (this.doesProgressMatchProductionTime(pmcData, prodId)) {
// Check if we're already complete, skip
if (production.AvailableForFinish) {
return; return;
} }
// Get seconds since last hideout update and now // Get seconds since last hideout update
const timeElapsedSeconds = this.timeUtil.getTimestamp() - pmcData.Hideout.sptUpdateLastRunTimestamp; const timeElapsedSeconds = this.timeUtil.getTimestamp() - pmcData.Hideout.sptUpdateLastRunTimestamp;
// Increment progress by time passed // Increment progress by time passed if progress is less than time needed
const production = pmcData.Hideout.Production[prodId]; if (production.Progress < production.ProductionTime) {
production.Progress += timeElapsedSeconds; production.Progress += timeElapsedSeconds;
return;
}
// Craft is complete, flas as such
production.AvailableForFinish = true;
// Reset progress so its not over production time
production.Progress = production.ProductionTime;
} }
/** /**