diff --git a/CookieMonster.js b/CookieMonster.js index 0c67459..e2f5e4b 100644 --- a/CookieMonster.js +++ b/CookieMonster.js @@ -1,5 +1,7 @@ CM = {}; +CM.Data = {}; + CM.Sim = {}; CM.Cache = {}; @@ -209,10 +211,18 @@ CM.Sim.CheckOtherAchiev = function() { if (CM.Sim.UpgradesOwned >= 50) CM.Sim.Win('Augmenter'); if (CM.Sim.UpgradesOwned >= 100) CM.Sim.Win('Upgrader'); if (CM.Sim.UpgradesOwned >= 150) CM.Sim.Win('Lord of Progress'); + + var hasAllHalloCook = true; + for (var i in CM.Data.HalloCookies) { + if (!CM.Sim.Has(CM.Data.HalloCookies[i])) hasAllHalloCook = false; + } + if (hasAllHalloCook) CM.Sim.Win('Spooky cookies'); - if (CM.Sim.Has('Skull cookies') && CM.Sim.Has('Ghost cookies') && CM.Sim.Has('Bat cookies') && CM.Sim.Has('Slime cookies') && CM.Sim.Has('Pumpkin cookies') && CM.Sim.Has('Eyeball cookies') && CM.Sim.Has('Spider cookies')) CM.Sim.Win('Spooky cookies'); - - if (CM.Sim.Has('Christmas tree biscuits') && CM.Sim.Has('Snowflake biscuits') && CM.Sim.Has('Snowman biscuits') && CM.Sim.Has('Holly biscuits') && CM.Sim.Has('Candy cane biscuits') && CM.Sim.Has('Bell biscuits') && CM.Sim.Has('Present biscuits')) CM.Sim.Win('Let it snow'); + var hasAllChristCook = true; + for (var i in CM.Data.ChristCookies) { + if (!CM.Sim.Has(CM.Data.ChristCookies[i])) hasAllChristCook = false; + } + if (hasAllChristCook) CM.Sim.Win('Let it snow'); } CM.Sim.BuyBuildings = function() { @@ -1015,6 +1025,28 @@ CM.Disp.AddMenu = function() { var possibleHC = Game.HowMuchPrestige(Game.cookiesEarned + Game.cookiesReset); var neededCook = CM.Sim.CookNeedPrest(possibleHC + 1) - (Game.cookiesEarned + Game.cookiesReset); + var halloCook = 0; + for (var i in CM.Data.HalloCookies) { + if (Game.Has(CM.Data.HalloCookies[i])) halloCook++; + } + var christCook = 0; + for (var i in CM.Data.ChristCookies) { + if (Game.Has(CM.Data.ChristCookies[i])) christCook++; + } + var valCook = 0; + for (var i in CM.Data.ValCookies) { + if (Game.Has(CM.Data.ValCookies[i])) valCook++; + else break; + } + var normEggs = 0; + for (var i in Game.eggDrops) { + if (Game.HasUnlocked(Game.eggDrops[i])) normEggs++; + } + var rareEggs = 0; + for (var i in Game.rareEggDrops) { + if (Game.HasUnlocked(Game.rareEggDrops[i])) rareEggs++; + } + var str = '