Mise en commun du shop et de la guilde

2 files changed, 11 insertions, 19 deletions

diff --git a/js/craftmine.js b/js/craftmine.js
index 000a8f2..92fa45a 100644
--- a/js/craftmine.js
+++ b/js/craftmine.js
@@ -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/guild.js b/js/guild.js
index cb9e783..8d4d91b 100644
--- a/js/guild.js
+++ b/js/guild.js
@@ -1,26 +1,17 @@
 function hireMiner(){
-	sendRequest("craftmine.php", "op=hireMiner", function(xhr) {
-		//data.gold -= 40;
-		var ret = xhr.responseText;
-		if(ret != "you need to create a guild first" && ret!=""){
-			console.log(ret);
-			var tmp = ret.split(",");
-			console.log(tmp);
-			data.gold = parseInt(tmp[0]);
-			data.miners = parseInt(tmp[1]);
-			updateData("gold","miners");
+	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(xhr) {
-		var ret = xhr.responseText;
-		if(ret != "g"){
-			document.getElementById("guild").innerHTML = ret;
-			data.gold -= 50;
-			updateData("gold");
+	sendRequest("craftmine.php", "op=createGuild", function(ret) {
+			showInfo("Your guild has been successfully created");
+			debitAccount(parseInt(ret.cost));
 		}
-	})
+	)
 }