Merge pull request #718 from Aktanusa/dev

Push fixes to master

src/Cache/PriceAndIncome/PriceAndIncome.js

@@ -24,8 +24,8 @@ import {
  * @param	{amount}	amount	Amount to be bought
  * @parem	{string}	target	The target Cache object ("Objects1", "Objects10" or "Objects100")
  */
-function CacheBuildingIncome(amount, target) {
+function CacheBuildingIncome(amount) {
-  const result = [];
+  const result = {};
   Object.keys(Game.Objects).forEach((i) => {
     result[i] = {};
     result[i].bonus = BuyBuildingsBonusIncome(i, amount);

src/Disp/HelperFunctions/GetCPS.js

@@ -23,6 +23,7 @@ export default function GetCPS() {
       (CacheCurrWrinklerCPSMult + (1 - CacheCurrWrinklerCount * 0.05))
     );
   }
+  if (CacheWrinklersFattest[1] !== null)
     if (
       CMOptions.CalcWrink === 2 &&
       Game.wrinklers[CacheWrinklersFattest[1]].type === 1

src/Main/ReplaceGameFunctions/ReplaceNative.js

@@ -11,11 +11,7 @@ import UpdateTitle from '../../Disp/TabTitle/TabTitle';
 import ReplaceAscendTooltip from '../../Disp/Tooltips/AscendButton';
 import UpdateTooltipLocation from '../../Disp/Tooltips/PositionLocation';
 import { CMSayTime, Title } from '../../Disp/VariablesAndData';
-import {
+import { SimDoSims } from '../../Sim/VariablesAndData';
-  SimDateAges,
-  SimDateCentury,
-  SimDoSims,
-} from '../../Sim/VariablesAndData';
 import ReplaceTooltipUpgrade from '../ReplaceGameElements/TooltipUpgrades';
 import { BackupFunctions } from '../VariablesAndData';
 import FixMouseY from './FixMouse';
@@ -33,8 +29,6 @@ export default function ReplaceNative() {
   Game.CalculateGains = function () {
     BackupFunctions.CalculateGains();
     SimDoSims = 1;
-    SimDateAges = Date.now();
-    SimDateCentury = Date.now();
   };
 
   BackupFunctions.tooltip = {};

src/Sim/Calculations/CalculateGains.js

@@ -11,8 +11,6 @@ import {
   SimAchievementsOwned,
   SimCookiesPs,
   SimCookiesPsRaw,
-  SimDateAges,
-  SimDateCentury,
   SimEffs,
   SimHeavenlyPower,
   SimObjects,
@@ -94,15 +92,13 @@ export default function CalculateGains() {
     godLvl = SimHasGod('ages');
     if (godLvl === 1)
       mult *=
-        1 + 0.15 * Math.sin((SimDateAges / 1000 / (60 * 60 * 3)) * Math.PI * 2);
+        1 + 0.15 * Math.sin((Date.now() / 1000 / (60 * 60 * 3)) * Math.PI * 2);
     else if (godLvl === 2)
       mult *=
-        1 +
+        1 + 0.15 * Math.sin((Date.now() / 1000 / (60 * 60 * 12)) * Math.PI * 2);
-        0.15 * Math.sin((SimDateAges / 1000 / (60 * 60 * 12)) * Math.PI * 2);
     else if (godLvl === 3)
       mult *=
-        1 +
+        1 + 0.15 * Math.sin((Date.now() / 1000 / (60 * 60 * 24)) * Math.PI * 2);
-        0.15 * Math.sin((SimDateAges / 1000 / (60 * 60 * 24)) * Math.PI * 2);
 
     godLvl = SimHasGod('decadence');
     if (godLvl === 1) buildMult *= 0.93;
@@ -193,7 +189,7 @@ export default function CalculateGains() {
   if (SimHas('Century egg')) {
     // The boost increases a little every day, with diminishing returns up to +10% on the 100th day
     let day =
-      (Math.floor((SimDateCentury - Game.startDate) / 1000 / 10) * 10) /
+      (Math.floor((Date.now() - Game.startDate) / 1000 / 10) * 10) /
       60 /
       60 /
       24;

src/Sim/VariablesAndData.js

@@ -17,7 +17,5 @@ export let SimGod2;
 export let SimGod3;
 export let SimDoSims;
 export let SimEffs;
-export let SimDateCentury = Game.startDate;
-export let SimDateAges = Game.startDate;
 export let SimCookiesPs;
 export let SimCookiesPsRaw;

webpack.config.js

@@ -1,13 +1,12 @@
-/** We know this is not how Webpack should be used, but we are slowly transferring our code.
- * For now this is how at least start to create a structure that allows us to transfer towards
- * more modular code. Any help is highly appreciated.
- */
 const path = require('path');
 
 module.exports = function (env) {
   return {
     mode: 'production',
     devtool: env.production ? 'source-map' : 'eval-source-map',
+    optimization: {
+      minimize: !!env.production,
+    },
     entry: {
       CookieMonster: {
         import: './src/CookieMonster.js',