diff --git a/js_v9/input.js b/js_v9/input.js
index 3e0481e..8f565ca 100644
--- a/js_v9/input.js
+++ b/js_v9/input.js
@@ -16,17 +16,6 @@ function addKeyListeners() {
}
}
});
- keypress.register_combo({
- keys: "down",
- on_keydown: function() {
- rush=2;
- },
- on_release: function() {
- rush=1;
- }
-
- });
-
keypress.register_combo({
keys: "a",
on_keydown: function() {
@@ -121,9 +110,9 @@ function addKeyListeners() {
canRestart = false;
});
$("#restart").on('touchstart', function() {
- alert("hey");
init();
canRestart = false;
+ $("#gameoverscreen").fadeOut();
});
}
@@ -177,11 +166,6 @@ function handleClickTap(x,y) {
Vertexes = Vertexes.map(function(coord){
return [coord[0] + trueCanvas.width/2, coord[1] + trueCanvas.height/2]});
- if (gameState == 1 && inside([x,y],Vertexes)){
- toggleRush();
- return;
- }
-
if (!MainHex || gameState === 0 || gameState==-1) {
return;
}
@@ -194,13 +178,3 @@ function handleClickTap(x,y) {
}
}
-function toggleRush(){
- rush = ((rush)%2)+1;
-}
-function setRush() {
- rush = 2;
-}
-
-function removeRush() {
- rush = 1;
-}
diff --git a/js_v9/view.js b/js_v9/view.js
index 2ef6684..a51cc59 100644
--- a/js_v9/view.js
+++ b/js_v9/view.js
@@ -39,9 +39,6 @@ function drawScoreboard() {
if (rush ==1){
var color = "rgb(236, 240, 241)";
}
- else{
- var color = "#e74c3c";
- }
var fontSize = settings.platform == 'mobile' ? 35 : 30;
if (gameState === 0) {
@@ -141,7 +138,7 @@ function hideText() {
}
function gameOverDisplay() {
- if( localStorage.getItem("been_mobile") != "true" || true){
+ if(Cookies.get("visited") == null){
settings.ending_block=true;
if(settings.os == "android"){
sweetAlert({
@@ -178,10 +175,11 @@ function gameOverDisplay() {
}
}
- localStorage.setItem("been_mobile", "true");
+ Cookies.set("visited",true);
$("#attributions").show();
var c = document.getElementById("canvas");
c.className = "blur";
+ updateHighScores();
$("#gameoverscreen").fadeIn();
$("#buttonCont").fadeIn();
$("#container").fadeIn();
@@ -189,6 +187,12 @@ function gameOverDisplay() {
$("#restart").fadeIn();
}
+function updateHighScores (){
+ $("#cScore").text(score);
+ $("#1place").text(highscores[0]);
+ $("#2place").text(highscores[1]);
+ $("#3place").text(highscores[2]);
+}
function pause(o) {
writeHighScores();
var message;
diff --git a/vendor/js.cookie.js b/vendor/js.cookie.js
new file mode 100644
index 0000000..116e62d
--- /dev/null
+++ b/vendor/js.cookie.js
@@ -0,0 +1,137 @@
+/*!
+ * JavaScript Cookie v2.0.0-pre
+ * https://github.com/js-cookie/js-cookie
+ *
+ * Copyright 2006, 2015 Klaus Hartl
+ * Released under the MIT license
+ */
+(function (factory) {
+ if (typeof define === 'function' && define.amd) {
+ define(factory);
+ } else if (typeof exports === 'object') {
+ module.exports = factory();
+ } else {
+ var _OldCookies = window.Cookies;
+ var api = window.Cookies = factory(window.jQuery);
+ api.noConflict = function () {
+ window.Cookies = _OldCookies;
+ return api;
+ };
+ }
+}(function () {
+ function extend () {
+ var i = 0;
+ var result = {};
+ for (; i < arguments.length; i++) {
+ var attributes = arguments[ i ];
+ for (var key in attributes) {
+ result[key] = attributes[key];
+ }
+ }
+ return result;
+ }
+
+ function init (converter) {
+ function api (key, value, attributes) {
+ var result;
+
+ // Write
+
+ if (arguments.length > 1) {
+ attributes = extend({
+ path: '/'
+ }, api.defaults, attributes);
+
+ if (typeof attributes.expires === 'number') {
+ var expires = new Date();
+ expires.setMilliseconds(expires.getMilliseconds() + attributes.expires * 864e+5);
+ attributes.expires = expires;
+ }
+
+ try {
+ result = JSON.stringify(value);
+ if (/^[\{\[]/.test(result)) {
+ value = result;
+ }
+ } catch (e) {}
+
+ value = encodeURIComponent(String(value));
+ value = value.replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent);
+
+ key = encodeURIComponent(String(key));
+ key = key.replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent);
+ key = key.replace(/[\(\)]/g, escape);
+
+ return (document.cookie = [
+ key, '=', value,
+ attributes.expires && '; expires=' + attributes.expires.toUTCString(), // use expires attribute, max-age is not supported by IE
+ attributes.path && '; path=' + attributes.path,
+ attributes.domain && '; domain=' + attributes.domain,
+ attributes.secure && '; secure'
+ ].join(''));
+ }
+
+ // Read
+
+ if (!key) {
+ result = {};
+ }
+
+ // To prevent the for loop in the first place assign an empty array
+ // in case there are no cookies at all. Also prevents odd result when
+ // calling "get()"
+ var cookies = document.cookie ? document.cookie.split('; ') : [];
+ var rdecode = /(%[0-9A-Z]{2})+/g;
+ var i = 0;
+
+ for (; i < cookies.length; i++) {
+ var parts = cookies[i].split('=');
+ var name = parts[0].replace(rdecode, decodeURIComponent);
+ var cookie = parts.slice(1).join('=');
+
+ if (cookie.charAt(0) === '"') {
+ cookie = cookie.slice(1, -1);
+ }
+
+ cookie = converter && converter(cookie, name) || cookie.replace(rdecode, decodeURIComponent);
+
+ if (this.json) {
+ try {
+ cookie = JSON.parse(cookie);
+ } catch (e) {}
+ }
+
+ if (key === name) {
+ result = cookie;
+ break;
+ }
+
+ if (!key) {
+ result[name] = cookie;
+ }
+ }
+
+ return result;
+ }
+
+ api.get = api.set = api;
+ api.getJSON = function () {
+ return api.apply({
+ json: true
+ }, [].slice.call(arguments));
+ };
+ api.defaults = {};
+
+ api.remove = function (key, attributes) {
+ api(key, '', extend(attributes, {
+ expires: -1
+ }));
+ };
+
+ api.withConverter = init;
+
+ return api;
+ }
+
+ return init();
+}));