From 0133251e523b1c984b2b5cdb60c7392c18e6bd73 Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Wed, 27 Apr 2016 19:51:32 +0200
Subject: Add button for saving on server/downloading the game

---
 index.xhtml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'index.xhtml')

diff --git a/index.xhtml b/index.xhtml
index aa29615..d12585f 100644
--- a/index.xhtml
+++ b/index.xhtml
@@ -32,6 +32,8 @@
 				<form class="form-horizontal" method="post" action="craftmine.php">
 					<button class="btn btn-default" type="button" name="withdraw" onclick="withdrawMine()">Withdraw</button>
 					<button class="btn btn-default" type="button" name="HireMiner" onclick="hireMiner()">Hire one miner</button>
+					<button class="btn btn-default" type="button" onclick="saveGame()">Save game</button>
+					<button class="btn btn-default" type="button" onclick="downGame()">Download game</button>
 				</form>
 			</div>
 		</div>
-- 
cgit v1.2.3-70-g09d2


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

---
 craftmine.php     |  3 ++-
 data/monsters.xml | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 inc/Monster.inc   | 19 +++++++++++++++++
 inc/dungeon.inc   | 39 ++++++++++++++++++++++++++++++++++
 inc/messages.inc  |  3 ++-
 index.xhtml       |  3 +++
 js/dungeon.js     | 18 ++++++++++++++++
 7 files changed, 146 insertions(+), 2 deletions(-)
 create mode 100644 data/monsters.xml
 create mode 100644 inc/Monster.inc
 create mode 100644 inc/dungeon.inc
 create mode 100644 js/dungeon.js

(limited to 'index.xhtml')

diff --git a/craftmine.php b/craftmine.php
index 78c5e37..4cd6b00 100644
--- a/craftmine.php
+++ b/craftmine.php
@@ -4,7 +4,7 @@ require_once("inc/mine.inc");
 require_once("inc/guild.inc");
 require_once("inc/shop.inc");
 require_once("inc/craftmine.inc");
-
+require_once("inc/dungeon.inc");
 session_start(); // Must be placed *BEFORE* $_SESSION is actually used and *AFTER* all classes are imported
 
 /**
@@ -42,6 +42,7 @@ switch($op) {
 	case "getCraftMine": sendCraftMine(); break;
 	case "buildShop": buildShop(); break;
 	case "buyItem": buyItem(); break;
+	case "buildDungeon" : buildDungeon(); break;
 	default: reportBadRequest();
 }
 
diff --git a/data/monsters.xml b/data/monsters.xml
new file mode 100644
index 0000000..86cf422
--- /dev/null
+++ b/data/monsters.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dungeon cost="10">
+	<floor name="floor1">
+		<monster>
+			<name>monster1</name>
+			<level>1</level>
+			<hp>2</hp>
+			<icon>m</icon>
+		</monster>
+		<monster >
+			<name>monster2</name>
+			<level>2</level>
+			<hp>3</hp>
+			<icon>m</icon>
+		</monster>
+		<monster>
+			<name>monster3</name>
+			<level>3</level>
+			<hp>4</hp>
+			<icon>m</icon>
+		</monster>
+	</floor>
+	<floor name="floor2">
+		<monster>
+			<name>monster4</name>
+			<level>4</level>
+			<hp>5</hp>
+			<icon>m</icon>
+		</monster>
+		<monster>
+			<name>monster5</name>
+			<level>5</level>
+			<hp>6</hp>
+			<icon>m</icon>
+		</monster>
+		<monster>
+			<name>monster5</name>
+			<level>6</level>
+			<hp>7</hp>
+			<icon>m</icon>
+		</monster>
+	</floor>
+	<floor name="floor3">
+		<monster>
+			<name>monster6</name>
+			<level>8</level>
+			<hp>9</hp>
+			<icon>m</icon>
+		</monster>
+		<monster>
+			<name>monster7</name>
+			<level>9</level>
+			<hp>10</hp>
+			<icon>m</icon>
+		</monster>
+		<monster>
+			<name>Boss</name>
+			<level>10</level>
+			<hp>12</hp>
+			<icon>m</icon>
+		</monster>
+	</floor>
+</dungeon>
diff --git a/inc/Monster.inc b/inc/Monster.inc
new file mode 100644
index 0000000..fbb0fe9
--- /dev/null
+++ b/inc/Monster.inc
@@ -0,0 +1,19 @@
+<?php
+
+class Monster {
+	public $name = "";
+	public $icon = "";
+	public $desc = "";
+	public $hp = 1;
+	public $level = 1;
+
+	function __construct($name, $level, $hp, $icon) {
+		$this->name = $name;
+		$this->level = $level;
+		$this->hp = $hp;
+		$this->icon = $icon;
+		
+	}
+}
+
+?>
diff --git a/inc/dungeon.inc b/inc/dungeon.inc
new file mode 100644
index 0000000..b2277f0
--- /dev/null
+++ b/inc/dungeon.inc
@@ -0,0 +1,39 @@
+<?php
+require_once("messages.inc");
+require_once("account.inc");
+require_once("Monster.inc");
+
+
+function generateMonster(){
+	$monsters = simplexml_load_file('data/monsters.xml');
+	$dungeon = array("cost"=>(string)$monsters["cost"],"monsters"=>array());
+	foreach($monsters as $f){
+		$floor = (string)$f["name"];
+		$dungeon["monsters"][$floor] = array();
+		foreach($f as $monster){
+			$dungeon["monsters"][$floor][] = new Monster((string)$monster->name, 
+											intval($monster->level), 
+											intval($monster->hp), 
+											(string)$monster->icon);
+		}
+	}
+	return $dungeon;
+}
+
+function initDungeon() {
+	$_SESSION["dungeon"] = true;
+}
+
+function buildDungeon() {
+	$dungeon=generateMonster();
+	if(!empty($_SESSION["dungeon"])) {
+		sendError("dungeon_already_available");
+	}
+	elseif(debitAccount($dungeon["cost"])) {
+		initDungeon();
+		$_SESSION["mine"]["gold"] -= $dungeon["cost"];
+		echo json_encode($dungeon);
+	}
+}
+
+?>
diff --git a/inc/messages.inc b/inc/messages.inc
index d6ea87e..c24bd18 100644
--- a/inc/messages.inc
+++ b/inc/messages.inc
@@ -5,7 +5,8 @@ $messages = array(
 	"gold_insufficient" => "You don't have enough gold.",
 	"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."
+	"guild_already_built" => "You have aready built a guild.",
+	"dungeon_already_available" => "You can already access the dungeon"
 );
 
 function sendError($msg) {
diff --git a/index.xhtml b/index.xhtml
index aa29615..2745c8a 100644
--- a/index.xhtml
+++ b/index.xhtml
@@ -15,6 +15,8 @@
 	<script type="text/javascript" charset="utf-8" src="js/guild.js"></script>
 	<script type="text/javascript" charset="utf-8" src="js/shop.js"></script>
 	<script type="text/javascript" charset="utf-8" src="js/gui.js"></script>
+	<script type="text/javascript" charset="utf-8" src="js/dungeon.js"></script>
+	
 </head>
 <body onload="init()" onhashchange="changeTab()">
 <div class="container-fluid">
@@ -69,6 +71,7 @@
 				<ul class="list-inline">
 					<li><button class="btn btn-default" type="button" onclick="createGuild()">Miner's guild</button></li>
 					<li><button class="btn btn-default" type="button" onclick="buildShop()">Shop</button></li>
+					<li><button class="btn btn-default" type="button" onclick="buildDungeon()">Dungeon</button></li>
 				</ul>
 			</div>
 			<div class="tab-pane" id="tab2">
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-70-g09d2


From f53549e4c2668ca268c8e31ef4c7cf3718fe08b5 Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Mon, 2 May 2016 15:50:14 +0200
Subject: Move saveGame()/downGame() to its own JS file

---
 index.xhtml     | 1 +
 js/craftmine.js | 8 --------
 js/savegame.js  | 7 +++++++
 3 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 js/savegame.js

(limited to 'index.xhtml')

diff --git a/index.xhtml b/index.xhtml
index d12585f..e879cf1 100644
--- a/index.xhtml
+++ b/index.xhtml
@@ -15,6 +15,7 @@
 	<script type="text/javascript" charset="utf-8" src="js/guild.js"></script>
 	<script type="text/javascript" charset="utf-8" src="js/shop.js"></script>
 	<script type="text/javascript" charset="utf-8" src="js/gui.js"></script>
+	<script type="text/javascript" charset="utf-8" src="js/savegame.js"></script>
 </head>
 <body onload="init()" onhashchange="changeTab()">
 <div class="container-fluid">
diff --git a/js/craftmine.js b/js/craftmine.js
index 13dd0a2..92fa45a 100644
--- a/js/craftmine.js
+++ b/js/craftmine.js
@@ -60,14 +60,6 @@ function updateMine() {
 	updateData("mine");
 }
 
-function saveGame() {
-	sendRequest("craftmine.php", "op=saveGame");
-}
-
-function downGame() {
-	window.open("craftmine.php?op=downGame", "_blank");
-}
-
 function init() {
 	initCraftMine();
 	changeTab();
diff --git a/js/savegame.js b/js/savegame.js
new file mode 100644
index 0000000..2a83f77
--- /dev/null
+++ b/js/savegame.js
@@ -0,0 +1,7 @@
+function saveGame() {
+	sendRequest("craftmine.php", "op=saveGame");
+}
+
+function downGame() {
+	window.open("craftmine.php?op=downSave", "_blank");
+}
-- 
cgit v1.2.3-70-g09d2


From c6e05fbec675d1f60e6adb2b29d6fed4f888fb1d Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Mon, 2 May 2016 15:51:43 +0200
Subject: Add Save tab

---
 index.xhtml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'index.xhtml')

diff --git a/index.xhtml b/index.xhtml
index e879cf1..6627ec5 100644
--- a/index.xhtml
+++ b/index.xhtml
@@ -65,6 +65,7 @@
 			<li role="presentation"><a href="#tab2" data-toggle="tab">Shop</a></li>
 			<li role="presentation"><a href="#tab3" data-toggle="tab">Inventory</a></li>
 			<li role="presentation"><a href="#tab4" data-toggle="tab">Dungeon</a></li>
+			<li role="presentation" class="pull-right"><a href="#tab5" data-toggle="tab" onclick="listSaves()">Save</a></li>
 		</ul>
 		<div class="tab-content">
 			<div class="tab-pane" id="tab1">
@@ -83,11 +84,18 @@
 			<div class="tab-pane" id="tab4">
 				<h4>Look at how poor you are! You can't access the dungeon, it is only for the elite.</h4>
 			</div>
+			<div class="tab-pane" id="tab5">
+				<h4>Saved games:</h4>
+				<div class="form" id="listsaves">
+				</div>
+				<ul class="list-inline">
+					<li><button class="btn btn-default" type="button" onclick="loadSave()">Load</button></li>
+					<li><button class="btn btn-default" type="button" onclick="downloadSave()">Download</button></li>
+					<li><button class="btn btn-default" type="button" onclick="deleteSave()">Delete</button></li>
+				</ul>
+			</div>
 		</div>
 		</div>
-
-
-
 	</div>
 	</div>
 </div>
-- 
cgit v1.2.3-70-g09d2


From 036d5a2e88232e966cfd0cc82277d5fba13e71ff Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Wed, 4 May 2016 14:25:50 +0200
Subject: Add upload button for save + move save/download button

---
 index.xhtml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'index.xhtml')

diff --git a/index.xhtml b/index.xhtml
index 6627ec5..5e0752a 100644
--- a/index.xhtml
+++ b/index.xhtml
@@ -33,8 +33,6 @@
 				<form class="form-horizontal" method="post" action="craftmine.php">
 					<button class="btn btn-default" type="button" name="withdraw" onclick="withdrawMine()">Withdraw</button>
 					<button class="btn btn-default" type="button" name="HireMiner" onclick="hireMiner()">Hire one miner</button>
-					<button class="btn btn-default" type="button" onclick="saveGame()">Save game</button>
-					<button class="btn btn-default" type="button" onclick="downGame()">Download game</button>
 				</form>
 			</div>
 		</div>
@@ -90,7 +88,11 @@
 				</div>
 				<ul class="list-inline">
 					<li><button class="btn btn-default" type="button" onclick="loadSave()">Load</button></li>
+					<li><button class="btn btn-default" type="button" onclick="saveGame()">Save game</button></li>
+					<li><button class="btn btn-default" type="button" onclick="downGame()">Download current game</button></li>
 					<li><button class="btn btn-default" type="button" onclick="downloadSave()">Download</button></li>
+					<li><input type="file" id="selectedFile" style="display: none;" accept=".save.xml" onchange="uploadSave()" />
+						<button class="btn btn-default" type="button" onclick="document.getElementById('selectedFile').click()">Upload</button></li>
 					<li><button class="btn btn-default" type="button" onclick="deleteSave()">Delete</button></li>
 				</ul>
 			</div>
-- 
cgit v1.2.3-70-g09d2


From b994c39019ff6a74870dda3b8c78326ef917ded4 Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Wed, 4 May 2016 14:49:09 +0200
Subject: Remove useless data-toggle attribute

---
 index.xhtml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'index.xhtml')

diff --git a/index.xhtml b/index.xhtml
index 9260134..dea1e22 100644
--- a/index.xhtml
+++ b/index.xhtml
@@ -60,11 +60,11 @@
 
 		<div id="tabs-panel" class="tabbable">
 		<ul class="nav nav-tabs">
-			<li role="presentation"><a href="#tab1" data-toggle="tab">Build</a></li>
-			<li role="presentation"><a href="#tab2" data-toggle="tab">Shop</a></li>
-			<li role="presentation"><a href="#tab3" data-toggle="tab">Inventory</a></li>
-			<li role="presentation"><a href="#tab4" data-toggle="tab">Dungeon</a></li>
-			<li role="presentation" class="pull-right"><a href="#tab5" data-toggle="tab" onclick="listSaves()">Save</a></li>
+			<li role="presentation"><a href="#tab1">Build</a></li>
+			<li role="presentation"><a href="#tab2">Shop</a></li>
+			<li role="presentation"><a href="#tab3">Inventory</a></li>
+			<li role="presentation"><a href="#tab4">Dungeon</a></li>
+			<li role="presentation" class="pull-right"><a href="#tab5" onclick="listSaves()">Save</a></li>
 		</ul>
 		<div class="tab-content">
 			<div class="tab-pane" id="tab1">
-- 
cgit v1.2.3-70-g09d2


From fcf504d0cb37545d6157f384eccdfd82daaa55e4 Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Wed, 4 May 2016 14:51:09 +0200
Subject: Remove useless role attributeé
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.xhtml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'index.xhtml')

diff --git a/index.xhtml b/index.xhtml
index dea1e22..bd2cdf3 100644
--- a/index.xhtml
+++ b/index.xhtml
@@ -60,11 +60,11 @@
 
 		<div id="tabs-panel" class="tabbable">
 		<ul class="nav nav-tabs">
-			<li role="presentation"><a href="#tab1">Build</a></li>
-			<li role="presentation"><a href="#tab2">Shop</a></li>
-			<li role="presentation"><a href="#tab3">Inventory</a></li>
-			<li role="presentation"><a href="#tab4">Dungeon</a></li>
-			<li role="presentation" class="pull-right"><a href="#tab5" onclick="listSaves()">Save</a></li>
+			<li><a href="#tab1">Build</a></li>
+			<li><a href="#tab2">Shop</a></li>
+			<li><a href="#tab3">Inventory</a></li>
+			<li><a href="#tab4">Dungeon</a></li>
+			<li class="pull-right"><a href="#tab5" onclick="listSaves()">Save</a></li>
 		</ul>
 		<div class="tab-content">
 			<div class="tab-pane" id="tab1">
-- 
cgit v1.2.3-70-g09d2


From 35ec65de0869c77fc66bf3f2702c561efd98f4af Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Wed, 4 May 2016 14:52:35 +0200
Subject: Move onhashchange event hook from XHTML to JavaScript Add some
 comments

---
 index.xhtml     | 2 +-
 js/craftmine.js | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'index.xhtml')

diff --git a/index.xhtml b/index.xhtml
index bd2cdf3..f242f76 100644
--- a/index.xhtml
+++ b/index.xhtml
@@ -18,7 +18,7 @@
 	<script type="text/javascript" charset="utf-8" src="js/dungeon.js"></script>
 	<script type="text/javascript" charset="utf-8" src="js/savegame.js"></script>
 </head>
-<body onload="init()" onhashchange="changeTab()">
+<body onload="init()">
 <div class="container-fluid">
 <div class="row">
 	<h1>CraftMine</h1>
diff --git a/js/craftmine.js b/js/craftmine.js
index 61abbf7..0e95aa3 100644
--- a/js/craftmine.js
+++ b/js/craftmine.js
@@ -70,7 +70,8 @@ function updateMine() {
 
 function init() {
 	initCraftMine();
-	changeTab();
-	listSaves();
-	window.setInterval(updateMine, 1000);
+	changeTab(); // Switch to tab specified in URL
+	listSaves(); // Update save list on page load
+	window.setInterval(updateMine, 1000); // Increase mine amount every 1 second
+	window.onhashchange = changeTab; // Hook changeTab from js/gui.js to hashchange event
 }
-- 
cgit v1.2.3-70-g09d2


From 2587d9627294ef3324a88aa6d11be48c72e397f3 Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Wed, 4 May 2016 14:57:54 +0200
Subject: Form → list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.xhtml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'index.xhtml')

diff --git a/index.xhtml b/index.xhtml
index f242f76..77ddf23 100644
--- a/index.xhtml
+++ b/index.xhtml
@@ -31,10 +31,10 @@
 				<span id="mine">0</span>
 				<p>Miners : <span id="miners">0</span></p>
 				<span id="guild"></span>
-				<form class="form-horizontal" method="post" action="craftmine.php">
-					<button class="btn btn-default" type="button" name="withdraw" onclick="withdrawMine()">Withdraw</button>
-					<button class="btn btn-default" type="button" name="HireMiner" onclick="hireMiner()">Hire one miner</button>
-				</form>
+				<ul class="list-inline">
+					<li><button class="btn btn-default" type="button" name="withdraw" onclick="withdrawMine()">Withdraw</button></li>
+					<li><button class="btn btn-default" type="button" name="HireMiner" onclick="hireMiner()">Hire one miner</button></li>
+				</ul>
 			</div>
 		</div>
 		<div id="error-box" class="row" style="margin-top:1em;display:none">
-- 
cgit v1.2.3-70-g09d2


From 9679e3aa45c1ac0b821bfde3c6b4ba65718797c2 Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Wed, 4 May 2016 15:05:19 +0200
Subject: Switch to HTML5 Doctype + remove useless Content-Type http-equiv

---
 index.xhtml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'index.xhtml')

diff --git a/index.xhtml b/index.xhtml
index 77ddf23..0760aeb 100644
--- a/index.xhtml
+++ b/index.xhtml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/css" href="css/bootstrap.min.css"?>
 <?xml-stylesheet type="text/css" href="css/craftmine.css"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">
 <head>
-	<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 	<meta name="viewport" content="width=device-width, initial-scale=1"/>    
 	<meta name="author" content="Alexandre Renoux,Pierre-Emmanuel Novac"/>
-- 
cgit v1.2.3-70-g09d2


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 'index.xhtml')

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-70-g09d2


From 8621eae6aa5fcdba0a60f0a5f1136412c61999ec Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Sat, 7 May 2016 13:31:49 +0200
Subject: UI improvements

---
 css/craftmine.css |  54 +++++++++++++++++++++++++++--
 index.xhtml       | 100 +++++++++++++++++++++++++++++-------------------------
 js/gui.js         |   4 +--
 3 files changed, 107 insertions(+), 51 deletions(-)

(limited to 'index.xhtml')

diff --git a/css/craftmine.css b/css/craftmine.css
index c459baa..fa42bd9 100644
--- a/css/craftmine.css
+++ b/css/craftmine.css
@@ -15,7 +15,57 @@
 }
 .item-icon {
 	display:inline-block;
-	width: 1em;
-	font-size: 3em;
+	font-size: 4em;
 	font-family: "Symbola";
 }
+.list-group-item > .label {
+	float:right;
+}
+#tab2 > ul > li > button {
+	width: 9em;
+	height: 9em;
+}
+.label {
+	font-size: 1.2em;
+}
+.list-group > button {
+	border-radius: 0;
+}
+a {
+	color: #5cb85c;
+}
+/*	color: hotpink;
+}
+.label-success {
+	background-color: hotpink;
+}
+
+.btn-success {
+	background-color: hotpink;
+	border-color: deeppink;
+}
+.btn-success:hover {
+	background-color: pink;
+	border-color: hotpink;
+}
+.btn-success.active.focus, .btn-success.active:focus,
+.btn-success.active:hover, .btn-success.focus:active,
+.btn-success:active:focus, .btn-success:active:hover,
+.btn-success.focus, .btn-success:focus {
+	background-color: deeppink;
+	border-color: magenta;
+}
+.panel-success {
+	border-color: lightpink;
+}
+.panel-success > .panel-heading {
+	background-color: pink;
+	color: deeppink;
+	border-color: lightpink;
+}
+.alert-success {
+	color: deeppink;
+	border-color: lightpink;
+	background-color: pink;
+}
+*/
diff --git a/index.xhtml b/index.xhtml
index 0760aeb..dcfdc69 100644
--- a/index.xhtml
+++ b/index.xhtml
@@ -18,44 +18,46 @@
 </head>
 <body onload="init()">
 <div class="container-fluid">
-<div class="row">
 	<h1>CraftMine</h1>
-</div>
-<div class="row">
-	<div class="col-md-4">
+
+	<div class="col-md-3">
 		<div class="row">
-			<div class="col-md-10">
-				<span id="gold">0</span>
-				<span id="mine">0</span>
-				<p>Miners : <span id="miners">0</span></p>
-				<span id="guild"></span>
-				<ul class="list-inline">
-					<li><button class="btn btn-default" type="button" name="withdraw" onclick="withdrawMine()">Withdraw</button></li>
-					<li><button class="btn btn-default" type="button" name="HireMiner" onclick="hireMiner()">Hire one miner</button></li>
-				</ul>
+			<div class="col-md-12">
+				<div class="panel panel-success">
+					<div class="panel-heading">
+						<h3 class="panel-title">Stats</h3>
+					</div>
+					<div class="panel-body">
+						<ul class="list-group">
+							<li class="list-group-item">Mine<span id="mine" class="label label-success">14</span></li>
+							<li class="list-group-item">Gold<span id="gold" class="label label-success">14</span></li>
+							<li class="list-group-item">Miners<span id="miners" class="label label-success">14</span></li>
+						</ul>
+
+						<div class="list-group">
+							<button class="list-group-item btn" type="button" name="withdraw" onclick="withdrawMine()">Withdraw</button>
+							<button class="list-group-item btn" type="button" name="HireMiner" onclick="hireMiner()">Hire one miner</button>
+						</div>
+					</div>
+				</div>
 			</div>
 		</div>
-		<div id="error-box" class="row" style="margin-top:1em;display:none">
-			<div class="col-md-10">
-				<div class="alert alert-danger">
-					<ul>
-					</ul>
-				</div>
+		<div id="error-box" class="row" style="display:none">
+			<div class="alert alert-danger">
+				<ul>
+				</ul>
 			</div>
 		</div>
-		<div id="info-box" class="row" style="margin-top:1em;display:none">
-			<div class="col-md-10">
-				<div class="alert alert-success">
-					<ul>
-					</ul>
-				</div>
+		<div id="info-box" class="row" style="display:none">
+			<div class="alert alert-success">
+				<ul>
+				</ul>
 			</div>
 		</div>
 
 	</div>
-	<div class="col-md-8">
-		<div class="row">
 
+	<div class="col-md-9">
 		<div id="tabs-panel" class="tabbable">
 		<ul class="nav nav-tabs">
 			<li><a href="#tab1">Build</a></li>
@@ -66,41 +68,45 @@
 		</ul>
 		<div class="tab-content">
 			<div class="tab-pane" id="tab1">
-				<h4>Select a building to build:</h4>
+				<h3>Select a building to build:</h3>
 				<ul class="list-inline">
-					<li><button class="btn btn-default" type="button" onclick="createGuild()">Miner's guild</button></li>
-					<li><button class="btn btn-default" type="button" onclick="buildShop()">Shop</button></li>
-					<li><button class="btn btn-default" type="button" onclick="buildDungeon()">Dungeon</button></li>
+					<li><button class="btn btn-success" type="button" onclick="createGuild()">Miner's guild</button></li>
+					<li><button class="btn btn-success" type="button" onclick="buildShop()">Shop</button></li>
+					<li><button class="btn btn-success" type="button" onclick="buildDungeon()">Dungeon</button></li>
 				</ul>
 			</div>
 			<div class="tab-pane" id="tab2">
-				<h4>There's no shop in this city.</h4>
+				<h3>There's no shop in this city.</h3>
 			</div>
 			<div class="tab-pane" id="tab3">
-				<h4>Your inventory is empty.</h4>
+				<h3>Your inventory is empty.</h3>
 			</div>
 			<div class="tab-pane" id="tab4">
-				<h4>Look at how poor you are! You can't access the dungeon, it is only for the elite.</h4>
+				<h3>Look at how poor you are! You can't access the dungeon, it is only for the elite.</h3>
 			</div>
 			<div class="tab-pane" id="tab5">
-				<h4>Saved games:</h4>
-				<div class="form" id="listsaves">
+				<h3>Saved games:</h3>
+				<form class="form-horizontal">
+				<div id="listsaves">
 				</div>
-				<ul class="list-inline">
-					<li><button class="btn btn-default" type="button" onclick="loadSave()">Load</button></li>
-					<li><button class="btn btn-default" type="button" onclick="saveGame()">Save game</button></li>
-					<li><button class="btn btn-default" type="button" onclick="downGame()">Download current game</button></li>
-					<li><button class="btn btn-default" type="button" onclick="downloadSave()">Download</button></li>
-					<li><input type="file" id="selectedFile" style="display: none;" accept=".save.xml" onchange="uploadSave()" />
-						<button class="btn btn-default" type="button" onclick="document.getElementById('selectedFile').click()">Upload</button></li>
-					<li><button class="btn btn-default" type="button" onclick="deleteSave()">Delete</button></li>
-				</ul>
+				<div class="form-group">
+				<div class="col-sm-offset-2 col-sm-10">
+				<div class="btn-group">
+					<button class="btn btn-success" type="button" onclick="loadSave()">Load</button>
+					<button class="btn btn-success" type="button" onclick="saveGame()">Save game</button>
+					<button class="btn btn-success" type="button" onclick="downGame()">Download current game</button>
+					<button class="btn btn-success" type="button" onclick="downloadSave()">Download</button>
+					<input type="file" id="selectedFile" style="display: none;" accept=".save.xml" onchange="uploadSave()" />
+						<button class="btn btn-success" type="button" onclick="document.getElementById('selectedFile').click()">Upload</button>
+					<button class="btn btn-success" type="button" onclick="deleteSave()">Delete</button>
+				</div>
+				</div>
+				</div>
+				</form>
 			</div>
 		</div>
 		</div>
 	</div>
-	</div>
-</div>
 </div>
 </body>
 </html>
diff --git a/js/gui.js b/js/gui.js
index 89fa0fa..ee29622 100644
--- a/js/gui.js
+++ b/js/gui.js
@@ -15,7 +15,7 @@ function changeTab() {
 function showMessage(type, msg) {
 	var msg_box = document.getElementById(type+"-box");
 	msg_box.style.display = "initial";
-	var msg_list = msg_box.firstElementChild.firstElementChild.firstElementChild;
+	var msg_list = msg_box.firstElementChild.firstElementChild;
 	msg_list.innerHTML = "<li>" + msg + "</li>\n" + msg_list.innerHTML;
 
 	window.setTimeout(hideMessage.bind(null, type), MESSAGE_TIMEOUT);
@@ -23,7 +23,7 @@ function showMessage(type, msg) {
 
 function hideMessage(type) {
 	var msg_box = document.getElementById(type+"-box");
-	var msg_list = msg_box.firstElementChild.firstElementChild.firstElementChild;
+	var msg_list = msg_box.firstElementChild.firstElementChild;
 	var item = msg_list.lastElementChild;
 	msg_list.removeChild(item);
 
-- 
cgit v1.2.3-70-g09d2


From 3c1b2013c1e2f71017ed44ad88737848c21d77ed Mon Sep 17 00:00:00 2001
From: piernov <piernov@piernov.org>
Date: Sat, 7 May 2016 14:01:31 +0200
Subject: Character UI

---
 index.xhtml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'index.xhtml')

diff --git a/index.xhtml b/index.xhtml
index c67ee28..1ea1bfe 100644
--- a/index.xhtml
+++ b/index.xhtml
@@ -22,9 +22,6 @@
 	<h1>CraftMine</h1>
 
 	<div class="col-md-3">
-		<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-12">
 				<div class="panel panel-success">
@@ -32,6 +29,12 @@
 						<h3 class="panel-title">Stats</h3>
 					</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">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>
+						</ul>
+
 						<ul class="list-group">
 							<li class="list-group-item">Mine<span id="mine" class="label label-success">14</span></li>
 							<li class="list-group-item">Gold<span id="gold" class="label label-success">14</span></li>
-- 
cgit v1.2.3-70-g09d2


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 'index.xhtml')

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-70-g09d2