diff --git a/GameEngine/Database.php b/GameEngine/Database.php index 48ffbcc7..7ad2dcbf 100755 --- a/GameEngine/Database.php +++ b/GameEngine/Database.php @@ -837,8 +837,8 @@ class MYSQLi_DB implements IDbConnection { // update cached values if ($ret = mysqli_query($this->dblink,$q)) { foreach ($field as $index => $fieldName) { - if (isset(self::$fieldsCache[$ref.$switch][$fieldName])) - self::$fieldsCache[$ref.$switch][$fieldName] = $value[$index]; + if (isset(self::$fieldsCache[$ref.($switch ? 0 : 1)][$fieldName])) + self::$fieldsCache[$ref.($switch ? 0 : 1)][$fieldName] = $value[$index]; } } @@ -3622,7 +3622,7 @@ class MYSQLi_DB implements IDbConnection { $array2 = $this->getVillage(0, 4); $vill = $array2['wref']; - if(mysqli_num_rows(mysqli_query($this->dblink,$q)) > 0){ + if ($array && count($array)){ foreach($array as $village){ $coor2 = $this->getCoor($village['wref']); $max = 2 * WORLD_MAX + 1; diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php index 8c0d0174..e38f659b 100755 --- a/GameEngine/Lang/en.php +++ b/GameEngine/Lang/en.php @@ -196,7 +196,7 @@ define("Q11_ORDER","Order:

Look for the coordinates of "); define("Q11_ORDER1","and enter them here."); define("Q11_RESP","Exactly, there "); define("Q11_RESP1"," Village! As many resources as you reach this village. Well, almost as much ..."); -define("Q11_BUTN","completar misión"); +define("Q11_BUTN","complete task"); define("Q12","Task 12: Cranny"); define("Q12_DESC","It's getting time to erect a cranny. The world of is dangerous.

Many players live by stealing other players' resources. Build a cranny to hide some of your resources from enemies."); @@ -1262,7 +1262,7 @@ define("WWVILLAGE","WW village"); $lang['screenshots']['title6']="Statistics"; $lang['screenshots']['desc6']="View your ranking in statistics"; $lang['screenshots']['title7']="Weapons or dough"; - $lang['screenshots']['desc7']="You can choose to play as military or economy"; - + $lang['screenshots']['desc7']="You can choose to play as military or economy"; + ?> diff --git a/Templates/Ajax/quest_core.tpl b/Templates/Ajax/quest_core.tpl index 3f84e132..5704d633 100644 --- a/Templates/Ajax/quest_core.tpl +++ b/Templates/Ajax/quest_core.tpl @@ -28,18 +28,18 @@ else if(!$message->unread && $message->nunread) { $messagelol = "i3"; } else if($message->unread && $message->nunread) { $messagelol = "i1"; } else { $messagelol = "i4"; } -//set $skipp_time. Use the SPEED. standard (1x) = 10 hours. -if(SPEED == '1'){ - $skipp_time="43200"; -} else if(SPEED == '2'){ +//set $skipp_time. Use the SPEED. standard (1x) = 10 hours. +if(SPEED == '1'){ + $skipp_time="43200"; +} else if(SPEED == '2'){ $skipp_time="21600"; -} else if(SPEED == '3'){ - $skipp_time="11988"; +} else if(SPEED == '3'){ + $skipp_time="11988"; } else if(SPEED <= '5'){ - $skipp_time="7200"; -} else if(SPEED > '5'){ - $skipp_time="3600"; -} + $skipp_time="7200"; +} else if(SPEED > '5'){ + $skipp_time="3600"; +} $_SESSION['qst_time'] = $uArray['quest_time']; if (isset($qact)){ @@ -50,7 +50,7 @@ if (isset($qact)){ $qact = $currentQuest; } - if ($check_quest==$qact) { + if ($check_quest===$qact) { //avoid hacking gold, resources or reward -- added by Ronix }else { switch($qact) { @@ -58,9 +58,9 @@ if (isset($qact)){ $database->updateUserField($_SESSION['username'],'quest','1',0); $_SESSION['qst']= 1; break; - - - //user does not follow the quest. + + + //user does not follow the quest. //Get reward: Resources: Every 24 hours (1 speed) 24/speed=hours //Gold: 25 gold case 'skip': @@ -69,14 +69,14 @@ if (isset($qact)){ break; case '2': - $database->updateUserField($_SESSION['username'],'quest','2',0); - $_SESSION['qst']= 2; + $database->updateUserField($_SESSION['username'],'quest','2',0); + $_SESSION['qst']= 2; //Give Reward - $database->FinishWoodcutter($session->villages[0]); + $database->FinishWoodcutter($session->villages[0]); break; case '3': - $database->updateUserField($_SESSION['username'],'quest','3',0); + $database->updateUserField($_SESSION['username'],'quest','3',0,false); $_SESSION['qst']= 3; //Give Reward if(!$session->plus){ @@ -92,18 +92,18 @@ if (isset($qact)){ $database->updateUserField($_SESSION['username'],'quest','4',0); $_SESSION['qst']= 4; //Give Reward - $database->modifyResource($session->villages[0],30,60,30,20,1); + $database->modifyResource($session->villages[0],30,60,30,20,1); break; - + case 'rank': $rSubmited=$qact2; break; - + case '5': $database->updateUserField($_SESSION['username'],'quest','5',0); $_SESSION['qst']= 5; //Give Reward - $database->modifyResource($session->villages[0],40,30,20,30,1); + $database->modifyResource($session->villages[0],40,30,20,30,1); break; case '6': @@ -115,47 +115,47 @@ if (isset($qact)){ $database->sendMessage($session->userinfo['id'],4,$Subject,$Message,0,0,0,0,0); $RB=true; //Give Reward - $database->modifyResource($session->villages[0],50,60,30,30,1); + $database->modifyResource($session->villages[0],50,60,30,30,1); break; - + case '7': $database->updateUserField($_SESSION['username'],'quest','7',0); $_SESSION['qst']= 7; //Give Reward $gold=$database->getUserField($_SESSION['username'],'gold','username'); $gold+=20; - $database->updateUserField($_SESSION['username'],'gold',$gold,0); + $database->updateUserField($_SESSION['username'],'gold',$gold,0,false); break; - + case '8': - $database->updateUserField($_SESSION['username'],'quest','8',0); + $database->updateUserField($_SESSION['username'],'quest','8',0,false); $_SESSION['qst']= 8; //Give Reward $database->modifyResource($session->villages[0],75,80,30,50,1); break; - + case '9': $crop = round($village->acrop); if ($crop>=200){ $database->updateUserField($_SESSION['username'],'quest','9',0); - //Get 200 Crop - $database->modifyResource($session->villages[0],0,0,0,-200,1); + //Get 200 Crop + $database->modifyResource($session->villages[0],0,0,0,-200,1); //Give Reward $attack = $database->addAttack(0,1,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0); $database->addMovement(3,0,$session->villages[0],$attack,time(),time()+43200/INCREASE_SPEED); } else{ $NoCrop=Q8_NOCROP; } - $_SESSION['qst']= 9; + $_SESSION['qst']= 9; break; - + case '10': $database->updateUserField($_SESSION['username'],'quest','10',0); $_SESSION['qst']= 10; //Give Reward $database->modifyResource($session->villages[0],75,90,30,50,1); break; - + case '11': $database->updateUserField($_SESSION['username'],'quest','11',0); $_SESSION['qst']= 11; @@ -168,70 +168,70 @@ if (isset($qact)){ $database->updateUserField($_SESSION['username'],'plus',$plus,0); } break; - + case 'coor': $x=$qact2; $y=$qact3; break; - + case '12': $database->updateUserField($_SESSION['username'],'quest','12',0); $_SESSION['qst']= 12; //Give Reward - $database->modifyResource($session->villages[0],60,30,40,90,1); + $database->modifyResource($session->villages[0],60,30,40,90,1); break; - + case '13': $database->updateUserField($_SESSION['username'],'quest','13',0); $_SESSION['qst']= 13; //Give Reward $database->modifyResource($session->villages[0],150,180,30,130,1); break; - + case '14': $database->updateUserField($_SESSION['username'],'quest','14',0); $_SESSION['qst']= 14; //Give Reward $database->modifyResource($session->villages[0],60,50,40,30,1); break; - + case 'lumber': $lSubmited=$qact2; break; - + case '15': $database->updateUserField($_SESSION['username'],'quest','15',0); $_SESSION['qst']= 15; //Give Reward $database->modifyResource($session->villages[0],50,30,60,20,1); break; - + case '16': $database->updateUserField($_SESSION['username'],'quest','16',0); $_SESSION['qst']= 16; //Give Reward $database->modifyResource($session->villages[0],75,75,40,40,1); break; - + case '17': $database->updateUserField($_SESSION['username'],'quest','17',0); $_SESSION['qst']= 17; //Give Reward $database->modifyResource($session->villages[0],100,90,100,60,1); break; - + case '18': $database->updateUserField($_SESSION['username'],'quest','18',0); - $_SESSION['qst']= 18; + $_SESSION['qst']= 18; break; - + case '19': $database->updateUserField($_SESSION['username'],'quest','19',0); $_SESSION['qst']= 19; //Give Reward $database->modifyResource($session->villages[0],80,90,60,40,1); break; - + case '20': $database->updateUserField($_SESSION['username'],'quest','20',0); $_SESSION['qst']= 20; @@ -241,28 +241,28 @@ if (isset($qact)){ case '21': $database->updateUserField($_SESSION['username'],'quest','21',0); - $_SESSION['qst']= 21; + $_SESSION['qst']= 21; break; - + case '22': $database->updateUserField($_SESSION['username'],'quest','22',0); $_SESSION['qst']= 22; //Give Reward $database->modifyResource($session->villages[0],200,200,700,450,1); break; - + case '23': $database->updateUserField($_SESSION['username'],'quest','23',0); $_SESSION['qst']= 23; break; - + case '24': $database->updateUserField($_SESSION['username'],'quest','24',0); $_SESSION['qst']= 24; //Give Reward $database->modifyResource($session->villages[0],300,320,360,570,1); break; - + case '28': $dataarray[3] = 1; $database->updateUserField($_SESSION['username'],'quest','28',0); @@ -272,7 +272,7 @@ if (isset($qact)){ $gold+=15; $database->updateUserField($_SESSION['username'],'gold',$gold,0); break; - + case '29': $dataarray[4] = 1; $database->updateUserField($_SESSION['username'],'quest','29',0); @@ -280,7 +280,7 @@ if (isset($qact)){ //Give Reward $database->modifyResource($session->villages[0],240,280,180,100,1); break; - + case '30': $dataarray[5] = 1; $database->updateUserField($_SESSION['username'],'quest','30',0); @@ -288,7 +288,7 @@ if (isset($qact)){ //Give Reward $database->modifyResource($session->villages[0],600,750,600,300,1); break; - + case '31': $dataarray[6] = 1; $database->updateUserField($_SESSION['username'],'quest','31',0); @@ -296,7 +296,7 @@ if (isset($qact)){ //Give Reward $database->modifyResource($session->villages[0],900,850,600,300,1); break; - + case '32': $dataarray[7] = 1; $database->updateUserField($_SESSION['username'],'quest','32',0); @@ -304,7 +304,7 @@ if (isset($qact)){ //Give Reward $database->modifyResource($session->villages[0],1800,2000,1650,800,1); break; - + case '33': $dataarray[8] = 1; $database->updateUserField($_SESSION['username'],'quest','33',0); @@ -312,7 +312,7 @@ if (isset($qact)){ //Give Reward $database->modifyResource($session->villages[0],1600,1800,1950,1200,1); break; - + case '34': $dataarray[9] = 1; $database->updateUserField($_SESSION['username'],'quest','34',0); @@ -320,7 +320,7 @@ if (isset($qact)){ //Give Reward $database->modifyResource($session->villages[0],3400,2800,3600,2200,1); break; - + case '35': $dataarray[10] = 1; $database->updateUserField($_SESSION['username'],'quest','35',0); @@ -328,19 +328,19 @@ if (isset($qact)){ //Give Reward $database->modifyResource($session->villages[0],1050,800,900,750,1); break; - + case '36': $database->updateUserField($_SESSION['username'],'quest','36',0); $_SESSION['qst']= 36; //Give Reward $database->modifyResource($session->villages[0],1600,2000,1800,1300,1); break; - + case '37': $database->updateUserField($_SESSION['username'],'quest','37',0); $_SESSION['qst']= 37; break; - + case '91': $database->updateUserField($_SESSION['username'],'quest','91',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); @@ -358,7 +358,7 @@ if (isset($qact)){ $gold+=15; $database->updateUserField($_SESSION['username'],'gold',$gold,0); break; - + case '92': $database->updateUserField($_SESSION['username'],'quest','92',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); @@ -366,8 +366,8 @@ if (isset($qact)){ $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward $database->modifyResource($session->villages[0],217,247,177,207,1); - break; - + break; + case '93': $database->updateUserField($_SESSION['username'],'quest','93',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); @@ -375,8 +375,8 @@ if (isset($qact)){ $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward $database->modifyResource($session->villages[0],217,247,177,207,1); - break; - + break; + case '94': $database->updateUserField($_SESSION['username'],'quest','94',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); @@ -384,8 +384,8 @@ if (isset($qact)){ $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward $database->modifyResource($session->villages[0],217,247,177,207,1); - break; - + break; + case '95': $database->updateUserField($_SESSION['username'],'quest','95',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); @@ -393,8 +393,8 @@ if (isset($qact)){ $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward $database->modifyResource($session->villages[0],217,247,177,207,1); - break; - + break; + case '96': $database->updateUserField($_SESSION['username'],'quest','96',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); @@ -402,8 +402,8 @@ if (isset($qact)){ $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward $database->modifyResource($session->villages[0],217,247,177,207,1); - break; - + break; + case '97': $database->updateUserField($_SESSION['username'],'quest','97',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()).'',0); @@ -421,7 +421,7 @@ if (isset($qact)){ $gold+=20; $database->updateUserField($_SESSION['username'],'gold',$gold,0); break; - } + } } } @@ -443,14 +443,14 @@ if($session->access!=BANNED){ getResourceLevel($session->villages[0]); $woodL=$tRes['f1']+$tRes['f3']+$tRes['f14']+$tRes['f17']; //check if you are building a woodcutter to level 1 foreach($building->buildArray as $jobs) { if($jobs['type']==1){ $woodL="99"; - } + } } if ($woodL<1){?> {"markup":"\n\t\t

\"\" <\/h1>
””<\/i>

<\/div>
<\/span><\/div>\n\t\t

<\/div>\n\t\t","number":"-1","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} @@ -458,9 +458,9 @@ if ($woodL<1){?> {"markup":"\n\t\t

\"\" <\/h1>
””<\/i>


<\/div>
<\/a><\/span><\/div>\n\t\t

<\/div>\n\t\t","number":"-1","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99,"ar":1} -getResourceLevel($session->villages[0]); $cropL=$tRes['f2']+$tRes['f8']+$tRes['f9']+$tRes['f12']+$tRes['f13']+$tRes['f15']; if ($cropL<1){?> @@ -469,7 +469,7 @@ if ($cropL<1){?> {"markup":"\n\t\t

\"\" <\/h1>
””<\/i>

Plus<\/div>
<\/a><\/span><\/div>\n\t\t

<\/div>\n\t\t","number":2,"reward":{"plus":1},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} -userinfo['username']."'s village"){?> // Compare real player rank with submited rank $temp['uid']=$session->userinfo['id']; $ranking->procRankReq($temp); -$displayarray = $database->getUserArray($temp['uid'],1); +$displayarray = $database->getUserArray($temp['uid'],1,false); $rRes=$ranking->searchRank($displayarray['username'],"username"); if (!isset($rSubmited)) { $rSubmited = null; @@ -496,9 +496,9 @@ if ($rRes!=$rSubmited && $rRes !== 'Multihunter'){?> {"markup":"\n\t\t

\"\"<\/h1>
””<\/i>

<\/p>\"Lumber\"40  \"Clay\"30  \"Iron\"20  \"Crop\"30  <\/div>
<\/a><\/span><\/div>\n\t\t","number":4,"reward":{"wood":40,"clay":30,"iron":20,"crop":30},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} -getResourceLevel($session->villages[0]); $ironL=$tRes['f4']+$tRes['f7']+$tRes['f10']+$tRes['f11']; $clayL=$tRes['f5']+$tRes['f6']+$tRes['f16']+$tRes['f18']; @@ -508,7 +508,7 @@ if ($ironL<1 || $clayL<1){?> {"markup":"\n\t\t

\"\"<\/h1>
””<\/i>

<\/p>\"Lumber\"50  \"Clay\"60  \"Iron\"30  \"Crop\"30  <\/div>
<\/a><\/span><\/div>\n\t\t

<\/div>\n\t\t","number":5,"reward":{"wood":50,"clay":60,"iron":30,"crop":30},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} - {"markup":"\n\t\t

\"\" <\/h1>
”.”<\/i>

<\/p>\"Lumber\"75  \"Clay\"80  \"Iron\"30  \"Crop\"50  <\/div>
<\/a><\/span><\/div>\n\t\t

<\/div>\n\t\t","number":9,"reward":{"wood":75,"clay":80,"iron":30,"crop":50},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} - {"markup":"\n\t\t

\"\" <\/h1>
””<\/i>

<\/p>\"Lumber\"60  \"Clay\"50  \"Iron\"40  \"Crop\"30  <\/div>
<\/a><\/span><\/div>\n\t\t

<\/div>\n\t\t","number":13,"reward":{"wood":60,"clay":50,"iron":40,"crop":30},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} - @@ -626,7 +626,7 @@ if ($mainbuilding<3){?> // Compare real player rank with submited rank $temp['uid']=$session->userinfo['id']; $ranking->procRankReq($temp); -$displayarray = $database->getUserArray($temp['uid'],1); +$displayarray = $database->getUserArray($temp['uid'],1,false); $rRes=$ranking->searchRank($displayarray['username'],"username"); if (!isset($rSubmited) || $rRes!=$rSubmited){ ?> {"markup":"\n\t\t

\"\" <\/h1>
””<\/i>

<\/div>
\"\/>
<\/span><\/div>\n\t\t

<\/div>\n\t\t","number":"-16","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} @@ -920,7 +920,7 @@ $_SESSION['qst']= 38; ?> getResourceLevel($session->villages[0]); $woodL=$tRes['f1']+$tRes['f3']+$tRes['f14']+$tRes['f17']; if ($woodL<1){?> @@ -929,9 +929,9 @@ if ($woodL<1){?> {"markup":"\n\t\t

\"\" Task 1: Woodcutter<\/h1>
”Yes, that way you gain more lumber.I helped a bit and completed the order instantly.”<\/i>

Your reward:<\/p>Woodcutter instantly completed.
<\/div>
Continue with the next task.<\/a><\/span><\/div>\n\t\t

<\/div>\n\t\t","number":"-1","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":0} -getResourceLevel($session->villages[0]); $cropL=$tRes['f2']+$tRes['f8']+$tRes['f9']+$tRes['f12']+$tRes['f13']+$tRes['f15']; if ($cropL<1){?> @@ -940,7 +940,7 @@ if ($cropL<1){?> {"markup":"\n\t\t

\"\" Task 2: Crop<\/h1>
”Very good. Now your subjects have enough to eat again...”<\/i>

Your reward:<\/p>\"Lumber\"50  \"Clay\"60  \"Iron\"30  \"Crop\"10  <\/div>
Continue with the next task.<\/a><\/span><\/div>\n\t\t

<\/div>\n\t\t","number":2,"reward":{"plus":1},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":0} -userinfo['username']."'s village"){?> // Compare real player rank with submited rank $temp['uid']=$session->userinfo['id']; $ranking->procRankReq($temp); -$displayarray = $database->getUserArray($temp['uid'],1); +$displayarray = $database->getUserArray($temp['uid'],1,false); $rRes=$ranking->searchRank($displayarray['username'],"username"); if (!isset($rSubmited) || $rRes!=$rSubmited){ ?> {"markup":"\n\t\t

\"\" Task 4: Other Players<\/h1>
”In you play along with billions of other players. Click 'statistics' in the top menu to look up your rank and enter it here.”<\/i>

Order:<\/p>Look for your rank in the statistics and enter it here.<\/div>

<\/span><\/div>\n\t\t

<\/div>\n\t\t","number":-4,"reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":0} @@ -964,9 +964,9 @@ if (!isset($rSubmited) || $rRes!=$rSubmited){ ?> {"markup":"\n\t\t

\"\" Task 4: Other Players<\/h1>
”Exactly! That's your rank.”<\/i>

Your reward:<\/p>\"Lumber\"40  \"Clay\"30  \"Iron\"20  \"Crop\"30  <\/div>
Continue with the next task.<\/a><\/span><\/div>\n\t\t","number":4,"reward":{"wood":40,"clay":30,"iron":20,"crop":30},"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":0} -getResourceLevel($session->villages[0]); $ironL=$tRes['f4']+$tRes['f7']+$tRes['f10']+$tRes['f11']; $clayL=$tRes['f5']+$tRes['f6']+$tRes['f16']+$tRes['f18']; @@ -976,7 +976,7 @@ if ($ironL<1 || $clayL<1){?> {"markup":"\n\t\t

\"\" Task 5: Two Building Orders<\/h1>
”As you noticed, building orders take rather long. The world of will continue to spin even if you are offline. Even in a few months there will be many new things for you to discover.\r\n

\r\nThe best thing to do is occasionally checking your village and giving you subjects new tasks to do.”<\/i>

Your reward:<\/p>\"Lumber\"50  \"Clay\"60  \"Iron\"30  \"Crop\"30  <\/div>
Continue with the next task.<\/a><\/span><\/div>\n\t\t

<\/div>\n\t\t","number":5,"reward":{"wood":50,"clay":60,"iron":30,"crop":30},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":0} -unread || $RB==true){?> @@ -1003,7 +1003,7 @@ if ($ironL<4 || $clayL<4 || $woodL<4 || $cropL<6){?> {"markup":"\n\t\t