[Automated] Merge dev into gh-pages

src/Data/Gamedata.ts

@@ -20,6 +20,7 @@ export const Fortunes: string[] = [
   'Fortune #016',
   'Fortune #017',
   'Fortune #018',
+  'Fortune #019',
   'Fortune #100',
   'Fortune #101',
   'Fortune #102',

src/Data/Moddata.ts

@@ -1,6 +1,6 @@
 /** Data related directly to Cookie Monster */
 
-export const VersionMajor = '2.031';
+export const VersionMajor = '2.048';
 export const VersionMinor = '10';
 
 /** Information about Cookie Monster to be displayed in the info section */
@@ -12,14 +12,7 @@ export const ModDescription = `<a href="https://github.com/CookieMonsterTeam/Coo
  `;
 
 /** Latest releasenotes of Cookie Monster to be displayed in the info section */
-export const LatestReleaseNotes = `This update implements the following functions:</br>
-- This updates adds a number of performance improvements which make CookieMonster about 33% more efficient</br>
-- Added a button to all buildings in the middle section that can "lock" the building. This makes the building unclickable, which might be useful for frantic clicking during cookie storms</br>
-- Added a percentage to the Golden Cookie timer bar</br>
-</br>
-This update fixes the following bugs:
-- Fix considerable lag on the Ascension screen when using the monospace font</br>
-- Fix sound playing at start-up</br>
-- Fix building tooltips and warnings not updating correctly</br>
-- Fix upgrade bar not displaying</br>
-- Fix loading of mod when no save was found</br>`;
+export const LatestReleaseNotes = `This update adds support for some parts of cookie clicker 2.048</br>
+- added support for Dragon Aura 'Supreme Intellect' in the pantheon calculations</br>
+- added support for new tiers of Shimmering veil</br>
+- resolved major issue for negative calculations due to missing glucosimium upgrades, kittens, and achievements</br>`;

src/Sim/Calculations/CalculateGains.js

@@ -50,7 +50,7 @@ export default function CalculateGains() {
   Object.keys(Game.cookieUpgrades).forEach((i) => {
     const me = Game.cookieUpgrades[i];
     if (SimHas(me.name)) {
-      // Some upgrades have a functio as .power (notably the valentine cookies)
+      // Some upgrades have a function as .power (notably the valentine cookies)
       // CM.Sim.InitialBuildingData has changed to use CM.Sim.Has instead of Game.Has etc.
       // Therefore this call is to the .power of the Sim.Object
       if (typeof me.power === 'function') {
@@ -134,11 +134,11 @@ export default function CalculateGains() {
   if (SimHas('Kitten specialists')) catMult *= 1 + milkProgress * 0.2 * milkMult;
   if (SimHas('Kitten experts')) catMult *= 1 + milkProgress * 0.2 * milkMult;
   if (SimHas('Kitten consultants')) catMult *= 1 + milkProgress * 0.2 * milkMult;
-  if (SimHas('Kitten assistants to the regional manager'))
-    catMult *= 1 + milkProgress * 0.175 * milkMult;
+  if (SimHas('Kitten assistants to the regional manager')) catMult *= 1 + milkProgress * 0.175 * milkMult;
   if (SimHas('Kitten marketeers')) catMult *= 1 + milkProgress * 0.15 * milkMult;
   if (SimHas('Kitten analysts')) catMult *= 1 + milkProgress * 0.125 * milkMult;
   if (SimHas('Kitten executives')) catMult *= 1 + milkProgress * 0.115 * milkMult;
+  if (SimHas('Kitten admins')) catMult *= 1 + milkProgress * 0.11 * milkMult;
   if (SimHas('Kitten angels')) catMult *= 1 + milkProgress * 0.1 * milkMult;
   if (SimHas('Fortune #103')) catMult *= 1 + milkProgress * 0.05 * milkMult;
 
@@ -216,6 +216,9 @@ export default function CalculateGains() {
   if (SimHas('Shimmering veil [off]')) {
     let veilMult = 0.5;
     if (SimHas('Reinforced membrane')) veilMult += 0.1;
+    if (SimHas('Delicate touch')) veilMult += 0.05;
+    if (SimHas('Steadfast murmur')) veilMult += 0.05;
+    if (SimHas('Glittering edge')) veilMult += 0.05;
     mult *= 1 + veilMult;
   }
 

src/Sim/Calculations/CheckOtherAchiev.js

@@ -49,13 +49,15 @@ export default function CheckOtherAchiev() {
   if (minAmount >= 500) SimWin('Quincentennial');
   if (minAmount >= 550) SimWin('Quincentennial and a half');
   if (minAmount >= 600) SimWin('Sexcentennial');
+  if (minAmount >= 650) SimWin('Sexcentennial and a half');
 
   if (buildingsOwned >= 100) SimWin('Builder');
   if (buildingsOwned >= 500) SimWin('Architect');
   if (buildingsOwned >= 1000) SimWin('Engineer');
-  if (buildingsOwned >= 2000) SimWin('Lord of Constructs');
-  if (buildingsOwned >= 4000) SimWin('Grand design');
-  if (buildingsOwned >= 8000) SimWin('Ecumenopolis');
+  if (buildingsOwned >= 2500) SimWin('Lord of Constructs');
+  if (buildingsOwned >= 5000) SimWin('Grand design');
+  if (buildingsOwned >= 7500) SimWin('Ecumenopolis');
+  if (buildingsOwned >= 10000) SimWin('Myriad');
 
   if (SimUpgradesOwned >= 20) SimWin('Enhancer');
   if (SimUpgradesOwned >= 50) SimWin('Augmenter');
@@ -63,6 +65,8 @@ export default function CheckOtherAchiev() {
   if (SimUpgradesOwned >= 200) SimWin('Lord of Progress');
   if (SimUpgradesOwned >= 300) SimWin('The full picture');
   if (SimUpgradesOwned >= 400) SimWin("When there's nothing left to add");
+  if (SimUpgradesOwned >= 500) SimWin("Kaizen");
+  if (SimUpgradesOwned >= 600) SimWin("Beyond quality");
 
   if (buildingsOwned >= 4000 && SimUpgradesOwned >= 300) SimWin('Polymath');
   if (buildingsOwned >= 8000 && SimUpgradesOwned >= 400) SimWin('Renaissance baker');

src/Sim/InitializeData/InitialBuildingData.js

@@ -27,6 +27,8 @@ export default function InitialBuildingData(buildingName) {
       if (SimHas('Septillion fingers')) add *= 20;
       if (SimHas('Octillion fingers')) add *= 20;
       if (SimHas('Nonillion fingers')) add *= 20;
+      if (SimHas('Decillion fingers')) add *= 20;
+      if (SimHas('Unshackled cursors')) add *= 25;
       let mult = 1;
       let num = 0;
       Object.keys(SimObjects).forEach((i) => {

src/Sim/ReplacedGameFunctions/SimHasGod.js

@@ -1,4 +1,5 @@
 import { SimGod1, SimGod2, SimGod3, SimObjects } from '../VariablesAndData';
+import SimHasAura from './SimHasAura'
 
 /**
  * This function checks for the current God level in the sim data
@@ -15,9 +16,15 @@ export default function SimHasGod(what) {
       return 1;
     }
     if (SimGod2 === god.id) {
+      if (SimHasAura('Supreme Intellect')){
+        return 1;
+      }
       return 2;
     }
     if (SimGod3 === god.id) {
+      if (SimHasAura('Supreme Intellect')){
+        return 2;
+      }
       return 3;
     }
   }

src/Sim/SimulationEvents/BuyUpgrades.js

@@ -32,6 +32,8 @@ function MouseCps() {
   if (SimHas('Septillion fingers')) add *= 20;
   if (SimHas('Octillion fingers')) add *= 20;
   if (SimHas('Nonillion fingers')) add *= 20;
+  if (SimHas('Decillion fingers')) add *= 20;
+  if (SimHas('Unshackled cursors')) add*=	25;
   let num = 0;
   Object.keys(SimObjects).forEach((i) => {
     num += SimObjects[i].amount;
@@ -53,6 +55,7 @@ function MouseCps() {
   if (SimHas('Technobsidian mouse')) add += SimCookiesPs * 0.01;
   if (SimHas('Plasmarble mouse')) add += SimCookiesPs * 0.01;
   if (SimHas('Miraculite mouse')) add += SimCookiesPs * 0.01;
+  if (SimHas('Aetherice mouse')) add += SimCookiesPs * 0.01;
 
   if (SimHas('Fortune #104')) add += SimCookiesPs * 0.01;