[Automated] Merge dev into gh-pages
This commit is contained in:
2
dist/CookieMonster.js
vendored
2
dist/CookieMonster.js
vendored
File diff suppressed because one or more lines are too long
2
dist/CookieMonster.js.map
vendored
2
dist/CookieMonster.js.map
vendored
File diff suppressed because one or more lines are too long
2
dist/CookieMonsterDev.js
vendored
2
dist/CookieMonsterDev.js
vendored
File diff suppressed because one or more lines are too long
2
dist/CookieMonsterDev.js.map
vendored
2
dist/CookieMonsterDev.js.map
vendored
File diff suppressed because one or more lines are too long
@@ -21,6 +21,7 @@ export const Fortunes = [
|
|||||||
'Fortune #017',
|
'Fortune #017',
|
||||||
'Fortune #018',
|
'Fortune #018',
|
||||||
'Fortune #019',
|
'Fortune #019',
|
||||||
|
'Fortune #020',
|
||||||
'Fortune #100',
|
'Fortune #100',
|
||||||
'Fortune #101',
|
'Fortune #101',
|
||||||
'Fortune #102',
|
'Fortune #102',
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/** Data related directly to Cookie Monster */
|
/** Data related directly to Cookie Monster */
|
||||||
|
|
||||||
export const VersionMajor = '2.048';
|
export const VersionMajor = '2.052';
|
||||||
export const VersionMinor = '10';
|
export const VersionMinor = '10';
|
||||||
|
|
||||||
/** Information about Cookie Monster to be displayed in the info section */
|
/** Information about Cookie Monster to be displayed in the info section */
|
||||||
|
|||||||
@@ -140,6 +140,7 @@ export default function CalculateGains() {
|
|||||||
if (SimHas('Kitten analysts')) catMult *= 1 + milkProgress * 0.125 * milkMult;
|
if (SimHas('Kitten analysts')) catMult *= 1 + milkProgress * 0.125 * milkMult;
|
||||||
if (SimHas('Kitten executives')) catMult *= 1 + milkProgress * 0.115 * milkMult;
|
if (SimHas('Kitten executives')) catMult *= 1 + milkProgress * 0.115 * milkMult;
|
||||||
if (SimHas('Kitten admins')) catMult *= 1 + milkProgress * 0.11 * milkMult;
|
if (SimHas('Kitten admins')) catMult *= 1 + milkProgress * 0.11 * milkMult;
|
||||||
|
if (SimHas('Kitten strategists')) catMult *= 1 + milkProgress * 0.105 * milkMult;
|
||||||
if (SimHas('Kitten angels')) catMult *= 1 + milkProgress * 0.1 * milkMult;
|
if (SimHas('Kitten angels')) catMult *= 1 + milkProgress * 0.1 * milkMult;
|
||||||
if (SimHas('Fortune #103')) catMult *= 1 + milkProgress * 0.05 * milkMult;
|
if (SimHas('Fortune #103')) catMult *= 1 + milkProgress * 0.05 * milkMult;
|
||||||
|
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ export default function CheckOtherAchiev() {
|
|||||||
if (minAmount >= 550) SimWin('Quincentennial and a half');
|
if (minAmount >= 550) SimWin('Quincentennial and a half');
|
||||||
if (minAmount >= 600) SimWin('Sexcentennial');
|
if (minAmount >= 600) SimWin('Sexcentennial');
|
||||||
if (minAmount >= 650) SimWin('Sexcentennial and a half');
|
if (minAmount >= 650) SimWin('Sexcentennial and a half');
|
||||||
|
if (minAmount >= 700) SimWin('Septcentennial');
|
||||||
|
|
||||||
if (buildingsOwned >= 100) SimWin('Builder');
|
if (buildingsOwned >= 100) SimWin('Builder');
|
||||||
if (buildingsOwned >= 500) SimWin('Architect');
|
if (buildingsOwned >= 500) SimWin('Architect');
|
||||||
@@ -67,6 +68,7 @@ export default function CheckOtherAchiev() {
|
|||||||
if (SimUpgradesOwned >= 400) SimWin("When there's nothing left to add");
|
if (SimUpgradesOwned >= 400) SimWin("When there's nothing left to add");
|
||||||
if (SimUpgradesOwned >= 500) SimWin('Kaizen');
|
if (SimUpgradesOwned >= 500) SimWin('Kaizen');
|
||||||
if (SimUpgradesOwned >= 600) SimWin('Beyond quality');
|
if (SimUpgradesOwned >= 600) SimWin('Beyond quality');
|
||||||
|
if (SimUpgradesOwned >= 700) SimWin("Oft we mar what's well");
|
||||||
|
|
||||||
if (buildingsOwned >= 4000 && SimUpgradesOwned >= 300) SimWin('Polymath');
|
if (buildingsOwned >= 4000 && SimUpgradesOwned >= 300) SimWin('Polymath');
|
||||||
if (buildingsOwned >= 8000 && SimUpgradesOwned >= 400) SimWin('Renaissance baker');
|
if (buildingsOwned >= 8000 && SimUpgradesOwned >= 400) SimWin('Renaissance baker');
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ export default function InitialBuildingData(buildingName) {
|
|||||||
if (SimHas('Octillion fingers')) add *= 20;
|
if (SimHas('Octillion fingers')) add *= 20;
|
||||||
if (SimHas('Nonillion fingers')) add *= 20;
|
if (SimHas('Nonillion fingers')) add *= 20;
|
||||||
if (SimHas('Decillion fingers')) add *= 20;
|
if (SimHas('Decillion fingers')) add *= 20;
|
||||||
|
if (SimHas('Undecillion fingers')) add *= 20;
|
||||||
if (SimHas('Unshackled cursors')) add *= 25;
|
if (SimHas('Unshackled cursors')) add *= 25;
|
||||||
let mult = 1;
|
let mult = 1;
|
||||||
let num = 0;
|
let num = 0;
|
||||||
|
|||||||
@@ -28,6 +28,8 @@ export default function BuyBuildingsBonusIncome(building, amount) {
|
|||||||
if (me.amount >= 600) SimWin('With her finger and her thumb');
|
if (me.amount >= 600) SimWin('With her finger and her thumb');
|
||||||
if (me.amount >= 700) SimWin('Gotta hand it to you');
|
if (me.amount >= 700) SimWin('Gotta hand it to you');
|
||||||
if (me.amount >= 800) SimWin("The devil's workshop");
|
if (me.amount >= 800) SimWin("The devil's workshop");
|
||||||
|
if (me.amount >= 900) SimWin('All on deck');
|
||||||
|
if (me.amount >= 1000) SimWin('A round of applause');
|
||||||
} else {
|
} else {
|
||||||
Object.keys(Game.Objects[me.name].tieredAchievs).forEach((j) => {
|
Object.keys(Game.Objects[me.name].tieredAchievs).forEach((j) => {
|
||||||
if (me.amount >= Game.Tiers[Game.Objects[me.name].tieredAchievs[j].tier].achievUnlock) {
|
if (me.amount >= Game.Tiers[Game.Objects[me.name].tieredAchievs[j].tier].achievUnlock) {
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ function MouseCps() {
|
|||||||
if (SimHas('Octillion fingers')) add *= 20;
|
if (SimHas('Octillion fingers')) add *= 20;
|
||||||
if (SimHas('Nonillion fingers')) add *= 20;
|
if (SimHas('Nonillion fingers')) add *= 20;
|
||||||
if (SimHas('Decillion fingers')) add *= 20;
|
if (SimHas('Decillion fingers')) add *= 20;
|
||||||
|
if (SimHas('Undecillion fingers')) add *= 20;
|
||||||
if (SimHas('Unshackled cursors')) add *= 25;
|
if (SimHas('Unshackled cursors')) add *= 25;
|
||||||
let num = 0;
|
let num = 0;
|
||||||
Object.keys(SimObjects).forEach((i) => {
|
Object.keys(SimObjects).forEach((i) => {
|
||||||
@@ -56,6 +57,7 @@ function MouseCps() {
|
|||||||
if (SimHas('Plasmarble mouse')) add += SimCookiesPs * 0.01;
|
if (SimHas('Plasmarble mouse')) add += SimCookiesPs * 0.01;
|
||||||
if (SimHas('Miraculite mouse')) add += SimCookiesPs * 0.01;
|
if (SimHas('Miraculite mouse')) add += SimCookiesPs * 0.01;
|
||||||
if (SimHas('Aetherice mouse')) add += SimCookiesPs * 0.01;
|
if (SimHas('Aetherice mouse')) add += SimCookiesPs * 0.01;
|
||||||
|
if (SimHas('Omniplast mouse')) add += SimCookiesPs * 0.01;
|
||||||
|
|
||||||
if (SimHas('Fortune #104')) add += SimCookiesPs * 0.01;
|
if (SimHas('Fortune #104')) add += SimCookiesPs * 0.01;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user