Sync with v.2.0042

author: ozh <ozh@ozh.org> 2017-11-10 23:04:03 +0100
committer: ozh <ozh@ozh.org> 2017-11-10 23:04:03 +0100
commit: d0378b1e0b994427b12548ae8145ec7f06d93efa (patch)
tree: 4ebb9a427133507647cb81d6901d4abe8a76e3ba /index.html
parent: 43c1724a58b493a8cef44cc6c7d622886eb634de (diff)
1 files changed, 153 insertions, 78 deletions
diff --git a/index.html b/index.html
index 4670f7a..1b04997 100644
--- a/index.html
+++ b/index.html
@@ -1,74 +1,79 @@
-
 <!DOCTYPE html>
 <html>
 <head>
+<script src="/cdn-cgi/apps/head/0qgk9sTk1hPaj4RmmbOPMlTGE6w.js"></script><script type="text/javascript">
+    window.cookieconsent_options = {"message":"Unsurprisingly, this website uses cookies for ads and traffic analysis.","dismiss":"Got it!","learnMore":"Learn more","link":"http://orteil.dashnet.org/cookieconsentpolicy.html","target":"_blank","theme":"http://orteil.dashnet.org/cookieconsent.css","domain":"dashnet.org"};
+</script>
+
+<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/1.0.9/cookieconsent.min.js"></script>
+
 <title>Cookie Clicker</title>
 <!--
-Code and graphics copyright Orteil, 2013
+Code and graphics copyright Orteil, 2013-2017
 Feel free to alter this code to your liking, but please do not re-host it, do not profit from it and do not present it as your own.
-
--TODO :
-	-milk toys
-	-temple building
-	-gambling
-	-better tooltips
-	-better prestige
-	-more dungeons
-	-add canvas support /!\ being added
-	-timer bars for golden cookie effects
-	-set event listeners instead of onclick /!\ being added
-	-more zebras
 -->
 
-<script type="text/javascript">
-//<![CDATA[
-try{if (!window.CloudFlare) {var CloudFlare=[{verbose:0,p:1392345132,byc:0,owlid:"cf",bag2:1,mirage2:0,oracle:0,paths:{cloudflare:"/cdn-cgi/nexp/dok8v=02fcfa4f56/"},atok:"d40641166b2975687e97008cce55fa9a",petok:"1ee8ec205f3fa8aea0d5df9bd6a4240d33462cb8-1392361439-1800",zone:"dashnet.org",rocket:"0",apps:{"ga_key":{"ua":"UA-29324474-2","ga_bs":"2"},"abetterbrowser":{"ie":"8"}}}];var a=document.createElement("script"),b=document.getElementsByTagName("script")[0];a.async=!0;a.src="//ajax.cloudflare.com/cdn-cgi/nexp/dok8v=221574e73d/cloudflare.min.js";b.parentNode.insertBefore(a,b);}}catch(e){};
-//]]>
-</script>
-<link rel="shortcut icon" href="favicon.ico" />
-<link href="http://fonts.googleapis.com/css?family=Kavoon&subset=latin,latin-ext" rel="stylesheet" type="text/css">
-<link href="style.css?v=1.51" rel="stylesheet" type="text/css">
+<link rel="shortcut icon" href="img/favicon.ico" />
+<!--<link href="https://fonts.googleapis.com/css?family=Kavoon&subset=latin,latin-ext" rel="stylesheet" type="text/css">-->
+<link href='https://fonts.googleapis.com/css?family=Merriweather:900&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
+<link href="style.css?v=2.0042" rel="stylesheet" type="text/css">
+<!--[if IE]>
+<style type="text/css">
+	#ifIE9{display:block;}
+</style>
+<![endif]-->
+<!--->
+<meta name="viewport"
+content="initial-scale=2.0,
+maximum-scale=2.0,
+minimum-scale=2.0,
+height=device-height,
+width=device-width,
+target-densityDpi=device-dpi"/>
+<!---->
+<!--<meta name="viewport" content="width=250"/>-->
+<!--<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=250, height=device-height, target-densitydpi=device-dpi"/>-->
 
 <!--[if lt IE9]><script src="excanvas.compiled.js"></script><![endif]-->
 <script src="base64.js"></script>
 <script src="ajax.js"></script>
-<script src="DungeonGen.js"></script>
-<script src="dungeons.js?v=1.5044"></script>
-<script src="main.js?v=1.511"></script>
-
-<script type="text/javascript">
-/* <![CDATA[ */
-var _gaq = _gaq || [];
-_gaq.push(['_setAccount', 'UA-29324474-2']);
-_gaq.push(['_trackPageview']);
+<script src="main.js?v=2.0042"></script>
 
-(function() {
-var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-})();
-
-(function(b){(function(a){"__CF"in b&&"DJS"in b.__CF?b.__CF.DJS.push(a):"addEventListener"in b?b.addEventListener("load",a,!1):b.attachEvent("onload",a)})(function(){"FB"in b&&"Event"in FB&&"subscribe"in FB.Event&&(FB.Event.subscribe("edge.create",function(a){_gaq.push(["_trackSocial","facebook","like",a])}),FB.Event.subscribe("edge.remove",function(a){_gaq.push(["_trackSocial","facebook","unlike",a])}),FB.Event.subscribe("message.send",function(a){_gaq.push(["_trackSocial","facebook","send",a])}));"twttr"in b&&"events"in twttr&&"bind"in twttr.events&&twttr.events.bind("tweet",function(a){if(a){var b;if(a.target&&a.target.nodeName=="IFRAME")a:{if(a=a.target.src){a=a.split("#")[0].match(/[^?=&]+=([^&]*)?/g);b=0;for(var c;c=a[b];++b)if(c.indexOf("url")===0){b=unescape(c.split("=")[1]);break a}}b=void 0}_gaq.push(["_trackSocial","twitter","tweet",b])}})})})(window);
-/* ]]> */
-</script>
 </head>
 <body>
 
 <div id="wrapper">
 
 	<div id="topBar">
-		<div>
-			<b>Cookie Clicker</b> &copy; <a href="http://orteil.dashnet.org" target="_blank">Orteil</a>, 2013 - hosted by <a href="http://dashnet.org" target="_blank">DashNet</a> | <a href="http://twitter.com/orteil42" target="_blank">twitter</a> | <a href="http://orteil42.tumblr.com" target="_blank">tumblr</a> | Help? Bugs? Ideas? Check out the <a href="http://forum.dashnet.org" target="_blank">forum</a>! | Chat with us on <a href="http://forum.dashnet.org/discussion/277/irc-chat-channel/p1" target="_blank">IRC</a> | Get your <a href="http://www.redbubble.com/people/dashnet" target="_blank" style="color:#6cf;">Cookie Clicker shirts, stickers and hoodies</a>!
-			<div id="links" style="display:block;position:absolute;right:8px;top:4px;"></div>
+		<div><b>Cookie Clicker</b>&trade; &copy; <a href="http://orteil.dashnet.org" target="_blank">Orteil</a>, 2017 - <a href="http://dashnet.org" target="_blank">DashNet</a></div>
+		<div><a href="http://twitter.com/orteil42" target="_blank">twitter</a></div>
+		<div><a href="http://orteil42.tumblr.com" target="_blank">tumblr</a></div>
+		<div>Help? Bugs? Ideas? Check out the <a href="http://forum.dashnet.org" target="_blank">forum</a>!</div>
+		<div style="position:relative;"><div style="width:25px;height:32px;background:url(img/weeHoodie.png);position:absolute;left:-2px;top:0px;pointer-events:none;"></div><a class="blueLink" href="http://www.redbubble.com/people/dashnet" target="_blank" style="padding-left:12px;">Cookie Clicker merch & stickers!</a></div>
+		<div><a href="http://orteil.dashnet.org/randomgen/" target="_blank">RandomGen</a></div>
+		<div id="links" class="hoverer">
+			Other versions
+			<div class="hoverable">
+			<a href="../" target="_blank" id="linkVersionLive">Live version</a>
+			<a href="beta" target="_blank" id="linkVersionBeta">Try the beta!</a>
+			<a href="http://orteil.dashnet.org/cookieclicker/v10466" target="_blank" id="linkVersionOld">v. 1.0466</a>
+			<a href="http://orteil.dashnet.org/experiments/cookie/" target="_blank">Classic</a>
+			</div>
 		</div>
 	</div>
 
 	<div id="game">
 		<div id="javascriptError">
-			<div style="padding:64px 128px;">
-				<div class="title">Oops, looks like the game isn't loading right!</div>
-				<div>Please make sure your javascript is enabled, then refresh.<br>
-				This could also be caused by a problem on our side, in which case - wait a moment, then refresh!</div>
+			<div id="loader">
+				<div class="spinnyBig"></div>
+				<div class="spinnySmall"></div>
+				<div id="loading" class="title">Loading...</div>
+				<div id="failedToLoad" class="title">This is taking longer than expected.<br>
+				<div style="font-size:65%;line-height:120%;">Slow connection? If not, please make sure your javascript is enabled, then refresh.<br>
+				If problems persist, this might be on our side - wait a few minutes, then hit ctrl+f5!</div></div>
+				<div id="ifIE9" class="title" style="font-size:100%;line-height:120%;">Your browser may not be recent enough to run Cookie Clicker.<br>You might want to update, or switch to a more modern browser such as Chrome or Firefox.</div>
+				<!--<div class="title">Oops, looks like we've got a problem.</div>
+				<div>Please bear with us while we fix it.<br>Your save is safe, don't worry!</div>-->
 			</div>
 		</div>
 
@@ -76,10 +81,22 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga
 		
 		<div id="goldenCookie" class="goldenCookie"></div>
 		<div id="seasonPopup" class="seasonPopup"></div>
+		<div id="shimmers"></div>
 		<div id="alert"></div>
 		<div id="particles"></div>
+		<div id="sparkles" class="sparkles"></div>
+		<div id="notes"></div>
+		<div id="darken"></div>
+		<div id="toggleBox" class="framed prompt"></div><!-- tabindex="-1" -->
+		<div id="promptAnchor"><div id="prompt" class="framed"><div id="promptContent"></div><div class="close" onclick="PlaySound('snd/tick.mp3');Game.ClosePrompt();">x</div></div></div>
 		<div id="versionNumber" class="title"></div>
-		<div id="timers"></div>
+		<div id="ascend">
+			<div id="ascendBG"></div>
+			<div id="ascendZoomable"><div id="ascendContent"><div id="ascendUpgrades" style="position:absolute;"></div></div></div>
+			<div id="ascendOverlay"></div>
+		</div>
+		
+		<div id="debug"><div id="devConsole" class="framed"></div><div id="debugLog"></div></div>
 		
 		<div id="sectionLeft" class="inset">
 			<canvas id="backgroundLeftCanvas" style="z-index:5;"></canvas>
@@ -87,60 +104,118 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga
 			<div class="blackGradient"></div>
 			<div id="sectionLeftInfo"></div>
 			<div id="cookies" class="title"></div>
+			<div id="bakeryNameAnchor"><div id="bakeryName" class="title"></div></div>
+			<div id="specialPopup" class="framed prompt offScreen"></div>
+			<div id="buffs" class="crateBox"></div>
 			<div id="cookieAnchor">
 				<div id="bigCookie"></div>
 				<div id="cookieNumbers"></div>
 			</div>
+			<div id="sectionLeftExtra"></div>
 		</div>
 
 		<div class="separatorLeft"></div>
 		<div class="separatorRight"></div>
-			
+
 		<div id="sectionMiddle" class="inset">
 			<div id="comments" class="inset title">
-				<div id="prefsButton" class="button">Menu</div>
+				<div id="prefsButton" class="button">Options</div>
 				<div id="statsButton" class="button">Stats</div>
-				<div id="logButton" class="button" style="font-size:80%;">Updates</div>
+				<div id="logButton" class="button">Info</div>
+				<div id="legacyButton" class="button">Legacy<div id="ascendMeterContainer" class="smallFramed meterContainer"><div id="ascendMeter" class="meter filling"></div></div><div class="roundedPanel" id="ascendNumber"></div><div id="ascendTooltip" class="framed"></div></div>
+				<div id="commentsTextBelow" class="commentsText"></div>
 				<div id="commentsText" class="commentsText"></div>
 				<div class="separatorBottom"></div>
 			</div>
-			<div id="buildingsTitle" class="inset title zoneTitle">Buildings</div>
-			<div id="rows"></div>
-			<div id="menu"></div>
+			<div id="centerArea">
+				<div id="buildingsTitle" class="inset title zoneTitle">Buildings</div>
+				<div id="rows"></div>
+				<div id="menu"></div>
+				<div id="donateBox">
+					<form target="_blank" action="https://www.paypal.com/cgi-bin/webscr" method="post" id="donate" style="margin:0px 16px;">
+					<input type="hidden" name="cmd" value="_s-xclick">
+					<input type="hidden" name="hosted_button_id" value="BBN2WL3TC6QH4">
+					<input type="image" src="https://www.paypalobjects.com/en_GB/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal — The safer, easier way to pay online.">
+					<img alt="" border="0" src="https://www.paypalobjects.com/nl_NL/i/scr/pixel.gif" width="1" height="1">
+					</form>
+					Help us keep developing the game!
+				</div>
+			</div>
 		</div>
 
 		<div id="sectionRight" class="inset">
 			<div id="store">
 				<div id="storeTitle" class="inset title zoneTitle">Store</div>
-				<div id="upgrades">
-				</div>
-				<div id="products">
-				</div>
+				<div id="toggleUpgrades" class="storeSection upgradeBox"></div>
+				<div id="techUpgrades" class="storeSection upgradeBox"></div>
+				<div id="upgrades" class="storeSection upgradeBox"></div>
+				<div id="products" class="storeSection"></div>
 			</div>
 			
 			
 			<div id="support" style="margin-top:130px;">
-				<div id="supportComment">Sponsored links</div>
-				<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-				<!-- Cookie Clicker Rectangle -->
-				<ins class="adsbygoogle"
-					 style="display:inline-block;width:300px;height:250px"
-					 data-ad-client="ca-pub-8491708950677704"
-					 data-ad-slot="9349826096"></ins>
-				<script>
-				(adsbygoogle = window.adsbygoogle || []).push({});
-				</script>
-				<!-- AdventureQuest Worlds banner -->
-				<a class="ad" id="aqad" href="http://www.aq.com/landing/cookie/?utm_campaign=AQW_CookieClicker&utm_source=CookieClicker" target="_blank" title="AdventureQuest Worlds" style="background:url(img/aqworldsbanner.jpg) no-repeat;width:300px;height:64px;display:block;position:relative;left:-10px;margin:16px 0px;">
-				</a>
-				<form target="_blank" action="https://www.paypal.com/cgi-bin/webscr" method="post" id="donate" style="margin:0px 16px;">
-				<input type="hidden" name="cmd" value="_s-xclick">
-				<input type="hidden" name="hosted_button_id" value="BBN2WL3TC6QH4">
-				<input type="image" src="https://www.paypalobjects.com/en_GB/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal — The safer, easier way to pay online.">
-				<img alt="" border="0" src="https://www.paypalobjects.com/nl_NL/i/scr/pixel.gif" width="1" height="1">
-				</form>
+				<div class="supportComment">Sponsored links</div>
+				<div style="position:relative;">
+				
+					<div style="position:relative;z-index:100;min-height:250px;">
+					
+						<!-- Google ad -->
+						<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+						<!-- Cookie Clicker Rectangle -->
+						<ins class="adsbygoogle"
+							 style="display:inline-block;width:300px;height:250px"
+							 data-ad-client="ca-pub-8491708950677704"
+							 data-ad-slot="9349826096"></ins>
+						<script>
+						(adsbygoogle = window.adsbygoogle || []).push({});
+						</script>
+						
+						<div style="height:16px;"></div>
+						
+						<!-- Google ad -->
+						<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+						<!-- Cookie Clicker Rectangle -->
+						<ins class="adsbygoogle"
+							 style="display:inline-block;width:300px;height:250px"
+							 data-ad-client="ca-pub-8491708950677704"
+							 data-ad-slot="9349826096"></ins>
+						<script>
+						(adsbygoogle = window.adsbygoogle || []).push({});
+						</script>
+						
+						<div style="height:16px;"></div>
+						
+						<!-- AdventureQuest Worlds banner -->
+						<a class="ad" id="aqad" href="http://www.aq.com/landing/cookie/?utm_campaign=AQW_CookieClicker&utm_source=CookieClicker" target="_blank" title="AdventureQuest Worlds" style="background:url(img/aqworldsbanner.jpg) no-repeat;width:300px;height:64px;display:block;position:relative;margin:0px auto;">
+						</a>
+						
+					</div>
+					
+				</div>
 			</div>
 		</div>
+		<!--
+		<div id="sectionAd" class="inset">
+		
+			<div class="supportComment">Sponsored links</div>
+			<div style="position:relative;">
+				<div class="supportPlaceholder">
+					<div>(Normally, there would be an ad here. It's fine if you want to block it, but remember - Cookie Clicker only happens because of ad revenue!)</div>
+				</div>
+				<div style="position:relative;z-index:100;">
+					<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+					<ins class="adsbygoogle"
+						 style="display:inline-block;width:160px;height:600px"
+						 data-ad-client="ca-pub-8491708950677704"
+						 data-ad-slot="8643839697"></ins>
+					<script>
+					(adsbygoogle = window.adsbygoogle || []).push({});
+					</script>
+				</div>
+			</div>
+		
+		</div>
+		-->
 		
 		<div id="focusButtons">
 			<div id="focusLeft" class="title">Cookie</div>
@@ -154,7 +229,7 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga
 			<div class="separatorBottom"></div>
 		</div>
 		
-		<div id="tooltipAnchor"><div id="tooltip" onMouseOut="Game.tooltip.hide();"></div></div>
+		<div id="tooltipAnchor"><div id="tooltip" class="framed" onMouseOut="Game.tooltip.hide();"></div></div>
 
 	</div>
author	ozh <ozh@ozh.org>	2017-11-10 23:04:03 +0100
committer	ozh <ozh@ozh.org>	2017-11-10 23:04:03 +0100
commit	d0378b1e0b994427b12548ae8145ec7f06d93efa (patch)
tree	4ebb9a427133507647cb81d6901d4abe8a76e3ba /index.html
parent	43c1724a58b493a8cef44cc6c7d622886eb634de (diff)