Merge remote-tracking branch 'origin/alexichi' into piernov

4 files changed, 21 insertions, 54 deletions

diff --git a/js/craftmine.js b/js/craftmine.js
index 66c35fc..92fa45a 100644
--- a/js/craftmine.js
+++ b/js/craftmine.js
@@ -1,7 +1,7 @@
 data = {
 	gold: 0,
 	mine: 0,
-	miners: 1,
+	miners: 0,
 	level: 1
 }
 
@@ -49,7 +49,8 @@ function initCraftMine() {
 		data.gold = parseInt(ret.gold); // Server's response is a string
 		if(ret.shop) displayShop(ret.shop);
 		displayInventory(ret.inventory);
-		updateData("gold");
+		data.miners = parseInt(ret.miners);
+		updateData("gold","miners");
 	})
 }
 
diff --git a/js/craftmine.js~ b/js/craftmine.js~
deleted file mode 100644
index bc03d6c..0000000
--- a/js/craftmine.js~
+++ /dev/null
@@ -1,51 +0,0 @@
-datas = {
-	gold: 0,
-	mine: 0,
-	miners: 1,
-	level: 1
-}
-
-function sendRequest(url, params, callback) {
-	var xhr = new XMLHttpRequest();
-	xhr.open("POST", url);
-	xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-	xhr.onreadystatechange = function() {
-		if(xhr.readyState == XMLHttpRequest.DONE && xhr.status == "200") {
-			callback(xhr);
-		}
-	}
-	xhr.send(params);
-}
-
-
-function updateDatas(t) {
-	document.getElementById(t).innerHTML = datas[t];
-}
-
-function withdrawMine() {
-	sendRequest("craftmine.php", "op=withdrawMine", function() {
-		datas.gold += parseInt(datas.mine);
-		datas.mine = 0;
-		updateDatas("gold");
-		updateDatas("mine");
-	})
-}
-
-function initCraftMine() {
-	sendRequest("craftmine.php", "op=getCraftMine", function(xhr) {
-		var ret = xhr.responseText;
-		datas.gold = ret;
-		updateDatas("gold");
-	})
-}
-
-
-function updateMine() {
-	datas.mine += (datas.mineurs+1);
-	updateDatas("mine");
-}
-
-function init() {
-	initCraftMine();
-	window.setInterval(updateMine, 1000);
-}
diff --git a/js/guild.js b/js/guild.js
new file mode 100644
index 0000000..8d4d91b
--- /dev/null
+++ b/js/guild.js
@@ -0,0 +1,17 @@
+function hireMiner(){
+	sendRequest("craftmine.php", "op=hireMiner", function(ret) {
+			debitAccount(parseInt(ret.cost));
+			data.miners = parseInt(ret.miners);
+			updateData("miners");
+		}
+	)
+}
+	
+function createGuild(){
+	sendRequest("craftmine.php", "op=createGuild", function(ret) {
+			showInfo("Your guild has been successfully created");
+			debitAccount(parseInt(ret.cost));
+		}
+	)
+}
+
diff --git a/js/shop.js b/js/shop.js
index 00636e1..22ca85f 100644
--- a/js/shop.js
+++ b/js/shop.js
@@ -25,7 +25,7 @@ function buildShop() {
 
 function addItem(ret) {
 	var itemhtml = "<li>";
-	itemhtml += "<button type=\"submit\" class=\"btn btn-primary\" onclick=\"useItem('" + ret.name + "')\"><span class=\"item-icon\">" + ret.icon + "</span><br />" + ret.name + "</button>";
+	itemhtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"useItem('" + ret.name + "')\"><span class=\"item-icon\">" + ret.icon + "</span><br />" + ret.name + "</button>";
 	itemhtml += "</li>";
 
 	var invcontent = document.getElementById("tab3");