From d72290bb35b262125f9cb93a9617a47d2578c684 Mon Sep 17 00:00:00 2001 From: Martin Ambrus Date: Sun, 26 Nov 2017 14:39:36 +0100 Subject: [PATCH] fix: changing village name to the same name in Quest 3 marks quest as OK --- Templates/Ajax/quest_core.tpl | 4 +- Templates/Ajax/quest_core25.tpl | 158 ++++++++++++++++---------------- 2 files changed, 81 insertions(+), 81 deletions(-) diff --git a/Templates/Ajax/quest_core.tpl b/Templates/Ajax/quest_core.tpl index 5704d633..4c5b22b2 100644 --- a/Templates/Ajax/quest_core.tpl +++ b/Templates/Ajax/quest_core.tpl @@ -473,7 +473,7 @@ if ($cropL<1){?> //Check the village name is changed or is default name -$vName=$village->vname; +$vName=str_replace(''', "'", $village->vname); if ($vName==$session->userinfo['username']."'s village"){?> {"markup":"\n\t\t

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

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

<\/div>\n\t\t","number":"-3","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} @@ -944,7 +944,7 @@ if ($cropL<1){?> //Check the village name is changed or is default name -$vName=$village->vname; +$vName=str_replace(''', "'", $village->vname); if ($vName==$session->userinfo['username']."'s village"){?> {"markup":"\n\t\t

\"\"Task 3: Your Village's Name<\/h1>
”Creative as you are you can grant your village the ultimate name.\r\n

\r\nClick on 'profile' in the left hand menu and then select 'change profile'...”<\/i>

Order:<\/p>Change your village's name to something nice.<\/div>
<\/span><\/div>\n\t\t

<\/div>\n\t\t","number":"-3","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":0} diff --git a/Templates/Ajax/quest_core25.tpl b/Templates/Ajax/quest_core25.tpl index f68fb105..a6aa5e40 100644 --- a/Templates/Ajax/quest_core25.tpl +++ b/Templates/Ajax/quest_core25.tpl @@ -8,7 +8,7 @@ ## Developed by: DesPlus and Marvin ## ## Fixed by: Shadow / Skype : cata7007 and Armando ## ## Revision by: noonn ## -## Official Quest by: ronix ## +## Official Quest by: ronix ## ## License: TravianZ Project ## ## Copyright: TravianZ (c) 2010-2013. All rights reserved. ## ## URLs: http://travian.shadowss.ro ## @@ -31,16 +31,16 @@ 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'){ - $skipp_time="21600"; -} else if(SPEED == '3'){ - $skipp_time="11988"; +//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 <= '5'){ - $skipp_time="7200"; -} else if(SPEED > '5'){ + $skipp_time="7200"; +} else if(SPEED > '5'){ $skipp_time= 3600 / SPEED; } @@ -57,7 +57,7 @@ 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': @@ -66,10 +66,10 @@ 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': @@ -89,18 +89,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': @@ -111,9 +111,9 @@ 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; @@ -127,36 +127,36 @@ if (isset($qact)){ $x=$qact2; $y=$qact3; break; - + case '8': $database->updateUserField($_SESSION['username'],'quest','8',0); $_SESSION['qst']= 8; //Give Reward $database->modifyResource($session->villages[0],60,30,40,90,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],100,80,40,40,1); break; - + case '11': $database->updateUserField($_SESSION['username'],'quest','11',0); $_SESSION['qst']= 11; @@ -174,16 +174,16 @@ if (isset($qact)){ $database->updateUserField($_SESSION['username'],'quest','12',0); $_SESSION['qst']= 12; //Give Reward - $database->modifyResource($session->villages[0],75,140,40,40,1); + $database->modifyResource($session->villages[0],75,140,40,40,1); break; - + case '13': $database->updateUserField($_SESSION['username'],'quest','13',0); $_SESSION['qst']= 13; //Give Reward $database->modifyResource($session->villages[0],75,80,30,50,1); break; - + case '14': $database->updateUserField($_SESSION['username'],'quest','14',0); $_SESSION['qst']= 14; @@ -197,7 +197,7 @@ if (isset($qact)){ //Give Reward $database->modifyResource($session->villages[0],150,180,30,130,1); break; - + case '16': $database->updateUserField($_SESSION['username'],'quest','16',0); $_SESSION['qst']= 16; @@ -215,21 +215,21 @@ if (isset($qact)){ //Give Reward $database->modifyResource($session->villages[0],50,30,60,20,1); break; - + case '18': $database->updateUserField($_SESSION['username'],'quest','18',0); $_SESSION['qst']= 18; //Give Reward $database->modifyResource($session->villages[0],75,75,40,40,1); break; - + case '19': $database->updateUserField($_SESSION['username'],'quest','19',0); $_SESSION['qst']= 19; //Give Reward $database->modifyResource($session->villages[0],100,90,100,60,1); break; - + case '20': $database->updateUserField($_SESSION['username'],'quest','20',0); $_SESSION['qst']= 20; @@ -242,28 +242,28 @@ if (isset($qact)){ //Give Reward granary $database->modifyResource($session->villages[0],80,90,60,40,1); break; - + case '22': $database->updateUserField($_SESSION['username'],'quest','22',0); $_SESSION['qst']= 22; //Give Reward warehouse $database->modifyResource($session->villages[0],70,120,90,50,1); break; - + case '23': $database->updateUserField($_SESSION['username'],'quest','23',0); $_SESSION['qst']= 23; //Give Reward //$database->modifyResource($session->villages[0],80,90,60,40,1); break; - + case '24': $database->updateUserField($_SESSION['username'],'quest','24',0); $_SESSION['qst']= 24; //Give Reward rally point $database->modifyResource($session->villages[0],80,90,60,40,1); break; - + case '25': //$dataarray[3] = 1; $database->updateUserField($_SESSION['username'],'quest','25',0); @@ -294,11 +294,11 @@ if (isset($qact)){ $gold+=15; $database->updateUserField($_SESSION['username'],'gold',$gold,0); break; - + case 'gold': $lSubmited=$qact2; break; - + case '28': //$dataarray[6] = 1; $database->updateUserField($_SESSION['username'],'quest','28',0); @@ -306,7 +306,7 @@ if (isset($qact)){ //Give Reward $database->modifyResource($session->villages[0],80,70,60,40,1); break; - + case '29': //$dataarray[7] = 1; $database->updateUserField($_SESSION['username'],'quest','29',0); @@ -314,7 +314,7 @@ if (isset($qact)){ //Give Reward $database->modifyResource($session->villages[0],100,60,90,40,1); break; - + case '30': //$dataarray[8] = 1; $database->updateUserField($_SESSION['username'],'quest','30',0); @@ -322,7 +322,7 @@ if (isset($qact)){ //Give Reward $database->modifyResource($session->villages[0],100,140,90,50,1); break; - + case '91': $database->updateUserField($_SESSION['username'],'quest','91',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); @@ -340,7 +340,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); @@ -348,8 +348,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); @@ -357,8 +357,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); @@ -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 '95': $database->updateUserField($_SESSION['username'],'quest','95',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 '96': $database->updateUserField($_SESSION['username'],'quest','96',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 '97': $database->updateUserField($_SESSION['username'],'quest','97',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()).'',0); @@ -403,7 +403,7 @@ if (isset($qact)){ $gold+=20; $database->updateUserField($_SESSION['username'],'gold',$gold,0); break; - } + } } } @@ -424,14 +424,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} @@ -439,9 +439,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){?> @@ -450,11 +450,11 @@ 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} -vname; +$vName=str_replace(''', "'", $village->vname); if ($vName==$session->userinfo['username']."'s village"){?> {"markup":"\n\t\t

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

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

<\/div>\n\t\t","number":"-3","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} @@ -477,9 +477,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']; @@ -489,7 +489,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>

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

<\/div>\n\t\t","number":10,"reward":{"plus":2},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} -getUnViewNotice($session->uid))>0) {?> @@ -568,7 +568,7 @@ if ($ironL<4 || $clayL<4 || $woodL<4 || $cropL<6){?> {"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":12,"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":15,"reward":{"wood":60,"clay":50,"iron":40,"crop":30},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} - @@ -718,7 +718,7 @@ if ($ironL<4 || $clayL<4 || $woodL<4 || $cropL<6){?> {"markup":"\n\t\t

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

<\/p>15 \"Gold\"
<\/div>
<\/a><\/span><\/div>\n\t\t

<\/div>\n\t\t","number":26,"reward":{"gold":15},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} - @@ -837,7 +837,7 @@ $_SESSION['qst']= 31; ?> getResourceLevel($session->villages[0]); $woodL=$tRes['f1']+$tRes['f3']+$tRes['f14']+$tRes['f17']; if ($woodL<1){?> @@ -846,9 +846,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} -getResourceLevel($session->villages[0]); $cropL=$tRes['f2']+$tRes['f8']+$tRes['f9']+$tRes['f12']+$tRes['f13']+$tRes['f15']; if ($cropL<1){?> @@ -857,10 +857,10 @@ 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} -vname; +$vName=str_replace(''', "'", $village->vname); if ($vName==$session->userinfo['username']."'s village"){?> {"markup":"\n\t\t

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

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

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