diff --git a/Admin/Templates/heatmap.tpl b/Admin/Templates/heatmap.tpl index 271f844a..ebb412c1 100644 --- a/Admin/Templates/heatmap.tpl +++ b/Admin/Templates/heatmap.tpl @@ -52,9 +52,11 @@ $js = [ .hm-layers{display:flex;gap:8px;margin-bottom:12px;flex-wrap:wrap;} .hm-layers button{background:#1e293b;color:#cbd5e1;border:1px solid #334155;border-radius:6px;padding:8px 16px;cursor:pointer;font-size:12px;} .hm-layers button.active{background:#f59e0b;color:#111827;border-color:#f59e0b;font-weight:bold;} -.hm-stage{display:flex;gap:14px;align-items:flex-start;flex-wrap:nowrap;} -.hm-map{position:relative;background:#0b1220;border:1px solid #1f2937;border-radius:8px;padding:8px;flex:1 1 0;min-width:0;} -.hm-map svg{display:block;background:#0a0f1c;border-radius:4px;width:100%;height:auto;max-width:520px;} +.hm-stage{display:block;} +.hm-map{position:relative;background:#0b1220;border:1px solid #1f2937;border-radius:8px;padding:8px;text-align:center;} +.hm-map svg{display:inline-block;background:#0a0f1c;border-radius:4px;width:100%;height:auto;max-width:600px;} +.hm-below{display:flex;gap:14px;align-items:flex-start;margin-top:14px;} +.hm-below .hm-card{flex:1 1 0;min-width:0;margin-bottom:0;} .hm-tip{position:absolute;pointer-events:none;background:#0b1220;border:1px solid #475569;border-radius:6px;padding:7px 9px;font-size:11px;color:#e2e8f0;display:none;z-index:10;white-space:nowrap;box-shadow:0 4px 14px rgba(0,0,0,.5);} .hm-side{flex:0 0 186px;min-width:0;} .hm-card{background:#111827;border:1px solid #1f2937;border-radius:8px;padding:12px 14px;margin-bottom:14px;} @@ -104,7 +106,7 @@ $js = [
-
+

Summary

Player villages
diff --git a/Admin/Templates/questEditor.tpl b/Admin/Templates/questEditor.tpl index 4435e591..ee6fe7af 100644 --- a/Admin/Templates/questEditor.tpl +++ b/Admin/Templates/questEditor.tpl @@ -39,12 +39,14 @@ $msg = isset($_GET['msg']) ? (string)$_GET['msg'] : ''; .qe-tabs{display:flex;gap:8px;margin-bottom:14px;} .qe-tabs a{background:#1e293b;color:#cbd5e1;border:1px solid #334155;border-radius:6px;padding:8px 18px;text-decoration:none;font-size:12px;} .qe-tabs a.active{background:#f59e0b;color:#111827;border-color:#f59e0b;font-weight:bold;} -.qe-table{width:100%;border-collapse:collapse;background:#0b1220;border:1px solid #1f2937;border-radius:8px;overflow:hidden;} -.qe-table th{background:#111827;text-align:left;padding:8px 8px;font-size:10px;text-transform:uppercase;letter-spacing:.4px;color:#94a3b8;border-bottom:1px solid #1f2937;} -.qe-table td{padding:5px 8px;border-bottom:1px solid #14203a;vertical-align:middle;} +.qe-scroll{overflow-x:auto;border-radius:8px;} +.qe-table{width:100%;border-collapse:collapse;background:#0b1220;border:1px solid #1f2937;border-radius:8px;} +.qe-table th{background:#111827;text-align:left;padding:7px 6px;font-size:9px;text-transform:uppercase;letter-spacing:.3px;color:#94a3b8;border-bottom:1px solid #1f2937;white-space:nowrap;} +.qe-table td{padding:4px 6px;border-bottom:1px solid #14203a;vertical-align:middle;} .qe-table tr:hover td{background:#0f1a30;} -.qe-table input[type=number]{background:#0b1220;border:1px solid #334155;border-radius:5px;color:#e2e8f0;padding:5px 6px;width:64px;font-variant-numeric:tabular-nums;} -.qe-table input.note{width:150px;} +.qe-table input[type=number]{background:#0b1220;border:1px solid #334155;border-radius:5px;color:#e2e8f0;padding:4px 5px;width:58px;font-variant-numeric:tabular-nums;} +.qe-qname{color:#cbd5e1;cursor:help;border-bottom:1px dotted #475569;white-space:nowrap;} +.qe-qname:hover{color:#fde68a;} .qe-qid{font-weight:bold;color:#fde68a;font-family:monospace;} .qe-bar{display:flex;gap:10px;align-items:center;margin:14px 0;flex-wrap:wrap;} .qe-save{background:#f59e0b;color:#111827;font-weight:bold;border:0;border-radius:6px;padding:10px 22px;cursor:pointer;font-size:13px;} @@ -83,14 +85,15 @@ $msg = isset($_GET['msg']) ? (string)$_GET['msg'] : ''; +
- - + + @@ -105,11 +108,16 @@ $msg = isset($_GET['msg']) ? (string)$_GET['msg'] : ''; - +
Quest On WoodClayIronCropGoldPlus (days)Req. levelNoteGoldPlus (days)Req. levelQuest (hover)
> > >> + + + +
+
diff --git a/Admin/Templates/users.tpl b/Admin/Templates/users.tpl index 578d2c2c..4e7a8d0c 100644 --- a/Admin/Templates/users.tpl +++ b/Admin/Templates/users.tpl @@ -51,6 +51,10 @@ function tribeLabel($t){ case 3: return array('Gaul','🌾','#27ae60'); case 4: return array('Nature','🌲','#16a085'); case 5: return array('Natars','👑','#8e44ad'); + case 6: return array('Huns','🐎','#a16207'); + case 7: return array('Egyptians','🏺','#d97706'); + case 8: return array('Spartans','🛡','#7c3aed'); + case 9: return array('Vikings','🪓','#0891b2'); default: return array('N/A','❓','#95a5a6'); } } @@ -65,53 +69,53 @@ function accessBadge($a){ function shortEmail($e){if(!$e)return '-';if(strlen($e)>22)return substr($e,0,19).'...';return $e;} ?>

👥 Users

-
found
+
found
diff --git a/GameEngine/QuestConfig.php b/GameEngine/QuestConfig.php index a61969d3..bf45000a 100644 --- a/GameEngine/QuestConfig.php +++ b/GameEngine/QuestConfig.php @@ -256,7 +256,15 @@ class QuestConfig return; } - $vil = (isset($session->villages) && isset($session->villages[0])) ? $session->villages[0] : 0; + // Grant to the village the player is CURRENTLY on (active village), + // not the capital. Village::__construct uses $_SESSION['wid'] as the + // active village, falling back to the first village. + $vil = 0; + if (isset($_SESSION['wid']) && (int) $_SESSION['wid'] > 0) { + $vil = (int) $_SESSION['wid']; + } elseif (isset($session->villages) && isset($session->villages[0])) { + $vil = (int) $session->villages[0]; + } $uid = 0; if (isset($session->uid)) { $uid = (int) $session->uid; @@ -297,6 +305,67 @@ class QuestConfig return ($v === self::V_EXTENDED) ? self::V_EXTENDED : self::V_STANDARD; } + /** + * Short human-readable name + objective per quest, for the editor tooltip + * (the in-game Q* language constants are not loaded in the admin panel). + * Objectives are derived from the requirement checks in quest_core*.tpl. + */ + public static function questInfo($variant, $qid) + { + $variant = self::normVariant($variant); + $qid = (int) $qid; + + // Objectives shared by both variants where the quest number matches its check. + $ext = [ + 2 => ['Woodcutter', 'Finish building a Woodcutter to level 1.'], + 3 => ['Clay Pit', 'Raise a Clay Pit.'], + 4 => ['Iron Mine', 'Raise an Iron Mine.'], + 5 => ['Cropland', 'Raise a Cropland.'], + 6 => ['Resource fields', 'Keep raising your resource fields.'], + 7 => ['Overview', 'Visit the resource / village overview.'], + 8 => ['Main Building', 'Build / upgrade the Main Building.'], + 9 => ['Crop balance', 'Reach the required crop level (costs 200 crop).'], + 10 => ['Main Building', 'Upgrade the Main Building further.'], + 11 => ['Plus reward', 'Tutorial milestone — grants Plus.'], + 12 => ['Marketplace', 'Build a Marketplace.'], + 13 => ['Embassy', 'Build an Embassy.'], + 14 => ['Barracks', 'Build a Barracks.'], + 15 => ['Academy', 'Build an Academy.'], + 16 => ['Smithy', 'Build a Smithy / Blacksmith.'], + 17 => ['Rally Point', 'Build a Rally Point.'], + 18 => ['Train troops', 'Train 2 first-tier units for your tribe.'], + 19 => ['Cranny', 'Build a Cranny.'], + 20 => ['Train warriors', 'Train 2 first-tier units for your tribe.'], + 21 => ['Granary', 'Build a Granary.'], + 22 => ['Warehouse', 'Build a Warehouse.'], + 23 => ['Marketplace', 'Trade at the Marketplace.'], + 24 => ['Expansion', 'Progress the expansion tutorial.'], + 25 => ['Village', 'Village development.'], + 26 => ['Bakery / dough', 'Complete the bakery / dough step.'], + 28 => ['Hero Mansion', 'Build a Hero\'s Mansion.'], + 29 => ['Adventure', 'Send your hero on an adventure.'], + 30 => ['Expansion', 'Grow your village.'], + 31 => ['Buildings', 'Upgrade key buildings.'], + 32 => ['Buildings', 'Upgrade key buildings.'], + 33 => ['Residence / Palace / Command Center', 'Raise Residence, Palace or (Huns) Command Center to level 10.'], + 34 => ['Train settlers', 'Train 3 Settlers for your tribe.'], + 35 => ['Found a village', 'Settle / found a second village.'], + 36 => ['Build a wall', 'Build your tribe\'s wall (City Wall / Palisade / Barricade …).'], + 37 => ['Tutorial complete', 'End of the tutorial quests.'], + 91 => ['Milestone', 'Milestone reward (fixed atomic logic).'], + 92 => ['Milestone', 'Milestone reward.'], + 93 => ['Milestone', 'Milestone reward.'], + 94 => ['Milestone', 'Milestone reward.'], + 95 => ['Milestone', 'Milestone reward.'], + 96 => ['Milestone', 'Milestone reward.'], + 97 => ['Milestone', 'Final milestone (2 days Plus + 20 gold, fixed atomic logic).'], + ]; + if (isset($ext[$qid])) { + return ['name' => $ext[$qid][0], 'desc' => $ext[$qid][1]]; + } + return ['name' => 'Quest ' . $qid, 'desc' => 'Tutorial quest ' . $qid . '.']; + } + /** * Quests that keep their original hardcoded logic in quest_core*.tpl and are * therefore NOT affected by edits here (conditional rewards, atomic-claim diff --git a/Templates/Ajax/quest_core.tpl b/Templates/Ajax/quest_core.tpl index d527c473..0376c933 100644 --- a/Templates/Ajax/quest_core.tpl +++ b/Templates/Ajax/quest_core.tpl @@ -1,4 +1,5 @@ updateUserField($_SESSION['username'],'quest','3',0,false); $_SESSION['qst']= 3; + QuestConfig::grantReward($database,$session,3,'extended'); //Give Reward if(!$session->plus){ - mysqli_query($database->dblink,"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+86400 where `username`='".$user_sanitized."'") or die(mysqli_error($database->dblink)); } else { - $plus=$database->getUserField($_SESSION['username'],'plus','username'); - $plus+=86400; - $database->updateUserField($_SESSION['username'],'plus',$plus,0); } break; case '4': $database->updateUserField($_SESSION['username'],'quest','4',0); $_SESSION['qst']= 4; + QuestConfig::grantReward($database,$session,4,'extended'); //Give Reward - $database->modifyResource($session->villages[0],30,60,30,20,1); break; case 'rank': @@ -108,36 +106,34 @@ if (isset($qact)){ case '5': $database->updateUserField($_SESSION['username'],'quest','5',0); $_SESSION['qst']= 5; + QuestConfig::grantReward($database,$session,5,'extended'); //Give Reward - $database->modifyResource($session->villages[0],40,30,20,30,1); break; case '6': $database->updateUserField($_SESSION['username'],'quest','6',0); $_SESSION['qst']= 6; + QuestConfig::grantReward($database,$session,6,'extended'); $Subject="Message From The Taskmaster"; $Subject=Q6_SUBJECT; $Message=Q6_MESSAGE; $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); break; case '7': $database->updateUserField($_SESSION['username'],'quest','7',0); $_SESSION['qst']= 7; + QuestConfig::grantReward($database,$session,7,'extended'); //Give Reward - $gold=$database->getUserField($_SESSION['username'],'gold','username'); - $gold+=20; - $database->updateUserField($_SESSION['username'],'gold',$gold,0,false); break; case '8': $database->updateUserField($_SESSION['username'],'quest','8',0,false); $_SESSION['qst']= 8; + QuestConfig::grantReward($database,$session,8,'extended'); //Give Reward - $database->modifyResource($session->villages[0],75,80,30,50,1); break; case '9': @@ -158,20 +154,17 @@ if (isset($qact)){ case '10': $database->updateUserField($_SESSION['username'],'quest','10',0); $_SESSION['qst']= 10; + QuestConfig::grantReward($database,$session,10,'extended'); //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; + QuestConfig::grantReward($database,$session,11,'extended'); //Give Reward if(!$session->plus){ - mysqli_query($database->dblink,"UPDATE ".TB_PREFIX."users set plus = ('".mktime(date("H"),date("i"), date("s"),date("m") , date("d"), date("Y"))."')+172800 where `username`='".$user_sanitized."'") or die(mysqli_error()); } else { - $plus=$database->getUserField($_SESSION['username'],'plus','username'); - $plus+=172800; - $database->updateUserField($_SESSION['username'],'plus',$plus,0); } break; @@ -183,22 +176,22 @@ if (isset($qact)){ case '12': $database->updateUserField($_SESSION['username'],'quest','12',0); $_SESSION['qst']= 12; + QuestConfig::grantReward($database,$session,12,'extended'); //Give Reward - $database->modifyResource($session->villages[0],60,30,40,90,1); break; case '13': $database->updateUserField($_SESSION['username'],'quest','13',0); $_SESSION['qst']= 13; + QuestConfig::grantReward($database,$session,13,'extended'); //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; + QuestConfig::grantReward($database,$session,14,'extended'); //Give Reward - $database->modifyResource($session->villages[0],60,50,40,30,1); break; case 'lumber': @@ -208,143 +201,145 @@ if (isset($qact)){ case '15': $database->updateUserField($_SESSION['username'],'quest','15',0); $_SESSION['qst']= 15; + QuestConfig::grantReward($database,$session,15,'extended'); //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; + QuestConfig::grantReward($database,$session,16,'extended'); //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; + QuestConfig::grantReward($database,$session,17,'extended'); //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; + QuestConfig::grantReward($database,$session,18,'extended'); break; case '19': $database->updateUserField($_SESSION['username'],'quest','19',0); $_SESSION['qst']= 19; + QuestConfig::grantReward($database,$session,19,'extended'); //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; + QuestConfig::grantReward($database,$session,20,'extended'); //Give Reward - $database->modifyResource($session->villages[0],70,120,90,50,1); break; case '21': $database->updateUserField($_SESSION['username'],'quest','21',0); $_SESSION['qst']= 21; + QuestConfig::grantReward($database,$session,21,'extended'); break; case '22': $database->updateUserField($_SESSION['username'],'quest','22',0); $_SESSION['qst']= 22; + QuestConfig::grantReward($database,$session,22,'extended'); //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; + QuestConfig::grantReward($database,$session,23,'extended'); break; case '24': $database->updateUserField($_SESSION['username'],'quest','24',0); $_SESSION['qst']= 24; + QuestConfig::grantReward($database,$session,24,'extended'); //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); $_SESSION['qst']= 28; + QuestConfig::grantReward($database,$session,28,'extended'); //Give Reward - $gold=$database->getUserField($_SESSION['username'],'gold','username'); - $gold+=15; - $database->updateUserField($_SESSION['username'],'gold',$gold,0); break; case '29': $dataarray[4] = 1; $database->updateUserField($_SESSION['username'],'quest','29',0); $_SESSION['qst']= 29; + QuestConfig::grantReward($database,$session,29,'extended'); //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); $_SESSION['qst']= 30; + QuestConfig::grantReward($database,$session,30,'extended'); //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); $_SESSION['qst']= 31; + QuestConfig::grantReward($database,$session,31,'extended'); //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); $_SESSION['qst']= 32; + QuestConfig::grantReward($database,$session,32,'extended'); //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); $_SESSION['qst']= 33; + QuestConfig::grantReward($database,$session,33,'extended'); //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); $_SESSION['qst']= 34; + QuestConfig::grantReward($database,$session,34,'extended'); //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); $_SESSION['qst']= 35; + QuestConfig::grantReward($database,$session,35,'extended'); //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; + QuestConfig::grantReward($database,$session,36,'extended'); //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; + QuestConfig::grantReward($database,$session,37,'extended'); break; case '91': @@ -366,45 +361,45 @@ if (isset($qact)){ $database->updateUserField($_SESSION['username'],'quest','92',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); $_SESSION['qst']= 92; + QuestConfig::grantReward($database,$session,92,'extended'); $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward - $database->modifyResource($session->villages[0],217,247,177,207,1); break; case '93': $database->updateUserField($_SESSION['username'],'quest','93',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); $_SESSION['qst']= 93; + QuestConfig::grantReward($database,$session,93,'extended'); $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward - $database->modifyResource($session->villages[0],217,247,177,207,1); break; case '94': $database->updateUserField($_SESSION['username'],'quest','94',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); $_SESSION['qst']= 94; + QuestConfig::grantReward($database,$session,94,'extended'); $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward - $database->modifyResource($session->villages[0],217,247,177,207,1); break; case '95': $database->updateUserField($_SESSION['username'],'quest','95',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); $_SESSION['qst']= 95; + QuestConfig::grantReward($database,$session,95,'extended'); $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward - $database->modifyResource($session->villages[0],217,247,177,207,1); break; case '96': $database->updateUserField($_SESSION['username'],'quest','96',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); $_SESSION['qst']= 96; + QuestConfig::grantReward($database,$session,96,'extended'); $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward - $database->modifyResource($session->villages[0],217,247,177,207,1); break; case '97': @@ -661,26 +656,8 @@ if ($barrack==0){ ?> // Checking 2 warrior trained or no $units = $village->unitall; -$unarray = array( - "", - U1, - U11, - U21, - U51, - U61, - U71, - U81 -); -$unarray2 = array( - "", - "u1", - "u11", - "u21", - "u51", - "u61", - "u71", - "u81" -); +$unarray=array(1=>U1,2=>U11,3=>U21,6=>U51,7=>U61,8=>U71,9=>U81); +$unarray2=array(1=>"u1",2=>"u11",3=>"u21",6=>"u51",7=>"u61",8=>"u71",9=>"u81"); if ($units[$unarray2[$session->userinfo['tribe']]]<2){ ?> {"markup":"\n\t\t

\"\" <\/h1>
userinfo['tribe']];?>.”<\/i>

userinfo['tribe']];?>.<\/div>
<\/span><\/div>\n\t\t

<\/div>\n\t\t","number":"-20","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} @@ -788,18 +765,15 @@ if ($ironL<4 || $clayL<4 || $woodL<4 || $cropL<6){?> $residence = $building->getTypeLevel(25); $palace = $building->getTypeLevel(26); -$commandCenter = $building->getTypeLevel(44); - -if ($palace >= 10) { - $text = PALACE; -} elseif ($residence >= 10) { - $text = RESIDENCE; -} elseif ($commandCenter >= 10) { - $text = COMMANDCENTER; +$commandcenter = $building->getTypeLevel(44); +if($palace >= 10){ +$text =PALACE; +}else if($residence >= 10){ +$text =RESIDENCE; +}else if($commandcenter >= 10){ +$text =COMMANDCENTER; } - -if ($residence < 10 && $palace < 10 && $commandCenter < 10) { -?> +if ($residence<10 && $palace<10 && $commandcenter<10){?> {"markup":"\n\t\t

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

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

<\/div>\n\t\t","number":"-33","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} {"markup":"\n\t\t

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

<\/p>\"Lumber\"3400  \"Clay\"2800  \"Iron\"3600  \"Crop\"2200  <\/div>
<\/a><\/span><\/div>\n\t\t

<\/div>\n\t\t","number":33,"reward":{"wood":3400,"clay":2800,"iron":3600,"crop":2200},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} @@ -837,7 +811,7 @@ if (count($vil)<2){ ?> CITYWALL,2=>EARTHWALL,3=>PALISADE,6=>MAKESHIFTWALL,7=>STONEWALL,8=>DEFENSIVEWALL,9=>BARRICADE); $wall = $village->resarray['f40']; @@ -1125,8 +1099,8 @@ if ($barrack==0){ ?> // Checking 2 warrior trained or no $units = $village->unitall; -$unarray=array("","Legionnaire", "Clubswinger","Phalanx"); -$unarray2=array("","u1", "u11","u21"); +$unarray=array(1=>U1,2=>U11,3=>U21,6=>U51,7=>U61,8=>U71,9=>U81); +$unarray2=array(1=>"u1",2=>"u11",3=>"u21",6=>"u51",7=>"u61",8=>"u71",9=>"u81"); if ($units[$unarray2[$session->userinfo['tribe']]]<2){ ?> {"markup":"\n\t\t

\"\" <\/h1>
”Now that you have barracks you can start training troops. Train two userinfo['tribe']];?>.”<\/i>

<\/p>Please train 2 userinfo['tribe']];?>.<\/div>
<\/span><\/div>\n\t\t

<\/div>\n\t\t","number":"-21","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":0} @@ -1235,12 +1209,15 @@ if ($ironL<4 || $clayL<4 || $woodL<4 || $cropL<6){?> $residence = $building->getTypeLevel(25); $palace = $building->getTypeLevel(26); +$commandcenter = $building->getTypeLevel(44); if($palace >= 10){ $text = "Palace "; }else if($residence >= 10){ $text = "Residence "; +}else if($commandcenter >= 10){ +$text = COMMANDCENTER." "; } -if ($residence<10 && $palace<10){?> +if ($residence<10 && $palace<10 && $commandcenter<10){?> {"markup":"\n\t\t

\"\" <\/h1>
”To found a new village, you will need settlers. Those you can train in either a palace or a residence.”<\/i>

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

<\/div>\n\t\t","number":"-33","reward":false,"qgsrc":"q_luserinfo['tribe'];?>","msrc":"","altstep":99} {"markup":"\n\t\t

\"\" <\/h1>
had reached to level 10, you can now train settlers and found your second village. Notice the cultural points...”<\/i>

Your reward:<\/p>\"Lumber\"3400  \"Clay\"2800  \"Iron\"3600  \"Crop\"2200  <\/div>
<\/a><\/span><\/div>\n\t\t

<\/div>\n\t\t","number":33,"reward":{"wood":3400,"clay":2800,"iron":3600,"crop":2200},"qgsrc":"q_luserinfo['tribe'];?>g","msrc":"","altstep":99} @@ -1271,7 +1248,7 @@ if (count($vil)<2){ ?> CITYWALL,2=>EARTHWALL,3=>PALISADE,6=>MAKESHIFTWALL,7=>STONEWALL,8=>DEFENSIVEWALL,9=>BARRICADE); $wall = $village->resarray['f40']; @@ -1370,4 +1347,5 @@ $_SESSION['qst']= 24; ?> \ No newline at end of file + }} ?> + diff --git a/Templates/Ajax/quest_core25.tpl b/Templates/Ajax/quest_core25.tpl index a55b7c51..073c7ed6 100644 --- a/Templates/Ajax/quest_core25.tpl +++ b/Templates/Ajax/quest_core25.tpl @@ -82,7 +82,7 @@ if (isset($qact)){ case '3': $database->updateUserField($_SESSION['username'],'quest','3',0); $_SESSION['qst']= 3; - QuestConfig::grantReward($database,$session,3); + QuestConfig::grantReward($database,$session,3,'standard'); //Give Reward if(!$session->plus){ } else { @@ -92,7 +92,7 @@ if (isset($qact)){ case '4': $database->updateUserField($_SESSION['username'],'quest','4',0); $_SESSION['qst']= 4; - QuestConfig::grantReward($database,$session,4); + QuestConfig::grantReward($database,$session,4,'standard'); //Give Reward break; @@ -103,14 +103,14 @@ if (isset($qact)){ case '5': $database->updateUserField($_SESSION['username'],'quest','5',0); $_SESSION['qst']= 5; - QuestConfig::grantReward($database,$session,5); + QuestConfig::grantReward($database,$session,5,'standard'); //Give Reward break; case '6': $database->updateUserField($_SESSION['username'],'quest','6',0); $_SESSION['qst']= 6; - QuestConfig::grantReward($database,$session,6); + QuestConfig::grantReward($database,$session,6,'standard'); $Subject=Q6_SUBJECT; $Message=Q6_MESSAGE; $database->sendMessage($session->userinfo['id'],4,$Subject,$Message,0,0,0,0,0); @@ -121,7 +121,7 @@ if (isset($qact)){ case '7': $database->updateUserField($_SESSION['username'],'quest','7',0); $_SESSION['qst']= 7; - QuestConfig::grantReward($database,$session,7); + QuestConfig::grantReward($database,$session,7,'standard'); //Give Reward break; @@ -133,7 +133,7 @@ if (isset($qact)){ case '8': $database->updateUserField($_SESSION['username'],'quest','8',0); $_SESSION['qst']= 8; - QuestConfig::grantReward($database,$session,8); + QuestConfig::grantReward($database,$session,8,'standard'); //Give Reward break; @@ -155,14 +155,14 @@ if (isset($qact)){ case '10': $database->updateUserField($_SESSION['username'],'quest','10',0); $_SESSION['qst']= 10; - QuestConfig::grantReward($database,$session,10); + QuestConfig::grantReward($database,$session,10,'standard'); //Give Reward break; case '11': $database->updateUserField($_SESSION['username'],'quest','11',0); $_SESSION['qst']= 11; - QuestConfig::grantReward($database,$session,11); + QuestConfig::grantReward($database,$session,11,'standard'); //Give Reward if(!$session->plus){ } else { @@ -172,35 +172,35 @@ if (isset($qact)){ case '12': $database->updateUserField($_SESSION['username'],'quest','12',0); $_SESSION['qst']= 12; - QuestConfig::grantReward($database,$session,12); + QuestConfig::grantReward($database,$session,12,'standard'); //Give Reward break; case '13': $database->updateUserField($_SESSION['username'],'quest','13',0); $_SESSION['qst']= 13; - QuestConfig::grantReward($database,$session,13); + QuestConfig::grantReward($database,$session,13,'standard'); //Give Reward break; case '14': $database->updateUserField($_SESSION['username'],'quest','14',0); $_SESSION['qst']= 14; - QuestConfig::grantReward($database,$session,14); + QuestConfig::grantReward($database,$session,14,'standard'); //Give Reward break; case '15': $database->updateUserField($_SESSION['username'],'quest','15',0); $_SESSION['qst']= 15; - QuestConfig::grantReward($database,$session,15); + QuestConfig::grantReward($database,$session,15,'standard'); //Give Reward break; case '16': $database->updateUserField($_SESSION['username'],'quest','16',0); $_SESSION['qst']= 16; - QuestConfig::grantReward($database,$session,16); + QuestConfig::grantReward($database,$session,16,'standard'); //Give Reward break; @@ -211,56 +211,56 @@ if (isset($qact)){ case '17': $database->updateUserField($_SESSION['username'],'quest','17',0); $_SESSION['qst']= 17; - QuestConfig::grantReward($database,$session,17); + QuestConfig::grantReward($database,$session,17,'standard'); //Give Reward break; case '18': $database->updateUserField($_SESSION['username'],'quest','18',0); $_SESSION['qst']= 18; - QuestConfig::grantReward($database,$session,18); + QuestConfig::grantReward($database,$session,18,'standard'); //Give Reward break; case '19': $database->updateUserField($_SESSION['username'],'quest','19',0); $_SESSION['qst']= 19; - QuestConfig::grantReward($database,$session,19); + QuestConfig::grantReward($database,$session,19,'standard'); //Give Reward break; case '20': $database->updateUserField($_SESSION['username'],'quest','20',0); $_SESSION['qst']= 20; - QuestConfig::grantReward($database,$session,20); + QuestConfig::grantReward($database,$session,20,'standard'); break; case '21': $_SESSION['dough']= true; $database->updateUserField($_SESSION['username'],'quest','21',0); $_SESSION['qst']= 21; - QuestConfig::grantReward($database,$session,21); + QuestConfig::grantReward($database,$session,21,'standard'); //Give Reward granary break; case '22': $database->updateUserField($_SESSION['username'],'quest','22',0); $_SESSION['qst']= 22; - QuestConfig::grantReward($database,$session,22); + QuestConfig::grantReward($database,$session,22,'standard'); //Give Reward warehouse break; case '23': $database->updateUserField($_SESSION['username'],'quest','23',0); $_SESSION['qst']= 23; - QuestConfig::grantReward($database,$session,23); + QuestConfig::grantReward($database,$session,23,'standard'); //Give Reward break; case '24': $database->updateUserField($_SESSION['username'],'quest','24',0); $_SESSION['qst']= 24; - QuestConfig::grantReward($database,$session,24); + QuestConfig::grantReward($database,$session,24,'standard'); //Give Reward rally point break; @@ -268,7 +268,7 @@ if (isset($qact)){ //$dataarray[3] = 1; $database->updateUserField($_SESSION['username'],'quest','25',0); $_SESSION['qst']= 25; - QuestConfig::grantReward($database,$session,25); + QuestConfig::grantReward($database,$session,25,'standard'); //Give Reward barrack break; @@ -289,7 +289,7 @@ if (isset($qact)){ //$dataarray[5] = 1; $database->updateUserField($_SESSION['username'],'quest','27',0); $_SESSION['qst']= 27; - QuestConfig::grantReward($database,$session,27); + QuestConfig::grantReward($database,$session,27,'standard'); //Give Reward break; @@ -301,7 +301,7 @@ if (isset($qact)){ //$dataarray[6] = 1; $database->updateUserField($_SESSION['username'],'quest','28',0); $_SESSION['qst']= 28; - QuestConfig::grantReward($database,$session,28); + QuestConfig::grantReward($database,$session,28,'standard'); //Give Reward break; @@ -309,7 +309,7 @@ if (isset($qact)){ //$dataarray[7] = 1; $database->updateUserField($_SESSION['username'],'quest','29',0); $_SESSION['qst']= 29; - QuestConfig::grantReward($database,$session,29); + QuestConfig::grantReward($database,$session,29,'standard'); //Give Reward break; @@ -317,7 +317,7 @@ if (isset($qact)){ //$dataarray[8] = 1; $database->updateUserField($_SESSION['username'],'quest','30',0); $_SESSION['qst']= 30; - QuestConfig::grantReward($database,$session,30); + QuestConfig::grantReward($database,$session,30,'standard'); //Give Reward break; @@ -340,7 +340,7 @@ if (isset($qact)){ $database->updateUserField($_SESSION['username'],'quest','92',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); $_SESSION['qst']= 92; - QuestConfig::grantReward($database,$session,92); + QuestConfig::grantReward($database,$session,92,'standard'); $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward break; @@ -349,7 +349,7 @@ if (isset($qact)){ $database->updateUserField($_SESSION['username'],'quest','93',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); $_SESSION['qst']= 93; - QuestConfig::grantReward($database,$session,93); + QuestConfig::grantReward($database,$session,93,'standard'); $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward break; @@ -358,7 +358,7 @@ if (isset($qact)){ $database->updateUserField($_SESSION['username'],'quest','94',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); $_SESSION['qst']= 94; - QuestConfig::grantReward($database,$session,94); + QuestConfig::grantReward($database,$session,94,'standard'); $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward break; @@ -367,7 +367,7 @@ if (isset($qact)){ $database->updateUserField($_SESSION['username'],'quest','95',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); $_SESSION['qst']= 95; - QuestConfig::grantReward($database,$session,95); + QuestConfig::grantReward($database,$session,95,'standard'); $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward break; @@ -376,7 +376,7 @@ if (isset($qact)){ $database->updateUserField($_SESSION['username'],'quest','96',0); $database->updateUserField($_SESSION['username'],'quest_time',''.(time()+$skipp_time).'',0); $_SESSION['qst']= 96; - QuestConfig::grantReward($database,$session,96); + QuestConfig::grantReward($database,$session,96,'standard'); $_SESSION['qst_time'] = time()+$skipp_time; //Give Reward break;