Merge branch 'alexichi' of /srv/git/candybox into alexichi

1 files changed, 39 insertions, 6 deletions

diff --git a/inc/perso.inc b/inc/perso.inc
index 0a32b64..2a514bb 100644
--- a/inc/perso.inc
+++ b/inc/perso.inc
@@ -24,15 +24,48 @@ function increasePerso($prop, $num) {
   */
 function limitUse($item){
 	$n = $item->name;
-	if($n =="Life Bottle")return true;
-	if(empty($_SESSION[$n])){
-		$_SESSION[$n]=1;
+	if(empty($item->feat["limit"])) return true;
+	if(empty($_SESSION["usedItem"])){
+		initUsedItem();
+		$_SESSION["usedItem"][$n]["nbUse"]=1;
 		return true;
 	}
 	else{
-		$_SESSION[$n]++;
-		if($_SESSION[$n] >= $item->feat["limit"])return false; 
-		else return true;
+		if($_SESSION["usedItem"][$n]["nbUse"] >= $item->feat["limit"])return false; 
+		else{
+			$_SESSION["usedItem"][$n]["nbUse"]++;
+			return true;
+		}
+	}
+}
+
+function initUsedItem(){ 
+	$_SESSION["usedItem"]["Strength Bottle"]["longevity"] = 0;//if longevity equals 2, it means that the item was used during 2 battles
+	$_SESSION["usedItem"]["Wooden Sword"]["longevity"] = 0;
+	$_SESSION["usedItem"]["Metal Sword"]["longevity"] = 0;
+	$_SESSION["usedItem"]["Strength Bottle"]["nbUse"] = 0;
+	$_SESSION["usedItem"]["Wooden Sword"]["nbUse"] = 0;
+	$_SESSION["usedItem"]["Metal Sword"]["nbUse"] = 0;
+}
+
+function reusable(){
+	if(empty($_SESSION["usedItem"])){
+		initUsedItem();
+	}
+	$_SESSION["usedItem"]["Strength Bottle"]["nbUse"]=0;
+	if($_SESSION["usedItem"]["Wooden Sword"]["nbUse"]>=1){
+		$_SESSION["usedItem"]["Wooden Sword"]["longevity"]++;
+		if($_SESSION["usedItem"]["Wooden Sword"]["longevity"]>=2){
+			$_SESSION["perso"]["powerBonus"] -= 1;
+			$_SESSION["usedItem"]["Wooden Sword"]["nbUse"]=0;
+		}
+	}
+	else if($_SESSION["usedItem"]["Metal Sword"]["nbUse"]>=1){
+		$_SESSION["usedItem"]["Metal Sword"]["longevity"]++;
+		if($_SESSION["usedItem"]["Metal Sword"]["longevity"]>=2){
+			$_SESSION["perso"]["powerBonus"] -= 3;
+			$_SESSION["usedItem"]["Metal Sword"]["nbUse"]=0;
+		}
 	}
 }