[Automated] Merge dev into gh-pages

src/Cache/PP/Building.js

@@ -1,5 +1,6 @@
 import GetWrinkConfigBank from '../../Disp/HelperFunctions/GetWrinkConfigBank';
 import { ColourGray } from '../../Disp/VariablesAndData';
+import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding';
 import {
   CacheMinPP, // eslint-disable-line no-unused-vars
   CacheMinPPBulk, // eslint-disable-line no-unused-vars
@@ -25,7 +26,16 @@ function CacheColour(target, amount) {
       return;
     }
     // eslint-disable-next-line no-param-reassign
-    target[i].color = ColourOfPP(target[i], Game.Objects[i].getSumPrice(amount));
+    target[i].color = ColourOfPP(
+      target[i],
+      BuildingGetPrice(
+        i,
+        Game.Objects[i].basePrice,
+        Game.Objects[i].amount,
+        Game.Objects[i].free,
+        amount,
+      ),
+    );
     // Colour based on excluding certain top-buildings
     for (
       let j = 0;
@@ -39,7 +49,13 @@ function CacheColour(target, amount) {
 
 function CachePP(target, amount) {
   Object.keys(target).forEach((i) => {
-    const price = Game.Objects[i].getSumPrice(amount);
+    const price = BuildingGetPrice(
+      i,
+      Game.Objects[i].basePrice,
+      Game.Objects[i].amount,
+      Game.Objects[i].free,
+      amount,
+    );
     if (Game.cookiesPs) {
       target[i].pp = // eslint-disable-line no-param-reassign
         Math.max(price - (Game.cookies + GetWrinkConfigBank()), 0) / Game.cookiesPs +

src/Cache/PriceAndIncome/PriceAndIncome.js

@@ -38,22 +38,25 @@ function CacheBuildingIncome(amount) {
  * It is called by CM.Cache.CacheIncome()
  */
 function CacheUpgradeIncome() {
-  CacheUpgrades = [];
+  CacheUpgrades = {};
-  Object.keys(Game.Upgrades).forEach((i) => {
+  for (let i = 0; i < Game.UpgradesInStore.length; i++) {
-    const bonusIncome = BuyUpgradesBonusIncome(i);
+    const upgradeName = Game.UpgradesInStore[i].name;
-    if (i === 'Elder Pledge') {
+    const bonusIncome = BuyUpgradesBonusIncome(upgradeName);
-      CacheUpgrades[i] = { bonus: Game.cookiesPs - CacheAverageGainBank };
+    if (upgradeName === 'Elder Pledge') {
+      CacheUpgrades[upgradeName] = {
+        bonus: Game.cookiesPs - CacheAverageGainBank,
+      };
       if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.CalcWrink === 1)
-        CacheUpgrades[i].bonus -= CacheAverageGainWrink;
+        CacheUpgrades[upgradeName].bonus -= CacheAverageGainWrink;
       else if (Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.CalcWrink === 2)
-        CacheUpgrades[i].bonus -= CacheAverageGainWrinkFattest;
+        CacheUpgrades[upgradeName].bonus -= CacheAverageGainWrinkFattest;
-      if (!Number.isFinite(CacheUpgrades[i].bonus)) CacheUpgrades[i].bonus = 0;
+      if (!Number.isFinite(CacheUpgrades[upgradeName].bonus)) CacheUpgrades[upgradeName].bonus = 0;
     } else {
-      CacheUpgrades[i] = {};
+      CacheUpgrades[upgradeName] = {};
-      if (bonusIncome[0]) CacheUpgrades[i].bonus = bonusIncome[0];
+      if (bonusIncome[0]) CacheUpgrades[upgradeName].bonus = bonusIncome[0];
-      if (bonusIncome[1]) CacheUpgrades[i].bonusMouse = bonusIncome[1];
+      if (bonusIncome[1]) CacheUpgrades[upgradeName].bonusMouse = bonusIncome[1];
+    }
   }
-  });
 }
 
 /**
@@ -62,28 +65,28 @@ function CacheUpgradeIncome() {
 export function CacheBuildingsPrices() {
   Object.keys(Game.Objects).forEach((i) => {
     CacheObjects1[i].price = BuildingGetPrice(
-      Game.Objects[i],
+      i,
       Game.Objects[i].basePrice,
       Game.Objects[i].amount,
       Game.Objects[i].free,
       1,
     );
     CacheObjects10[i].price = BuildingGetPrice(
-      Game.Objects[i],
+      i,
       Game.Objects[i].basePrice,
       Game.Objects[i].amount,
       Game.Objects[i].free,
       10,
     );
     CacheObjects100[i].price = BuildingGetPrice(
-      Game.Objects[i],
+      i,
       Game.Objects[i].basePrice,
       Game.Objects[i].amount,
       Game.Objects[i].free,
       100,
     );
     CacheObjectsNextAchievement[i].price = BuildingGetPrice(
-      Game.Objects[i],
+      i,
       Game.Objects[i].basePrice,
       Game.Objects[i].amount,
       Game.Objects[i].free,

src/Cache/TillNextAchievement/AllAmountTillNextAchievement.js

@@ -1,3 +1,4 @@
+import BuildingGetPrice from '../../Sim/SimulationEvents/BuyBuilding';
 import { CacheObjectsNextAchievement } from '../VariablesAndData';
 import IndividualAmountTillNextAchievement from './IndividualAmountTillNextAchievement';
 
@@ -17,7 +18,11 @@ export default function AllAmountTillNextAchievement(forceRecalc) {
       result[i] = {
         AmountNeeded: CacheObjectsNextAchievement[i].TotalNeeded - Game.Objects[i].amount,
         TotalNeeded: CacheObjectsNextAchievement[i].TotalNeeded,
-        price: Game.Objects[i].getSumPrice(
+        price: BuildingGetPrice(
+          i,
+          Game.Objects[i].basePrice,
+          Game.Objects[i].amount,
+          Game.Objects[i].free,
           CacheObjectsNextAchievement[i].TotalNeeded - Game.Objects[i].amount,
         ),
       };
@@ -26,7 +31,13 @@ export default function AllAmountTillNextAchievement(forceRecalc) {
       result[i] = {
         AmountNeeded: tillNext,
         TotalNeeded: Game.Objects[i].amount + tillNext,
-        price: Game.Objects[i].getSumPrice(tillNext),
+        price: BuildingGetPrice(
+          i,
+          Game.Objects[i].basePrice,
+          Game.Objects[i].amount,
+          Game.Objects[i].free,
+          tillNext,
+        ),
       };
     }
   });

src/Disp/Tooltips/AscendButton.js

@@ -20,16 +20,15 @@ export default function ReplaceAscendTooltip() {
   );
 
   const startDate = Game.sayTime(((Date.now() - Game.startDate) / 1000) * Game.fps, -1);
-  let str = '';
+  let str = `You've been on this run for <b>${
-  str += `You've been on this run for <b>${
     startDate === '' ? 'not very long' : startDate
-  }</b>.<br>`;
+  }</b>.<br>
-  str += '<div class="line"></div>';
+  <div class="line"></div>`;
   if (Game.prestige > 0) {
     str += `Your prestige level is currently <b>${Beautify(Game.prestige)}</b>.<br>(CpS +${Beautify(
       Game.prestige,
-    )}%)`;
+    )}%)
-    str += '<div class="line"></div>';
+    <div class="line"></div>`;
   }
   if (CacheLastHeavenlyChips < 1) str += 'Ascending now would grant you no prestige.';
   else if (CacheLastHeavenlyChips < 2)
@@ -41,9 +40,9 @@ export default function ReplaceAscendTooltip() {
     )} prestige levels</b> (+${Beautify(CacheLastHeavenlyChips)}% CpS)<br>and <b>${Beautify(
       CacheLastHeavenlyChips,
     )} heavenly chips</b> to spend.`;
-  str += '<div class="line"></div>';
+  str += `<div class="line"></div>
-  str += `You need <b>${Beautify(cookiesToNext)} more cookies</b> for the next level.<br>`;
+  You need <b>${Beautify(cookiesToNext)} more cookies</b> for the next level.<br>
-  str += `${
+  ${
     Game.mods.cookieMonsterFramework.saveData.cookieMonsterMod.settings.TooltipAscendButton
       ? `<div class='line'></div>It takes ${CacheTimeTillNextPrestige} to reach the next level and you were making ${Beautify(
           CacheHCPerSecond,

src/Sim/SimulationEvents/BuyBuilding.js

@@ -1,7 +1,5 @@
 /**
  * This function calculates the total price for buying "increase" of a building
- * Base Game does not currently allow this
- * It is called by CM.Cache.CacheBuildingsPrices() and CM.Disp.Tooltip()
  * @param	{string}	build		Name of the building
  * @param	{number}	basePrice	Base Price of building
  * @param	{number}	start		Starting amount of building
@@ -10,14 +8,11 @@
  * @returns {number}	moni		Total price
  */
 export default function BuildingGetPrice(build, basePrice, start, free, increase) {
-  let startingAmount = start;
+  let partialPrice = 0;
-  let moni = 0;
+  for (let i = Math.max(0, start); i < Math.max(0, start + increase); i++) {
-  for (let i = 0; i < increase; i += 1) {
+    partialPrice += Game.priceIncrease ** Math.max(0, i - free);
-    let price = basePrice * Game.priceIncrease ** Math.max(0, startingAmount - free);
-    price = Game.modifyBuildingPrice(build, price);
-    price = Math.ceil(price);
-    moni += price;
-    startingAmount += 1;
   }
-  return moni;
+  let price = basePrice * partialPrice;
+  price = Game.modifyBuildingPrice(Game.Objects[build], price);
+  return Math.ceil(price);
 }