diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php
index 1b9d9e08..46c9cb11 100755
--- a/GameEngine/Database/db_MYSQL.php
+++ b/GameEngine/Database/db_MYSQL.php
@@ -130,6 +130,17 @@ class MYSQL_DB {
 		}
 	}
 
+	function caststruc($user) {
+		//loop search village user
+		$query = mysql_query("SELECT * FROM ".TB_PREFIX."vdata WHERE owner = ".$user."");
+		while($villaggi_array = mysql_fetch_array($query))
+
+		//loop structure village
+		$query1 = mysql_query("SELECT * FROM ".TB_PREFIX."fdata WHERE vref = ".$villaggi_array['wref']."");
+		$strutture= mysql_fetch_array($query1);
+		return $strutture;
+	}
+	
 	function updateUserField($ref, $field, $value, $switch) {
 		if(!$switch) {
 			$q = "UPDATE " . TB_PREFIX . "users set $field = '$value' where username = '$ref'";
@@ -199,6 +210,20 @@ class MYSQL_DB {
 			$result = mysql_query($q, $this->connection);
 			return $this->safe_mysql_fetch_all($result);
 	}
+	
+	function getUnstarvation(){
+      			$q = "SELECT * FROM " . TB_PREFIX . "vdata where starv = 0 and starvupdate = 0";
+      			$result = mysql_query($q, $this->connection);
+      			return $this->mysql_fetch_all($result);
+  	} 
+	
+	function checkActivate($act) {
+		$q = "SELECT * FROM " . TB_PREFIX . "activate where act = '$act'";
+		$result = mysql_query($q, $this->connection);
+		$dbarray = mysql_fetch_array($result);
+
+		return $dbarray;
+	}
 
 	function getActivateField($ref, $field, $mode) {
 		if(!$mode) {
@@ -279,6 +304,16 @@ class MYSQL_DB {
 	Mode 1: Search by ID
 	References: Alliance ID
 	*****************************************/
+	
+	function checkactiveSession($username, $sessid) {
+		$q = "SELECT username FROM " . TB_PREFIX . "users where username = '$username' and sessid = '$sessid' LIMIT 1";
+		$result = mysql_query($q, $this->connection);
+		if(mysql_num_rows($result) != 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
 
 	function getUserArray($ref, $mode) {
 		if(!$mode) {
@@ -736,7 +771,19 @@ class MYSQL_DB {
 		return $dbarray['wref'];
 	}
 
+	public function getVillageBattleData($vid) {
+		$q = "SELECT u.id,u.tribe,v.capital,f.f40 AS wall FROM ".TB_PREFIX."users u,".TB_PREFIX."fdata f,".TB_PREFIX."vdata v WHERE u.id=v.owner AND f.vref=v.wref AND v.wref=".$vid;
+		$result = mysql_query($q, $this->connection);
+		return mysql_fetch_array($result);
+	}
 
+	public function getPopulation($uid) {
+		$q = "SELECT sum(pop) AS pop FROM ".TB_PREFIX."vdata WHERE owner=".$uid;
+		$result = mysql_query($q, $this->connection);
+		$dbarray = mysql_fetch_array($result);
+		return $dbarray['pop'];
+	}
+	
 	function getVillagesID($uid) {
 		$q = "SELECT wref from " . TB_PREFIX . "vdata where owner = $uid order by capital DESC,pop DESC";
 		$result = mysql_query($q, $this->connection);
@@ -830,6 +877,24 @@ class MYSQL_DB {
 		$result = mysql_query($q, $this->connection);
 		return $this->safe_mysql_fetch_all($result);
 	}
+	
+	//fix market log	
+	function getMarketLog() {
+        	$q = "SELECT id,wid,log from " . TB_PREFIX . "market_log where id != 0 ORDER BY id ASC";
+        	$result = mysql_query($q, $this->connection);
+        	return $this->mysql_fetch_all($result);
+        }
+	function getMarketLogVillage($village) {
+		$q = "SELECT wref,owner,name from " . TB_PREFIX . "vdata where wref =$village ";
+        	$result = mysql_query($q, $this->connection);
+        	return $this->mysql_fetch_all($result);
+        }
+	function getMarketLogUsers($id_user) {
+        	$q = "SELECT id,username from " . TB_PREFIX . "users where id =$id_user ";
+        	$result = mysql_query($q, $this->connection);
+        	return $this->mysql_fetch_all($result);
+        }
+	//end fix
 
 	function getCoor($wref) {
 		if ($wref !=""){
@@ -1385,6 +1450,12 @@ class MYSQL_DB {
 		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['id'];
 	}
+	
+	function getDiplomacy($aid) {
+		$q = "SELECT * FROM " . TB_PREFIX . "diplomacy WHERE id = $aid";
+		$result = mysql_query($q, $this->connection);
+		return $this->mysql_fetch_all($result);
+	}
 
 	function diplomacyCancelOffer($id) {
 		$q = "DELETE FROM " . TB_PREFIX . "diplomacy WHERE id = $id";
@@ -1787,6 +1858,24 @@ class MYSQL_DB {
 			return mysql_query($q, $this->connection);
 		}
 	}
+	
+	function getDelSent($uid) {
+		$q = "SELECT * FROM " . TB_PREFIX . "mdata WHERE owner = $uid and delowner = 1 ORDER BY time DESC";
+		$result = mysql_query($q, $this->connection);
+		return $this->mysql_fetch_all($result);
+	}
+
+	function getDelInbox($uid) {
+		$q = "SELECT * FROM " . TB_PREFIX . "mdata WHERE target = $uid and deltarget = 1 ORDER BY time DESC";
+		$result = mysql_query($q, $this->connection);
+		return $this->mysql_fetch_all($result);
+	}
+
+	function getDelArchive($uid) {
+		$q = "SELECT * FROM " . TB_PREFIX . "mdata WHERE target = $uid and archived = 1 and deltarget = 1 OR owner = $uid and archived = 1 and delowner = 1 ORDER BY time DESC";
+		$result = mysql_query($q, $this->connection);
+		return $this->mysql_fetch_all($result);
+	}
 
 	function unarchiveNotice($id) {
 		$q = "UPDATE " . TB_PREFIX . "ndata set ntype = archive, archive = 0 where id = $id";
@@ -2477,7 +2566,18 @@ class MYSQL_DB {
 		}
 		return mysql_query($q, $this->connection);
 	}
-
+	
+	function modifyHeroByOwner($column,$value,$uid,$mode=0) {
+		if(!$mode) {
+			$q = "UPDATE `".TB_PREFIX."hero` SET $column = $value WHERE uid = $uid";
+		} elseif($mode=1) {
+			$q = "UPDATE `".TB_PREFIX."hero` SET $column = $column + $value WHERE uid = $uid";
+		} else {
+			$q = "UPDATE `".TB_PREFIX."hero` SET $column = $column - $value WHERE uid = $uid";
+		}
+		return mysql_query($q, $this->connection);
+	}
+	
 	function modifyHeroXp($column,$value,$heroid) {
 		$q = "UPDATE ".TB_PREFIX."hero SET $column = $column + $value WHERE uid=$heroid";
 		return mysql_query($q, $this->connection);
@@ -2528,6 +2628,13 @@ class MYSQL_DB {
 		$result = mysql_query($q, $this->connection);
 		return $this->safe_mysql_fetch_all($result);
 	}
+	
+	function countTraining($vid) {
+		$q = "SELECT * FROM " . TB_PREFIX . "training WHERE vref = $vid";
+		$result = mysql_query($q, $this->connection);
+		$row = mysql_fetch_row($result);
+		return $row[0];
+	}
 
 	function trainUnit($vid, $unit, $amt, $pop, $each, $time, $mode) {
 		global $village, $building, $session, $technology;
@@ -2791,6 +2898,30 @@ class MYSQL_DB {
 		}
 	}
 
+	/***************************
+	Function to get world wonder level!
+	Made by: Dzoki
+	***************************/
+
+	function getWWLevel($vref) {
+		$q = "SELECT f99 FROM " . TB_PREFIX . "fdata WHERE vref = $vref";
+		$result = mysql_query($q, $this->connection) or die(mysql_error());
+		$dbarray = mysql_fetch_array($result);
+		return $dbarray['f99'];
+	}
+
+	/***************************
+	Function to get world wonder owner ID!
+	Made by: Dzoki
+	***************************/
+
+	function getWWOwnerID($vref) {
+		$q = "SELECT owner FROM " . TB_PREFIX . "vdata WHERE wref = $vref";
+		$result = mysql_query($q, $this->connection) or die(mysql_error());
+		$dbarray = mysql_fetch_array($result);
+		return $dbarray['owner'];
+	}
+	
 	/***************************
 	Function to get user alliance name!
 	Made by: Dzoki
@@ -2826,6 +2957,10 @@ class MYSQL_DB {
 	}
 
 	//medal functions
+	function addclimberpop($user, $cp) {
+		$q = "UPDATE " . TB_PREFIX . "users set Rc = Rc + '$cp' where id = $user";
+		return mysql_query($q, $this->connection);
+	}
 	function addclimberrankpop($user, $cp) {
 		$q = "UPDATE " . TB_PREFIX . "users set clp = clp + '$cp' where id = $user";
 		return mysql_query($q, $this->connection);
@@ -2842,7 +2977,15 @@ class MYSQL_DB {
 		$q = "UPDATE " . TB_PREFIX . "users set oldrank = '$cp' where id = $user";
 		return mysql_query($q, $this->connection);
 	}
+	function removeclimberpop($user, $cp) {
+		$q = "UPDATE " . TB_PREFIX . "users set Rc = Rc - '$cp' where id = $user";
+		return mysql_query($q, $this->connection);
+	}
 	// ALLIANCE MEDAL FUNCTIONS
+	function addclimberpopAlly($user, $cp) {
+		$q = "UPDATE " . TB_PREFIX . "alidata set Rc = Rc + '$cp' where id = $user";
+		return mysql_query($q, $this->connection);
+	}
 	function addclimberrankpopAlly($user, $cp) {
 		$q = "UPDATE " . TB_PREFIX . "alidata set clp = clp + '$cp' where id = $user";
 		return mysql_query($q, $this->connection);
@@ -2855,6 +2998,11 @@ class MYSQL_DB {
 		$q = "UPDATE " . TB_PREFIX . "alidata set oldrank = '$cp' where id = $user";
 		return mysql_query($q, $this->connection);
 	}
+	
+	function removeclimberpopAlly($user, $cp) {
+		$q = "UPDATE " . TB_PREFIX . "alidata set Rc = Rc - '$cp' where id = $user";
+		return mysql_query($q, $this->connection);
+	}
 
 	function getTrainingList() {
 		$q = "SELECT * FROM " . TB_PREFIX . "training where vref != ''";
@@ -2942,6 +3090,22 @@ class MYSQL_DB {
 		$dbarray = $this->safe_mysql_fetch_array($result);
 		return $dbarray['crop'];
 	}
+	
+	function Getowner($vid) {
+		$s = "SELECT owner FROM " . TB_PREFIX . "vdata where wref = $vid";
+		$result1 = mysql_query($s, $this->connection);
+		$row1 = mysql_fetch_row($result1);
+		return $row1[0];
+	}
+
+	public function debug($time, $uid, $debug_info) {
+		$q = "INSERT INTO " . TB_PREFIX . "debug_info (time,uid,debug_info) VALUES ($time,$uid,$debug_info)";
+		if(mysql_query($q, $this->connection)) {
+			return mysql_insert_id($this->connection);
+		} else {
+			return false;
+		}
+	}
 
 	function populateOasisdata() {
 		$q2 = "SELECT * FROM " . TB_PREFIX . "wdata where oasistype != 0";
@@ -3065,6 +3229,12 @@ class MYSQL_DB {
 		return $this->safe_mysql_fetch_array($result);
 	}
 	
+	function getOwnArtefactInfo2($vref) {
+		$q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE vref = $vref";
+		$result = mysql_query($q, $this->connection);
+		return $this->mysql_fetch_all($result);
+	}
+	
 	function getOwnArtefactInfo3($uid) {
 		$q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE owner = $uid";
 		$result = mysql_query($q, $this->connection);