From 31866085151518f468794dc71b541543e6b2f691 Mon Sep 17 00:00:00 2001
From: alexichi <alexbankai96@gmail.com>
Date: Sun, 1 May 2016 11:32:08 +0200
Subject: add the beginning part of the dungeon When you have enough money you
 can buy a ticket and access the dungeon I made a file monsters.xml . It's a
 bit like the code with the shop but modified When you press the button launch
 in the onglet dungeon , it display "Battle!" in the console

---
 js/dungeon.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 js/dungeon.js

(limited to 'js/dungeon.js')

diff --git a/js/dungeon.js b/js/dungeon.js
new file mode 100644
index 0000000..1760afa
--- /dev/null
+++ b/js/dungeon.js
@@ -0,0 +1,18 @@
+function buildDungeon(){
+	sendRequest("craftmine.php", "op=buildDungeon", function(ret) {
+		displayDungeon();
+		debitAccount(ret.cost);
+		showInfo("You can acces the dungeon now. Good Luck.");
+	});
+}
+
+function displayDungeon(){
+	var tmphtml = "<br/>";
+	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"launchDungeon()\">Launch</button>";
+	//tmphtml += "</li>";
+	document.getElementById("tab4").innerHTML = tmphtml;
+}
+
+function launchDungeon(){
+	console.log("Battle!");
+}
-- 
cgit v1.2.3-54-g00ecf


From 64b1663e55544e1ed0e072c4f624688625691c9f Mon Sep 17 00:00:00 2001
From: alexichi <alexbankai96@gmail.com>
Date: Sun, 1 May 2016 13:55:08 +0200
Subject: Add dungeon without fight system You can buy a "ticket" to access the
 dungeon If you exit you have to buy another ticket Problem when we update the
 page, the default sentence is displayed while it said that you can access the
 dungeon

---
 craftmine.php   |  2 ++
 data/items.xml  |  4 ++--
 inc/dungeon.inc | 11 +++++++++++
 js/craftmine.js |  5 ++++-
 js/dungeon.js   | 30 +++++++++++++++++++++++++++---
 5 files changed, 46 insertions(+), 6 deletions(-)

(limited to 'js/dungeon.js')

diff --git a/craftmine.php b/craftmine.php
index 4cd6b00..72817cc 100644
--- a/craftmine.php
+++ b/craftmine.php
@@ -43,6 +43,8 @@ switch($op) {
 	case "buildShop": buildShop(); break;
 	case "buyItem": buyItem(); break;
 	case "buildDungeon" : buildDungeon(); break;
+	case "launchDungeon" : launchDungeon(); break;
+	case "exitDungeon" : exitDungeon(); break;
 	default: reportBadRequest();
 }
 
diff --git a/data/items.xml b/data/items.xml
index 6c19b84..8888796 100644
--- a/data/items.xml
+++ b/data/items.xml
@@ -25,7 +25,7 @@
 			<name>Life Bottle</name>
 			<cost>5</cost>
 			<features></features>
-			<icon>🍶</icon>
+			<icon>💧</icon>
 			<description>A bottle which can heal you by regaining hp</description> 
 		</item>
 		<item>
@@ -34,7 +34,7 @@
 			<features>
 				<power>20</power>
 			</features>
-			<icon>🍶</icon>	
+			<icon>💧</icon>	
 			<description>If used, you have 20% more chance to hit your enemy during the battle</description>
 		</item>
 	</category>
diff --git a/inc/dungeon.inc b/inc/dungeon.inc
index b2277f0..8c26c92 100644
--- a/inc/dungeon.inc
+++ b/inc/dungeon.inc
@@ -36,4 +36,15 @@ function buildDungeon() {
 	}
 }
 
+function launchDungeon(){
+	$dungeon=generateMonster();
+	$opponent = $dungeon["monsters"]["floor1"];
+	echo json_encode($opponent);
+}
+
+function exitDungeon(){
+	$_SESSION["dungeon"] = false;
+	echo json_encode(array("a" => 7));//Cette ligne ne sert qu'à contourner l'erreur créé à cause de sendRequest. A revoir.
+}
+
 ?>
diff --git a/js/craftmine.js b/js/craftmine.js
index 92fa45a..c40106c 100644
--- a/js/craftmine.js
+++ b/js/craftmine.js
@@ -1,8 +1,11 @@
 data = {
+	name: "You",
 	gold: 0,
 	mine: 0,
 	miners: 0,
-	level: 1
+	level: 1,
+	hp: 1,
+	icon : "H"
 }
 
 function sendRequest(url, params, callback) {
diff --git a/js/dungeon.js b/js/dungeon.js
index 1760afa..d20a3cf 100644
--- a/js/dungeon.js
+++ b/js/dungeon.js
@@ -8,11 +8,35 @@ function buildDungeon(){
 
 function displayDungeon(){
 	var tmphtml = "<br/>";
-	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"launchDungeon()\">Launch</button>";
-	//tmphtml += "</li>";
+	tmphtml += "<button id=\"launch\" type=\"button\" class=\"btn btn-primary\" onclick=\"launchDungeon()\">Launch</button>";
 	document.getElementById("tab4").innerHTML = tmphtml;
 }
 
 function launchDungeon(){
-	console.log("Battle!");
+	sendRequest("craftmine.php", "op=launchDungeon", function(ret) {
+		document.getElementById("launch").style.display = "none";
+		displayBattle(ret);
+	});
+}
+
+function displayBattle(ret){
+	var tmphtml = "<div class=\"row\">";
+	tmphtml += "<h4>Battle</h4>";
+	tmphtml += "<ul class=\"list-inline\">";
+	tmphtml += "<li>";
+	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" style=\"margin-left:30px;\"><span class=\"item-icon\">" + data.icon + "</span><br />" + data.name + "<br/> lv: " + data.level + "  <span id=\"lifeMob\">hp: " + data.hp + "</span></button>";
+	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" style=\"margin-left:30px;\"><span class=\"item-icon\">" + ret[0].icon + "</span><br />" + ret[0].name + "<br/> lv: " + ret[0].level + "  <span id=\"lifeMob\">hp: " + ret[0].hp + "</span></button>";
+	tmphtml += "</li>";
+	tmphtml += "</ul>";
+	tmphtml += "</div>";
+	tmphtml += "<br/><br/>";
+	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"exitDungeon()\">Exit</button>";
+	document.getElementById("tab4").innerHTML = tmphtml;
+}
+
+function exitDungeon(){
+	sendRequest("craftmine.php", "op=exitDungeon", function() {
+		document.getElementById("tab4").innerHTML = "<h4>Look at how poor you are! You can't access the dungeon, it is only for the elite.</h4>";
+		showInfo("You have left the dungeon");
+	});
 }
-- 
cgit v1.2.3-54-g00ecf


From 1efc4a15c8ab913bf8bdb1aef9f3b5720b3b7762 Mon Sep 17 00:00:00 2001
From: alexichi <alexbankai96@gmail.com>
Date: Thu, 5 May 2016 20:28:26 +0200
Subject: add dungeon server side and improve some details like the difference
 between floors

---
 craftmine.php     |  1 +
 data/items.xml    |  4 +--
 data/monsters.xml |  2 +-
 inc/dungeon.inc   | 16 ++++++++---
 inc/messages.inc  |  3 +-
 js/craftmine.js   |  7 +++--
 js/dungeon.js     | 82 ++++++++++++++++++++++++++++++++++++++++++++++---------
 7 files changed, 90 insertions(+), 25 deletions(-)

(limited to 'js/dungeon.js')

diff --git a/craftmine.php b/craftmine.php
index 242e1fd..43fdc66 100644
--- a/craftmine.php
+++ b/craftmine.php
@@ -51,6 +51,7 @@ switch($op) {
 	case "buildDungeon" : buildDungeon(); break;
 	case "launchDungeon" : launchDungeon(); break;
 	case "exitDungeon" : exitDungeon(); break;
+	case "sendDungeonProgress" : sendDungeonProgress(); break;
 	case "saveGame": saveGame(); break;
 	case "downSave": downSave(); break;
 	case "listSaves": listSaves(); break;
diff --git a/data/items.xml b/data/items.xml
index 8888796..6c19b84 100644
--- a/data/items.xml
+++ b/data/items.xml
@@ -25,7 +25,7 @@
 			<name>Life Bottle</name>
 			<cost>5</cost>
 			<features></features>
-			<icon>💧</icon>
+			<icon>🍶</icon>
 			<description>A bottle which can heal you by regaining hp</description> 
 		</item>
 		<item>
@@ -34,7 +34,7 @@
 			<features>
 				<power>20</power>
 			</features>
-			<icon>💧</icon>	
+			<icon>🍶</icon>	
 			<description>If used, you have 20% more chance to hit your enemy during the battle</description>
 		</item>
 	</category>
diff --git a/data/monsters.xml b/data/monsters.xml
index 86cf422..630e83a 100644
--- a/data/monsters.xml
+++ b/data/monsters.xml
@@ -4,7 +4,7 @@
 		<monster>
 			<name>monster1</name>
 			<level>1</level>
-			<hp>2</hp>
+			<hp>3</hp>
 			<icon>m</icon>
 		</monster>
 		<monster >
diff --git a/inc/dungeon.inc b/inc/dungeon.inc
index 81e2ba7..ebe74b7 100644
--- a/inc/dungeon.inc
+++ b/inc/dungeon.inc
@@ -21,12 +21,12 @@ function generateMonster(){
 }
 
 function initDungeon() {
-	$_SESSION["dungeon"] = true;
+	$_SESSION["dungeon"]["access"] = true;
 }
 
 function sendDungeon() {
 	if(!empty($_SESSION["dungeon"]))
-		return generateMonster();
+		return $_SESSION["dungeon"];
 	else return false;
 }
 
@@ -43,14 +43,22 @@ function buildDungeon() {
 }
 
 function launchDungeon(){
+	$f= $_POST["floor"];
 	$dungeon=generateMonster();
-	$opponent = $dungeon["monsters"]["floor1"];
+	$opponent = $dungeon["monsters"]["floor".$f];
 	echo json_encode($opponent);
 }
 
+function sendDungeonProgress(){
+	$f= $_POST["floor"];
+	$nb=$_POST["mob"];
+	$_SESSION["dungeon"]["flat"] = $f;
+	$_SESSION["dungeon"]["mob"] = $nb;
+}
+
+
 function exitDungeon(){
 	$_SESSION["dungeon"] = false;
-	echo json_encode(array("a" => 7));//Cette ligne ne sert qu'à contourner l'erreur créé à cause de sendRequest. A revoir.
 }
 
 ?>
diff --git a/inc/messages.inc b/inc/messages.inc
index c51adba..1f25ed3 100644
--- a/inc/messages.inc
+++ b/inc/messages.inc
@@ -6,8 +6,7 @@ $messages = array(
 	"shop_missing_item" => "This item does not exist.",
 	"guild_not_yet_created" => "You need to create a guild first.",
 	"guild_already_built" => "You have aready built a guild.",
-	"dungeon_already_available" => "You can already access the dungeon"
-
+	"dungeon_already_available" => "You can already access the dungeon",
 	"gamesave_ok" => "Game saved.",
 	"gamesave_error" => "An error occured when trying to save the game.",
 	"gamesave_not_found" => "Couldn't find the specified save file.",
diff --git a/js/craftmine.js b/js/craftmine.js
index ffc9b5e..9af9b9f 100644
--- a/js/craftmine.js
+++ b/js/craftmine.js
@@ -3,8 +3,8 @@ data = {
 	gold: 0,
 	mine: 0,
 	miners: 0,
-	level: 1,
-	hp: 1,
+	level: 4,
+	hp: 5,
 	icon : "H"
 }
 
@@ -56,7 +56,8 @@ function initCraftMine() {
 		data.mine = 0; // Reset mine
 		if(ret.shop) displayShop(ret.shop);
 		displayInventory(ret.inventory);
-		if(ret.dungeon) displayDungeon();
+		if(typeof ret.dungeon.mob == "undefined") displayDungeon(0,1,true);
+		else displayDungeon(ret.dungeon.mob,ret.dungeon.flat,true);
 		data.miners = parseInt(ret.miners);
 		updateData("gold", "mine", "miners");
 	})
diff --git a/js/dungeon.js b/js/dungeon.js
index d20a3cf..c6ce014 100644
--- a/js/dungeon.js
+++ b/js/dungeon.js
@@ -1,41 +1,97 @@
+var timeout;
+
 function buildDungeon(){
 	sendRequest("craftmine.php", "op=buildDungeon", function(ret) {
-		displayDungeon();
+		displayDungeon(0,1,true);//mob 0 in the floor 1 and I access the dungeon for the first dungeon
 		debitAccount(ret.cost);
 		showInfo("You can acces the dungeon now. Good Luck.");
 	});
 }
 
-function displayDungeon(){
+function displayDungeon(nb,f,firstTime){
 	var tmphtml = "<br/>";
-	tmphtml += "<button id=\"launch\" type=\"button\" class=\"btn btn-primary\" onclick=\"launchDungeon()\">Launch</button>";
+	tmphtml += "<button id=\"launch\" type=\"button\" class=\"btn btn-primary\" onclick=\"launchDungeon("+nb+","+f+","+firstTime+")\">Launch</button>";
 	document.getElementById("tab4").innerHTML = tmphtml;
 }
 
-function launchDungeon(){
-	sendRequest("craftmine.php", "op=launchDungeon", function(ret) {
-		document.getElementById("launch").style.display = "none";
-		displayBattle(ret);
+function launchDungeon(nb,f,firstTime){
+	sendRequest("craftmine.php", "op=launchDungeon&floor="+f, function(ret) {
+		if(nb==0 && firstTime){
+			document.getElementById("launch").style.display = "none";
+		}
+		displayBattle(ret,nb,f);
 	});
 }
 
-function displayBattle(ret){
+function displayBattle(ret,nb,f){
 	var tmphtml = "<div class=\"row\">";
-	tmphtml += "<h4>Battle</h4>";
+	tmphtml += "<h4>Battle floor "+ f +"</h4>";
 	tmphtml += "<ul class=\"list-inline\">";
 	tmphtml += "<li>";
-	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" style=\"margin-left:30px;\"><span class=\"item-icon\">" + data.icon + "</span><br />" + data.name + "<br/> lv: " + data.level + "  <span id=\"lifeMob\">hp: " + data.hp + "</span></button>";
-	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" style=\"margin-left:30px;\"><span class=\"item-icon\">" + ret[0].icon + "</span><br />" + ret[0].name + "<br/> lv: " + ret[0].level + "  <span id=\"lifeMob\">hp: " + ret[0].hp + "</span></button>";
+	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" id=\"perso\" style=\"margin-left:30px;\"><span class=\"item-icon\">" + data.icon + "</span><br />" + data.name + "<br/> lv: " + data.level + " hp:  <span id=\"lifePerso\">" + data.hp + "</span></button>";
+	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" id=\"mob\" style=\"margin-left:30px;\">"
+				+"<span class=\"item-icon\">" + ret[nb].icon + "</span><br />" + ret[nb].name + "<br/>"
+				+" lv: " + ret[nb].level + " hp: <span id=\"lifeMob\">" + ret[nb].hp + "</span></button>";
 	tmphtml += "</li>";
 	tmphtml += "</ul>";
 	tmphtml += "</div>";
-	tmphtml += "<br/><br/>";
-	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"exitDungeon()\">Exit</button>";
 	document.getElementById("tab4").innerHTML = tmphtml;
+	displayExit();
+	battle(ret,nb,f);
+}
+
+function battle(ret,nb,f){
+	timeout=window.setTimeout(strike, 1000, ret, nb, f);
+}
+
+function strike(ret,nb, f){
+	var lvDiff = data.level-parseInt(ret[0].level);
+	var hitRate = Math.floor((Math.random() * 100) + 1);
+	var mobLife = document.getElementById("lifeMob").innerHTML;
+	var persoLife = document.getElementById("lifePerso").innerHTML;
+	if(mobLife == 0){
+		endBattle("perso",nb,f);
+		return;
+	}
+	else if(persoLife == 0){
+		endBattle("mob",nb);
+		return;
+	}
+	if(hitRate<50+10*lvDiff){
+		mobLife--;
+		document.getElementById("lifeMob").innerHTML = parseInt(mobLife);
+	}
+	else{
+		persoLife--;
+		document.getElementById("lifePerso").innerHTML = parseInt(persoLife);
+	}
+	battle(ret,nb,f);
+}
+
+function endBattle(v,nb, f){
+	window.clearTimeout(timeout);
+	if(v=="mob")exitDungeon();//if you die in the dungeon, you are immediately sent out of the dungeon
+	nb++;//go to the next mob in the same floor
+	if(nb>=3){//floor changing
+		nb=0;//reset the number of the mob
+		f++;//increment the number of the floor
+	}
+	var tmphtml = "Le " + v + " a gagné.";
+	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"launchDungeon("+nb+","+ f +",false)\">Next Battle</button>"
+	document.getElementById("tab4").innerHTML = tmphtml;
+	displayExit();
+	sendRequest("craftmine.php", "op=sendDungeonProgress&floor="+f+"&mob="+nb);
+}
+
+function displayExit(){
+	var tmphtml = "<br/><br/>";
+	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"exitDungeon()\">Exit</button>";
+	document.getElementById("tab4").innerHTML += tmphtml;
 }
 
 function exitDungeon(){
 	sendRequest("craftmine.php", "op=exitDungeon", function() {
+		window.clearTimeout(timeout);
 		document.getElementById("tab4").innerHTML = "<h4>Look at how poor you are! You can't access the dungeon, it is only for the elite.</h4>";
 		showInfo("You have left the dungeon");
 	});
-- 
cgit v1.2.3-54-g00ecf


From f171811a44364f605712aff1ca0808bfe570ef6e Mon Sep 17 00:00:00 2001
From: alexichi <alexbankai96@gmail.com>
Date: Thu, 5 May 2016 23:06:29 +0200
Subject: add xp system and perso server side

---
 craftmine.php     |  3 +++
 data/monsters.xml |  9 +++++++++
 inc/Monster.inc   |  4 +++-
 inc/craftmine.inc |  2 ++
 inc/dungeon.inc   |  5 +++--
 inc/perso.inc     | 17 +++++++++++++++++
 index.xhtml       |  4 ++++
 js/craftmine.js   | 13 +++++++++++--
 js/dungeon.js     | 38 ++++++++++++++++++++++++++------------
 js/perso.js       |  5 +++++
 10 files changed, 83 insertions(+), 17 deletions(-)
 create mode 100644 inc/perso.inc
 create mode 100644 js/perso.js

(limited to 'js/dungeon.js')

diff --git a/craftmine.php b/craftmine.php
index 43fdc66..d47989c 100644
--- a/craftmine.php
+++ b/craftmine.php
@@ -6,6 +6,7 @@ require_once("inc/shop.inc");
 require_once("inc/craftmine.inc");
 require_once("inc/dungeon.inc");
 require_once("inc/savegame.inc");
+require_once("inc/perso.inc");
 
 session_start(); // Must be placed *BEFORE* $_SESSION is actually used and *AFTER* all classes are imported
 
@@ -52,6 +53,8 @@ switch($op) {
 	case "launchDungeon" : launchDungeon(); break;
 	case "exitDungeon" : exitDungeon(); break;
 	case "sendDungeonProgress" : sendDungeonProgress(); break;
+	case "updatePerso" : updatePerso(); break;
+	case "sendPerso" : sendPerso(); break;
 	case "saveGame": saveGame(); break;
 	case "downSave": downSave(); break;
 	case "listSaves": listSaves(); break;
diff --git a/data/monsters.xml b/data/monsters.xml
index 630e83a..ab29364 100644
--- a/data/monsters.xml
+++ b/data/monsters.xml
@@ -5,18 +5,21 @@
 			<name>monster1</name>
 			<level>1</level>
 			<hp>3</hp>
+			<xp>1</xp>
 			<icon>m</icon>
 		</monster>
 		<monster >
 			<name>monster2</name>
 			<level>2</level>
 			<hp>3</hp>
+			<xp>2</xp>
 			<icon>m</icon>
 		</monster>
 		<monster>
 			<name>monster3</name>
 			<level>3</level>
 			<hp>4</hp>
+			<xp>3</xp>
 			<icon>m</icon>
 		</monster>
 	</floor>
@@ -25,18 +28,21 @@
 			<name>monster4</name>
 			<level>4</level>
 			<hp>5</hp>
+			<xp>4</xp>
 			<icon>m</icon>
 		</monster>
 		<monster>
 			<name>monster5</name>
 			<level>5</level>
 			<hp>6</hp>
+			<xp>5</xp>
 			<icon>m</icon>
 		</monster>
 		<monster>
 			<name>monster5</name>
 			<level>6</level>
 			<hp>7</hp>
+			<xp>6</xp>
 			<icon>m</icon>
 		</monster>
 	</floor>
@@ -45,18 +51,21 @@
 			<name>monster6</name>
 			<level>8</level>
 			<hp>9</hp>
+			<xp>8</xp>
 			<icon>m</icon>
 		</monster>
 		<monster>
 			<name>monster7</name>
 			<level>9</level>
 			<hp>10</hp>
+			<xp>9</xp>
 			<icon>m</icon>
 		</monster>
 		<monster>
 			<name>Boss</name>
 			<level>10</level>
 			<hp>12</hp>
+			<xp>10</xp>
 			<icon>m</icon>
 		</monster>
 	</floor>
diff --git a/inc/Monster.inc b/inc/Monster.inc
index fbb0fe9..c7063ec 100644
--- a/inc/Monster.inc
+++ b/inc/Monster.inc
@@ -5,12 +5,14 @@ class Monster {
 	public $icon = "";
 	public $desc = "";
 	public $hp = 1;
+	public $xp = 0;
 	public $level = 1;
 
-	function __construct($name, $level, $hp, $icon) {
+	function __construct($name, $level, $hp, $xp, $icon) {
 		$this->name = $name;
 		$this->level = $level;
 		$this->hp = $hp;
+		$this->xp = $xp;
 		$this->icon = $icon;
 		
 	}
diff --git a/inc/craftmine.inc b/inc/craftmine.inc
index 0d6a445..f5dbbb1 100644
--- a/inc/craftmine.inc
+++ b/inc/craftmine.inc
@@ -3,6 +3,7 @@
 require_once("mine.inc");
 require_once("shop.inc");
 require_once("dungeon.inc");
+require_once("perso.inc");
 
 function sendCraftMine() {
 	$data = array("gold" => sendMine(),
@@ -10,6 +11,7 @@ function sendCraftMine() {
 		"inventory" => Inventory::sendContent(),
 		"miners" => sendMiners(),
 		"dungeon" => sendDungeon(),
+		"perso" => sendPerso(),
 	);
 	echo json_encode($data);
 }
diff --git a/inc/dungeon.inc b/inc/dungeon.inc
index ebe74b7..c023cf8 100644
--- a/inc/dungeon.inc
+++ b/inc/dungeon.inc
@@ -12,8 +12,9 @@ function generateMonster(){
 		$dungeon["monsters"][$floor] = array();
 		foreach($f as $monster){
 			$dungeon["monsters"][$floor][] = new Monster((string)$monster->name, 
-											intval($monster->level), 
-											intval($monster->hp), 
+											intval($monster->level),
+											intval($monster->hp),
+											intval($monster->xp), 
 											(string)$monster->icon);
 		}
 	}
diff --git a/inc/perso.inc b/inc/perso.inc
new file mode 100644
index 0000000..075f8ae
--- /dev/null
+++ b/inc/perso.inc
@@ -0,0 +1,17 @@
+<?php
+function sendPerso() {
+	if(!empty($_SESSION["perso"]))
+		return $_SESSION["perso"];
+	else return false;
+}
+
+function updatePerso(){
+	$hp = $_POST["hp"];
+	$xp = $_POST["xp"];
+	$lv = $_POST["lv"];
+	$_SESSION["perso"]["hp"] = $hp;
+	$_SESSION["perso"]["xp"] = $xp;
+	$_SESSION["perso"]["lv"] = $lv;
+}
+
+?>
diff --git a/index.xhtml b/index.xhtml
index ed3e7a6..7921cab 100644
--- a/index.xhtml
+++ b/index.xhtml
@@ -17,12 +17,16 @@
 	<script type="text/javascript" charset="utf-8" src="js/gui.js"></script>
 	<script type="text/javascript" charset="utf-8" src="js/dungeon.js"></script>
 	<script type="text/javascript" charset="utf-8" src="js/savegame.js"></script>
+	<script type="text/javascript" charset="utf-8" src="js/perso.js"></script>
 </head>
 <body onload="init()" onhashchange="changeTab()">
 <div class="container-fluid">
 <div class="row">
 	<h1>CraftMine</h1>
 </div>
+<div class="row">
+	<span id="perso">HP : <span id="hp">5</span>/ LV : <span id="lv">1</span>/ exp : <span id="xp">0</span></span>
+</div>
 <div class="row">
 	<div class="col-md-4">
 		<div class="row">
diff --git a/js/craftmine.js b/js/craftmine.js
index 9af9b9f..c7a396f 100644
--- a/js/craftmine.js
+++ b/js/craftmine.js
@@ -5,6 +5,7 @@ data = {
 	miners: 0,
 	level: 4,
 	hp: 5,
+	xp: 0,
 	icon : "H"
 }
 
@@ -52,12 +53,20 @@ function withdrawMine() {
 
 function initCraftMine() {
 	sendRequest("craftmine.php", "op=getCraftMine", function(ret) {
+		console.log(ret.perso);
 		data.gold = parseInt(ret.gold); // Server's response is a string
 		data.mine = 0; // Reset mine
+		if(ret.perso){
+			data.hp = ret.perso.hp;
+			data.xp = ret.perso.xp;
+			data.level = ret.perso.lv;
+			displayPerso(ret.perso.hp,ret.perso.xp,ret.perso.lv);
+		}
 		if(ret.shop) displayShop(ret.shop);
 		displayInventory(ret.inventory);
-		if(typeof ret.dungeon.mob == "undefined") displayDungeon(0,1,true);
-		else displayDungeon(ret.dungeon.mob,ret.dungeon.flat,true);
+		if(ret.dungeon == false){}//if we have left the donjon
+		else if(typeof ret.dungeon.mob == "undefined") displayDungeon(0,1,true); //if we have reload just after buying the ticket
+		else displayDungeon(ret.dungeon.mob,ret.dungeon.flat,true);//if we have reload in the middle of the dungeon
 		data.miners = parseInt(ret.miners);
 		updateData("gold", "mine", "miners");
 	})
diff --git a/js/dungeon.js b/js/dungeon.js
index c6ce014..65d1081 100644
--- a/js/dungeon.js
+++ b/js/dungeon.js
@@ -50,11 +50,12 @@ function strike(ret,nb, f){
 	var mobLife = document.getElementById("lifeMob").innerHTML;
 	var persoLife = document.getElementById("lifePerso").innerHTML;
 	if(mobLife == 0){
-		endBattle("perso",nb,f);
+		data.hp = persoLife;
+		endBattle("perso",nb,f,ret);
 		return;
 	}
 	else if(persoLife == 0){
-		endBattle("mob",nb);
+		endBattle("mob",nb,f,ret);
 		return;
 	}
 	if(hitRate<50+10*lvDiff){
@@ -68,19 +69,32 @@ function strike(ret,nb, f){
 	battle(ret,nb,f);
 }
 
-function endBattle(v,nb, f){
+function endBattle(v,nb, f, ret){
 	window.clearTimeout(timeout);
 	if(v=="mob")exitDungeon();//if you die in the dungeon, you are immediately sent out of the dungeon
-	nb++;//go to the next mob in the same floor
-	if(nb>=3){//floor changing
-		nb=0;//reset the number of the mob
-		f++;//increment the number of the floor
+	//To level up you have to obtain 2 xp to go to lv 3, 3 to go to lv 4, etc
+	//A mob level 2 , if defeated gives you 2 xp, ...etc
+	else{
+		data.xp += ret[nb].xp;
+		if(data.xp>=data.level){
+			data.xp-=data.level;
+			data.level++;
+			//need to send the xp to the server
+			sendRequest("craftmine.php", "op=updatePerso&hp="+data.hp+"&xp="+data.xp+"&lv="+data.level, function(){
+				displayPerso(data.hp,data.xp,data.level);
+			});
+		}
+		nb++;//go to the next mob in the same floor
+		if(nb>=3){//floor changing
+			nb=0;//reset the number of the mob
+			f++;//increment the number of the floor
+		}
+		var tmphtml = "Le " + v + " a gagné.";
+		tmphtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"launchDungeon("+nb+","+ f +",false)\">Next Battle</button>"
+		document.getElementById("tab4").innerHTML = tmphtml;
+		displayExit();
+		sendRequest("craftmine.php", "op=sendDungeonProgress&floor="+f+"&mob="+nb);
 	}
-	var tmphtml = "Le " + v + " a gagné.";
-	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"launchDungeon("+nb+","+ f +",false)\">Next Battle</button>"
-	document.getElementById("tab4").innerHTML = tmphtml;
-	displayExit();
-	sendRequest("craftmine.php", "op=sendDungeonProgress&floor="+f+"&mob="+nb);
 }
 
 function displayExit(){
diff --git a/js/perso.js b/js/perso.js
new file mode 100644
index 0000000..365cf54
--- /dev/null
+++ b/js/perso.js
@@ -0,0 +1,5 @@
+function displayPerso(hp,xp,lv){
+	document.getElementById("hp").innerHTML = hp;
+	document.getElementById("lv").innerHTML = lv;
+	document.getElementById("xp").innerHTML = xp;
+}
-- 
cgit v1.2.3-54-g00ecf


From ee02581b7fabd087fc4056bda739c88656fbca14 Mon Sep 17 00:00:00 2001
From: alexichi <alexbankai96@gmail.com>
Date: Sat, 7 May 2016 10:13:20 +0200
Subject: add the display of the perso characteristics below the title

---
 inc/perso.inc   | 12 +++++++++---
 js/craftmine.js |  2 +-
 js/dungeon.js   | 18 +++++++++++++-----
 3 files changed, 23 insertions(+), 9 deletions(-)

(limited to 'js/dungeon.js')

diff --git a/inc/perso.inc b/inc/perso.inc
index 075f8ae..4fb05ef 100644
--- a/inc/perso.inc
+++ b/inc/perso.inc
@@ -1,8 +1,8 @@
 <?php
 function sendPerso() {
-	if(!empty($_SESSION["perso"]))
-		return $_SESSION["perso"];
-	else return false;
+	if(empty($_SESSION["perso"]))
+		initPerso();
+	return $_SESSION["perso"];
 }
 
 function updatePerso(){
@@ -14,4 +14,10 @@ function updatePerso(){
 	$_SESSION["perso"]["lv"] = $lv;
 }
 
+function initPerso(){
+	$_SESSION["perso"]["hp"] = 5;
+	$_SESSION["perso"]["xp"] = 0;
+	$_SESSION["perso"]["lv"] = 3;
+}
+
 ?>
diff --git a/js/craftmine.js b/js/craftmine.js
index c7a396f..a8619df 100644
--- a/js/craftmine.js
+++ b/js/craftmine.js
@@ -3,7 +3,7 @@ data = {
 	gold: 0,
 	mine: 0,
 	miners: 0,
-	level: 4,
+	level: 3,
 	hp: 5,
 	xp: 0,
 	icon : "H"
diff --git a/js/dungeon.js b/js/dungeon.js
index 65d1081..30808ff 100644
--- a/js/dungeon.js
+++ b/js/dungeon.js
@@ -71,11 +71,11 @@ function strike(ret,nb, f){
 
 function endBattle(v,nb, f, ret){
 	window.clearTimeout(timeout);
-	if(v=="mob")exitDungeon();//if you die in the dungeon, you are immediately sent out of the dungeon
+	if(v=="mob")exitDungeon(false);//if you die in the dungeon, you are immediately sent out of the dungeon
 	//To level up you have to obtain 2 xp to go to lv 3, 3 to go to lv 4, etc
 	//A mob level 2 , if defeated gives you 2 xp, ...etc
 	else{
-		data.xp += ret[nb].xp;
+		data.xp += parseInt(ret[nb].xp);
 		if(data.xp>=data.level){
 			data.xp-=data.level;
 			data.level++;
@@ -88,6 +88,10 @@ function endBattle(v,nb, f, ret){
 		if(nb>=3){//floor changing
 			nb=0;//reset the number of the mob
 			f++;//increment the number of the floor
+			if(f>=4){
+				exitDungeon(true);//true means that you have completed the dungeon and not just die or exit by yourself
+				return;
+			}
 		}
 		var tmphtml = "Le " + v + " a gagné.";
 		tmphtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"launchDungeon("+nb+","+ f +",false)\">Next Battle</button>"
@@ -95,18 +99,22 @@ function endBattle(v,nb, f, ret){
 		displayExit();
 		sendRequest("craftmine.php", "op=sendDungeonProgress&floor="+f+"&mob="+nb);
 	}
+	sendRequest("craftmine.php", "op=updatePerso&hp="+data.hp+"&xp="+data.xp+"&lv="+data.level, function(){
+				displayPerso(data.hp,data.xp,data.level);
+	});
 }
 
 function displayExit(){
 	var tmphtml = "<br/><br/>";
-	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"exitDungeon()\">Exit</button>";
+	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"exitDungeon(false)\">Exit</button>";
 	document.getElementById("tab4").innerHTML += tmphtml;
 }
 
-function exitDungeon(){
+function exitDungeon(boss){
 	sendRequest("craftmine.php", "op=exitDungeon", function() {
 		window.clearTimeout(timeout);
-		document.getElementById("tab4").innerHTML = "<h4>Look at how poor you are! You can't access the dungeon, it is only for the elite.</h4>";
+		document.getElementById("tab4").innerHTML = "<h4>Not available, you have to buy a ticket in the build section.</h4>";
+		if(boss) showInfo("You have beaten the final boss! CONGRATULATIONS!");
 		showInfo("You have left the dungeon");
 	});
 }
-- 
cgit v1.2.3-54-g00ecf


From 79cfbb29042fd60dfbc76a6810f75cce21d3ffe0 Mon Sep 17 00:00:00 2001
From: alexichi <alexbankai96@gmail.com>
Date: Sat, 7 May 2016 12:08:36 +0200
Subject: add the use of the life bottle

---
 craftmine.php     |  1 +
 inc/Inventory.inc | 17 +++++++++++++++++
 inc/perso.inc     |  2 +-
 inc/shop.inc      |  6 ++++++
 js/craftmine.js   |  2 +-
 js/dungeon.js     |  3 ++-
 js/shop.js        | 18 +++++++++++++++++-
 7 files changed, 45 insertions(+), 4 deletions(-)

(limited to 'js/dungeon.js')

diff --git a/craftmine.php b/craftmine.php
index d47989c..9a8806b 100644
--- a/craftmine.php
+++ b/craftmine.php
@@ -49,6 +49,7 @@ switch($op) {
 	case "getCraftMine": sendCraftMine(); break;
 	case "buildShop": buildShop(); break;
 	case "buyItem": buyItem(); break;
+	case "useItem": useItem(); break;
 	case "buildDungeon" : buildDungeon(); break;
 	case "launchDungeon" : launchDungeon(); break;
 	case "exitDungeon" : exitDungeon(); break;
diff --git a/inc/Inventory.inc b/inc/Inventory.inc
index 024a4fe..747c4db 100644
--- a/inc/Inventory.inc
+++ b/inc/Inventory.inc
@@ -46,6 +46,23 @@ class Inventory {
 		$inv->_removeItem($item);
 	}
 
+	private function _useItem($item) {
+		foreach($this->items as $k => $object){
+			if($object[0] == $item){
+				if($this->items[$k][1]>0)$this->items[$k][1]--;
+				//if($this->items[$k][1] == 0) _removeItem($item);
+				return $this->items[$k];
+			}
+		}
+		return false;
+	}
+
+	public static function useItem($item) {
+		$inv = self::get();
+		$it = $inv->_useItem($item);
+		return $it;
+	}
+
 	public function addToXML($root) {
 		foreach($this->items as $item)
 			$item->addToXML($root);
diff --git a/inc/perso.inc b/inc/perso.inc
index 4fb05ef..0362d8c 100644
--- a/inc/perso.inc
+++ b/inc/perso.inc
@@ -10,7 +10,7 @@ function updatePerso(){
 	$xp = $_POST["xp"];
 	$lv = $_POST["lv"];
 	$_SESSION["perso"]["hp"] = $hp;
-	$_SESSION["perso"]["xp"] = $xp;
+	$_SESSION["perso"]["xp"] = intval($xp);
 	$_SESSION["perso"]["lv"] = $lv;
 }
 
diff --git a/inc/shop.inc b/inc/shop.inc
index 49ee20b..32ecea2 100644
--- a/inc/shop.inc
+++ b/inc/shop.inc
@@ -60,5 +60,11 @@ function buyItem() {
 	}
 }
 
+function useItem(){
+	$item = getItem($_POST["item"]);
+	$it = Inventory::useItem($item);
+	echo json_encode($it);
+}
+
 
 ?>
diff --git a/js/craftmine.js b/js/craftmine.js
index a8619df..70becec 100644
--- a/js/craftmine.js
+++ b/js/craftmine.js
@@ -63,7 +63,7 @@ function initCraftMine() {
 			displayPerso(ret.perso.hp,ret.perso.xp,ret.perso.lv);
 		}
 		if(ret.shop) displayShop(ret.shop);
-		displayInventory(ret.inventory);
+		if(ret.inventory) displayInventory(ret.inventory);
 		if(ret.dungeon == false){}//if we have left the donjon
 		else if(typeof ret.dungeon.mob == "undefined") displayDungeon(0,1,true); //if we have reload just after buying the ticket
 		else displayDungeon(ret.dungeon.mob,ret.dungeon.flat,true);//if we have reload in the middle of the dungeon
diff --git a/js/dungeon.js b/js/dungeon.js
index 30808ff..982dcf6 100644
--- a/js/dungeon.js
+++ b/js/dungeon.js
@@ -55,6 +55,7 @@ function strike(ret,nb, f){
 		return;
 	}
 	else if(persoLife == 0){
+		data.hp = 1;
 		endBattle("mob",nb,f,ret);
 		return;
 	}
@@ -100,7 +101,7 @@ function endBattle(v,nb, f, ret){
 		sendRequest("craftmine.php", "op=sendDungeonProgress&floor="+f+"&mob="+nb);
 	}
 	sendRequest("craftmine.php", "op=updatePerso&hp="+data.hp+"&xp="+data.xp+"&lv="+data.level, function(){
-				displayPerso(data.hp,data.xp,data.level);
+				displayPerso(data.hp,parseInt(data.xp),data.level);
 	});
 }
 
diff --git a/js/shop.js b/js/shop.js
index bda3885..efb347a 100644
--- a/js/shop.js
+++ b/js/shop.js
@@ -37,7 +37,7 @@ function addItem(ret) {
 	var itemtag = document.querySelector("[data-name=\""+ret[0].name+"\"]");
 	if(!itemtag){ //si c'est la première itération de l'objet
 		itemhtml += "<li>";
-		itemhtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"useItem('" + ret[0].name + "')\"><span class=\"item-icon\">" + ret[0].icon + "</span><br />" + ret[0].name + "(<span data-name=\""+ ret[0].name + "\">"+ret[1]+"</span>)</button>"; 
+		itemhtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"useItem('" + ret[0].name + "')\"><span class=\"item-icon\">" + ret[0].icon + "</span><br />" + ret[0].name + "(<span id=\"nbItem\" data-name=\""+ ret[0].name + "\">"+ret[1]+"</span>)</button>"; 
 		itemhtml += "</li>";
 	}
 	else{ // si c'est une n-ième itération
@@ -68,6 +68,22 @@ function buyItem(name) {
 
 function useItem(name) {
 	sendRequest("craftmine.php", "op=useItem&item="+name, function(ret) {
+		if(parseInt(ret[1])>=0){
+			var nb = parseInt(document.getElementById("nbItem").innerHTML);
+			if(nb>0){
+				nb--;
+				switch(ret[0].name){
+					case "Life Bottle": data.hp = parseInt(data.hp) + 3; break;
+					case "Strength Bottle" : break; // to do
+					case "Wooden Sword" : break; //to do
+					case "Metal Sword" : break; //to do
+				}
+			}
+			document.getElementById("nbItem").innerHTML = nb;
+			sendRequest("craftmine.php", "op=updatePerso&hp="+data.hp+"&xp="+data.xp+"&lv="+data.level, function(){
+					displayPerso(data.hp,data.xp,data.level);
+			});
+		}
 	});
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 25556ed4765a897996fba7fb4b0776f043d47cb9 Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Sat, 7 May 2016 13:31:15 +0200
Subject: btn-primary → btn-success
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/dungeon.js | 8 ++++----
 js/shop.js    | 8 +++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'js/dungeon.js')

diff --git a/js/dungeon.js b/js/dungeon.js
index d20a3cf..4fb226d 100644
--- a/js/dungeon.js
+++ b/js/dungeon.js
@@ -8,7 +8,7 @@ function buildDungeon(){
 
 function displayDungeon(){
 	var tmphtml = "<br/>";
-	tmphtml += "<button id=\"launch\" type=\"button\" class=\"btn btn-primary\" onclick=\"launchDungeon()\">Launch</button>";
+	tmphtml += "<button id=\"launch\" type=\"button\" class=\"btn btn-success\" onclick=\"launchDungeon()\">Launch</button>";
 	document.getElementById("tab4").innerHTML = tmphtml;
 }
 
@@ -24,13 +24,13 @@ function displayBattle(ret){
 	tmphtml += "<h4>Battle</h4>";
 	tmphtml += "<ul class=\"list-inline\">";
 	tmphtml += "<li>";
-	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" style=\"margin-left:30px;\"><span class=\"item-icon\">" + data.icon + "</span><br />" + data.name + "<br/> lv: " + data.level + "  <span id=\"lifeMob\">hp: " + data.hp + "</span></button>";
-	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" style=\"margin-left:30px;\"><span class=\"item-icon\">" + ret[0].icon + "</span><br />" + ret[0].name + "<br/> lv: " + ret[0].level + "  <span id=\"lifeMob\">hp: " + ret[0].hp + "</span></button>";
+	tmphtml += "<button type=\"button\" class=\"btn btn-success\" style=\"margin-left:30px;\"><span class=\"item-icon\">" + data.icon + "</span><br />" + data.name + "<br/> lv: " + data.level + "  <span id=\"lifeMob\">hp: " + data.hp + "</span></button>";
+	tmphtml += "<button type=\"button\" class=\"btn btn-success\" style=\"margin-left:30px;\"><span class=\"item-icon\">" + ret[0].icon + "</span><br />" + ret[0].name + "<br/> lv: " + ret[0].level + "  <span id=\"lifeMob\">hp: " + ret[0].hp + "</span></button>";
 	tmphtml += "</li>";
 	tmphtml += "</ul>";
 	tmphtml += "</div>";
 	tmphtml += "<br/><br/>";
-	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"exitDungeon()\">Exit</button>";
+	tmphtml += "<button type=\"button\" class=\"btn btn-success\" onclick=\"exitDungeon()\">Exit</button>";
 	document.getElementById("tab4").innerHTML = tmphtml;
 }
 
diff --git a/js/shop.js b/js/shop.js
index bda3885..a2f14ad 100644
--- a/js/shop.js
+++ b/js/shop.js
@@ -3,16 +3,14 @@ function displayShop(ret) {
 	for(var key in ret.items){
 		if(ret.items.hasOwnProperty(key)){
 			var category = ret.items[key];
-			tmphtml += "<div class=\"row\">";
 			tmphtml += "<h4>"+key+"</h4>";
 			tmphtml += "<ul class=\"list-inline\">";
 			for(var i=0; i < category.length; i++) {
 				tmphtml += "<li>";
-				tmphtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"buyItem('" + category[i].name + "')\"><span class=\"item-icon\">" + category[i].icon + "</span><br />" + category[i].name + "</button>";
+				tmphtml += "<button type=\"button\" class=\"btn btn-success\" onclick=\"buyItem('" + category[i].name + "')\"><span class=\"item-icon\">" + category[i].icon + "</span><br />" + category[i].name + "</button>";
 				tmphtml += "</li>";
 			}
 			tmphtml += "</ul>";
-			tmphtml += "</div>";
 		}
 	}
 	document.getElementById("tab2").innerHTML = tmphtml;
@@ -37,7 +35,7 @@ function addItem(ret) {
 	var itemtag = document.querySelector("[data-name=\""+ret[0].name+"\"]");
 	if(!itemtag){ //si c'est la première itération de l'objet
 		itemhtml += "<li>";
-		itemhtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"useItem('" + ret[0].name + "')\"><span class=\"item-icon\">" + ret[0].icon + "</span><br />" + ret[0].name + "(<span data-name=\""+ ret[0].name + "\">"+ret[1]+"</span>)</button>"; 
+		itemhtml += "<button type=\"button\" class=\"btn btn-success\" onclick=\"useItem('" + ret[0].name + "')\"><span class=\"item-icon\">" + ret[0].icon + "</span><br />" + ret[0].name + "(<span data-name=\""+ ret[0].name + "\">"+ret[1]+"</span>)</button>"; 
 		itemhtml += "</li>";
 	}
 	else{ // si c'est une n-ième itération
@@ -48,7 +46,7 @@ function addItem(ret) {
 
 	if(invcontent.children.length <= 1)
 	{
-		var tmphtml = "<h4>Your bag contains the following items:</h4>";
+		var tmphtml = "<h3>Your bag contains the following items:</h3>";
 		tmphtml += "<ul class=\"list-inline\">";
 		tmphtml += itemhtml;
 		tmphtml += "</ul>"
-- 
cgit v1.2.3-54-g00ecf


From f5f13ebb900746c942d339149a838b6c8ef0586d Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Sat, 7 May 2016 14:02:55 +0200
Subject: btn-primary → btn-success
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/dungeon.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/dungeon.js')

diff --git a/js/dungeon.js b/js/dungeon.js
index c23b549..6ebf4dd 100644
--- a/js/dungeon.js
+++ b/js/dungeon.js
@@ -95,7 +95,7 @@ function endBattle(v,nb, f, ret){
 			}
 		}
 		var tmphtml = "Le " + v + " a gagné.";
-		tmphtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"launchDungeon("+nb+","+ f +",false)\">Next Battle</button>"
+		tmphtml += "<button type=\"button\" class=\"btn btn-success\" onclick=\"launchDungeon("+nb+","+ f +",false)\">Next Battle</button>"
 		document.getElementById("tab4").innerHTML = tmphtml;
 		displayExit();
 		sendRequest("craftmine.php", "op=sendDungeonProgress&floor="+f+"&mob="+nb);
@@ -107,7 +107,7 @@ function endBattle(v,nb, f, ret){
 
 function displayExit(){
 	var tmphtml = "<br/><br/>";
-	tmphtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"exitDungeon(false)\">Exit</button>";
+	tmphtml += "<button type=\"button\" class=\"btn btn-success\" onclick=\"exitDungeon(false)\">Exit</button>";
 	document.getElementById("tab4").innerHTML += tmphtml;
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 2f32bc3153b7f2c2561e4603f912573921e6449f Mon Sep 17 00:00:00 2001
From: alexichi <alexbankai96@gmail.com>
Date: Mon, 9 May 2016 20:26:51 +0200
Subject: add the use of the objects and the feature power and maxHP

---
 data/items.xml    |  9 ++++++---
 data/monsters.xml | 33 +++++++++++++++++++++------------
 inc/Inventory.inc | 14 +++++++++-----
 inc/Item.inc      |  2 +-
 inc/Monster.inc   |  4 +++-
 inc/dungeon.inc   |  3 ++-
 inc/perso.inc     | 33 +++++++++++++++++++++++++++++++++
 index.xhtml       | 10 +++++++++-
 js/craftmine.js   | 17 +++++++++++++++--
 js/dungeon.js     | 35 +++++++++++++++++++----------------
 js/perso.js       | 24 ++++++++++++++++++++++--
 js/shop.js        |  2 --
 12 files changed, 140 insertions(+), 46 deletions(-)

(limited to 'js/dungeon.js')

diff --git a/data/items.xml b/data/items.xml
index 9489b1a..4448b1c 100644
--- a/data/items.xml
+++ b/data/items.xml
@@ -5,7 +5,8 @@
 			<name>Wooden Sword</name>
 			<cost>10</cost>
 			<features>
-				<power>10</power>
+				<power>+1</power>
+				<limit>1</limit>
 			</features>
 			<icon>⚔</icon>
 			<description>A sword that beginners need to use to improve their skills</description>
@@ -14,7 +15,8 @@
 			<name>Metal Sword</name>
 			<cost>15</cost>
 			<features>
-				<power>30</power>
+				<power>+3</power>
+				<limit>1</limit>
 			</features>
 			<icon>⚔</icon> 
 			<description>A sword which are often use buy skilled knight. The material is very good and the sword is very powerful</description>
@@ -34,7 +36,8 @@
 			<name>Strength Bottle</name>
 			<cost>10</cost>
 			<features>
-				<power>20</power>
+				<power>+2</power>
+				<limit>3</limit>
 			</features>
 			<icon>🍶</icon>	
 			<description>If used, you have 20% more chance to hit your enemy during the battle</description>
diff --git a/data/monsters.xml b/data/monsters.xml
index ab29364..a8dc2f7 100644
--- a/data/monsters.xml
+++ b/data/monsters.xml
@@ -6,21 +6,24 @@
 			<level>1</level>
 			<hp>3</hp>
 			<xp>1</xp>
-			<icon>m</icon>
+			<power>1</power>
+			<icon>👾</icon>
 		</monster>
 		<monster >
 			<name>monster2</name>
 			<level>2</level>
 			<hp>3</hp>
 			<xp>2</xp>
-			<icon>m</icon>
+			<power>2</power>
+			<icon>👾</icon>
 		</monster>
 		<monster>
 			<name>monster3</name>
 			<level>3</level>
 			<hp>4</hp>
 			<xp>3</xp>
-			<icon>m</icon>
+			<power>3</power>
+			<icon>👾</icon>
 		</monster>
 	</floor>
 	<floor name="floor2">
@@ -29,44 +32,50 @@
 			<level>4</level>
 			<hp>5</hp>
 			<xp>4</xp>
-			<icon>m</icon>
+			<power>4</power>
+			<icon>👾</icon>
 		</monster>
 		<monster>
 			<name>monster5</name>
 			<level>5</level>
 			<hp>6</hp>
 			<xp>5</xp>
-			<icon>m</icon>
+			<power>5</power>
+			<icon>👾</icon>
 		</monster>
 		<monster>
-			<name>monster5</name>
+			<name>monster6</name>
 			<level>6</level>
 			<hp>7</hp>
 			<xp>6</xp>
-			<icon>m</icon>
+			<power>6</power>
+			<icon>👾</icon>
 		</monster>
 	</floor>
 	<floor name="floor3">
 		<monster>
-			<name>monster6</name>
+			<name>monster7</name>
 			<level>8</level>
 			<hp>9</hp>
 			<xp>8</xp>
-			<icon>m</icon>
+			<power>8</power>
+			<icon>👾</icon>
 		</monster>
 		<monster>
-			<name>monster7</name>
+			<name>monster8</name>
 			<level>9</level>
 			<hp>10</hp>
 			<xp>9</xp>
-			<icon>m</icon>
+			<power>9</power>
+			<icon>👾</icon>
 		</monster>
 		<monster>
 			<name>Boss</name>
 			<level>10</level>
 			<hp>12</hp>
 			<xp>10</xp>
-			<icon>m</icon>
+			<power>14</power>
+			<icon>👾</icon>
 		</monster>
 	</floor>
 </dungeon>
diff --git a/inc/Inventory.inc b/inc/Inventory.inc
index 2be48f8..3e0137d 100644
--- a/inc/Inventory.inc
+++ b/inc/Inventory.inc
@@ -1,5 +1,7 @@
 <?php
 
+require_once("perso.inc");
+
 class Inventory {
 
 	public $items = array();
@@ -55,12 +57,14 @@ class Inventory {
 		foreach($this->items as $k => $object){
 			if($object[0] == $item) {
 				$nb = $this->items[$k][1];
-				if($nb > 0) {
-					$this->items[$k][0]->consume();
-					$this->items[$k][1]--;
+				if(limitUse($this->items[$k][0])){
+					if($nb > 0) {
+						$this->items[$k][0]->consume();
+						$this->items[$k][1]--;
+					}
+					if($nb-1 <= 0) $this->_removeItem($item);
+					return array($object[0], $nb-1);
 				}
-				if($nb-1 <= 0) $this->_removeItem($item);
-				return array($object[0], $nb-1);
 			}
 		}
 		return false;
diff --git a/inc/Item.inc b/inc/Item.inc
index 8eebbf8..a8ee302 100644
--- a/inc/Item.inc
+++ b/inc/Item.inc
@@ -21,7 +21,7 @@ class Item {
 		foreach($this->feat as $k => $v) {
 			switch($k) {
 				case "hp": increasePerso("hp", +$v); break;
-				case "power": break;
+				case "power": increasePerso("bonusPower", +$v); break;
 			}
 		}
 	}
diff --git a/inc/Monster.inc b/inc/Monster.inc
index c7063ec..ae48691 100644
--- a/inc/Monster.inc
+++ b/inc/Monster.inc
@@ -7,12 +7,14 @@ class Monster {
 	public $hp = 1;
 	public $xp = 0;
 	public $level = 1;
+	public $power = 1;
 
-	function __construct($name, $level, $hp, $xp, $icon) {
+	function __construct($name, $level, $hp, $xp, $power, $icon) {
 		$this->name = $name;
 		$this->level = $level;
 		$this->hp = $hp;
 		$this->xp = $xp;
+		$this->power = $power;
 		$this->icon = $icon;
 		
 	}
diff --git a/inc/dungeon.inc b/inc/dungeon.inc
index c023cf8..521303e 100644
--- a/inc/dungeon.inc
+++ b/inc/dungeon.inc
@@ -14,7 +14,8 @@ function generateMonster(){
 			$dungeon["monsters"][$floor][] = new Monster((string)$monster->name, 
 											intval($monster->level),
 											intval($monster->hp),
-											intval($monster->xp), 
+											intval($monster->xp),
+											intval($monster->power),
 											(string)$monster->icon);
 		}
 	}
diff --git a/inc/perso.inc b/inc/perso.inc
index f455173..0a32b64 100644
--- a/inc/perso.inc
+++ b/inc/perso.inc
@@ -10,21 +10,54 @@ function increasePerso($prop, $num) {
 	if(empty($_SESSION["perso"]))
 		initPerso();
 	$_SESSION["perso"][$prop] += $num;
+	if($_SESSION["perso"]["hp"] > $_SESSION["perso"]["maxHP"]){//if you want to heal even if you have less than 3 hp to heal, heal until the max is attained
+		$diff = $_SESSION["perso"]["hp"] - $_SESSION["perso"]["maxHP"];
+		$_SESSION["perso"]["hp"] -= $diff;
+	} 
+}
+
+/**
+  *traite le fait que wooden sword n'est pas cumulable
+  *metal sword non plus
+  *life bottle cumulable 3 fois
+  *si on clique sur wooden sword alors que on avait une metal sword, le bonusPower passe de +3 à +1 
+  */
+function limitUse($item){
+	$n = $item->name;
+	if($n =="Life Bottle")return true;
+	if(empty($_SESSION[$n])){
+		$_SESSION[$n]=1;
+		return true;
+	}
+	else{
+		$_SESSION[$n]++;
+		if($_SESSION[$n] >= $item->feat["limit"])return false; 
+		else return true;
+	}
 }
 
 function updatePerso(){
 	$hp = $_POST["hp"];
+	$maxHP = $_POST["maxHP"];
 	$xp = $_POST["xp"];
 	$lv = $_POST["lv"];
+	$power = $_POST["power"];
+	$bonusPower = $_POST["bonusPower"];
 	$_SESSION["perso"]["hp"] = +$hp;
+	$_SESSION["perso"]["maxHP"] = +$maxHP;
 	$_SESSION["perso"]["xp"] = +$xp;
 	$_SESSION["perso"]["lv"] = +$lv;
+	$_SESSION["perso"]["power"] = +$power;
+	$_SESSION["perso"]["bonusPower"] = +$bonusPower;
 }
 
 function initPerso(){
 	$_SESSION["perso"]["hp"] = 5;
+	$_SESSION["perso"]["maxHP"] = 5;
 	$_SESSION["perso"]["xp"] = 0;
 	$_SESSION["perso"]["lv"] = 3;
+	$_SESSION["perso"]["power"] = 3;
+	$_SESSION["perso"]["bonusPower"] = 0;
 }
 
 ?>
diff --git a/index.xhtml b/index.xhtml
index 1ea1bfe..eba0f43 100644
--- a/index.xhtml
+++ b/index.xhtml
@@ -30,9 +30,17 @@
 					</div>
 					<div class="panel-body">
 						<ul class="list-group">
-							<li class="list-group-item">HP<span id="hp" class="label label-success">5</span></li>
+							<li class="list-group-item">HP<span class="label label-success">
+							<span id="hp">5</span> /
+							<span id="maxHP">5</span>
+							</span>
+							</li>
 							<li class="list-group-item">LV<span id="lv" class="label label-success">1</span></li>
 							<li class="list-group-item">Exp<span id="xp" class="label label-success">0</span></li>
+							<li class="list-group-item">Power<span class="label label-success">
+							<span id="power">1</span> +
+							<span id="bonusPower">0</span>
+							</span></li>
 						</ul>
 
 						<ul class="list-group">
diff --git a/js/craftmine.js b/js/craftmine.js
index 77cafee..fa70809 100644
--- a/js/craftmine.js
+++ b/js/craftmine.js
@@ -5,8 +5,11 @@ data = {
 	miners: 0,
 	level: 3,
 	hp: 5,
+	maxHP: 5,
 	xp: 0,
-	icon : "H"
+	power: 3,
+	bonusPower: 0,
+	icon : "💪"
 }
 
 function sendRequest(url, params, callback, isFile) {
@@ -41,6 +44,16 @@ function debitAccount(amount) {
 	updateData("gold");
 }
 
+function creditAccount(amount){
+	data.gold += amount;
+	sendRequest("craftmine.php", "op=withdrawMine&amount="+amount, function(xhr) {
+		var gold = parseInt(xhr);
+		if(isNaN(gold)) return;
+		data.gold = gold;
+		updateData("gold");
+	});
+}
+
 function withdrawMine() {
 	sendRequest("craftmine.php", "op=withdrawMine&amount="+data.mine, function(xhr) {
 		var gold = parseInt(xhr); // Server's response is a string
@@ -53,7 +66,7 @@ function withdrawMine() {
 
 function initCraftMine() {
 	sendRequest("craftmine.php", "op=getCraftMine", function(ret) {
-		console.log(ret.perso);
+		//console.log(ret.perso);
 		data.gold = parseInt(ret.gold); // Server's response is a string
 		data.mine = 0; // Reset mine
 		if(ret.perso) updatePerso(ret.perso);
diff --git a/js/dungeon.js b/js/dungeon.js
index 6ebf4dd..2921c7d 100644
--- a/js/dungeon.js
+++ b/js/dungeon.js
@@ -2,7 +2,7 @@ var timeout;
 
 function buildDungeon(){
 	sendRequest("craftmine.php", "op=buildDungeon", function(ret) {
-		displayDungeon(0,1,true);//mob 0 in the floor 1 and I access the dungeon for the first dungeon
+		displayDungeon(0,1,true);//mob 0 in the floor 1 and I access the dungeon for the first time
 		debitAccount(ret.cost);
 		showInfo("You can acces the dungeon now. Good Luck.");
 	});
@@ -45,21 +45,23 @@ function battle(ret,nb,f){
 }
 
 function strike(ret,nb, f){
-	var lvDiff = data.level-parseInt(ret[0].level);
+	var powerDiff = (data.power+data.bonusPower)-parseInt(ret[nb].power);
 	var hitRate = Math.floor((Math.random() * 100) + 1);
 	var mobLife = document.getElementById("lifeMob").innerHTML;
 	var persoLife = document.getElementById("lifePerso").innerHTML;
 	if(mobLife == 0){
 		data.hp = persoLife;
+		data.bonusPower = 0; //à revoir car l'épée doit continuer à apporter un bonus
 		endBattle("perso",nb,f,ret);
 		return;
 	}
 	else if(persoLife == 0){
 		data.hp = 1;
+		data.bonusPower = 0;//when you die you lose your sword and all your power bonus
 		endBattle("mob",nb,f,ret);
 		return;
 	}
-	if(hitRate<50+10*lvDiff){
+	if(hitRate<50+10*powerDiff){
 		mobLife--;
 		document.getElementById("lifeMob").innerHTML = parseInt(mobLife);
 	}
@@ -76,15 +78,7 @@ function endBattle(v,nb, f, ret){
 	//To level up you have to obtain 2 xp to go to lv 3, 3 to go to lv 4, etc
 	//A mob level 2 , if defeated gives you 2 xp, ...etc
 	else{
-		data.xp += parseInt(ret[nb].xp);
-		if(data.xp>=data.level){
-			data.xp-=data.level;
-			data.level++;
-			//need to send the xp to the server
-			sendRequest("craftmine.php", "op=updatePerso&hp="+data.hp+"&xp="+data.xp+"&lv="+data.level, function(){
-				displayPerso(data.hp,data.xp,data.level);
-			});
-		}
+		levelUp(ret[nb].xp);
 		nb++;//go to the next mob in the same floor
 		if(nb>=3){//floor changing
 			nb=0;//reset the number of the mob
@@ -100,8 +94,8 @@ function endBattle(v,nb, f, ret){
 		displayExit();
 		sendRequest("craftmine.php", "op=sendDungeonProgress&floor="+f+"&mob="+nb);
 	}
-	sendRequest("craftmine.php", "op=updatePerso&hp="+data.hp+"&xp="+data.xp+"&lv="+data.level, function(){
-				displayPerso(data.hp,parseInt(data.xp),data.level);
+	sendRequest("craftmine.php", "op=updatePerso&hp="+data.hp+"&maxHP="+data.maxHP+"&xp="+data.xp+"&lv="+data.level+"&power="+data.power+"&bonusPower="+data.bonusPower, function(){
+				displayPerso(data.hp,data.maxHP,data.xp,data.level,data.power,data.bonusPower);
 	});
 }
 
@@ -114,8 +108,17 @@ function displayExit(){
 function exitDungeon(boss){
 	sendRequest("craftmine.php", "op=exitDungeon", function() {
 		window.clearTimeout(timeout);
-		document.getElementById("tab4").innerHTML = "<h4>Not available, you have to buy a ticket in the build section.</h4>";
-		if(boss) showInfo("You have beaten the final boss! CONGRATULATIONS!");
+		if(boss){//if the boss is beaten
+			levelUp(20);//you earn 20 xp
+			creditAccount(1000);//you earn 1000 gold coins
+			var tmphtml = "<h3>You have completed the dungeon! CONGRATULATIONS!</h3>";
+			tmphmtl += "<ul>";
+			tmphtml += "<li><h4>You have earned 1000 gold coins</h4></li>"
+			tmphmtl += "<li><h4>You have earned 20 xp</h4></li>";
+			tmphmtl += "</ul>";
+			document.getElementById("tab4").innerHTML = tmphtml;
+		}
+		else document.getElementById("tab4").innerHTML = "<h4>Not available, you have to buy a ticket in the build section.</h4>";
 		showInfo("You have left the dungeon");
 	});
 }
diff --git a/js/perso.js b/js/perso.js
index 02a8892..44b82eb 100644
--- a/js/perso.js
+++ b/js/perso.js
@@ -1,12 +1,32 @@
-function displayPerso(hp,xp,lv){
+function displayPerso(hp,maxHP,xp,lv,power,bonusPower){
 	document.getElementById("hp").innerHTML = hp;
+	document.getElementById("maxHP").innerHTML = maxHP;
 	document.getElementById("lv").innerHTML = lv;
 	document.getElementById("xp").innerHTML = xp;
+	document.getElementById("power").innerHTML = power;
+	document.getElementById("bonusPower").innerHTML = bonusPower;
 }
 
 function updatePerso(perso) {
 	data.hp = perso.hp;
+	data.maxHP = perso.maxHP;
 	data.xp = perso.xp;
 	data.level = perso.lv;
-	displayPerso(perso.hp, perso.xp, perso.lv);
+	data.power = perso.power;
+	data.bonusPower = perso.bonusPower;
+	displayPerso(perso.hp, perso.maxHP, perso.xp, perso.lv, perso.power, perso.bonusPower);
+}
+
+function levelUp(xp){
+	data.xp += parseInt(xp);
+	while(data.xp>=data.level){
+		data.xp-=data.level;
+		data.level++;
+		data.power++;
+		data.maxHP+=2;
+	}
+	//need to send the xp to the server
+	sendRequest("craftmine.php", "op=updatePerso&hp="+data.hp+"&maxHP="+data.maxHP+"&xp="+data.xp+"&lv="+data.level+"&power="+data.power+"&bonusPower="+bonusPower, function(){
+		displayPerso(data.hp,data.maxHP,data.maxHP,data.xp,data.level,data.power,data.bonusPower);
+	});
 }
diff --git a/js/shop.js b/js/shop.js
index a520a38..b6d4cee 100644
--- a/js/shop.js
+++ b/js/shop.js
@@ -69,10 +69,8 @@ function useItem(name) {
 	sendRequest("craftmine.php", "op=useItem&item="+name, function(ret) {
 		if(!ret.item) return;
 		if(ret.perso) updatePerso(ret.perso);
-
 		var item = document.querySelector("[data-name=\""+ret.item[0].name+"\"]");
 		var nb = ret.item[1];
-
 		if(nb>=1)
 			item.innerHTML = nb;
 		else
-- 
cgit v1.2.3-54-g00ecf