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

Do not progress bitcoin production when power is off

Browse Source 
Small cleanup of function to reduce nesting and duplication
This commit is contained in:
Dev 2024-09-20 17:24:22 +01:00
parent 23570f4e2a
commit f333d45d70
1 changed files with 51 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -890,20 +890,11 @@ export class HideoutHelper {
protected updateBitcoinFarm(pmcData: IPmcData, btcFarmCGs: number, isGeneratorOn: boolean): Production | undefined { protected updateBitcoinFarm(pmcData: IPmcData, btcFarmCGs: number, isGeneratorOn: boolean): Production | undefined {
const btcProd = pmcData.Hideout.Production[HideoutHelper.bitcoinFarm]; const btcProd = pmcData.Hideout.Production[HideoutHelper.bitcoinFarm];
const bitcoinProdData = this.databaseService const isBtcProd = this.isProduction(btcProd);
.getHideout() if (!isBtcProd) {
.production.recipes.find((production) => production._id === HideoutHelper.bitcoinProductionId); return undefined;
const coinSlotCount = this.getBTCSlots(pmcData);
// Full on bitcoins, halt progress
if (this.isProduction(btcProd) && btcProd.Products.length >= coinSlotCount) {
// Set progress to 0
btcProd.Progress = 0;
return btcProd;
} }
if (this.isProduction(btcProd)) {
// The wiki has a wrong formula! // The wiki has a wrong formula!
// Do not change unless you validate it with the Client code files! // Do not change unless you validate it with the Client code files!
// This formula was found on the client files: // This formula was found on the client files:
@ -938,6 +929,26 @@ export class HideoutHelper {
this.gclass1678_1.Type = EDetailsType.Farming; this.gclass1678_1.Type = EDetailsType.Farming;
} }
*/ */
// Needs power to function
if (!isGeneratorOn) {
// Return with no changes
return btcProd;
}
const coinSlotCount = this.getBTCSlots(pmcData);
// Full on bitcoins, halt progress
if (btcProd.Products.length >= coinSlotCount) {
// Set progress to 0
btcProd.Progress = 0;
return btcProd;
}
const bitcoinProdData = this.databaseService
.getHideout()
.production.recipes.find((production) => production._id === HideoutHelper.bitcoinProductionId);
// 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 adjustedCraftTime = const adjustedCraftTime =
(this.profileHelper.isDeveloperAccount(pmcData.sessionId) ? 40 : bitcoinProdData.productionTime) / (this.profileHelper.isDeveloperAccount(pmcData.sessionId) ? 40 : bitcoinProdData.productionTime) /
@ -950,7 +961,7 @@ export class HideoutHelper {
while (btcProd.Progress >= bitcoinProdData.productionTime) { while (btcProd.Progress >= bitcoinProdData.productionTime) {
if (btcProd.Products.length < coinSlotCount) { if (btcProd.Products.length < coinSlotCount) {
// Has space to add a coin to production // Has space to add a coin to production rewards
this.addBtcToProduction(btcProd, bitcoinProdData.productionTime); this.addBtcToProduction(btcProd, bitcoinProdData.productionTime);
} else { } else {
// Filled up bitcoin storage // Filled up bitcoin storage
@ -963,9 +974,6 @@ export class HideoutHelper {
return btcProd; return btcProd;
} }
return undefined;
}
/** /**
* Add bitcoin object to btc production products array and set progress time * Add bitcoin object to btc production products array and set progress time
* @param btcProd Bitcoin production object * @param btcProd Bitcoin production object