diff --git a/GameEngine/Database/db_MYSQLi.php b/GameEngine/Database/db_MYSQLi.php
index efc97b54..d9e61e3c 100644
--- a/GameEngine/Database/db_MYSQLi.php
+++ b/GameEngine/Database/db_MYSQLi.php
@@ -1418,13 +1418,33 @@ class MYSQLi_DB {
 		}
 	}
 
-	function modifyResource($vid, $wood, $clay, $iron, $crop, $mode) {
-		if(!$mode) {
-			$q = "UPDATE " . TB_PREFIX . "vdata set wood = wood - $wood, clay = clay - $clay, iron = iron - $iron, crop = crop - $crop where wref = $vid";
-		} else {
-			$q = "UPDATE " . TB_PREFIX . "vdata set wood = wood + $wood, clay = clay + $clay, iron = iron + $iron, crop = crop + $crop where wref = $vid";
-		}
-		return mysqli_query($this->connection, $q);
+	 function modifyResource($vid, $wood, $clay, $iron, $crop, $mode) {
+    $q="SELECT wood,clay,iron,crop,maxstore,maxcrop from " . TB_PREFIX . "vdata where wref = ".$vid."";
+                $result = mysqli_query($this->connection, $q);
+    $checkres= $this->mysqli_fetch_all($result);
+                if(!$mode){
+    $nwood=$checkres[0]['wood']-$wood;
+    $nclay=$checkres[0]['clay']-$clay;
+    $niron=$checkres[0]['iron']-$iron;
+    $ncrop=$checkres[0]['crop']-$crop;
+    if($nwood<0 or $nclay<0 or $niron<0 or $ncrop<0){$shit=true;}
+    $dwood=($nwood<0)?0:$nwood;
+    $dclay=($nclay<0)?0:$nclay;
+    $diron=($niron<0)?0:$niron;
+    $dcrop=($ncrop<0)?0:$ncrop;
+    }else{
+    $nwood=$checkres[0]['wood']+$wood;
+    $nclay=$checkres[0]['clay']+$clay;
+    $niron=$checkres[0]['iron']+$iron;
+    $ncrop=$checkres[0]['crop']+$crop;
+    $dwood=($nwood>$checkres[0]['maxstore'])?$checkres[0]['maxstore']:$nwood;
+    $dclay=($nclay>$checkres[0]['maxstore'])?$checkres[0]['maxstore']:$nclay;
+    $diron=($niron>$checkres[0]['maxstore'])?$checkres[0]['maxstore']:$niron;
+    $dcrop=($ncrop>$checkres[0]['maxcrop'])?$checkres[0]['maxcrop']:$ncrop;
+    }
+    if(!$shit){
+    $q = "UPDATE " . TB_PREFIX . "vdata set wood = $dwood, clay = $dclay, iron = $diron, crop = $dcrop where wref = ".$vid;
+    return mysqli_query($this->connection, $q); }else{return false;}
 	}
 
 	function modifyOasisResource($vid, $wood, $clay, $iron, $crop, $mode) {
@@ -2395,7 +2415,7 @@ class MYSQLi_DB {
 
 		if(!$mode) {
 			$barracks = array(1,2,3,11,12,13,14,21,22,31,32,33,34,35,36,37,38,39,40,41,42,43,44);
-			$greatbarracks = array(61,62,63,71,72,73,84,81,82,91,92,93,94,95,96,97,98,99,100,101,102,103,104);
+			$greatbarracks = array(61,62,63,71,72,73,74,81,82,91,92,93,94,95,96,97,98,99,100,101,102,103,104);
 			$stables = array(4,5,6,15,16,23,24,25,26,45,46);
 			$greatstables = array(64,65,66,75,76,83,84,85,86,105,106);
 			$workshop = array(7,8,17,18,27,28,47,48);
diff --git a/Templates/Ajax/quest_core.tpl b/Templates/Ajax/quest_core.tpl
index fd9e4bfb..952e160a 100644
--- a/Templates/Ajax/quest_core.tpl
+++ b/Templates/Ajax/quest_core.tpl
@@ -244,11 +244,9 @@ if (isset($qact)){
 	case '23':
 	$database->updateUserField($_SESSION['username'],'quest','23',0);
 	$_SESSION['qst']= 23;
-	
+
 	//Give Reward
-	$gold=$database->getUserField($_SESSION['username'],'gold','username');
-	$gold+=15;
-	$database->updateUserField($_SESSION['username'],'gold',$gold,0);
+	$database->modifyResource($session->villages[0],1700,2100,1900,1400,1);
 	break;
 
 	case '24':
@@ -266,85 +264,89 @@ if (isset($qact)){
 	$_SESSION['qst']= 28;
 	
 	//Give Reward
-	$database->modifyResource($session->villages[0],240,280,180,100,1);
+	$gold=$database->getUserField($_SESSION['username'],'gold','username');
+	$gold+=15;
+	$database->updateUserField($_SESSION['username'],'gold',$gold,0);
 	break;
-    
-        case '29':
-	$dataarray[4] = 1;
+	
+      case '29':
+	$dataarray[3] = 1;
 	$database->updateUserField($_SESSION['username'],'quest','29',0);
 
 	$_SESSION['qst']= 29;
 	
 	//Give Reward
-	$database->modifyResource($session->villages[0],600,750,600,300,1);
+	$database->modifyResource($session->villages[0],240,280,180,100,1);
 	break;
     
         case '30':
-	$dataarray[5] = 1;
+	$dataarray[4] = 1;
 	$database->updateUserField($_SESSION['username'],'quest','30',0);
 
 	$_SESSION['qst']= 30;
 	
 	//Give Reward
-	$database->modifyResource($session->villages[0],900,850,600,300,1);
+	$database->modifyResource($session->villages[0],600,750,600,300,1);
 	break;
     
         case '31':
-	$dataarray[6] = 1;
+	$dataarray[5] = 1;
 	$database->updateUserField($_SESSION['username'],'quest','31',0);
 
 	$_SESSION['qst']= 31;
 	
 	//Give Reward
-	$database->modifyResource($session->villages[0],1800,2000,1650,800,1);
+	$database->modifyResource($session->villages[0],900,850,600,300,1);
 	break;
     
         case '32':
-	$dataarray[7] = 1;
+	$dataarray[6] = 1;
 	$database->updateUserField($_SESSION['username'],'quest','32',0);
 
 	$_SESSION['qst']= 32;
 	
 	//Give Reward
-	$database->modifyResource($session->villages[0],1600,1800,1950,1200,1);
+	$database->modifyResource($session->villages[0],1800,2000,1650,800,1);
 	break;
     
         case '33':
-	$dataarray[8] = 1;
+	$dataarray[7] = 1;
 	$database->updateUserField($_SESSION['username'],'quest','33',0);
 
 	$_SESSION['qst']= 33;
 	
 	//Give Reward
-	$database->modifyResource($session->villages[0],3400,2800,3600,2200,1);
+	$database->modifyResource($session->villages[0],1600,1800,1950,1200,1);
 	break;
     
         case '34':
-	$dataarray[9] = 1;
+	$dataarray[8] = 1;
 	$database->updateUserField($_SESSION['username'],'quest','34',0);
 
 	$_SESSION['qst']= 34;
 	
 	//Give Reward
-	$database->modifyResource($session->villages[0],1050,800,900,750,1);
+	$database->modifyResource($session->villages[0],3400,2800,3600,2200,1);
 	break;
     
         case '35':
-	$dataarray[10] = 1;
+	$dataarray[9] = 1;
 	$database->updateUserField($_SESSION['username'],'quest','35',0);
 
 	$_SESSION['qst']= 35;
 	
 	//Give Reward
-	$database->modifyResource($session->villages[0],1600,2000,1800,1300,1);
+	$database->modifyResource($session->villages[0],1050,800,900,750,1);
 	break;
-
-	case '36':
+    
+        case '36':
+	$dataarray[10] = 1;
 	$database->updateUserField($_SESSION['username'],'quest','36',0);
-	$_SESSION['qst']= 36;
 
+	$_SESSION['qst']= 36;
+	
 	//Give Reward
-	$database->modifyResource($session->villages[0],1700,2100,1900,1400,1);
+	$database->modifyResource($session->villages[0],1600,2000,1800,1300,1);
 	break;