From 17a0e288ad663633dbbbdbd61d4ca26a0a9d1292 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Wed, 4 Dec 2019 11:10:12 -0500 Subject: [PATCH] Fix global prod bonuses messing up percentages --- gorge.js | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/gorge.js b/gorge.js index 33a2006..10e3969 100644 --- a/gorge.js +++ b/gorge.js @@ -17,18 +17,24 @@ let clickBonus = 0; let lastTime = 0; -function calculateProductivity() { - let productivity = 0; - for (const [key, value] of Object.entries(belongings)) { - productivity += productivityOf(key); - } - +function applyGlobalProdBonuses(productivity) { for (let effect of effects["prod-all"]) { if (ownedUpgrades[effect.parent]) { productivity = effect.apply(productivity); } } + + return productivity; +} + +function calculateProductivity() { + let productivity = 0; + + for (const [key, value] of Object.entries(belongings)) { + productivity += productivityOf(key); + } + return productivity; } @@ -59,6 +65,8 @@ function productivityOf(type) { let prod = baseProd * productivityMultiplierOf(type); + prod = applyGlobalProdBonuses(prod); + return prod * belongings[type].count; }