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

Cleanup of updateFuel()

Browse Source 
Make function calculate drain rate for the whole period since last update ran, not just the interval period in config
Look up max fuel storage of item instead of assuming its expeditionary or the other fuel container

Reduce nesting by inventing an if
This commit is contained in:
Dev 2024-01-29 15:55:43 +00:00
parent a9517bb1cc
commit ad0489a9e7
1 changed files with 64 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
import { inject, injectable } from "tsyringe"; import { inject, injectable } from "tsyringe";
import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper"; import { InventoryHelper } from "@spt-aki/helpers/InventoryHelper";
import { ItemHelper } from "@spt-aki/helpers/ItemHelper";
import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper";
import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; import { IPmcData } from "@spt-aki/models/eft/common/IPmcData";
import { HideoutArea, IHideoutImprovement, Production, Productive } from "@spt-aki/models/eft/common/tables/IBotBase"; import { HideoutArea, IHideoutImprovement, Production, Productive } from "@spt-aki/models/eft/common/tables/IBotBase";
@ -49,6 +50,7 @@ export class HideoutHelper
@inject("InventoryHelper") protected inventoryHelper: InventoryHelper, @inject("InventoryHelper") protected inventoryHelper: InventoryHelper,
@inject("PlayerService") protected playerService: PlayerService, @inject("PlayerService") protected playerService: PlayerService,
@inject("LocalisationService") protected localisationService: LocalisationService, @inject("LocalisationService") protected localisationService: LocalisationService,
@inject("ItemHelper") protected itemHelper: ItemHelper,
@inject("ConfigServer") protected configServer: ConfigServer, @inject("ConfigServer") protected configServer: ConfigServer,
) )
{ {
@ -388,7 +390,7 @@ export class HideoutHelper
case HideoutAreas.GENERATOR: case HideoutAreas.GENERATOR:
if (hideoutProperties.isGeneratorOn) if (hideoutProperties.isGeneratorOn)
{ {
this.updateFuel(area, pmcData); this.updateFuel(area, pmcData, hideoutProperties.isGeneratorOn);
} }
break; break;
case HideoutAreas.WATER_COLLECTOR: case HideoutAreas.WATER_COLLECTOR:
@ -405,16 +407,23 @@ export class HideoutHelper
} }
} }
protected updateFuel(generatorArea: HideoutArea, pmcData: IPmcData): void /**
* Decrease fuel from generator slots based on amount of time since last time this occured
* @param generatorArea Hideout area
* @param pmcData Player profile
* @param isGeneratorOn Is the generator turned on since last update
*/
protected updateFuel(generatorArea: HideoutArea, pmcData: IPmcData, isGeneratorOn: boolean): 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
// 10-10-2021 From wiki, 1 resource last 12 minutes 38 seconds, 1/12.63333/60 = 0.00131 // 10-10-2021 From wiki, 1 resource last 12 minutes 38 seconds, 1/12.63333/60 = 0.00131
let fuelDrainRate = this.databaseServer.getTables().hideout.settings.generatorFuelFlowRate let fuelDrainRate = this.databaseServer.getTables().hideout.settings.generatorFuelFlowRate
* this.hideoutConfig.runIntervalSeconds; * this.getTimeElapsedSinceLastServerTick(pmcData, isGeneratorOn);
// implemented moddable bonus for fuel consumption bonus instead of using solar power variable as before
const fuelBonus = pmcData.Bonuses.find((bonus) => bonus.type === BonusType.FUEL_CONSUMPTION); const fuelBonus = pmcData.Bonuses.find((bonus) => bonus.type === BonusType.FUEL_CONSUMPTION);
const fuelBonusPercent = 1.0 - (fuelBonus ? Math.abs(fuelBonus.value) : 0) / 100; const fuelBonusPercent = 1.0 - (fuelBonus ? Math.abs(fuelBonus.value) : 0) / 100;
fuelDrainRate *= fuelBonusPercent; fuelDrainRate *= fuelBonusPercent;
// Hideout management resource consumption bonus: // Hideout management resource consumption bonus:
const hideoutManagementConsumptionBonus = 1.0 - this.getHideoutManagementConsumptionBonus(pmcData); const hideoutManagementConsumptionBonus = 1.0 - this.getHideoutManagementConsumptionBonus(pmcData);
fuelDrainRate *= hideoutManagementConsumptionBonus; fuelDrainRate *= hideoutManagementConsumptionBonus;
@ -423,58 +432,61 @@ export class HideoutHelper
for (let i = 0; i < generatorArea.slots.length; i++) for (let i = 0; i < generatorArea.slots.length; i++)
{ {
if (generatorArea.slots[i].item) const fuelItemInSlot = generatorArea.slots[i].item[0];
{ if (!fuelItemInSlot)
let resourceValue = (generatorArea.slots[i].item[0].upd?.Resource)
? generatorArea.slots[i].item[0].upd.Resource.Value
: null;
if (resourceValue === 0)
{ {
// No item in slot, skip
continue; continue;
} }
else if (!resourceValue)
let fuelRemaining = fuelItemInSlot.upd?.Resource?.Value;
if (fuelRemaining === 0)
{ {
const fuelItem = HideoutHelper.expeditionaryFuelTank; // No fuel left, skip
resourceValue = generatorArea.slots[i].item[0]._tpl === fuelItem continue;
? 60 - fuelDrainRate }
: 100 - fuelDrainRate;
// Undefined fuel, fresh fuel item and needs its max fuel amount looked up
if (!fuelRemaining)
{
const fuelItemTemplate = this.itemHelper.getItem(fuelItemInSlot._tpl)[1];
pointsConsumed = fuelDrainRate; pointsConsumed = fuelDrainRate;
fuelRemaining = fuelItemTemplate._props.MaxResource - fuelDrainRate;
} }
else else
{ {
pointsConsumed = (generatorArea.slots[i].item[0].upd.Resource.UnitsConsumed || 0) + fuelDrainRate; // Fuel exists already, deduct fuel from item remaining value
resourceValue -= fuelDrainRate; pointsConsumed = (fuelItemInSlot.upd.Resource.UnitsConsumed || 0) + fuelDrainRate;
fuelRemaining -= fuelDrainRate;
} }
resourceValue = Math.round(resourceValue * 10000) / 10000; fuelRemaining = Math.round(fuelRemaining * 10000) / 10000;
pointsConsumed = Math.round(pointsConsumed * 10000) / 10000; pointsConsumed = Math.round(pointsConsumed * 10000) / 10000;
// check unit consumed for increment skill point // Fuel consumed / 10 is over 1, add hideout management skill point
if (pmcData && Math.floor(pointsConsumed / 10) >= 1) if (pmcData && Math.floor(pointsConsumed / 10) >= 1)
{ {
this.profileHelper.addSkillPointsToPlayer(pmcData, SkillTypes.HIDEOUT_MANAGEMENT, 1); this.profileHelper.addSkillPointsToPlayer(pmcData, SkillTypes.HIDEOUT_MANAGEMENT, 1);
pointsConsumed -= 10; pointsConsumed -= 10;
} }
if (resourceValue > 0) if (fuelRemaining > 0)
{ {
generatorArea.slots[i].item[0].upd = this.getAreaUpdObject(1, resourceValue, pointsConsumed); fuelItemInSlot.upd = this.getAreaUpdObject(1, fuelRemaining, pointsConsumed);
this.logger.debug(`${pmcData._id} Generator: ${resourceValue} fuel left in slot ${i + 1}`); this.logger.debug(`$Profile: ${pmcData._id} Generator has: ${fuelRemaining} fuel left in slot ${i + 1}`);
hasFuelRemaining = true; hasFuelRemaining = true;
break; // Break here to avoid updating all the fuel tanks break; // Break here to avoid updating all the fuel tanks
} }
else
{ fuelItemInSlot.upd = this.getAreaUpdObject(1, 0, 0);
generatorArea.slots[i].item[0].upd = this.getAreaUpdObject(1, 0, 0);
// Update remaining resources to be subtracted // Update remaining resources to be subtracted
fuelDrainRate = Math.abs(resourceValue); fuelDrainRate = Math.abs(fuelRemaining);
}
}
} }
// Out of fuel, flag generator as offline
if (!hasFuelRemaining) if (!hasFuelRemaining)
{ {
generatorArea.active = false; generatorArea.active = false;