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

Add Production object if none exists prior to adding a production to it + Move functions around for consistency

Browse Source
This commit is contained in:
Dev 2023-07-31 19:18:29 +01:00
parent c24e8d9858
commit 11acbbc0f2
1 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,6 +84,10 @@ export class HideoutHelper
// @Important: Here we need to be very exact: // @Important: Here we need to be very exact:
// - normal recipe: Production time value is stored in attribute "productionType" with small "p" // - normal recipe: Production time value is stored in attribute "productionType" with small "p"
// - scav case recipe: Production time value is stored in attribute "ProductionType" with capital "P" // - scav case recipe: Production time value is stored in attribute "ProductionType" with capital "P"
if (!pmcData.Hideout.Production)
{
pmcData.Hideout.Production = {};
}
pmcData.Hideout.Production[body.recipeId] = this.initProduction(body.recipeId, modifiedProductionTime); pmcData.Hideout.Production[body.recipeId] = this.initProduction(body.recipeId, modifiedProductionTime);
} }
@ -226,6 +230,18 @@ export class HideoutHelper
return hideoutProperties; return hideoutProperties;
} }
protected doesWaterCollectorHaveFilter(waterCollector: HideoutArea): boolean
{
if (waterCollector.level === 3) // can put filters in from L3
{
// Has filter in at least one slot
return waterCollector.slots.some(x => x.item);
}
// No Filter
return false;
}
/** /**
* Update progress timer for water collector * Update progress timer for water collector
@ -380,46 +396,6 @@ export class HideoutHelper
} }
} }
protected updateWaterCollector(sessionId: string, pmcData: IPmcData, area: HideoutArea, isGeneratorOn: boolean): void
{
// Skip water collector when not level 3
if (area.level !== 3)
{
return;
}
const prod = pmcData.Hideout.Production[HideoutHelper.waterCollector];
if (prod && this.isProduction(prod))
{
area = this.updateWaterFilters(area, prod, isGeneratorOn, pmcData);
}
else
{
// continuousProductionStart()
// seem to not trigger consistently
const recipe: IHideoutSingleProductionStartRequestData = {
recipeId: HideoutHelper.waterCollector,
Action: "HideoutSingleProductionStart",
items: [],
timestamp: this.timeUtil.getTimestamp()
};
this.registerProduction(pmcData, recipe, sessionId);
}
}
protected doesWaterCollectorHaveFilter(waterCollector: HideoutArea): boolean
{
if (waterCollector.level === 3) // can put filters in from L3
{
// Has filter in at least one slot
return waterCollector.slots.some(x => x.item);
}
// No Filter
return false;
}
protected updateFuel(generatorArea: HideoutArea, pmcData: IPmcData): void protected updateFuel(generatorArea: HideoutArea, pmcData: IPmcData): void
{ {
// 1 resource last 14 min 27 sec, 1/14.45/60 = 0.00115 // 1 resource last 14 min 27 sec, 1/14.45/60 = 0.00115
@ -495,6 +471,35 @@ export class HideoutHelper
} }
} }
protected updateWaterCollector(sessionId: string, pmcData: IPmcData, area: HideoutArea, isGeneratorOn: boolean): void
{
// Skip water collector when not level 3 (cant collect until 3)
if (area.level !== 3)
{
return;
}
// Canister with purified water craft exists
const prod = pmcData.Hideout.Production[HideoutHelper.waterCollector];
if (prod && this.isProduction(prod))
{
area = this.updateWaterFilters(area, prod, isGeneratorOn, pmcData);
}
else
{
// continuousProductionStart()
// seem to not trigger consistently
const recipe: IHideoutSingleProductionStartRequestData = {
recipeId: HideoutHelper.waterCollector,
Action: "HideoutSingleProductionStart",
items: [],
timestamp: this.timeUtil.getTimestamp()
};
this.registerProduction(pmcData, recipe, sessionId);
}
}
/** /**
* Adjust water filter objects resourceValue or delete when they reach 0 resource * Adjust water filter objects resourceValue or delete when they reach 0 resource
* @param waterFilterArea water filter area to update * @param waterFilterArea water filter area to update
@ -520,6 +525,7 @@ export class HideoutHelper
if (production.Progress < productionTime) if (production.Progress < productionTime)
{ {
// Check all slots that take water filters // Check all slots that take water filters
// Must loop to find first water filter and use that
for (let i = 0; i < waterFilterArea.slots.length; i++) for (let i = 0; i < waterFilterArea.slots.length; i++)
{ {
// Has a water filter installed into slot // Has a water filter installed into slot
@ -551,8 +557,10 @@ export class HideoutHelper
// Filter has some juice left in it // Filter has some juice left in it
if (resourceValue > 0) if (resourceValue > 0)
{ {
// Set filter consumed amount
waterFilterArea.slots[i].item[0].upd = this.getAreaUpdObject(1, resourceValue, pointsConsumed); waterFilterArea.slots[i].item[0].upd = this.getAreaUpdObject(1, resourceValue, pointsConsumed);
this.logger.debug(`Water filter: ${resourceValue} filter left on slot ${i + 1}`); this.logger.debug(`Water filter: ${resourceValue} filter left on slot ${i + 1}`);
break; // Break here to avoid updating all filters break; // Break here to avoid updating all filters
} }