Skip to content

Commit

Permalink
fix(workshop): Consume is always applied
Browse files Browse the repository at this point in the history
Even when a resource was disabled in resource control, the set consume rate was still applied.
  • Loading branch information
oliversalzburg committed Dec 5, 2023
1 parent 3c8d9e1 commit a0f0162
Showing 1 changed file with 17 additions and 6 deletions.
23 changes: 17 additions & 6 deletions packages/kitten-scientists/source/WorkshopManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -468,10 +468,23 @@ export class WorkshopManager extends UpgradeManager implements Automation {
* @returns How many items of the resource to always keep in stock.
*/
getStock(name: Resource): number {
const res = this._host.engine.settings.resources.resources[name];
const stock = res && res.enabled ? res.stock : 0;
const resource = this._host.engine.settings.resources.resources[name];
const stock = resource && resource.enabled ? resource.stock : 0;

return !stock ? 0 : stock;
return stock;
}

/**
* Retrieve the consume rate for a resource.
*
* @param name - The resource.
* @returns The consume rate for the resource.
*/
getConsume(name: Resource): number {
const resource = this._host.engine.settings.resources.resources[name];
const consume = resource && resource.enabled ? resource.consume : 1;

return consume;
}

/**
Expand Down Expand Up @@ -511,9 +524,7 @@ export class WorkshopManager extends UpgradeManager implements Automation {
value = Math.max(value - stock, 0);

// Determine the consume rate.
// If the consume rate is 0.6, we'll always only make 60% of the resource available.
const resourceSettings = this._host.engine.settings.resources.resources[name];
const consume = resourceSettings.consume;
const consume = this.getConsume(name);

return value * consume;
}
Expand Down

0 comments on commit a0f0162

Please sign in to comment.