Merge pull request #59 from Disilon/master

fixed tidalBurden with genesis upgrades

Author: StopSign

KTL/actionData5.js

@@ -57,7 +57,7 @@ actionData = {
             this.updateMults();
 
             addResourceTo(actionObj, actionObj.resourceToAdd);
-            addResourceTo(data.actions.tidalBurden, (actionObj.efficiency / 100));
+            addResourceTo(data.actions.tidalBurden, (Math.min(actionObj.efficiency/100, 1)));
             addResourceTo(data.actions.dipInTheRiver, actionObj.resource / 10);
 
             views.scheduleUpdate('turnTheWheelResourceSent', intToString(actionObj.resourceToAdd, 2), "textContent")
@@ -71,7 +71,7 @@ actionData = {
             actionObj.resourceToAdd = actionObj.actionPower * actionObj.upgradeMult * (actionObj.efficiency / 100);
             actionObj.expToAddBase = 0;
             actionObj.showResourceAdded = actionObj.resourceToAdd;
-            data.actions.tidalBurden.showResourceAdded = actionObj.efficiency/100;
+            data.actions.tidalBurden.showResourceAdded = Math.min(actionObj.efficiency/100, 1);
             data.actions.dipInTheRiver.showResourceAdded = actionObj.resource/10;
         },
         onLevelAtts:[["flow", 5]],

KTL/driver.js

@@ -201,8 +201,11 @@ function calcDeltas() {
         if(dataObj.ignoreConsume) {
             totalDecrease = 0;
         }
-
-        actionObj.resourceDecrease = totalDecrease * (1-data.upgrades.reduceResourcesConsumed.upgradePower*.05);
+        if(actionVar === "tidalBurden") {
+            actionObj.resourceDecrease = totalDecrease
+        } else {
+            actionObj.resourceDecrease = totalDecrease * (1-data.upgrades.reduceResourcesConsumed.upgradePower*.05);
+        }
 
         // Calculate the final net change per second for display.
         actionObj.resourceDelta = actionObj.resourceIncrease - actionObj.resourceDecrease;
@@ -247,7 +250,7 @@ function tickGameObject(actionVar) {
     if (!actionObj.isRunning) {
         return;
     }
-    let upgradeMult = Math.pow(1.1, data.upgrades.extraConsumptionRate.upgradePower)
+    let upgradeMult = actionVar === "tidalBurden" ? 1 : Math.pow(1.1, data.upgrades.extraConsumptionRate.upgradePower)
 
     let momentumMaxRate = dataObj.isGenerator ? dataObj.generatorSpeed / data.gameSettings.ticksPerSecond :
         (actionObj.resource * calcTierMult(dataObj.tier) * upgradeMult / data.gameSettings.ticksPerSecond);
@@ -266,7 +269,11 @@ function tickGameObject(actionVar) {
 
     // For non-generators, consume the resource used to generate progress.
     if (!dataObj.isGenerator && !dataObj.ignoreConsume) {
-        actionObj.resource -= resourceToAddInefficient * (1-data.upgrades.reduceResourcesConsumed.upgradePower*.05);
+        if(actionVar === "tidalBurden") {
+            actionObj.resource -= resourceToAddInefficient
+        } else {
+            actionObj.resource -= resourceToAddInefficient * (1-data.upgrades.reduceResourcesConsumed.upgradePower*.05);
+        }
     }
 
     if(actionObj.instability > 0) {