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

Fixed 2 issues with collecting bitcoins;

Browse Source 
Only check if progress was only `great than` craft time, not `great than or equal to`
Didn't take into account developer accounts have reduce craft timers
This commit is contained in:
Dev 2024-02-09 22:01:19 +00:00
parent b6ff89cd46
commit 4b9f2ddbd1
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -753,8 +753,8 @@ export class HideoutHelper
protected updateBitcoinFarm(pmcData: IPmcData, btcFarmCGs: number, isGeneratorOn: boolean): Production protected updateBitcoinFarm(pmcData: IPmcData, btcFarmCGs: number, isGeneratorOn: boolean): Production
{ {
const btcProd = pmcData.Hideout.Production[HideoutHelper.bitcoinFarm]; const btcProd = pmcData.Hideout.Production[HideoutHelper.bitcoinFarm];
const bitcoinProdData = this.databaseServer.getTables().hideout.production.find((p) => const bitcoinProdData = this.databaseServer.getTables().hideout.production.find((production) =>
p._id === HideoutHelper.bitcoinProductionId production._id === HideoutHelper.bitcoinProductionId
); );
const coinSlotCount = this.getBTCSlots(pmcData); const coinSlotCount = this.getBTCSlots(pmcData);
@ -807,9 +807,11 @@ export class HideoutHelper
} }
*/ */
// BSG finally fixed their settings, they now get loaded from the settings and used in the client // BSG finally fixed their settings, they now get loaded from the settings and used in the client
const coinCraftTimeSeconds = bitcoinProdData.productionTime const coinCraftTimeSeconds =
((this.profileHelper.isDeveloperAccount(pmcData.sessionId)) ? 40 : bitcoinProdData.productionTime)
/ (1 + (btcFarmCGs - 1) * this.databaseServer.getTables().hideout.settings.gpuBoostRate); / (1 + (btcFarmCGs - 1) * this.databaseServer.getTables().hideout.settings.gpuBoostRate);
while (btcProd.Progress > coinCraftTimeSeconds)
while (btcProd.Progress >= coinCraftTimeSeconds)
{ {
if (btcProd.Products.length < coinSlotCount) if (btcProd.Products.length < coinSlotCount)
{ {
@ -818,6 +820,7 @@ export class HideoutHelper
} }
else else
{ {
// Filled up bitcoin storage
btcProd.Progress = 0; btcProd.Progress = 0;
} }
} }
@ -843,6 +846,7 @@ export class HideoutHelper
upd: { StackObjectsCount: 1 }, upd: { StackObjectsCount: 1 },
}); });
// Deduct time spent crafting from progress
btcProd.Progress -= coinCraftTimeSeconds; btcProd.Progress -= coinCraftTimeSeconds;
} }
@ -863,7 +867,8 @@ export class HideoutHelper
let timeElapsed = this.timeUtil.getTimestamp() - pmcData.Hideout.sptUpdateLastRunTimestamp; let timeElapsed = this.timeUtil.getTimestamp() - pmcData.Hideout.sptUpdateLastRunTimestamp;
if (recipe?.areaType === HideoutAreas.LAVATORY) if (recipe?.areaType === HideoutAreas.LAVATORY)
{ // Lavatory works at 100% when power is on / off {
// Lavatory works at 100% when power is on / off
return timeElapsed; return timeElapsed;
} }